[修改] 三说代码事件流程代码提交

manailin

2022-09-15 8a2e79466a12e3dd5c65fe271c1304255bd29f31

[修改] 三说代码事件流程代码提交

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComEventController.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java

New file
@@ -0,0 +1,157 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.*;
import com.panzhihua.common.service.community.CommunitySanShuoService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.HashMap;

/**
 * ClassName   ComEventController
 * Description 三说会堂事件表控制层
 *
 * @author manailin
 * @date 2022-09-07 11:23:51
 */
@Slf4j
@Api(tags = {"三说会堂事件表控制层"})
@RestController
@RequestMapping("/sanshuo/comEvent")
public class ComSanShuoEventController extends BaseController {

    @Resource
    private CommunitySanShuoService comEventService;


    /**
     * description 新增三说会堂事件表
     *
     * @param comSanRequestVO 对象
     * @return R  新增结果对象
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("新增三说会堂事件表")
    @PostMapping("/add")
    public R insertComEvent(@RequestBody @Valid ComSanRequestVO comSanRequestVO, @ApiIgnore BindingResult results) {
        if (results.hasErrors()) {
            return R.fail(results.getFieldError().getDefaultMessage());
        }
        return comEventService.insertComEvent(comSanRequestVO);
    }


    /**
     * description 根据ID获取三说会堂事件表信息
     *
     * @param id 主键id
     * @return R<ComEvent> comEvent 对象
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("根据ID获取三说会堂事件详情信息，返回事件信息和图片信息")
    @GetMapping("/detail/{id}")
    public R<HashMap> detail(@PathVariable(value = "id") String id) {
        if (StringUtils.isEmpty(id)) {
            throw new RuntimeException("参数不能为空");
        }
        return comEventService.detail(id);
    }


    /**
     * description page   三说会堂事件表分页列表数据
     *
     * @param comEventPageRequestVO 对象
     * @return PageResult<List < ComEvent>>  三说会堂事件表分页列表数据
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据")
    @PostMapping("/page")
    public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
        ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
        return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
    }


    /**
     * description 修改三说会堂事件表状态
     *
     * @param id 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("取消申请")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
    })
    @PutMapping("/cancelRequest")
    public R cancelRequest(@RequestParam("id") Long id) {
        return comEventService.cancelRequest(id);
    }

    /**
     * description 修改三说会堂事件表状态
     *
     * @param id 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("专家不受理，转其他专家处理")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
    })
    @PutMapping("/reject/Request")
    public R rejectRequest(@RequestParam("id") Long id) {
        return comEventService.rejectRequest(id);
    }

    /**
     * description 专家调解处理
     *
     * @param comEventConciliationVO 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("专家调解处理")
    @PutMapping("/conciliation/Request")
    public R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO) {
        return comEventService.conciliationRequest(comEventConciliationVO);
    }

    /**
     * description 专家归档
     *
     * @param comEventArchiveVO 归档对象
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("事件专家归档")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
            @ApiImplicitParam(name = "result", value = "归档结论", required = true, dataType = "String"),
    })
    @PutMapping("/archive/Request")
    public R archiveRequest(@RequestBody ComEventArchiveVO comEventArchiveVO) {
        return comEventService.archiveRequest(comEventArchiveVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventPageRequestVO.java

New file
@@ -0,0 +1,52 @@
package com.panzhihua.common.model.vos.sanshuo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * Description 三说会堂事件表
 * ClassName   ComEventPageRequestVO
 * @author     manailin
 * @date       2022-09-07 11:23:51
 */
@Data
@ApiModel(value = "三说会堂事件表分页列表数据")
public class ComEventPageRequestVO {

    /**主键*/
    @ApiModelProperty(name = "id", value = "主键")
    private Long id;
    /**服务单号（流水号）按照日期时间+数字*/
    @ApiModelProperty(name = "orderSn", value = "服务单号（流水号）按照日期时间+数字")
    private String orderSn;
    /**调解发起人ID*/
    @ApiModelProperty(name = "requestUserId", value = "调解发起人ID")
    private Long requestUserId;
    /**调解事件类型*/
    @ApiModelProperty(name = "eventCategory", value = "调解事件类型")
    private Long eventCategory;
    /**调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）*/
    @ApiModelProperty(name = "type", value = "调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）")
    private String type;
    /**选择调解专家ID*/
    @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")
    private Long specialistId;
    /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/
    @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消")
    private Integer eventProcessStatus;
    /**当前处理对象类型（1、行业分中心2、社区3、是街道4、区）*/
    @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区）")
    private Integer currentProcessType;
    /**当前处理机构ID*/
    @ApiModelProperty(name = "currentOrgId", value = "当前处理机构ID")
    private String currentOrgId;
    /**当前机构下处理人ID*/
    @ApiModelProperty(name = "currentProcessUserId", value = "当前机构下处理人ID")
    private Long currentProcessUserId;

    private Long pageNo;
    private Long pageSize;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestImageVO.java

@@ -4,25 +4,27 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * Description 三说会堂事件表
 * ClassName   ComEventVO
 * @author     manailin
 * @date       2022-09-07 11:23:51
 *
 * @author manailin
 * @date 2022-09-07 11:23:51
 */
@Data
@ApiModel(value = "三说会堂事件表")
@ApiModel(value = "三说会堂事件图片对象")
public class ComEventRequestImageVO {
    private static final long serialVersionUID = 1L;
    /**name*/
    @ApiModelProperty(name = "name", value = "图片name")
    private String name;
    /**图片大小*/
    @ApiModelProperty(name = "orderSn", value = "图片大小")
    private String size;
    @ApiModelProperty(name = "url", value = "图片地址")
    private String url;
   
    /**
     * name
     */
    @ApiModelProperty(name = "name", value = "图片name")
    private String name;
    /**
     * 图片大小
     */
    @ApiModelProperty(name = "size", value = "图片大小")
    private String size;
    @ApiModelProperty(name = "url", value = "图片地址")
    private String url;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanRequestVO.java

File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestVO.java
@@ -10,14 +10,13 @@

/**
 * Description 三说会堂事件表
 * ClassName   ComEventVO
 * ClassName   ComEventRequestVO
 * @author     manailin
 * @date       2022-09-07 11:23:51
 */
@Data
@ApiModel(value = "三说会堂事件表")
public class ComEventRequestVO {
    private static final long serialVersionUID = 1L;
@ApiModel(value = "新增三说会堂事件表")
public class ComSanRequestVO {

    /**调解发起人诉求事件描述*/
    @ApiModelProperty(name = "requestUserEventDes", value = "调解发起人诉求事件描述")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java

@@ -3,8 +3,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventRequestVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

@@ -23,7 +23,7 @@
     * @date 2022-09-07 11:23:51
     */
    @PostMapping("/add")
    R insertComEvent(@RequestBody ComEventRequestVO comEventVO);
    R insertComEvent(@RequestBody ComSanRequestVO comEventVO);

    /**
     * description 更新三说会堂事件表
@@ -93,7 +93,7 @@
     * @date 2022-09-07 11:23:51
     */
    @DeleteMapping("/remove/{id}")
    R remove(@PathVariable Long id);
    R remove(@PathVariable(value = "id") Long id);

    /**
     * description 修改三说会堂事件表状态

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSanShuoEventController.java

@@ -4,8 +4,10 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventPageRequestVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.service.community.CommunitySanShuoService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -76,18 +78,15 @@
     * description page   三说会堂事件表分页列表数据
     * params   [pageNo, pageSize]
     *
     * @param comEventVO 对象
     * @param comEventPageRequestVO 对象
     * @return PageResult<List < ComEvent>>  三说会堂事件表分页列表数据
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "pageNo", value = "当前页码", required = true, dataType = "Long", paramType = "query"),
            @ApiImplicitParam(name = "pageSize", value = "每页显示数量", required = true, dataType = "Long", paramType = "query")
    })
    @PostMapping("/page")
    public R page(@RequestBody ComEventVO comEventVO) {
    public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
        ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
        return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComEventController.java

@@ -7,8 +7,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventRequestVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
@@ -54,7 +54,7 @@
     */
    @ApiOperation("新增三说会堂事件表")
    @PostMapping("/add")
    public R insertComEvent(@RequestBody @Valid ComEventRequestVO comEventVO, @ApiIgnore BindingResult results) {
    public R insertComEvent(@RequestBody @Valid ComSanRequestVO comEventVO, @ApiIgnore BindingResult results) {
        if (results.hasErrors()) {
            return R.fail(results.getFieldError().getDefaultMessage());
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java

@@ -19,7 +19,7 @@
 * @date       2022-09-07 11:23:51
 */
@Data
@TableName("event")
@TableName("com_sanshuo_event_info")
public class ComEvent implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventResource.java

@@ -16,7 +16,7 @@
 * @date       2022-09-07 11:23:52
 */
@Data
@TableName("event_resource")
@TableName("com_sanshuo_event_resource")
public class ComEventResource implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventTransferRecord.java

@@ -14,7 +14,7 @@
 * @date       2022-09-07 11:23:52
 */
@Data
@TableName("event_transfer_record")
@TableName("com_sanshuo_event_transfer_record")
public class ComEventTransferRecord implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml

@@ -53,17 +53,17 @@

    <select id="pageByComEvent" resultType="com.panzhihua.service_community.entity.ComEvent">
        SELECT <include refid="columns" />
        FROM event
        FROM com_sanshuo_event_info
    </select>

    <select id="listByComEvent" resultType="com.panzhihua.service_community.entity.ComEvent">
        SELECT <include refid="columns" />
        FROM event
        FROM com_sanshuo_event_info
    </select>

    <select id="calculate" resultType="com.panzhihua.common.model.vos.sanshuo.ComEventCalculateVO">
        select event_process_status as status ,count(1) as  sum
        from event
        from com_sanshuo_event_info
        group by event_process_status
    </select>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventResourceMapper.xml

@@ -22,12 +22,12 @@

    <select id="pageByComEventResource" resultType="com.panzhihua.service_community.entity.ComEventResource">
        SELECT <include refid="columns" />
        FROM event_resource
        FROM com_sanshuo_event_resource
    </select>

    <select id="listByComEventResource" resultType="com.panzhihua.service_community.entity.ComEventResource">
        SELECT <include refid="columns" />
        FROM event_resource
        FROM com_sanshuo_event_resource
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventTransferRecordMapper.xml

@@ -35,12 +35,12 @@

    <select id="pageByComEventTransferRecord" resultType="com.panzhihua.service_community.entity.ComEventTransferRecord">
        SELECT <include refid="columns" />
        FROM event_transfer_record
        FROM com_sanshuo_event_transfer_record
    </select>

    <select id="listByComEventTransferRecord" resultType="com.panzhihua.service_community.entity.ComEventTransferRecord">
        SELECT <include refid="columns" />
        FROM event_transfer_record
        FROM com_sanshuo_event_transfer_record
    </select>

</mapper>