Merge branch 'feature/teamB_zz_wgh_1'

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaKettleBaseDisputeProcessDTO.java

@@ -0,0 +1,235 @@
+package com.epmet.opendata.dto.ca;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+@Data
+public class CaKettleBaseDisputeProcessDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 事件信息主键，事件流转关联字段，关联tbactinst表的recid字段
+     */
+	private Integer baseKeyId;
+
+    /**
+     * 网格编码
+     */
+	private String griddingid;
+
+    /**
+     * 网格名称
+     */
+	private String griddingname;
+
+    /**
+     * 经度
+     */
+	private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+	private BigDecimal latitude;
+
+    /**
+     * 事件名称
+     */
+	private String eventtitle;
+
+    /**
+     * 发生日期
+     */
+	private Date eventdate;
+
+    /**
+     * 发生地点
+     */
+	private String eventaddrdetail;
+
+    /**
+     * 事件规模
+     */
+	private String eventscale;
+
+    /**
+     * 事件类别
+     */
+	private String eventcategoryid;
+
+    /**
+     * 涉及人数
+     */
+	private String peoplenum;
+
+    /**
+     * 事件简述
+     */
+	private String eventtext;
+
+    /**
+     * 涉及单位
+     */
+	private String responsibilityUnit;
+
+    /**
+     * 主要当事人姓名
+     */
+	private String mainpartyid;
+
+    /**
+     * 主要当事人民族
+     */
+	private String mainnation;
+
+    /**
+     * 办结时限
+     */
+	private BigDecimal timelimit;
+
+    /**
+     * 办结方式
+     */
+	private String finishedmethod;
+
+    /**
+     * 办结层级
+     */
+	private String completionleve;
+
+    /**
+     * 是否办结
+     */
+	private String eventstatus;
+
+    /**
+     * 创建人
+     */
+	private String createUser;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 更新人
+     */
+	private String updateUser;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     *
+     */
+	private Date eventtime;
+
+    /**
+     *
+     */
+	private Date finisheddatetime;
+
+    /**
+     * 重点场所类别
+     */
+	private String keyAreaType;
+
+    /**
+     * 宗教活动规模
+     */
+	private String religionScale;
+
+    /**
+     * 宗教类别
+     */
+	private String religionType;
+
+    /**
+     * 重点场所是否变动
+     */
+	private String isKeyareaState;
+
+    /**
+     * 重点人员是否在当地
+     */
+	private String isLocal;
+
+    /**
+     * 重点人员现状
+     */
+	private String presentSituation;
+
+    /**
+     *
+     */
+	private Integer qdDeleteflag;
+
+    /**
+     * 是否化解
+     */
+	private String successfulDefuse;
+
+    /**
+     * 关注程度
+     */
+	private String attentionlevel;
+
+    /**
+     * 事件编码
+     */
+	private String eventnumber;
+
+    /**
+     * 事件来源，网格员上报赋值05；街道吹哨赋值03；其他赋值99
+     */
+	private String eventsource;
+
+    /**
+     * 事件状态 0待提交1提交2代派发3处理中4复核5办结6退回-1作废
+     */
+	private Integer curstatus;
+
+    /**
+     * 上报人（网格员姓名）
+     */
+	private String wgy;
+
+    /**
+     * 附件id
+     */
+	private String fileid;
+
+    /**
+     * 网格员id
+     */
+	private String wgyhumanid;
+
+    /**
+     * 是否已抽取 0 未抽取 1 已抽取 2 准备抽取(中间状态)
+     */
+	private String isExtracted;
+
+    /**
+     * 1正常2临期3超期
+     */
+	private Integer timelimitstatus;
+
+    /**
+     * 数据同步时间
+     */
+	private Date importTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java

@@ -23,6 +23,7 @@ public interface CaWghDataConstant {
     String UNICOM_RENTAL = "ca_rental";
     String UNICOM_BM_CATEGORY = "ca_bm_category";
     String UNICOM_SYS_DICT = "ca_sys_dict";
+    String UNICOM_KETTLE = "ca_kettle_base_dispute_process";
 
     String SHARE_BASE_GRID = "wgh_base_grid";
     String SHARE_WGH_SUB = "wgh_subdistrict_office";

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaKettleDetailsById.java

@@ -0,0 +1,13 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CaKettleDetailsById implements Serializable {
+
+    private static final long serialVersionUID = 8874110627694588503L;
+
+    private Integer baseKeyId;
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java

@@ -0,0 +1,32 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class KettleNewsFormDto implements Serializable {
+
+    private static final long serialVersionUID = -6633389149995248497L;
+
+    /**
+     * 上报人姓名
+     */
+    private String wgy;
+
+    /**
+     * 网格名称
+     */
+    private String griddingname;
+
+
+
+    /**
+     * 事件名称
+     */
+    private String eventtitle;
+
+    private Integer page;
+
+    private Integer limit;
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java

@@ -9,10 +9,6 @@ public class NewWghSjxxFormDTO implements Serializable {
 
     private static final long serialVersionUID = -4846956644682609996L;
 
-    /**
-     * 网格员名称
-     */
-    private String wgymc;
 
     /**
      * 街道标签

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java

@@ -0,0 +1,62 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class CaKettleDetailsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2712173770296330515L;
+
+    /**
+     * 网格名称
+     */
+    private String griddingname;
+
+    /**
+     * 事件名称
+     */
+    private String eventtitle;
+
+    /**
+     * 发生日期
+     */
+    private Date eventdate;
+
+    /**
+     * 发生地点
+     */
+    private String eventaddrdetail;
+
+    /**
+     * 事件简述
+     */
+    private String eventtext;
+
+    /**
+     * 办结方式
+     */
+    private String finishedmethod;
+
+    /**
+     * 上报人
+     */
+    private String wgy;
+
+    /**
+     * 事件来源
+     */
+    private String eventsource;
+
+    /**
+     * 事件状态
+     */
+    private Integer curstatus;
+
+    /**
+     * 是否已抽取
+     */
+    private Character isExtracted;
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java

@@ -0,0 +1,48 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class KettleNewsResultDto implements Serializable {
+
+    private static final long serialVersionUID = -7150387899029264693L;
+
+    /**
+     * 网格名称
+     */
+    private String griddingname;
+
+    /**
+     * 事件名称
+     */
+    private String eventtitle;
+
+    /**
+     * 发生日期
+     */
+    private Date eventdate;
+
+
+    /**
+     * 主键
+     */
+    private Integer baseKeyId;
+
+    /**
+     * 发生地点
+     */
+    private String eventaddrdetail;
+
+    /**
+     * 办结方式
+     */
+    private String finishedmethod;
+
+    /**
+     * 上报人（网格员名称）
+     */
+    private String wgy;
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java

@@ -34,12 +34,13 @@ public class NewWghSjxxResultDTO implements Serializable {
     /**
      * 核查时间
      */
-    private Date hcsj;
+    private Date createdate;
 
     /**
-     * 事件描述
+     * 所属市标签
      */
-    private String sjms;
+    private String ssqsbq;
+
 
     /**
      * 唯一标识

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java

@@ -10,6 +10,8 @@ public class ResidentByIdCardResultDTO implements Serializable {
 
     private static final long serialVersionUID = 3809219691923066512L;
 
+    private Long residentId;
+
     /**
      * 人口性质
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxDetailResultDto.java

@@ -0,0 +1,98 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class WghSjxxDetailResultDto implements Serializable {
+
+    private static final long serialVersionUID = -1339322272385084037L;
+
+    /**
+     * 网格员标签
+     */
+    private String wgymc;
+
+    /**
+     * 所属街道标签
+     */
+    private String ssjdbq;
+
+    /**
+     * 所属社区标签
+     */
+    private String sssqbq;
+
+    /**
+     * 核查意见
+     */
+    private String hcyj;
+
+    /**
+     * 核查时间
+     */
+    private Date createdate;
+
+    /**
+     * 事件地址
+     */
+    private String sjdz;
+
+    /**
+     * 事件描述
+     */
+    private String sjms;
+
+    /**
+     * 所属部门
+     */
+    private String ssbm;
+
+    /**
+     * 事件领域标签
+     */
+    private String sjlyubq;
+
+    /**
+     * 事件小类标签
+     */
+    private String sjdlbq;
+
+    /**
+     * 事件细类标签
+     */
+    private String sjxlbq;
+
+    /**
+     * 所属市标签
+     */
+    private String ssqsbq;
+
+    /**
+     * 处置结果
+     */
+    private String czjg;
+
+    /**
+     * 处置单位标签
+     */
+    private String czdwbq;
+
+    /**
+     * 事件来源标签
+     */
+    private String sjlybq;
+
+    /**
+     * 应结办时间
+     */
+    private Date ybjsj;
+
+    /**
+     * 到期时间
+     */
+    private Date dqsj;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java

@@ -0,0 +1,133 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+
+import com.epmet.opendata.dto.ca.CaKettleBaseDisputeProcessDTO;
+import com.epmet.opendata.dto.form.CaKettleDetailsById;
+import com.epmet.opendata.dto.form.KettleNewsFormDto;
+import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.result.CaKettleDetailsResultDTO;
+import com.epmet.opendata.dto.result.KettleNewsResultDto;
+import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
+import com.epmet.opendata.excel.CaKettleBaseDisputeProcessExcel;
+import com.epmet.opendata.service.CaKettleBaseDisputeProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+@RestController
+@RequestMapping("caKettleBaseDisputeProcess")
+public class CaKettleBaseDisputeProcessController {
+
+    @Autowired
+    private CaKettleBaseDisputeProcessService caKettleBaseDisputeProcessService;
+
+    @RequestMapping("page")
+    public Result<PageData<CaKettleBaseDisputeProcessDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<CaKettleBaseDisputeProcessDTO> page = caKettleBaseDisputeProcessService.page(params);
+        return new Result<PageData<CaKettleBaseDisputeProcessDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<CaKettleBaseDisputeProcessDTO> get(@PathVariable("id") String id){
+        CaKettleBaseDisputeProcessDTO data = caKettleBaseDisputeProcessService.get(id);
+        return new Result<CaKettleBaseDisputeProcessDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody CaKettleBaseDisputeProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        caKettleBaseDisputeProcessService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody CaKettleBaseDisputeProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        caKettleBaseDisputeProcessService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        caKettleBaseDisputeProcessService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<CaKettleBaseDisputeProcessDTO> list = caKettleBaseDisputeProcessService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, CaKettleBaseDisputeProcessExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口存储数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/2 10:02
+     */
+    @PostMapping("/preserKettleVation")
+    public Result getPreserKettleVation(@RequestBody PreserVationFormDTO dto) {
+        caKettleBaseDisputeProcessService.getPreserKettleVation(dto);
+        return new Result();
+    }
+
+    /**
+     * CaKettle分页
+     *
+     * @param form
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/7/5 15:48
+     */
+    @PostMapping("todo/getCaKettlePage")
+    public Result getWghSjxxPage(@RequestBody KettleNewsFormDto form, @LoginUser TokenDto tokenDto) {
+        PageData<KettleNewsResultDto> dto = caKettleBaseDisputeProcessService.getCaKettlePage(form);
+        return new Result<PageData<KettleNewsResultDto>>().ok(dto);
+    }
+
+    /**
+     * 根据id查询详情
+     *
+     * @param form
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/7/6 17:47
+     */
+    @PostMapping("getCaKettleDetails")
+    public Result getCaKettleDetails(@RequestBody CaKettleDetailsById form){
+        CaKettleDetailsResultDTO result = caKettleBaseDisputeProcessService.getCaKettleDetails(form);
+        return new Result().ok(result);
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java

@@ -16,6 +16,7 @@ import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.form.WghSjxxDetailFormDto;
 import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxDetailResultDto;
 import com.epmet.opendata.dto.result.WghSjxxResultDTO;
 import com.epmet.opendata.dto.wgh.WghSjxxDTO;
 import com.epmet.opendata.excel.WghSjxxExcel;
@@ -124,7 +125,7 @@ public class WghSjxxController {
      */
     @PostMapping("getWghSjxxDetail")
     public Result getWghSjxxDetail(@RequestBody WghSjxxDetailFormDto dto){
-        NewWghSjxxResultDTO result = wghSjxxService.getWghSjxxDetail(dto);
+        WghSjxxDetailResultDto result = wghSjxxService.getWghSjxxDetail(dto);
         return new Result().ok(result);
     }
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java

@@ -0,0 +1,60 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.dto.form.CaKettleDetailsById;
+import com.epmet.opendata.dto.form.KettleNewsFormDto;
+import com.epmet.opendata.dto.result.CaKettleDetailsResultDTO;
+import com.epmet.opendata.dto.result.KettleNewsResultDto;
+import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+@Mapper
+public interface CaKettleBaseDisputeProcessDao extends BaseDao<CaKettleBaseDisputeProcessEntity> {
+
+    /**
+     * 全量删除
+     *
+     * @param
+     * @return int
+     * @author LZN
+     * @date 2022/7/6 17:02
+     */
+    int deleteAll();
+
+    /**
+     * CaKettle分页
+     *
+     * @param form
+     * @return java.util.List<com.epmet.opendata.dto.result.KettleNewsResultDto>
+     * @author LZN
+     * @date 2022/7/6 17:32
+     */
+    List<KettleNewsResultDto> getCaKettlePage(@Param("form") KettleNewsFormDto form);
+
+    /**
+     * 根据id查询详情
+     *
+     * @param form
+     * @return com.epmet.opendata.dto.result.CaKettleDetailsResultDTO
+     * @author LZN
+     * @date 2022/7/6 17:47
+     */
+    CaKettleDetailsResultDTO getCaKettleDetails(@Param("form") CaKettleDetailsById form);
+
+    /**
+     * 查询最后一个baseKeyId
+     *
+     * @param
+     * @return java.lang.String
+     * @author LZN
+     * @date 2022/7/7 16:47
+     */
+    String selectBaseKeyId();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java

@@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
 import com.epmet.opendata.dto.form.WghSjxxDetailFormDto;
 import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxDetailResultDto;
 import com.epmet.opendata.entity.WghSjxxEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -48,5 +49,5 @@ public interface WghSjxxDao extends BaseDao<WghSjxxEntity> {
      * @author LZN
      * @date 2022/7/5 16:15
      */
-    NewWghSjxxResultDTO getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto);
+    WghSjxxDetailResultDto getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java

@@ -0,0 +1,240 @@
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ca_kettle_base_dispute_process")
+public class CaKettleBaseDisputeProcessEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 事件信息主键，事件流转关联字段，关联tbactinst表的recid字段
+     */
+	private Integer baseKeyId;
+
+    /**
+     * 网格编码
+     */
+	private String griddingid;
+
+    /**
+     * 网格名称
+     */
+	private String griddingname;
+
+    /**
+     * 经度
+     */
+	private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+	private BigDecimal latitude;
+
+    /**
+     * 事件名称
+     */
+	private String eventtitle;
+
+    /**
+     * 发生日期
+     */
+	private Date eventdate;
+
+    /**
+     * 发生地点
+     */
+	private String eventaddrdetail;
+
+    /**
+     * 事件规模
+     */
+	private String eventscale;
+
+    /**
+     * 事件类别
+     */
+	private String eventcategoryid;
+
+    /**
+     * 涉及人数
+     */
+	private String peoplenum;
+
+    /**
+     * 事件简述
+     */
+	private String eventtext;
+
+    /**
+     * 涉及单位
+     */
+	private String responsibilityUnit;
+
+    /**
+     * 主要当事人姓名
+     */
+	private String mainpartyid;
+
+    /**
+     * 主要当事人民族
+     */
+	private String mainnation;
+
+    /**
+     * 办结时限
+     */
+	private BigDecimal timelimit;
+
+    /**
+     * 办结方式
+     */
+	private String finishedmethod;
+
+    /**
+     * 办结层级
+     */
+	private String completionleve;
+
+    /**
+     * 是否办结
+     */
+	private String eventstatus;
+
+    /**
+     * 创建人
+     */
+	private String createUser;
+
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+
+    /**
+     * 更新人
+     */
+	private String updateUser;
+
+    /**
+     * 更新时间
+     */
+	private Date updateTime;
+
+    /**
+     *
+     */
+	private Date eventtime;
+
+    /**
+     *
+     */
+	private Date finisheddatetime;
+
+    /**
+     * 重点场所类别
+     */
+	private String keyAreaType;
+
+    /**
+     * 宗教活动规模
+     */
+	private String religionScale;
+
+    /**
+     * 宗教类别
+     */
+	private String religionType;
+
+    /**
+     * 重点场所是否变动
+     */
+	private String isKeyareaState;
+
+    /**
+     * 重点人员是否在当地
+     */
+	private String isLocal;
+
+    /**
+     * 重点人员现状
+     */
+	private String presentSituation;
+
+    /**
+     *
+     */
+	private Integer qdDeleteflag;
+
+    /**
+     * 是否化解
+     */
+	private String successfulDefuse;
+
+    /**
+     * 关注程度
+     */
+	private String attentionlevel;
+
+    /**
+     * 事件编码
+     */
+	private String eventnumber;
+
+    /**
+     * 事件来源，网格员上报赋值05；街道吹哨赋值03；其他赋值99
+     */
+	private String eventsource;
+
+    /**
+     * 事件状态 0待提交1提交2代派发3处理中4复核5办结6退回-1作废
+     */
+	private Integer curstatus;
+
+    /**
+     * 上报人（网格员姓名）
+     */
+	private String wgy;
+
+    /**
+     * 附件id
+     */
+	private String fileid;
+
+    /**
+     * 网格员id
+     */
+	private String wgyhumanid;
+
+    /**
+     * 是否已抽取 0 未抽取 1 已抽取 2 准备抽取(中间状态)
+     */
+	private String isExtracted;
+
+    /**
+     * 1正常2临期3超期
+     */
+	private Integer timelimitstatus;
+
+    /**
+     * 数据同步时间
+     */
+	private Date importTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaKettleBaseDisputeProcessExcel.java

@@ -0,0 +1,148 @@
+package com.epmet.opendata.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+@Data
+public class CaKettleBaseDisputeProcessExcel {
+
+    @Excel(name = "事件信息主键，事件流转关联字段，关联tbactinst表的recid字段")
+    private Integer baseKeyId;
+
+    @Excel(name = "网格编码")
+    private String griddingid;
+
+    @Excel(name = "网格名称")
+    private String griddingname;
+
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    @Excel(name = "事件名称")
+    private String eventtitle;
+
+    @Excel(name = "发生日期")
+    private Date eventdate;
+
+    @Excel(name = "发生地点")
+    private String eventaddrdetail;
+
+    @Excel(name = "事件规模")
+    private String eventscale;
+
+    @Excel(name = "事件类别")
+    private String eventcategoryid;
+
+    @Excel(name = "涉及人数")
+    private String peoplenum;
+
+    @Excel(name = "事件简述")
+    private String eventtext;
+
+    @Excel(name = "涉及单位")
+    private String responsibilityUnit;
+
+    @Excel(name = "主要当事人姓名")
+    private String mainpartyid;
+
+    @Excel(name = "主要当事人民族")
+    private String mainnation;
+
+    @Excel(name = "办结时限")
+    private BigDecimal timelimit;
+
+    @Excel(name = "办结方式")
+    private String finishedmethod;
+
+    @Excel(name = "办结层级")
+    private String completionleve;
+
+    @Excel(name = "是否办结")
+    private String eventstatus;
+
+    @Excel(name = "创建人")
+    private String createUser;
+
+    @Excel(name = "创建时间")
+    private Date createTime;
+
+    @Excel(name = "更新人")
+    private String updateUser;
+
+    @Excel(name = "更新时间")
+    private Date updateTime;
+
+    @Excel(name = "")
+    private Date eventtime;
+
+    @Excel(name = "")
+    private Date finisheddatetime;
+
+    @Excel(name = "重点场所类别")
+    private String keyAreaType;
+
+    @Excel(name = "宗教活动规模")
+    private String religionScale;
+
+    @Excel(name = "宗教类别")
+    private String religionType;
+
+    @Excel(name = "重点场所是否变动")
+    private String isKeyareaState;
+
+    @Excel(name = "重点人员是否在当地")
+    private String isLocal;
+
+    @Excel(name = "重点人员现状")
+    private String presentSituation;
+
+    @Excel(name = "")
+    private Integer qdDeleteflag;
+
+    @Excel(name = "是否化解")
+    private String successfulDefuse;
+
+    @Excel(name = "关注程度")
+    private String attentionlevel;
+
+    @Excel(name = "事件编码")
+    private String eventnumber;
+
+    @Excel(name = "事件来源，网格员上报赋值05；街道吹哨赋值03；其他赋值99")
+    private String eventsource;
+
+    @Excel(name = "事件状态 0待提交1提交2代派发3处理中4复核5办结6退回-1作废")
+    private Integer curstatus;
+
+    @Excel(name = "上报人（网格员姓名）")
+    private String wgy;
+
+    @Excel(name = "附件id")
+    private String fileid;
+
+    @Excel(name = "网格员id")
+    private String wgyhumanid;
+
+    @Excel(name = "是否已抽取 0 未抽取 1 已抽取 2 准备抽取(中间状态)")
+    private String isExtracted;
+
+    @Excel(name = "1正常2临期3超期")
+    private Integer timelimitstatus;
+
+    @Excel(name = "数据同步时间")
+    private Date importTime;
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaKettleBaseDisputeProcessRedis.java

@@ -0,0 +1,30 @@
+package com.epmet.opendata.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+@Component
+public class CaKettleBaseDisputeProcessRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java

@@ -0,0 +1,111 @@
+package com.epmet.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.opendata.dto.ca.CaKettleBaseDisputeProcessDTO;
+import com.epmet.opendata.dto.form.CaKettleDetailsById;
+import com.epmet.opendata.dto.form.KettleNewsFormDto;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.result.CaKettleDetailsResultDTO;
+import com.epmet.opendata.dto.result.KettleNewsResultDto;
+import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+public interface CaKettleBaseDisputeProcessService extends BaseService<CaKettleBaseDisputeProcessEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<CaKettleBaseDisputeProcessDTO>
+     * @author generator
+     * @date 2022-07-06
+     */
+    PageData<CaKettleBaseDisputeProcessDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<CaKettleBaseDisputeProcessDTO>
+     * @author generator
+     * @date 2022-07-06
+     */
+    List<CaKettleBaseDisputeProcessDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return CaKettleBaseDisputeProcessDTO
+     * @author generator
+     * @date 2022-07-06
+     */
+    CaKettleBaseDisputeProcessDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-06
+     */
+    void save(CaKettleBaseDisputeProcessDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-06
+     */
+    void update(CaKettleBaseDisputeProcessDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-07-06
+     */
+    void delete(String[] ids);
+
+    /**
+     * 调用ruoyi接口存储数据
+     *
+     * @param dto
+     * @return void
+     * @author LZN
+     * @date 2022/7/6 17:02
+     */
+    void getPreserKettleVation(PreserVationFormDTO dto);
+
+    /**
+     * CaKettle分页
+     *
+     * @param form
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.KettleNewsResultDto>
+     * @author LZN
+     * @date 2022/7/6 17:32
+     */
+    PageData<KettleNewsResultDto> getCaKettlePage(KettleNewsFormDto form);
+
+    /**
+     * 根据id查询详情
+     *
+     * @param form
+     * @return com.epmet.opendata.dto.result.CaKettleDetailsResultDTO
+     * @author LZN
+     * @date 2022/7/6 17:47
+     */
+    CaKettleDetailsResultDTO getCaKettleDetails(CaKettleDetailsById form);
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java

@@ -6,6 +6,7 @@ import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.form.WghSjxxDetailFormDto;
 import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxDetailResultDto;
 import com.epmet.opendata.dto.result.WghSjxxResultDTO;
 import com.epmet.opendata.dto.wgh.WghSjxxDTO;
 import com.epmet.opendata.entity.WghSjxxEntity;
@@ -110,5 +111,5 @@ public interface WghSjxxService extends BaseService<WghSjxxEntity> {
      * @author LZN
      * @date 2022/7/5 16:15
      */
-    NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto);
+    WghSjxxDetailResultDto getWghSjxxDetail(WghSjxxDetailFormDto dto);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java

@@ -0,0 +1,206 @@
+package com.epmet.opendata.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.HttpClientManager;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.opendata.dao.CaKettleBaseDisputeProcessDao;
+import com.epmet.opendata.dto.ca.CaKettleBaseDisputeProcessDTO;
+import com.epmet.opendata.dto.constant.CaWghDataConstant;
+import com.epmet.opendata.dto.form.CaKettleDetailsById;
+import com.epmet.opendata.dto.form.KettleNewsFormDto;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.result.CaKettleDetailsResultDTO;
+import com.epmet.opendata.dto.result.KettleNewsResultDto;
+import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
+import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity;
+import com.epmet.opendata.entity.CaLoudongEntity;
+import com.epmet.opendata.redis.CaKettleBaseDisputeProcessRedis;
+import com.epmet.opendata.service.CaKettleBaseDisputeProcessService;
+import com.epmet.opendata.util.AesUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+@Service
+public class CaKettleBaseDisputeProcessServiceImpl extends BaseServiceImpl<CaKettleBaseDisputeProcessDao, CaKettleBaseDisputeProcessEntity> implements CaKettleBaseDisputeProcessService {
+
+    @Autowired
+    private CaKettleBaseDisputeProcessRedis caKettleBaseDisputeProcessRedis;
+
+    @Override
+    public PageData<CaKettleBaseDisputeProcessDTO> page(Map<String, Object> params) {
+        IPage<CaKettleBaseDisputeProcessEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, CaKettleBaseDisputeProcessDTO.class);
+    }
+
+    @Override
+    public List<CaKettleBaseDisputeProcessDTO> list(Map<String, Object> params) {
+        List<CaKettleBaseDisputeProcessEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, CaKettleBaseDisputeProcessDTO.class);
+    }
+
+    private QueryWrapper<CaKettleBaseDisputeProcessEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<CaKettleBaseDisputeProcessEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public CaKettleBaseDisputeProcessDTO get(String id) {
+        CaKettleBaseDisputeProcessEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, CaKettleBaseDisputeProcessDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(CaKettleBaseDisputeProcessDTO dto) {
+        CaKettleBaseDisputeProcessEntity entity = ConvertUtils.sourceToTarget(dto, CaKettleBaseDisputeProcessEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(CaKettleBaseDisputeProcessDTO dto) {
+        CaKettleBaseDisputeProcessEntity entity = ConvertUtils.sourceToTarget(dto, CaKettleBaseDisputeProcessEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 调用ruoyi接口存储数据
+     *
+     * @param dto
+     * @return void
+     * @author LZN
+     * @date 2022/7/6 17:02
+     */
+    @Override
+    public void getPreserKettleVation(PreserVationFormDTO dto) {
+
+        dto.setPageNo(NumConstant.ONE);
+        dto.setPageSize(CaWghDataConstant.PAGE_LIMIT);
+        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
+        dto.setTableName(CaWghDataConstant.UNICOM_KETTLE);
+        dto.setOrderBy("timelimit,create_time,update_time,import_time,eventdate desc");
+
+        int pageNo = 1;
+
+        int total = 0;
+
+        String id = baseDao.selectBaseKeyId();
+
+        dto.setWhereCase("base_key_id >" + id);
+
+        do {
+            try {
+                total = listKettle(dto);
+                pageNo++;
+                dto.setPageNo(pageNo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } while (total > (pageNo * NumConstant.FIFTY));
+    }
+
+    /**
+     * CaKettle分页
+     *
+     * @param form
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.KettleNewsResultDto>
+     * @author LZN
+     * @date 2022/7/6 17:32
+     */
+    @Override
+    public PageData<KettleNewsResultDto> getCaKettlePage(KettleNewsFormDto form) {
+        PageHelper.startPage(form.getPage(), form.getLimit());
+        List<KettleNewsResultDto> result = baseDao.getCaKettlePage(form);
+        PageInfo<KettleNewsResultDto> info = new PageInfo<>(result);
+        return new PageData<>(result, info.getTotal());
+    }
+
+    /**
+     * 根据id查询详情
+     *
+     * @param form
+     * @return com.epmet.opendata.dto.result.CaKettleDetailsResultDTO
+     * @author LZN
+     * @date 2022/7/6 17:47
+     */
+    @Override
+    public CaKettleDetailsResultDTO getCaKettleDetails(CaKettleDetailsById form) {
+        CaKettleDetailsResultDTO result = baseDao.getCaKettleDetails(form);
+        return result;
+    }
+
+    private int listKettle(PreserVationFormDTO dto) throws Exception {
+        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
+        JSONObject obj = new JSONObject();
+        obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
+        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
+        JSONObject toResult = JSON.parseObject(data);
+        Result result = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (!result.success()) {
+            return dto.getPageNo() + 1;
+        }
+
+        ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class);
+        this.insertBatch(returnDate.getList());
+        return returnDate.getTotal();
+    }
+
+    static class ReturnDate {
+
+        private int total;
+        private List<CaKettleBaseDisputeProcessEntity> list;
+
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public List<CaKettleBaseDisputeProcessEntity> getList() {
+            return list;
+        }
+
+        public void setList(List<CaKettleBaseDisputeProcessEntity> list) {
+            this.list = list;
+        }
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java

@@ -81,6 +81,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
     @Autowired
     private WghSjxxService wghSjxxService;
 
+    @Autowired
+    private CaKettleBaseDisputeProcessService caKettleBaseDisputeProcessService;
+
     @Override
     public void guardarDatosTask(PreserVationFormDTO dto) {
         if (StringUtils.isNotBlank(dto.getTableName())) {
@@ -154,9 +157,12 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
                 case CaWghDataConstant.SHARE_WGH_SJXX:
                     wghSjxxService.getWghSjxx(dto);
                     break;
+                case CaWghDataConstant.UNICOM_KETTLE:
+                    caKettleBaseDisputeProcessService.getPreserKettleVation(dto);
+                    break;
             }
         } else{
-            throw new Error("没传名字");
+            throw new Error("没传表名");
         }
     }
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java

@@ -17,6 +17,7 @@ import com.epmet.opendata.dto.form.NewWghSjxxFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.form.WghSjxxDetailFormDto;
 import com.epmet.opendata.dto.result.NewWghSjxxResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxDetailResultDto;
 import com.epmet.opendata.dto.result.WghSjxxResultDTO;
 import com.epmet.opendata.dto.wgh.WghSjxxDTO;
 import com.epmet.opendata.entity.WghSjxxEntity;
@@ -161,7 +162,7 @@ public class WghSjxxServiceImpl extends BaseServiceImpl<WghSjxxDao, WghSjxxEntit
      * @date 2022/7/5 16:15
      */
     @Override
-    public NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto) {
+    public WghSjxxDetailResultDto getWghSjxxDetail(WghSjxxDetailFormDto dto) {
         return baseDao.getWghSjxxDetail(dto);
     }
 

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.13__create_table_ca_kettle_base_dispute_process.sql

@@ -0,0 +1,53 @@
+DROP TABLE IF EXISTS `ca_kettle_base_dispute_process`;
+CREATE TABLE `ca_kettle_base_dispute_process` (
+  `base_key_id` int(11) DEFAULT NULL COMMENT '事件信息主键，事件流转关联字段，关联tbactinst表的recid字段',
+  `griddingid` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT '网格编码',
+  `griddingname` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '网格名称',
+  `longitude` decimal(18,9) DEFAULT NULL COMMENT '经度',
+  `latitude` decimal(18,9) DEFAULT NULL COMMENT '纬度',
+  `eventtitle` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '事件名称',
+  `eventdate` datetime DEFAULT NULL COMMENT '发生日期',
+  `eventaddrdetail` varchar(300) COLLATE utf8_bin DEFAULT NULL COMMENT '发生地点',
+  `eventscale` varchar(2) COLLATE utf8_bin DEFAULT NULL COMMENT '事件规模',
+  `eventcategoryid` varchar(4) COLLATE utf8_bin DEFAULT NULL COMMENT '事件类别',
+  `peoplenum` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '涉及人数',
+  `eventtext` varchar(4000) COLLATE utf8_bin DEFAULT NULL COMMENT '事件简述',
+  `responsibility_unit` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT '涉及单位',
+  `mainpartyid` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT '主要当事人姓名',
+  `mainnation` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT '主要当事人民族',
+  `timelimit` decimal(10,2) DEFAULT NULL COMMENT '办结时限',
+  `finishedmethod` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '办结方式',
+  `completionleve` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT '办结层级',
+  `eventstatus` varchar(8) COLLATE utf8_bin DEFAULT NULL COMMENT '是否办结',
+  `create_user` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_user` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `eventtime` datetime DEFAULT NULL,
+  `finisheddatetime` datetime DEFAULT NULL,
+  `key_area_type` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '重点场所类别',
+  `religion_scale` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '宗教活动规模',
+  `religion_type` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '宗教类别',
+  `is_keyarea_state` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '重点场所是否变动',
+  `is_local` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '重点人员是否在当地',
+  `present_situation` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '重点人员现状',
+  `qd_deleteflag` int(11) DEFAULT NULL,
+  `successful_defuse` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '是否化解',
+  `attentionlevel` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '关注程度',
+  `eventnumber` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '事件编码',
+  `eventsource` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '事件来源，网格员上报赋值05；街道吹哨赋值03；其他赋值99',
+  `curstatus` int(11) DEFAULT NULL COMMENT '事件状态 0待提交1提交2代派发3处理中4复核5办结6退回-1作废',
+  `wgy` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '上报人（网格员姓名）',
+  `fileid` varchar(1000) COLLATE utf8_bin DEFAULT NULL COMMENT '附件id',
+  `wgyhumanid` varchar(20) COLLATE utf8_bin DEFAULT NULL COMMENT '网格员id',
+  `is_extracted` char(1) COLLATE utf8_bin NOT NULL DEFAULT '0' COMMENT '是否已抽取 0 未抽取 1 已抽取 2 准备抽取(中间状态)',
+  `timelimitStatus` int(11) DEFAULT NULL COMMENT '1正常2临期3超期',
+  `import_time` datetime DEFAULT NULL COMMENT '数据同步时间',
+  KEY `idx_categoryid` (`eventcategoryid`) USING BTREE,
+  KEY `idx_curstatus` (`curstatus`) USING BTREE,
+  KEY `idx_eventscale` (`eventscale`) USING BTREE,
+  KEY `idx_eventsource` (`eventsource`) USING BTREE,
+  KEY `idx_eventnumber` (`eventnumber`) USING BTREE,
+  KEY `idx_griddingid` (`griddingid`) USING BTREE,
+  KEY `idx_basekeyid` (`base_key_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.opendata.dao.CaKettleBaseDisputeProcessDao">
+
+
+    <delete id="deleteAll">
+        delete from ca_kettle_base_dispute_process
+    </delete>
+    <select id="getCaKettlePage" resultType="com.epmet.opendata.dto.result.KettleNewsResultDto">
+        SELECT
+            griddingname,
+            eventtitle,
+            eventtime as eventdate,
+            base_key_id,
+            eventaddrdetail,
+            finishedmethod,
+            wgy
+        from
+            ca_kettle_base_dispute_process
+        <where>
+            DATE_SUB(CURDATE(),INTERVAL 30 DAY) &lt;= date(eventtime)
+            <if test="form.wgy != null and form.wgy != ''">
+                AND wgy like '%${form.wgy}%'
+            </if>
+            <if test="form.griddingname != null and form.griddingname != ''">
+                AND griddingname like '%${form.griddingname}%'
+            </if>
+            <if test="form.eventtitle != null and form.eventtitle != ''">
+                AND eventtitle like '%${form.eventtitle}%'
+            </if>
+        </where>
+            order by create_time desc,update_time desc,eventdate desc
+    </select>
+    <select id="getCaKettleDetails" resultType="com.epmet.opendata.dto.result.CaKettleDetailsResultDTO">
+        select
+            griddingname,
+            eventtitle,
+            eventtime as eventdate,
+            eventaddrdetail,
+            eventtext,
+            finishedmethod,
+            wgy,
+            eventsource,
+            curstatus,
+            is_extracted
+        from
+            ca_kettle_base_dispute_process
+        where
+            base_key_id = #{form.baseKeyId}
+    </select>
+    <select id="selectBaseKeyId" resultType="java.lang.String">
+        SELECT
+            base_key_id
+        FROM
+            ca_kettle_base_dispute_process
+        ORDER BY
+            base_key_id DESC
+            LIMIT 1
+    </select>
+
+</mapper>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml

@@ -159,6 +159,7 @@
     <select id="getResidentDetailByIdCard"
             resultType="com.epmet.opendata.dto.result.ResidentByIdCardResultDTO">
         SELECT
+            resident_id,
             resident_property,
             resident_type,
             id_type,

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml

@@ -76,16 +76,13 @@
             ssjdbq,
             sssqbq,
             hcyj,
-            hcsj,
-            sjms,
+            createdate,
+            ssqsbq,
             recid
         FROM
 	        wgh_sjxx
 	    <where>
             1=1
-            <if test="form.wgymc != null and form.wgymc != ''">
-                AND wgymc like '%${form.wgymc}%'
-            </if>
             <if test="form.ssjdbq != null and form.ssjdbq != ''">
                 AND ssjdbq like '%${form.ssjdbq}%'
             </if>
@@ -98,14 +95,26 @@
         </where>
         order by czsj desc
     </select>
-    <select id="getWghSjxxDetail" resultType="com.epmet.opendata.dto.result.NewWghSjxxResultDTO">
+    <select id="getWghSjxxDetail" resultType="com.epmet.opendata.dto.result.WghSjxxDetailResultDto">
         select
-             wgymc,
+            wgymc,
             ssjdbq,
             sssqbq,
             hcyj,
             hcsj,
-            sjms
+            sjms,
+            ssbm,
+            sjlyubq,
+            sjdlbq,
+            ssqsbq,
+            czjg,
+            czdwbq,
+            sjlybq,
+            ybjsj,
+            dqsj,
+            sjdz,
+            createdate,
+            sjxlbq
         FROM
 	        wgh_sjxx
 	        where recid = #{dto.recid}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java

@@ -25,5 +25,9 @@ public class BindHomeFormDTO implements Serializable {
     /**
      * 用户id
      */
+    @NotBlank(message = "客户id不能为空")
     private String customerId;
+
+    @NotBlank(message = "人id不能为空")
+    private String userId;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -1181,8 +1181,9 @@ public class IcResiUserController implements ResultDataResolver {
      */
     @PostMapping("/bindHome")
     public Result bindHome(@RequestBody BindHomeFormDTO form, @LoginUser TokenDto tokenDto) {
-        ValidatorUtils.validateEntity(form);
         form.setCustomerId(tokenDto.getCustomerId());
+        form.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(form);
         icResiUserService.bindHome(form);
         return new Result();
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -2828,9 +2828,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if(houseInfo == null){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
         }
+        // 变更记录
+        IcResiUserTransferFormDTO formDTO = new IcResiUserTransferFormDTO();
         // 将人的信息放入ic_resi_user对象中
         IcResiUserEntity entity = new IcResiUserEntity();
         entity.setCustomerId(form.getCustomerId());
+        formDTO.setCustomerId(form.getCustomerId());
+        formDTO.setStaffId(form.getUserId());
         // 进行日期转换
         if(residentDetailByIdCard.getBirthday() == null){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取出生日期失败", "获取出生日期失败");
@@ -2864,20 +2868,41 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             HouseAgencyInfoResultDTO data = resultDTOResult.getData();
             entity.setGridId(data.getGridId());
             entity.setPids(data.getPids() + ":" + data.getAgencyId());
+            formDTO.setNewGridId(data.getGridId());
         } else {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋信息不完整", "房屋信息不完整");
         }
         SaveCaResidentUserFormDTO saveForm = new SaveCaResidentUserFormDTO();
         saveForm.setHomeId(form.getHomeId());
         saveForm.setIdCard(form.getIdCard());
+
+        // 添加变更记录
+        formDTO.setType("in");
+        formDTO.setNewAgencyId(houseInfo.getAgencyId());
+        formDTO.setNewNeighborHoodId(houseInfo.getNeighborHoodId());
+        formDTO.setNewBuildingId(houseInfo.getBuildingId());
+        formDTO.setNewBuildingUnitId(houseInfo.getBuildingUnitId());
+        formDTO.setNewHouseId(houseInfo.getHomeId());
+        formDTO.setTransferTime(new Date());
+
+
         if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) {
            String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
+           // 变更记录
+           formDTO.setIcUserId(id);
+           icUserTransferRecordService.add(formDTO);
+
            baseDao.updateIcResiUserByIdCard(entity);
            saveForm.setIcResiUserId(id);
         } else {
             baseDao.insert(entity);
+
             String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
             saveForm.setIcResiUserId(id);
+            formDTO.setIcUserId(id);
+
+            // 变更记录
+            icUserTransferRecordService.add(formDTO);
         }
         guardarDatosFeignClient.saveCaResidentUser(saveForm);
     }