manailin
2022-09-14 9b1df600b3afbfd4b27266dcc54026db10cd8164
[修改] 三说代码事件流程代码提交
11个文件已添加
18个文件已修改
1483 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComEventController.java 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SanShuoEventStatusEnum.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventArchiveVO.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventCalculateVO.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestImageVO.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestVO.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java 185 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSanShuoEventController.java 245 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActWarehouseApplyApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComEventController.java 159 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoIndustryCenterApi.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMediateTypeDao.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventResource.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/schedule/AcidSchedule.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleRecordServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/CommediateTypeServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComEventController.java
New file
@@ -0,0 +1,112 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventRequestVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.service.community.CommunitySanShuoService;
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("/comEvent")
public class ComEventController extends BaseController {
    @Resource
    private CommunitySanShuoService comEventService;
    /**
     * description 新增三说会堂事件表
     *
     * @param comEventVO 对象
     * @return R  新增结果对象
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("新增三说会堂事件表")
    @PostMapping("/add")
    public R insertComEvent(@RequestBody @Valid ComEventRequestVO comEventVO, @ApiIgnore BindingResult results) {
        if (results.hasErrors()) {
            return R.fail(results.getFieldError().getDefaultMessage());
        }
        return comEventService.insertComEvent(comEventVO);
    }
    /**
     * 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   三说会堂事件表分页列表数据
     * params   [pageNo, pageSize]
     *
     * @param comEventVO 对象
     * @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) {
        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);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SanShuoEventStatusEnum.java
New file
@@ -0,0 +1,40 @@
package com.panzhihua.common.enums;
import lombok.Getter;
/**
 * 事件状态
 *
 * @author 1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除
 */
@Getter
public enum SanShuoEventStatusEnum {
    UNDO(1, "待处理"), VALID(2, "待验证"), ACCEPT(3, "专家已受理"), REJECT(4, "专家未受理,拒绝5"), conciliation(5, "调解中"), OVER(6, "已结案归档"), CANCEL(7, "调解取消"), DELETE(8, "已删除");
    private final Integer code;
    private final String name;
    SanShuoEventStatusEnum(Integer code, String name) {
        this.code = code;
        this.name = name;
    }
    public static int getCodeByName(String name) {
        for (SanShuoEventStatusEnum item : SanShuoEventStatusEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return UNDO.getCode();
    }
    public static String getCnDescByName(Integer code) {
        for (SanShuoEventStatusEnum item : SanShuoEventStatusEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "未知";
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventArchiveVO.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.vos.sanshuo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * Description 三说会堂事件归档对象
 * ClassName   ComEventArchiveVO
 *
 * @author manailin
 * @date 2022-09-07 11:23:52
 */
@Data
@ApiModel(value = "三说会堂事件归档对象")
public class ComEventArchiveVO {
    private static final long serialVersionUID = 1L;
    /**
     * 主键
     */
    @ApiModelProperty(name = "id", value = "主键")
    private Long id;
    /**
     * 归档结论
     */
    @ApiModelProperty(name = "result", value = "归档结论")
    private String result;
    /**
     * 调解上传图片地址列表,逗号进行分割
     */
    @ApiModelProperty(name = "images", value = "调解上传图片地址列表,逗号进行分割")
    private List<ComEventRequestImageVO> images;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventCalculateVO.java
New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.vos.sanshuo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
 * Description 三说会堂事件表
 * ClassName   ComEventVO
 * @author     manailin
 * @date       2022-09-07 11:23:51
 */
@Data
@ApiModel(value = "三说会堂事件表")
public class ComEventCalculateVO {
    private static final long serialVersionUID = 1L;
    private String status;
    private String  sum;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java
New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.model.vos.sanshuo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
 * Description 三说会堂事件调解对象
 * ClassName   ComEventResourceVO
 * @author     manailin
 * @date       2022-09-07 11:23:52
 */
@Data
@ApiModel(value = "三说会堂事件调解对象")
public class ComEventConciliationVO {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @ApiModelProperty(name = "id", value = "主键")
    private Long id;
    /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消*/
    @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消")
    private Integer eventProcessStatus;
    /**事件结果(1、调解失败2、调解成功)*/
    @ApiModelProperty(name = "eventResult", value = "事件结果(1、调解失败2、调解成功)")
    private Integer eventResult;
    /**当前处理人是否上报上级单位处理*/
    @ApiModelProperty(name = "reportSuperior", value = "当前处理人是否上报上级单位处理")
    private Boolean reportSuperior;
    /**当前调解处理结果*/
    @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
    private String currentEventProcessResult;
    /**调解是否成果1未成果2已成果*/
    @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
    private Integer eventSucceed;
    /**调解上传图片地址列表,逗号进行分割*/
    @ApiModelProperty(name = "images", value = "调解上传图片地址列表,逗号进行分割")
    private List<ComEventRequestImageVO> images;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
New file
@@ -0,0 +1,126 @@
package com.panzhihua.common.model.vos.sanshuo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
 * Description 三说会堂事件调解对象
 * ClassName   ComEventResourceVO
 * @author     manailin
 * @date       2022-09-07 11:23:52
 */
@Data
@ApiModel(value = "三说会堂事件调解对象")
public class ComEventDetailVO {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @ApiModelProperty(name = "id", value = "主键")
    private Long id;
    /**服务单号(流水号)按照日期时间+数字*/
    @ApiModelProperty(name = "orderSn", value = "服务单号(流水号)按照日期时间+数字")
    private String orderSn;
    /**调解发起人ID*/
    @ApiModelProperty(name = "requestUserId", value = "调解发起人ID")
    private Long requestUserId;
    /**调解发起人操作事件状态(1草稿箱2发布3逻辑删除4、撤销)*/
    @ApiModelProperty(name = "userEventStatus", value = "调解发起人操作事件状态(1草稿箱2发布3逻辑删除4、撤销)")
    private Integer userEventStatus;
    /**调解发起人诉求事件描述*/
    @ApiModelProperty(name = "requestUserEventDes", value = "调解发起人诉求事件描述")
    private String requestUserEventDes;
    /**调解发起人姓名*/
    @ApiModelProperty(name = "requestUserName", value = "调解发起人姓名")
    private String requestUserName;
    /**调解发起人电话*/
    @ApiModelProperty(name = "requestUserTel", value = "调解发起人电话")
    private String requestUserTel;
    /**调解事件类型*/
    @ApiModelProperty(name = "eventCategory", value = "调解事件类型")
    private Long eventCategory;
    /**调解类型(1、行业分中心调解2、村社区调解3、是街道调解4、区)*/
    @ApiModelProperty(name = "type", value = "调解类型(1、行业分中心调解2、村社区调解3、是街道调解4、区)")
    private String type;
    /**上报提交时间*/
    @ApiModelProperty(name = "submitDate", value = "上报提交时间")
    private Date submitDate;
    /**选择预约调解时间*/
    @ApiModelProperty(name = "appointmentTime", value = "选择预约调解时间")
    private Date appointmentTime;
    /**申请人选择的社区ID*/
    @ApiModelProperty(name = "requestUserCommunity", value = "申请人选择的社区ID")
    private Long requestUserCommunity;
    /**行业分中心ID*/
    @ApiModelProperty(name = "centerId", value = "行业分中心ID")
    private String centerId;
    /**行业分中心调解室电话*/
    @ApiModelProperty(name = "centerTel", value = "行业分中心调解室电话")
    private String centerTel;
    /**调解专家所属单位*/
    @ApiModelProperty(name = "specialistOrg", value = "调解专家所属单位")
    private String specialistOrg;
    /**调解专家级别*/
    @ApiModelProperty(name = "specialistLevel", value = "调解专家级别")
    private String specialistLevel;
    /**选择调解专家ID*/
    @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")
    private Long specialistId;
    /**调解专家名字*/
    @ApiModelProperty(name = "specialistName", value = "调解专家名字")
    private String specialistName;
    /**调解专家联系方式*/
    @ApiModelProperty(name = "specialistTel", value = "调解专家联系方式")
    private String specialistTel;
    /**专家受理时间*/
    @ApiModelProperty(name = "specialistAcceptTime", value = "专家受理时间")
    private Date specialistAcceptTime;
    /**撤销类型 1 用户 2 社区3、街道4、行业分中心*/
    @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心")
    private Integer revokeType;
    /**工作人员的事件处理状态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;
    /**当前机构下处理人名称*/
    @ApiModelProperty(name = "currentProcessUserName", value = "当前机构下处理人名称")
    private String currentProcessUserName;
    /**当前调解处理结果*/
    @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
    private String currentEventProcessResult;
    /**调解是否成果1未成果2已成果*/
    @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
    private Integer eventSucceed;
    /**撤销描述*/
    @ApiModelProperty(name = "revokeDes", value = "撤销描述")
    private String revokeDes;
    /**事件结果(1、调解失败2、调解成功)*/
    @ApiModelProperty(name = "eventResult", value = "事件结果(1、调解失败2、调解成功)")
    private Integer eventResult;
    /**当前处理人是否上报上级单位处理*/
    @ApiModelProperty(name = "reportSuperior", value = "当前处理人是否上报上级单位处理")
    private Boolean reportSuperior;
    /**归档结案报告*/
    @ApiModelProperty(name = "result", value = "归档结案报告")
    private String result;
    /**已归档处理完毕时间*/
    @ApiModelProperty(name = "resultDate", value = "已归档处理完毕时间")
    private Date resultDate;
    /**创建时间*/
    @ApiModelProperty(name = "createAt", value = "创建时间")
    private Date createAt;
    /**调解上传图片地址列表,逗号进行分割*/
    @ApiModelProperty(name = "images", value = "调解上传图片地址列表,逗号进行分割")
    private List<ComEventRequestImageVO> images;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestImageVO.java
New file
@@ -0,0 +1,28 @@
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   ComEventVO
 * @author     manailin
 * @date       2022-09-07 11:23:51
 */
@Data
@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;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestVO.java
New file
@@ -0,0 +1,47 @@
package com.panzhihua.common.model.vos.sanshuo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.util.Date;
import java.util.List;
/**
 * Description 三说会堂事件表
 * ClassName   ComEventVO
 * @author     manailin
 * @date       2022-09-07 11:23:51
 */
@Data
@ApiModel(value = "三说会堂事件表")
public class ComEventRequestVO {
    private static final long serialVersionUID = 1L;
    /**调解发起人诉求事件描述*/
    @ApiModelProperty(name = "requestUserEventDes", value = "调解发起人诉求事件描述")
    @Length(max = 500)
    private String requestUserEventDes;
    /**调解事件类型*/
    @ApiModelProperty(name = "eventCategory", value = "调解事件类型")
    private Long eventCategory;
    /**调解类型(1、行业分中心调解2、村社区调解3、是街道调解4、区)*/
    @ApiModelProperty(name = "type", value = "调解类型(1、行业分中心调解2、村社区调解3、是街道调解4、区)")
    private String type;
    /**选择预约调解时间*/
    @ApiModelProperty(name = "appointmentTime", value = "选择预约调解时间")
    private Date appointmentTime;
    /**申请人选择的社区ID*/
    @ApiModelProperty(name = "requestUserCommunity", value = "申请人选择的社区ID")
    private Long requestUserCommunity;
    /**行业分中心ID*/
    @ApiModelProperty(name = "centerId", value = "行业分中心ID")
    private String centerId;
    /**选择调解专家ID*/
    @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")
    private Long specialistId;
    /**调解上传图片地址列表,逗号进行分割*/
    @ApiModelProperty(name = "images", value = "调解上传图片地址列表,逗号进行分割")
    private List<ComEventRequestImageVO> images;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
@@ -93,6 +93,13 @@
    /**当前机构下处理人名称*/
    @ApiModelProperty(name = "currentProcessUserName", value = "当前机构下处理人名称")
    private String currentProcessUserName;
    /**当前调解处理结果*/
    @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
    private String currentEventProcessResult;
    /**调解是否成果1未成果2已成果*/
    @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
    private Integer eventSucceed;
    /**撤销描述*/
    @ApiModelProperty(name = "revokeDes", value = "撤销描述")
    private String revokeDes;
@@ -139,4 +146,6 @@
    @ApiModelProperty(name = "updateAt", value = "修改时间")
    private Date updateAt;
   
    private Long pageNo;
    private Long pageSize;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java
New file
@@ -0,0 +1,185 @@
package com.panzhihua.common.service.community;
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 org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
@FeignClient(name = "huacheng-community", contextId = "CommunitySanShuoService", path = "/sanshuo/comEvent")
public interface CommunitySanShuoService {
    /**
     * description 新增三说会堂事件表
     *
     * @param comEventVO 对象
     * @return R  新增结果对象
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PostMapping("/add")
    R insertComEvent(@RequestBody ComEventRequestVO comEventVO);
    /**
     * description 更新三说会堂事件表
     *
     * @param comEventVO 对象
     * @return R  修改结果对象
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PostMapping("/update")
    R updateComEvent(@RequestBody ComEventVO comEventVO);
    /**
     * description 根据ID获取三说会堂事件表信息
     *
     * @param id 主键id
     * @return R<ComEvent> comEvent 对象
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @GetMapping("/get/{id}")
    R<ComEventVO> get(@PathVariable(value = "id") String id);
    /**
     * description 根据ID获取三说会堂事件表信息
     *
     * @param id 主键id
     * @return R<ComEvent> comEvent 对象
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @GetMapping("/detail/{id}")
    R<HashMap> detail(@PathVariable(value = "id") String id);
    /**
     * description 查询返回列表数据
     *
     * @param comEventVO 三说会堂事件表对象
     * @return R<List < ComEventVO>>  comEventVO对象列表
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PostMapping("/list")
    R<List<ComEventVO>> listByComEvent(@RequestBody ComEventVO comEventVO);
    /**
     * description page   三说会堂事件表分页列表数据
     * params   [pageNo, pageSize]
     *
     * @param comEventVO 对象
     * @param pageNo     当前页码
     * @param pageSize   每页显示数量
     * @return PageResult<List < ComEvent>>  三说会堂事件表分页列表数据
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PostMapping("/page")
    R page(@RequestBody ComEventVO comEventVO, @RequestParam("pageNo") Long pageNo, @RequestParam("pageSize") Long pageSize);
    /**
     * description 根据ID删除三说会堂事件表
     *
     * @param id 主键id
     * @return R 删除结果
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @DeleteMapping("/remove/{id}")
    R remove(@PathVariable Long id);
    /**
     * description 修改三说会堂事件表状态
     *
     * @param id 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PutMapping("/updateEnabled")
    R updateEnabled(@RequestParam("id") Long id, @RequestParam("enabled") Boolean enabled);
    /**
     * description 修改三说会堂事件表状态
     *
     * @param id 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PutMapping("/cancelRequest")
    R cancelRequest(@RequestParam("id") Long id);
    /**
     * description 修改三说会堂事件表状态
     *
     * @param id 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PutMapping("/accept/Request")
    R acceptRequest(@RequestParam("id") Long id, @RequestParam("specialistId") Long specterId);
    /**
     * description 修改三说会堂事件表状态
     *
     * @param id 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PutMapping("/reject/Request")
    R rejectRequest(@RequestParam("id") Long id);
    /**
     * description 修改三说会堂事件表状态
     *
     * @param id 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PutMapping("/reappoint/Request")
    R reappoint(@RequestParam("id") Long id, @RequestParam("specialistId") Long specialistId);
    /**
     * description 专家调解处理
     *
     * @param comEventConciliationVO 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PutMapping("/conciliation/Request")
    R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO);
    /**
     * description 专家归档
     *
     * @param comEventArchiveVO 归档对象
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PutMapping("/archive/Request")
    R archiveRequest(@RequestBody ComEventArchiveVO comEventArchiveVO);
    /**
     * description 事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除)数据统计
     *
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @PutMapping("/status/calculate")
    R calculate();
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSanShuoEventController.java
New file
@@ -0,0 +1,245 @@
package com.panzhihua.community_backstage.api;
import com.panzhihua.common.controller.BaseController;
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.ComEventVO;
import com.panzhihua.common.service.community.CommunitySanShuoService;
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 comEventVO 对象
     * @return R  修改结果对象
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("更新三说会堂事件表")
    @PostMapping("/update")
    public R updateComEvent(@RequestBody @Valid ComEventVO comEventVO, @ApiIgnore BindingResult results) {
        if (results.hasErrors()) {
            return R.fail(results.getFieldError().getDefaultMessage());
        }
        return comEventService.updateComEvent(comEventVO);
    }
    /**
     * 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   三说会堂事件表分页列表数据
     * params   [pageNo, pageSize]
     *
     * @param comEventVO 对象
     * @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) {
        return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
    }
    /**
     * description 根据ID删除三说会堂事件表
     *
     * @param id 主键id
     * @return R 删除结果
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("删除三说会堂事件")
    @ApiImplicitParams(
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long")
    )
    @DeleteMapping("/remove/{id}")
    public R remove(@PathVariable Long id) {
        return comEventService.remove(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"),
            @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
    })
    @PutMapping("/updateEnabled")
    public R updateEnabled(@RequestParam("id") Long id, @RequestParam("enabled") Boolean enabled) {
        return comEventService.updateEnabled(id, enabled);
    }
    /**
     * 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"),
            @ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
    })
    @PutMapping("/accept/Request")
    public R acceptRequest(@RequestParam("id") Long id, Long specterId) {
        return comEventService.acceptRequest(id, specterId);
    }
    /**
     * 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 id 主键id
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("重新指定专家处理")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
            @ApiImplicitParam(name = "specialistId", value = "专家ID", required = true, dataType = "Long")
    })
    @PutMapping("/reappoint/Request")
    public R reappoint(Long id, Long specialistId) {
        return comEventService.reappoint(id, specialistId);
    }
    /**
     * 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);
    }
    /**
     * description 事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除)数据统计
     *
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
    @PutMapping("/status/calculate")
    public R calculate() {
        return comEventService.calculate();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java
@@ -9,7 +9,7 @@
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.schedule.util.QRCodeUtil;
import com.panzhihua.service_community.util.QRCodeUtil;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActWarehouseApplyApi.java
@@ -8,7 +8,7 @@
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.service_community.entity.ComActWarehouseApply;
import com.panzhihua.service_community.service.ComActWarehouseApplyService;
import com.panzhihua.service_community.schedule.util.QRCodeUtil;
import com.panzhihua.service_community.util.QRCodeUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComEventController.java
@@ -2,7 +2,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
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.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
@@ -19,6 +24,7 @@
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
/**
@@ -31,7 +37,7 @@
@Slf4j
@Api(tags = {"三说会堂事件表控制层"})
@RestController
@RequestMapping("/comEvent")
@RequestMapping("/sanshuo/comEvent")
public class ComEventController extends BaseController {
    @Resource
@@ -48,11 +54,15 @@
     */
    @ApiOperation("新增三说会堂事件表")
    @PostMapping("/add")
    public R insertComEvent(@RequestBody @Valid ComEventVO comEventVO, @ApiIgnore BindingResult results) {
    public R insertComEvent(@RequestBody @Valid ComEventRequestVO comEventVO, @ApiIgnore BindingResult results) {
        if (results.hasErrors()) {
            return R.fail(results.getFieldError().getDefaultMessage());
        }
        ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
        LoginUserInfoVO loginUser = getLoginUserInfo();
        comEvent.setRequestUserId(loginUser.getUserId());
        comEvent.setRequestUserName(loginUser.getName());
        comEvent.setRequestUserTel(loginUser.getPhone());
        return comEventService.insertComEvent(comEvent);
    }
@@ -89,6 +99,23 @@
            throw new RuntimeException("参数不能为空");
        }
        return R.ok(CopyUtil.copyProperties(comEventService.getById(id), ComEventVO.class));
    }
    /**
     * 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 R.ok(comEventService.detail(id));
    }
    /**
@@ -138,13 +165,16 @@
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("删除三说会堂事件表")
    @ApiOperation("删除三说会堂事件")
    @ApiImplicitParams(
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long")
    )
    @DeleteMapping("/remove/{id}")
    public R remove(@PathVariable Long id) {
        return comEventService.removeById(id) ? R.ok() : R.fail();
        ComEvent comEvent = new ComEvent();
        comEvent.setId(id);
        comEvent.setEventProcessStatus(8);
        return comEventService.updateComEvent(comEvent);
    }
    /**
@@ -155,7 +185,7 @@
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("修改状态")
    @ApiOperation("修改是否有效状态")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
            @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
@@ -164,4 +194,123 @@
    public R updateEnabled(@RequestParam("id") Long id, @RequestParam("enabled") Boolean enabled) {
        return comEventService.updateEnabled(id, enabled);
    }
    /**
     * 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"),
            @ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
    })
    @PutMapping("/accept/Request")
    public R acceptRequest(@RequestParam("id") Long id, Long specterId) {
        return comEventService.acceptRequest(id, specterId);
    }
    /**
     * 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) {
        ComEvent comEvent = new ComEvent();
        comEvent.setId(id);
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.REJECT.getCode());
        return comEventService.updateComEvent(comEvent);
    }
    /**
     * 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"),
            @ApiImplicitParam(name = "specialistId", value = "专家ID", required = true, dataType = "Long")
    })
    @PutMapping("/reappoint/Request")
    public R reappoint(Long id, Long specialistId) {
        return comEventService.reappoint(id, specialistId);
    }
    /**
     * 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.conciliationEvent(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, getLoginUserInfo());
    }
    /**
     * description 事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除)数据统计
     *
     * @return Result  修改成功和失败
     * @author manailin
     * @date 2022-09-07 11:23:51
     */
    @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
    @PutMapping("/status/calculate")
    public R calculate() {
        return comEventService.calculate();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoIndustryCenterApi.java
@@ -6,16 +6,14 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.entity.ComSanshuoIndustryCenter;
import com.panzhihua.service_community.schedule.util.MyAESUtil;
import com.panzhihua.service_community.service.ComSanShuoIndustryCenterService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * 三说会堂业务中心管理控制器
 * */
 */
@RestController
@RequestMapping("/sanshuo/industryCenter")
public class ComSanShuoIndustryCenterApi extends BaseController {
@@ -43,7 +41,7 @@
    /**
     * 添加业务中心
     * */
     */
    @PostMapping
    public R add(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO){
        comSanShuoIndustryCenterDTO.setCreateBy(this.getLoginUserInfo().getName());
@@ -52,7 +50,7 @@
    /**
     * 修改业务中心
     * */
     */
    @PutMapping
    public R update(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO){
        return comSanShuoIndustryCenterService.addOrUpdate(comSanShuoIndustryCenterDTO);
@@ -60,7 +58,7 @@
    /**
     * 删除业务中心
     * */
     */
    @DeleteMapping("/remove")
    public R remove(@RequestParam("id") Long id){
        ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(id);
@@ -71,7 +69,7 @@
    /**
     * 重置密码
     * */
     */
    @PostMapping("/resetPass")
    public R resetPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO){
        ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(comSanShuoIndustryCenterDTO.getId());
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.sanshuo.ComEventCalculateVO;
import com.panzhihua.service_community.entity.ComEvent;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -36,4 +37,6 @@
       * @date   2022-09-07 11:23:51
       */
   List<ComEvent> listByComEvent(@Param("comEvent") ComEvent comEvent);
    List<ComEventCalculateVO> calculate();
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMediateTypeDao.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.ComMediateType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
@@ -12,6 +13,7 @@
* @createDate 2022-09-07 10:31:38
* @Entity generator.entity.ComMediateType
*/
@Mapper
public interface ComMediateTypeDao extends BaseMapper<ComMediateType> {
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
@@ -1,11 +1,16 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.panzhihua.common.model.vos.sanshuo.ComEventRequestImageVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.Date;
import java.util.List;
/**
 * Description 三说会堂事件表
@@ -19,6 +24,7 @@
    private static final long serialVersionUID = 1L;
    /**主键*/
    @ApiModelProperty(name = "id", value = "主键")
    @TableId(type = IdType.INPUT)
    private Long id;
    /**服务单号(流水号)按照日期时间+数字*/
    @ApiModelProperty(name = "orderSn", value = "服务单号(流水号)按照日期时间+数字")
@@ -81,7 +87,7 @@
    @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心")
    private Integer revokeType;
    /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消*/
    @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消")
    @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除")
    private Integer eventProcessStatus;
    /**当前处理对象类型(1、行业分中心2、社区3、是街道4、区)*/
    @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型(1、行业分中心2、社区3、是街道4、区)")
@@ -89,6 +95,9 @@
    /**当前处理机构ID*/
    @ApiModelProperty(name = "currentOrgId", value = "当前处理机构ID")
    private String currentOrgId;
    /**当前处理机构ID*/
    @ApiModelProperty(name = "currentOrgName", value = "当前处理机构名称")
    private String currentOrgName;
    /**当前机构下处理人ID*/
    @ApiModelProperty(name = "currentProcessUserId", value = "当前机构下处理人ID")
    private Long currentProcessUserId;
@@ -98,6 +107,12 @@
    /**撤销描述*/
    @ApiModelProperty(name = "revokeDes", value = "撤销描述")
    private String revokeDes;
    /**当前调解处理结果*/
    @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
    private String currentEventProcessResult;
    /**调解是否成果1未成果2已成果*/
    @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
    private Integer eventSucceed;
    /**事件结果(1、调解失败2、调解成功)*/
    @ApiModelProperty(name = "eventResult", value = "事件结果(1、调解失败2、调解成功)")
    private Integer eventResult;
@@ -140,5 +155,8 @@
    /**修改时间*/
    @ApiModelProperty(name = "updateAt", value = "修改时间")
    private Date updateAt;
    /**调解上传图片地址列表,逗号进行分割*/
    @TableField(exist = false)
    @ApiModelProperty(name = "images", value = "调解上传图片地址列表,逗号进行分割")
    private List<ComEventRequestImageVO> images;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventResource.java
@@ -1,5 +1,7 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
    private static final long serialVersionUID = 1L;
    /**主键*/
    @ApiModelProperty(name = "id", value = "主键")
    @TableId(type = IdType.INPUT)
    private Long id;
    /**事件关联ID*/
    @ApiModelProperty(name = "refId", value = "事件关联ID")
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/schedule/AcidSchedule.java
@@ -33,19 +33,19 @@
    @Resource
    private ComActAcidRecordDao comActAcidRecordDao;
    @Scheduled(cron = "0 0 9 * * *")
    public void push(){
       List<ComActAcidMemberVO> comActAcidMemberList=comActAcidMemberDao.selectPushList("");
       comActAcidMemberList.forEach(comActAcidMember -> {
           FiveCount fiveCount=comActAcidRecordDao.pushStatics(DateUtils.getDateFormatString(DateUtils.addDay(new Date(),-1),"yyyy-MM-dd"),comActAcidMember.getRelationName());
           WxXCXTempSend util = new WxXCXTempSend();
           String accessToken = null;
           try {
               accessToken = util.getAccessToken();
           } catch (Exception e) {
               e.printStackTrace();
           }
           WxUtil.sendSubscribeStatics(comActAcidMember.getOpenid(), accessToken, fiveCount, "Yr5idSziLRiRo0t07mcz284sMm41Kr2KsA5UmSc0jWU");
       });
    }
//    @Scheduled(cron = "0 0 9 * * *")
//    public void push(){
//       List<ComActAcidMemberVO> comActAcidMemberList=comActAcidMemberDao.selectPushList("");
//       comActAcidMemberList.forEach(comActAcidMember -> {
//           FiveCount fiveCount=comActAcidRecordDao.pushStatics(DateUtils.getDateFormatString(DateUtils.addDay(new Date(),-1),"yyyy-MM-dd"),comActAcidMember.getRelationName());
//           WxXCXTempSend util = new WxXCXTempSend();
//           String accessToken = null;
//           try {
//               accessToken = util.getAccessToken();
//           } catch (Exception e) {
//               e.printStackTrace();
//           }
//           WxUtil.sendSubscribeStatics(comActAcidMember.getOpenid(), accessToken, fiveCount, "Yr5idSziLRiRo0t07mcz284sMm41Kr2KsA5UmSc0jWU");
//       });
//    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
@@ -2,9 +2,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
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.ComEventDetailVO;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.entity.SysUser;
import java.util.HashMap;
import java.util.List;
/**
@@ -67,4 +73,18 @@
     * @date 2022-09-07 11:23:51
     */
    R updateEnabled(Long id, Boolean enabled);
    R conciliationEvent(ComEventConciliationVO comEventConciliationVO);
    R cancelRequest(Long id );
    HashMap detail(String id);
    R acceptRequest(Long id,Long specterId);
    R reappoint(Long id, Long specialistId);
    R calculate();
    R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleRecordServiceImpl.java
@@ -12,7 +12,7 @@
import com.panzhihua.service_community.entity.ComActRaffleRecord;
import com.panzhihua.service_community.dao.ComActRaffleRecordDao;
import com.panzhihua.service_community.service.ComActRaffleRecordService;
import com.panzhihua.service_community.schedule.util.QRCodeUtil;
import com.panzhihua.service_community.util.QRCodeUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -12,7 +12,7 @@
import javax.annotation.Resource;
import com.panzhihua.service_community.schedule.util.RSAUtils;
import com.panzhihua.service_community.util.RSAUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -6,7 +6,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import com.panzhihua.service_community.schedule.util.MyAESUtil;
import com.panzhihua.service_community.util.MyAESUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -5,18 +5,28 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.constants.ReturnMsgConstants;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.*;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComEventMapper;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.service.IComEventService;
import com.panzhihua.service_community.dao.ComStreetDAO;
import com.panzhihua.service_community.entity.*;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import java.util.*;
/**
 * Description 三说会堂事件表业务层实现类
@@ -29,12 +39,35 @@
@Service("comEventService")
public class ComEventServiceImpl extends ServiceImpl<ComEventMapper, ComEvent> implements IComEventService {
    @Resource
    private IComEventTransferRecordService comEventTransferRecordService;
    @Resource
    private ComSanShuoExpertService comSanShuoExpertService;
    @Resource
    private IComEventResourceService comEventResourceService;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComStreetDAO comStreetDAO;
    @Resource
    private ComSanShuoIndustryCenterService comSanShuoIndustryCenterService;
    @Override
    public R pageByComEvent(ComEvent comEvent, Page pagination) {
        IPage<ComEvent> list = baseMapper.pageByComEvent(comEvent, pagination);
        if (list.getRecords().size() < 1) {
            return R.ok(Collections.emptyList());
        }
        list.getRecords().forEach(comEvent1 -> {
            List<ComEventResource> resourceList = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent1.getId()));
            List<ComEventRequestImageVO> comEventRequestImageVO = CopyUtil.deepCopyListObject(resourceList, ComEventRequestImageVO.class);
            comEvent1.setImages(comEventRequestImageVO);
        });
        return R.ok(list);
    }
@@ -50,17 +83,52 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R insertComEvent(ComEvent comEvent) {
        if (checkExist( comEvent.getOrderSn(), null)) {
            return R.fail(ReturnMsgConstants.DATA_EXIST);
        ComSanshuoExpert expert = comSanShuoExpertService.getById(comEvent.getSpecialistId());
        if (comEvent.getRequestUserCommunity() != null) {
            ComActDO community = comActDAO.selectById(comEvent.getRequestUserCommunity());
            comEvent.setCurrentOrgName(community.getName());
        }
        if (comEvent.getCenterId() != null) {
            ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(comEvent.getCenterId());
            comEvent.setCurrentOrgName(center.getName());
        }
        comEvent.setUserEventStatus(2);
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.UNDO.getCode());
        comEvent.setSpecialistName(expert.getName());
        comEvent.setOrderSn(DateUtils.getDateFormatString(new Date(), "yyyyMMddHHmmss") + RandomUtils.nextLong(1, 10000));
        comEvent.setInvalid(true);
        comEvent.setId(Snowflake.getId());
        comEvent.setSubmitDate(new Date());
        comEvent.setCreateAt(new Date());
        comEvent.setCreateBy(comEvent.getRequestUserId());
        comEvent.setUpdateBy(comEvent.getRequestUserId());
        comEvent.setUpdateAt(new Date());
        boolean flag = save(comEvent);
        if (!flag) {
            return R.fail(ReturnMsgConstants.DATA_EXIST);
        }
        saveEventImageList(comEvent.getImages(), comEvent.getId());
        return R.ok(ReturnMsgConstants.SAVE_SUCCESS);
    }
    private Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id) {
        List<ComEventResource> comEventResourceList = new ArrayList<>();
        if (!StringUtils.isEmpty(images)) {
            List<ComEventRequestImageVO> imagesList = images;
            imagesList.forEach(comEventRequestImageVO -> {
                ComEventResource comEventResource = new ComEventResource();
                comEventResource.setId(Snowflake.getId());
                comEventResource.setRefId(id);
                comEventResource.setStatus(1);
                comEventResource.setType(1);
                comEventResource.setResourceName(comEventRequestImageVO.getName());
                comEventResource.setResourceSize(comEventRequestImageVO.getSize());
                comEventResource.setUrl(comEventRequestImageVO.getUrl());
                comEventResource.setDeleteFlag(false);
                comEventResourceList.add(comEventResource);
            });
        }
        return comEventResourceService.saveBatch(comEventResourceList);
    }
    @Override
@@ -85,6 +153,134 @@
        return flag ? R.ok(comEvent, ReturnMsgConstants.UPDATE_SUCCESS) : R.fail(ReturnMsgConstants.UPDATE_FALSE);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R conciliationEvent(ComEventConciliationVO comEventConciliationVO) {
        saveEventImageList(comEventConciliationVO.getImages(), comEventConciliationVO.getId());
        ComEvent comEvent = baseMapper.selectById(comEventConciliationVO.getId());
        comEvent.setEventSucceed(comEventConciliationVO.getEventSucceed());
        comEvent.setEventResult(comEventConciliationVO.getEventResult());
        comEvent.setReportSuperior(comEventConciliationVO.getReportSuperior());
        comEvent.setCurrentEventProcessResult(comEventConciliationVO.getCurrentEventProcessResult());
        //如果当前请求,需要上报上级进行处理
        if (comEventConciliationVO.getReportSuperior()) {
            if (comEvent.getCurrentProcessType() == 2) {
                //查询街道的账号
                comEvent.setCurrentProcessType(3);
                ComActDO comActDO = comActDAO.selectById(comEvent.getCurrentOrgId());
                comEvent.setCurrentOrgId(comActDO.getStreetId().toString());
            } else {
                //查询街道的上级区域账号
                comEvent.setCurrentProcessType(4);
                try {
                    ComStreetDO street = comStreetDAO.selectById(comEvent.getCurrentOrgId());
                    comEvent.setCurrentOrgId(street.getAreaCode().toString());
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        }
        baseMapper.updateById(comEvent);
        return R.ok();
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R cancelRequest(Long id) {
        ComEvent comEvent = baseMapper.selectById(id);
        if (comEvent.getEventProcessStatus() == SanShuoEventStatusEnum.UNDO.getCode().intValue()
                || comEvent.getEventProcessStatus() == SanShuoEventStatusEnum.VALID.getCode().intValue()) {
            comEvent.setId(id);
            comEvent.setUserEventStatus(4);
            comEvent.setEventProcessStatus(SanShuoEventStatusEnum.CANCEL.getCode());
            comEvent.setRevokeDes("用户手动取消");
            baseMapper.updateById(comEvent);
            return R.ok();
        } else {
            return R.fail("当前申请已经受理,不能取消!");
        }
    }
    @Override
    public HashMap detail(String id) {
        HashMap map = new HashMap(3);
        ComEventDetailVO comEventDetailVO = new ComEventDetailVO();
        ComEvent comEvent = baseMapper.selectById(id);
        ComSanshuoExpert specter = comSanShuoExpertService.getById(comEvent.getSpecialistId());
        CopyUtil.copyProperties(comEvent, comEventDetailVO);
        List<ComEventResource> resourceList = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id));
        List<ComEventRequestImageVO> comEventRequestImageVO = CopyUtil.deepCopyListObject(resourceList, ComEventRequestImageVO.class);
        comEventDetailVO.setImages(comEventRequestImageVO);
        map.put("specter", specter);
        map.put("eventDetail", comEventDetailVO);
        List<ComEventTransferRecord> transferRecord = comEventTransferRecordService.list(new QueryWrapper<ComEventTransferRecord>().lambda().eq(ComEventTransferRecord::getEventId, id));
        map.put("transferLog", transferRecord);
        List<ComEventResource> resource = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id)
                .eq(ComEventResource::getStatus, 5));
        map.put("archiveImage", resource);
        return map;
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R acceptRequest(Long id, Long specterId) {
        ComEvent comEvent = new ComEvent();
        comEvent.setId(id);
        comEvent.setSpecialistId(specterId);
        ComSanshuoExpert specter = comSanShuoExpertService.getById(specterId);
        comEvent.setSpecialistAcceptTime(new Date());
        comEvent.setSpecialistName(specter.getName());
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode());
        baseMapper.updateById(comEvent);
        return R.ok();
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R reappoint(Long id, Long specialistId) {
        ComEvent comEvent = new ComEvent();
        comEvent.setId(id);
        comEvent.setSpecialistId(specialistId);
        ComSanshuoExpert specter = comSanShuoExpertService.getById(specialistId);
        comEvent.setSpecialistAcceptTime(new Date());
        comEvent.setSpecialistName(specter.getName());
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode());
        baseMapper.updateById(comEvent);
        return R.ok();
    }
    @Override
    public R calculate() {
        List<ComEventCalculateVO> calculateList = baseMapper.calculate();
        return R.ok(calculateList);
    }
    @Override
    public R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser) {
        ComEvent comEvent = baseMapper.selectById(comEventArchiveVO.getId());
        comEvent.setEventProcessStatus(6);
        comEvent.setResult(comEventArchiveVO.getResult());
        baseMapper.updateById(comEvent);
        ComEventTransferRecord comEventTransferRecord = new ComEventTransferRecord();
        comEventTransferRecord.setEventId(comEvent.getId());
        comEventTransferRecord.setSave(true);
        comEventTransferRecord.setProcessResult(comEventArchiveVO.getResult());
        comEventTransferRecord.setProcessResultData(new Date().toString());
        comEventTransferRecord.setProcessDate(new Date());
        comEventTransferRecord.setProcessBy(sysUser.getUserId());
        comEventTransferRecord.setProcessByName(sysUser.getName());
        comEventTransferRecord.setProcessType(1);
        comEventTransferRecord.setCreateAt(new Date());
        comEventTransferRecord.setSpecialistId(comEvent.getSpecialistId());
        comEventTransferRecord.setSpecialistOrg(comEvent.getCurrentOrgId());
        comEventTransferRecord.setSpecialistLevel(comEvent.getSpecialistLevel());
        comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
        comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
        comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
        comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
        return R.ok();
    }
    private Boolean checkExist(String sn, Long id) {
        ComEvent comEvent = new ComEvent();
        comEvent.setOrderSn(sn);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java
@@ -13,7 +13,7 @@
import com.panzhihua.service_community.dao.SysUserDao;
import com.panzhihua.service_community.entity.ComSanshuoIndustryCenter;
import com.panzhihua.service_community.entity.SysUser;
import com.panzhihua.service_community.schedule.util.MyAESUtil;
import com.panzhihua.service_community.util.MyAESUtil;
import com.panzhihua.service_community.service.ComSanShuoIndustryCenterService;
import org.springframework.stereotype.Service;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/CommediateTypeServiceImpl.java
@@ -22,6 +22,7 @@
@Service
public class CommediateTypeServiceImpl extends ServiceImpl<ComMediateTypeDao, ComMediateType> implements CommediateTypeService {
    @Resource
    private ComMediateTypeDao comMediateTypeDao;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
@@ -30,6 +30,8 @@
            <result property="currentProcessUserName" column="current_process_user_name" />
            <result property="revokeDes" column="revoke_des" />
            <result property="eventResult" column="event_result" />
            <result property="eventSucceed" column="event_succeed" />
            <result property="currentEventProcessResult" column="current_event_process_result" />
            <result property="reportSuperior" column="report_superior" />
            <result property="result" column="result" />
            <result property="resultDate" column="result_date" />
@@ -46,7 +48,7 @@
    </resultMap>
    <sql id="columns">
        id,order_sn,request_user_id,user_event_status,request_user_event_des,request_user_name,request_user_tel,event_category,type,submit_date,appointment_time,request_user_community,center_id,center_tel,specialist_org,specialist_level,specialist_id,specialist_name,specialist_tel,specialist_accept_time,revoke_type,event_process_status,current_process_type,current_org_id,current_process_user_id,current_process_user_name,revoke_des,event_result,report_superior,result,result_date,urgent,difficult,urgent_dell,invalid,major,request_user_response,create_by,create_at,update_by,update_at
        id,order_sn,request_user_id,user_event_status,request_user_event_des,event_succeed,current_event_process_result,request_user_name,request_user_tel,event_category,type,submit_date,appointment_time,request_user_community,center_id,center_tel,specialist_org,specialist_level,specialist_id,specialist_name,specialist_tel,specialist_accept_time,revoke_type,event_process_status,current_process_type,current_org_id,current_process_user_id,current_process_user_name,revoke_des,event_result,report_superior,result,result_date,urgent,difficult,urgent_dell,invalid,major,request_user_response,create_by,create_at,update_by,update_at
    </sql>
    <select id="pageByComEvent" resultType="com.panzhihua.service_community.entity.ComEvent">
@@ -59,4 +61,10 @@
        FROM event
    </select>
    <select id="calculate" resultType="com.panzhihua.common.model.vos.sanshuo.ComEventCalculateVO">
        select event_process_status as status ,count(1) as  sum
        from event
        group by event_process_status
    </select>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java
New file
@@ -0,0 +1,105 @@
package com.panzhihua.service_community.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventDetailVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventRequestImageVO;
import com.panzhihua.service_community.ServiceCommunityApplication;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.service.IComEventService;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
/**
 * 应用模块名称<p>
 * 代码描述<p>
 * Copyright: Copyright (C) 2022 XXX, Inc. All rights reserved. <p>
 * Company: 成都呐喊信息技术有限公司<p>
 *
 * @author manailin
 * @since 2022/9/13 16:27
 */
@Slf4j
@SpringBootTest(classes = ServiceCommunityApplication.class)
class ComEventServiceImplTest {
    @Resource
    private IComEventService comEventService;
    @Test
    void pageByComEvent() {
        Page pagination = new Page(1, 10);
        ComEvent comEvent=new ComEvent();
        comEvent.setCreateBy(1l);
        R data = comEventService.pageByComEvent(comEvent, pagination);
        log.info(JSONObject.toJSONString(data));
    }
    @Test
    void listByComEvent() {
    }
    @Test
    void insertComEvent() {
        ComEvent comEvent =new ComEvent();
        comEvent.setRequestUserId(1l);
        comEvent.setRequestUserEventDes("测试申请数据");
        comEvent.setType("2");
        comEvent.setEventCategory(1l);
        comEvent.setSpecialistId(1L);
        comEvent.setAppointmentTime(new Date());
        List<ComEventRequestImageVO> images =new ArrayList<>();
        ComEventRequestImageVO comEventRequestImageVO =new ComEventRequestImageVO();
        comEventRequestImageVO.setUrl("www.baidu.com");
        images.add(comEventRequestImageVO);
        comEvent.setImages(images);
        comEventService.insertComEvent(comEvent);
    }
    @Test
    void updateComEvent() {
    }
    @Test
    void updateEnabled() {
    }
    @Test
    void conciliationEvent() {
    }
    @Test
    void cancelRequest() {
        comEventService.cancelRequest(1569688381582086144L);
    }
    @Test
    void detail() {
        HashMap data = comEventService.detail("1569688381582086144");
        log.info(JSONObject.toJSONString(data));
    }
    @Test
    void calculate() {
        R data = comEventService.calculate();
        log.info(JSONObject.toJSONString(data));
    }
    @Test
    void archiveRequest() {
//        R data = comEventService.archiveRequest();
//        log.info(JSONObject.toJSONString(data));
    }
}