Merge branch 'feature/dev_zz_wgh'

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

@@ -13,6 +13,7 @@ public interface CaWghDataConstant {
 
     String TABLESCHEMA_UNICOM = "unicom";
     String TABLESCHEMA_SHARE = "share";
+    String TABLESCHEMA_WGH = "wgh";
 
 
     String UNICOM_PINGFANG = "ca_pingfang";
@@ -32,7 +33,7 @@ public interface CaWghDataConstant {
     String SHARE_WGH_JQZ = "wgh_jqz";
     String SHARE_WGH_JXCS = "wgh_jxcs";
     String SHARE_WGH_JYZ = "wgh_jyz";
-    String SHARE_WGH_SJXX = "wgh_sjxxb";
+    String SHARE_WGH_SJXXB = "wgh_sjxxb";
     String SHARE_WGH_SQXX = "wgh_sqxx";
     String SHARE_WGH_SZCGWGH = "wgh_szcgwgh";
     String SHARE_WGH_SZZRWG = "wgh_szzrwg";
@@ -40,9 +41,14 @@ public interface CaWghDataConstant {
     String SHARE_WGH_YJBMCS = "wgh_yjbmcs";
     String SHARE_WGH_YQHJZ = "wgh_yqhjz";
 
+
+    String SHARE_WGH_SJXX = "wgh_sjxx";
+
     String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page";
     String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage";
+    String DATA_URL_WGH = "http://120.221.72.83:9090/bridge/wgh/wghPage";
 
     String UNICOM_CONDITION = "unicomCondition";
     String SHARE_CONDITION = "shareCondition";
+    String WGH_CONDITION = "wghCondition";
 }

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

@@ -35,6 +35,11 @@ public class CaLoudongFormDTO  implements Serializable {
      */
     private String gridId;
 
+    /**
+     * 所处位置
+     */
+    private String buildingAddr;
+
     private Integer page;
     private Integer limit;
 

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

@@ -29,6 +29,11 @@ public class CaPingfangFormDTO implements Serializable {
      */
     private String communityName;
 
+    /**
+     * 所处位置
+     */
+    private String buildingAddr;
+
     /**
      * 网格id
      */

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

@@ -39,6 +39,11 @@ public class CaRentalFormtDTO implements Serializable {
      */
     private String renterName;
 
+    /**
+     * 房屋地址
+     */
+    private String houseAddress;
+
     private Integer page;
 
     private Integer limit;

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

@@ -44,4 +44,9 @@ public class CaResidentFormDTO implements Serializable {
      */
     private String gridId;
 
+    /**
+     * 现住详细地址
+     */
+    private String curliveAddressDetail;
+
 }

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

@@ -40,6 +40,11 @@ public class CaRotatorsFormDTO implements Serializable {
      */
     private String gridId;
 
+    /**
+     * 现住详细地址
+     */
+    private String curliveAddressDetail;
+
     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

@@ -0,0 +1,35 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class NewWghSjxxFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4846956644682609996L;
+
+    /**
+     * 网格员名称
+     */
+    private String wgymc;
+
+    /**
+     * 街道标签
+     */
+    private String ssjdbq;
+
+    /**
+     * 社区标签
+     */
+    private String sssqbq;
+
+    /**
+     * 核查意见
+     */
+    private String hcyj;
+
+    private Integer page;
+
+    private Integer limit;
+}

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

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

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

@@ -0,0 +1,37 @@
+package com.epmet.opendata.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.net.Inet4Address;
+
+@Data
+public class WghSjxxFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3208547934202974728L;
+
+    /**
+     * 事件来源
+     */
+    private String infosourcename;
+
+    /**
+     * 事件类别
+     */
+    private String infotypename;
+
+    /**
+     * 社区名称
+     */
+    private String communityname;
+
+    /**
+     * 事件状态
+     */
+    private String statusname;
+
+    private Integer page;
+
+    private Integer limit;
+}

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

@@ -0,0 +1,16 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WghSjxxbDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7558785082629887627L;
+
+    /**
+     * 唯一id
+     */
+    private String taskid;
+}

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

@@ -0,0 +1,48 @@
+package com.epmet.opendata.dto.result;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class NewWghSjxxResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4088593179578850358L;
+
+    /**
+     * 网格员标签
+     */
+    private String wgymc;
+
+    /**
+     * 所属街道标签
+     */
+    private String ssjdbq;
+
+    /**
+     * 所属社区标签
+     */
+    private String sssqbq;
+
+    /**
+     * 核查意见
+     */
+    private String hcyj;
+
+    /**
+     * 核查时间
+     */
+    private Date hcsj;
+
+    /**
+     * 事件描述
+     */
+    private String sjms;
+
+    /**
+     * 唯一标识
+     */
+    private Integer recid;
+}

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

@@ -0,0 +1,52 @@
+package com.epmet.opendata.dto.result;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WghSjxxResultDTO extends PageFormDTO  implements Serializable {
+
+    private static final long serialVersionUID = -5318466282262952340L;
+
+    /**
+     * 事件来源
+     */
+    private String infosourcename;
+
+    /**
+     * 事件类别
+     */
+    private String infotypename;
+
+    /**
+     * 社区名称
+     */
+    private String communityname;
+
+    /**
+     * 事见描述
+     */
+    private String description;
+
+    /**
+     * 事见地址
+     */
+    private String address;
+
+    /**
+     * 事见状态
+     */
+    private String statusname;
+
+    /**
+     * 街道名称
+     */
+    private String streetname;
+
+    /**
+     * 唯一id
+     */
+    private String taskid;
+}

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

@@ -0,0 +1,46 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WghSjxxbDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8965818800454155651L;
+
+    /**
+     * 事件来源
+     */
+    private String infosourcename;
+
+    /**
+     * 事件类别
+     */
+    private String infotypename;
+
+    /**
+     * 社区名称
+     */
+    private String communityname;
+
+    /**
+     * 事见描述
+     */
+    private String description;
+
+    /**
+     * 事见地址
+     */
+    private String address;
+
+    /**
+     * 事见状态
+     */
+    private String statusname;
+
+    /**
+     * 街道名称
+     */
+    private String streetname;
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxDTO.java

@@ -0,0 +1,330 @@
+package com.epmet.opendata.dto.wgh;
+
+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-05
+ */
+@Data
+public class WghSjxxDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 案卷标识
+     */
+	private Integer recid;
+
+    /**
+     * 事件编号
+     */
+	private String sjbh;
+
+    /**
+     * 事件领域
+     */
+	private String sjlyu;
+
+    /**
+     * 事件大类
+     */
+	private String sjdl;
+
+    /**
+     * 事件小类
+     */
+	private String sjxl;
+
+    /**
+     * 事件细类
+     */
+	private String sjxil;
+
+    /**
+     * 事件来源
+     */
+	private String sjly;
+
+    /**
+     * 所属区/市
+     */
+	private String ssqs;
+
+    /**
+     * 所属街道
+     */
+	private String ssjd;
+
+    /**
+     * 所属社区
+     */
+	private String sssq;
+
+    /**
+     * 事件地址
+     */
+	private String sjdz;
+
+    /**
+     * 事件描述
+     */
+	private String sjms;
+
+    /**
+     * 网格员标识
+     */
+	private String wgybs;
+
+    /**
+     * 网格员名称
+     */
+	private String wgymc;
+
+    /**
+     * 所属部门
+     */
+	private String ssbm;
+
+    /**
+     * X坐标
+     */
+	private BigDecimal xzb;
+
+    /**
+     * Y坐标
+     */
+	private BigDecimal yzb;
+
+    /**
+     * 核实意见
+     */
+	private String hsyj;
+
+    /**
+     * 创建日期
+     */
+	private Date createdate;
+
+    /**
+     * 事件领域标签
+     */
+	private String sjlyubq;
+
+    /**
+     * 事件大类标签
+     */
+	private String sjdlbq;
+
+    /**
+     * 事件小类标签
+     */
+	private String sjxlbq;
+
+    /**
+     * 事件细类标签
+     */
+	private String sjxilbq;
+
+    /**
+     * 所属区/市标签
+     */
+	private String ssqsbq;
+
+    /**
+     * 所属街道标签
+     */
+	private String ssjdbq;
+
+    /**
+     * 所属社区标签
+     */
+	private String sssqbq;
+
+    /**
+     * 事件上报
+     */
+	private String sjsbwj;
+
+    /**
+     * 事件核实
+     */
+	private String sjhswj;
+
+    /**
+     * 事件处置
+     */
+	private String sjczwj;
+
+    /**
+     * 事件核查
+     */
+	private String sjhcwj;
+
+    /**
+     * 外系统唯一标识
+     */
+	private String wxtwybs;
+
+    /**
+     * 缩略图
+     */
+	private String slt;
+
+    /**
+     * 处置单位
+     */
+	private Integer czdw;
+
+    /**
+     * 处置结果
+     */
+	private String czjg;
+
+    /**
+     * 处置单位标签
+     */
+	private String czdwbq;
+
+    /**
+     * 是否退单
+     */
+	private Integer sftd;
+
+    /**
+     * 是否延期
+     */
+	private Integer sfyq;
+
+    /**
+     * 核查意见
+     */
+	private String hcyj;
+
+    /**
+     * 是否作废
+     */
+	private Integer sfzf;
+
+    /**
+     * 是否已核实
+     */
+	private Integer sfyhs;
+
+    /**
+     * 是否已核查
+     */
+	private Integer sfyhc;
+
+    /**
+     * 是否已督办
+     */
+	private Integer sfydb;
+
+    /**
+     * 专项任务标识
+     */
+	private Integer zxrwbs;
+
+    /**
+     * 待确责
+     */
+	private Integer dqz;
+
+    /**
+     * 熔断状态
+     */
+	private Integer rdzt;
+
+    /**
+     * 事件来源标签
+     */
+	private String sjlybq;
+
+    /**
+     * 应办结时间
+     */
+	private Date ybjsj;
+
+    /**
+     * 接收部门标识
+     */
+	private Integer jsbmbs;
+
+    /**
+     * 核实人员标识
+     */
+	private Integer hsrybs;
+
+    /**
+     * 核查人员标识
+     */
+	private Integer hcrybs;
+
+    /**
+     * 处置人员标识
+     */
+	private Integer czrybs;
+
+    /**
+     * 是否已处置
+     */
+	private Integer sfycz;
+
+    /**
+     * 核实时间
+     */
+	private Date hssj;
+
+    /**
+     * 核查时间
+     */
+	private Date hcsj;
+
+    /**
+     * 处置时间
+     */
+	private Date czsj;
+
+    /**
+     * 是否自发自处
+     */
+	private Integer sfzfzc;
+
+    /**
+     * 核查用时
+     */
+	private BigDecimal hcys;
+
+    /**
+     * 诉求联系人
+     */
+	private String sqlxr;
+
+    /**
+     * 僵尸车
+     */
+	private Integer jsc;
+
+    /**
+     * 到期时间
+     */
+	private Date dqsj;
+
+    /**
+     * 星级评定
+     */
+	private Integer xjpd;
+
+    /**
+     * 所属网格
+     */
+	private String sswg;
+
+}

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

@@ -0,0 +1,130 @@
+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.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.WghSjxxResultDTO;
+import com.epmet.opendata.dto.wgh.WghSjxxDTO;
+import com.epmet.opendata.excel.WghSjxxExcel;
+import com.epmet.opendata.service.WghSjxxService;
+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-05
+ */
+@RestController
+@RequestMapping("wghSjxx")
+public class WghSjxxController {
+
+    @Autowired
+    private WghSjxxService wghSjxxService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghSjxxDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<WghSjxxDTO> page = wghSjxxService.page(params);
+        return new Result<PageData<WghSjxxDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<WghSjxxDTO> get(@PathVariable("id") String id) {
+        WghSjxxDTO data = wghSjxxService.get(id);
+        return new Result<WghSjxxDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghSjxxDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghSjxxService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghSjxxDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghSjxxService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghSjxxService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghSjxxDTO> list = wghSjxxService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghSjxxExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口获取wgh_sjxxb数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/7/5 14:17
+     */
+    @PostMapping("/wgh/getWghSjxx")
+    public Result getWghSjxx(@RequestBody PreserVationFormDTO dto) {
+        wghSjxxService.getWghSjxx(dto);
+        return new Result();
+    }
+
+    /**
+     * 新的事件信息分页
+     *
+     * @param form
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/7/5 15:48
+     */
+    @PostMapping("todo/wghSjxxPage")
+    public Result getWghSjxxPage(@RequestBody NewWghSjxxFormDTO form, @LoginUser TokenDto tokenDto) {
+        PageData<NewWghSjxxResultDTO> dto = wghSjxxService.getWghSjxxPage(form);
+        return new Result<PageData<NewWghSjxxResultDTO>>().ok(dto);
+    }
+
+    /**
+     * 查询事件信息详情
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/7/5 16:14
+     */
+    @PostMapping("getWghSjxxDetail")
+    public Result getWghSjxxDetail(@RequestBody WghSjxxDetailFormDto dto){
+        NewWghSjxxResultDTO result = wghSjxxService.getWghSjxxDetail(dto);
+        return new Result().ok(result);
+    }
+}

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

@@ -1,7 +1,9 @@
 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;
@@ -10,6 +12,11 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.form.WghSjxxFormDTO;
+import com.epmet.opendata.dto.form.WghSjxxbDetailFormDTO;
+import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO;
 import com.epmet.opendata.dto.wgh.WghSjxxbDTO;
 import com.epmet.opendata.excel.WghSjxxbExcel;
 import com.epmet.opendata.service.WghSjxxbService;
@@ -79,7 +86,7 @@ public class WghSjxxbController {
     }
 
     /**
-     * 调用ruoyi接口获取wgh_sjxx数据
+     * 调用ruoyi接口获取wgh_sjxxb数据
      *
      * @param dto
      * @return com.epmet.commons.tools.utils.Result
@@ -92,4 +99,33 @@ public class WghSjxxbController {
         return new Result();
     }
 
+    /**
+     * 事件信息分页
+     *
+     * @param form
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.opendata.dto.result.WghSjxxResultDTO>>
+     * @author LZN
+     * @date 2022/6/29 10:42
+     */
+    @PostMapping("todo/page")
+    public Result<PageData<WghSjxxResultDTO>> getSjxxPage(@RequestBody WghSjxxFormDTO form, @LoginUser TokenDto tokenDto) {
+        PageData<WghSjxxResultDTO> dto = wghSjxxbService.getSjxxPage(form);
+        return new Result<PageData<WghSjxxResultDTO>>().ok(dto);
+    }
+
+    /**
+     * 根据id查询详情
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO>
+     * @author LZN
+     * @date 2022/6/30 14:12
+     */
+    @PostMapping("sjxx/getDetailById")
+    public Result<WghSjxxbDetailResultDTO> getDetailById(@RequestBody WghSjxxbDetailFormDTO dto) {
+        WghSjxxbDetailResultDTO result = wghSjxxbService.getDetailById(dto);
+        return new Result<WghSjxxbDetailResultDTO>().ok(result);
+    }
+
 }

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

@@ -35,7 +35,8 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
     List<CaLoudongResultDTO> getPage(@Param("communityName") String communityName,
                                      @Param("buildingName") String buildingName,
                                      @Param("gridId") String gridId,
-                                     @Param("gridList") List<String> gridList);
+                                     @Param("gridList") List<String> gridList,
+                                     @Param("buildingAddr") String buildingAddr);
 
     /**
      * 楼栋基本信息详情

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

@@ -25,7 +25,8 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
     List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName,
                                       @Param("communityName") String communityName,
                                       @Param("gridId") String gridId,
-                                      @Param("gridList") List<String> gridList);
+                                      @Param("gridList") List<String> gridList,
+                                      @Param("buildingAddr") String buildingAddr);
 
     int deleteAll();
 

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

@@ -30,7 +30,8 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
                                     @Param("houseName") String houseName,
                                     @Param("renterName") String renterName,
                                     @Param("gridId") String gridId,
-                                    @Param("gridList") List<String> gridList);
+                                    @Param("gridList") List<String> gridList,
+                                    @Param("houseAddress") String houseAddress);
 
     int deleteAll();
 

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

@@ -32,7 +32,8 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
                                       @Param("idCard") String idCard,
                                       @Param("telephone") String telephone,
                                       @Param("gridId") String gridId,
-                                      @Param("gridList") List<String> gridList);
+                                      @Param("gridList") List<String> gridList,
+                                      @Param("curliveAddressDetail") String curliveAddressDetail);
 
     int deleteAll();
 

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

@@ -30,7 +30,8 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
                                       @Param("idCard") String idCard,
                                       @Param("telephone") String telephone,
                                       @Param("gridId") String gridId,
-                                      @Param("gridList") List<String> gridList);
+                                      @Param("gridList") List<String> gridList,
+                                      @Param("curliveAddressDetail") String curliveAddressDetail);
 
     int deleteAll();
 

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

@@ -0,0 +1,52 @@
+package com.epmet.opendata.dao;
+
+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.entity.WghSjxxEntity;
+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-05
+ */
+@Mapper
+public interface WghSjxxDao extends BaseDao<WghSjxxEntity> {
+
+    /**
+     * 全量删除
+     *
+     * @param
+     * @return int
+     * @author LZN
+     * @date 2022/7/5 14:18
+     */
+    int deleteAll();
+
+    /**
+     * 新的事件信息分页
+     *
+     * @param form
+     * @return java.util.List<com.epmet.opendata.dto.result.NewWghSjxxResultDTO>
+     * @author LZN
+     * @date 2022/7/5 15:49
+     */
+    List<NewWghSjxxResultDTO> getWghSjxxPage(@Param("form") NewWghSjxxFormDTO form);
+
+    /**
+     * 查询事件信息详情
+     *
+     * @param dto
+     * @return com.epmet.opendata.dto.result.NewWghSjxxResultDTO
+     * @author LZN
+     * @date 2022/7/5 16:15
+     */
+    NewWghSjxxResultDTO getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto);
+}

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

@@ -1,8 +1,14 @@
 package com.epmet.opendata.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.dto.form.WghSjxxFormDTO;
+import com.epmet.opendata.dto.result.WghSjxxResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO;
 import com.epmet.opendata.entity.WghSjxxbEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 事件信息
@@ -14,4 +20,25 @@ import org.apache.ibatis.annotations.Mapper;
 public interface WghSjxxbDao extends BaseDao<WghSjxxbEntity> {
 
     int deleteAll();
+
+
+    /**
+     * 事件信息分页
+     *
+     * @param form
+     * @return java.util.List<com.epmet.opendata.dto.result.WghSjxxResultDTO>
+     * @author LZN
+     * @date 2022/6/29 10:43
+     */
+    List<WghSjxxResultDTO> getSjxxPage(@Param("form") WghSjxxFormDTO form);
+
+    /**
+     * 根据id查询详情
+     *
+     * @param taskid
+     * @return com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO
+     * @author LZN
+     * @date 2022/6/30 14:13
+     */
+    WghSjxxbDetailResultDTO getDetailById(@Param("taskid") String taskid);
 }

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

@@ -0,0 +1,335 @@
+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-05
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wgh_sjxx")
+public class WghSjxxEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 案卷标识
+     */
+	private Integer recid;
+
+    /**
+     * 事件编号
+     */
+	private String sjbh;
+
+    /**
+     * 事件领域
+     */
+	private String sjlyu;
+
+    /**
+     * 事件大类
+     */
+	private String sjdl;
+
+    /**
+     * 事件小类
+     */
+	private String sjxl;
+
+    /**
+     * 事件细类
+     */
+	private String sjxil;
+
+    /**
+     * 事件来源
+     */
+	private String sjly;
+
+    /**
+     * 所属区/市
+     */
+	private String ssqs;
+
+    /**
+     * 所属街道
+     */
+	private String ssjd;
+
+    /**
+     * 所属社区
+     */
+	private String sssq;
+
+    /**
+     * 事件地址
+     */
+	private String sjdz;
+
+    /**
+     * 事件描述
+     */
+	private String sjms;
+
+    /**
+     * 网格员标识
+     */
+	private String wgybs;
+
+    /**
+     * 网格员名称
+     */
+	private String wgymc;
+
+    /**
+     * 所属部门
+     */
+	private String ssbm;
+
+    /**
+     * X坐标
+     */
+	private BigDecimal xzb;
+
+    /**
+     * Y坐标
+     */
+	private BigDecimal yzb;
+
+    /**
+     * 核实意见
+     */
+	private String hsyj;
+
+    /**
+     * 创建日期
+     */
+	private Date createdate;
+
+    /**
+     * 事件领域标签
+     */
+	private String sjlyubq;
+
+    /**
+     * 事件大类标签
+     */
+	private String sjdlbq;
+
+    /**
+     * 事件小类标签
+     */
+	private String sjxlbq;
+
+    /**
+     * 事件细类标签
+     */
+	private String sjxilbq;
+
+    /**
+     * 所属区/市标签
+     */
+	private String ssqsbq;
+
+    /**
+     * 所属街道标签
+     */
+	private String ssjdbq;
+
+    /**
+     * 所属社区标签
+     */
+	private String sssqbq;
+
+    /**
+     * 事件上报
+     */
+	private String sjsbwj;
+
+    /**
+     * 事件核实
+     */
+	private String sjhswj;
+
+    /**
+     * 事件处置
+     */
+	private String sjczwj;
+
+    /**
+     * 事件核查
+     */
+	private String sjhcwj;
+
+    /**
+     * 外系统唯一标识
+     */
+	private String wxtwybs;
+
+    /**
+     * 缩略图
+     */
+	private String slt;
+
+    /**
+     * 处置单位
+     */
+	private Integer czdw;
+
+    /**
+     * 处置结果
+     */
+	private String czjg;
+
+    /**
+     * 处置单位标签
+     */
+	private String czdwbq;
+
+    /**
+     * 是否退单
+     */
+	private Integer sftd;
+
+    /**
+     * 是否延期
+     */
+	private Integer sfyq;
+
+    /**
+     * 核查意见
+     */
+	private String hcyj;
+
+    /**
+     * 是否作废
+     */
+	private Integer sfzf;
+
+    /**
+     * 是否已核实
+     */
+	private Integer sfyhs;
+
+    /**
+     * 是否已核查
+     */
+	private Integer sfyhc;
+
+    /**
+     * 是否已督办
+     */
+	private Integer sfydb;
+
+    /**
+     * 专项任务标识
+     */
+	private Integer zxrwbs;
+
+    /**
+     * 待确责
+     */
+	private Integer dqz;
+
+    /**
+     * 熔断状态
+     */
+	private Integer rdzt;
+
+    /**
+     * 事件来源标签
+     */
+	private String sjlybq;
+
+    /**
+     * 应办结时间
+     */
+	private Date ybjsj;
+
+    /**
+     * 接收部门标识
+     */
+	private Integer jsbmbs;
+
+    /**
+     * 核实人员标识
+     */
+	private Integer hsrybs;
+
+    /**
+     * 核查人员标识
+     */
+	private Integer hcrybs;
+
+    /**
+     * 处置人员标识
+     */
+	private Integer czrybs;
+
+    /**
+     * 是否已处置
+     */
+	private Integer sfycz;
+
+    /**
+     * 核实时间
+     */
+	private Date hssj;
+
+    /**
+     * 核查时间
+     */
+	private Date hcsj;
+
+    /**
+     * 处置时间
+     */
+	private Date czsj;
+
+    /**
+     * 是否自发自处
+     */
+	private Integer sfzfzc;
+
+    /**
+     * 核查用时
+     */
+	private BigDecimal hcys;
+
+    /**
+     * 诉求联系人
+     */
+	private String sqlxr;
+
+    /**
+     * 僵尸车
+     */
+	private Integer jsc;
+
+    /**
+     * 到期时间
+     */
+	private Date dqsj;
+
+    /**
+     * 星级评定
+     */
+	private Integer xjpd;
+
+    /**
+     * 所属网格
+     */
+	private String sswg;
+
+}

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

@@ -0,0 +1,205 @@
+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-05
+ */
+@Data
+public class WghSjxxExcel {
+
+    @Excel(name = "案卷标识")
+    private Integer recid;
+
+    @Excel(name = "事件编号")
+    private String sjbh;
+
+    @Excel(name = "事件领域")
+    private String sjlyu;
+
+    @Excel(name = "事件大类")
+    private String sjdl;
+
+    @Excel(name = "事件小类")
+    private String sjxl;
+
+    @Excel(name = "事件细类")
+    private String sjxil;
+
+    @Excel(name = "事件来源")
+    private String sjly;
+
+    @Excel(name = "所属区/市")
+    private String ssqs;
+
+    @Excel(name = "所属街道")
+    private String ssjd;
+
+    @Excel(name = "所属社区")
+    private String sssq;
+
+    @Excel(name = "事件地址")
+    private String sjdz;
+
+    @Excel(name = "事件描述")
+    private String sjms;
+
+    @Excel(name = "网格员标识")
+    private String wgybs;
+
+    @Excel(name = "网格员名称")
+    private String wgymc;
+
+    @Excel(name = "所属部门")
+    private String ssbm;
+
+    @Excel(name = "X坐标")
+    private BigDecimal xzb;
+
+    @Excel(name = "Y坐标")
+    private BigDecimal yzb;
+
+    @Excel(name = "核实意见")
+    private String hsyj;
+
+    @Excel(name = "创建日期")
+    private Date createdate;
+
+    @Excel(name = "事件领域标签")
+    private String sjlyubq;
+
+    @Excel(name = "事件大类标签")
+    private String sjdlbq;
+
+    @Excel(name = "事件小类标签")
+    private String sjxlbq;
+
+    @Excel(name = "事件细类标签")
+    private String sjxilbq;
+
+    @Excel(name = "所属区/市标签")
+    private String ssqsbq;
+
+    @Excel(name = "所属街道标签")
+    private String ssjdbq;
+
+    @Excel(name = "所属社区标签")
+    private String sssqbq;
+
+    @Excel(name = "事件上报")
+    private String sjsbwj;
+
+    @Excel(name = "事件核实")
+    private String sjhswj;
+
+    @Excel(name = "事件处置")
+    private String sjczwj;
+
+    @Excel(name = "事件核查")
+    private String sjhcwj;
+
+    @Excel(name = "外系统唯一标识")
+    private String wxtwybs;
+
+    @Excel(name = "缩略图")
+    private String slt;
+
+    @Excel(name = "处置单位")
+    private Integer czdw;
+
+    @Excel(name = "处置结果")
+    private String czjg;
+
+    @Excel(name = "处置单位标签")
+    private String czdwbq;
+
+    @Excel(name = "是否退单")
+    private Integer sftd;
+
+    @Excel(name = "是否延期")
+    private Integer sfyq;
+
+    @Excel(name = "核查意见")
+    private String hcyj;
+
+    @Excel(name = "是否作废")
+    private Integer sfzf;
+
+    @Excel(name = "是否已核实")
+    private Integer sfyhs;
+
+    @Excel(name = "是否已核查")
+    private Integer sfyhc;
+
+    @Excel(name = "是否已督办")
+    private Integer sfydb;
+
+    @Excel(name = "专项任务标识")
+    private Integer zxrwbs;
+
+    @Excel(name = "待确责")
+    private Integer dqz;
+
+    @Excel(name = "熔断状态")
+    private Integer rdzt;
+
+    @Excel(name = "事件来源标签")
+    private String sjlybq;
+
+    @Excel(name = "应办结时间")
+    private Date ybjsj;
+
+    @Excel(name = "接收部门标识")
+    private Integer jsbmbs;
+
+    @Excel(name = "核实人员标识")
+    private Integer hsrybs;
+
+    @Excel(name = "核查人员标识")
+    private Integer hcrybs;
+
+    @Excel(name = "处置人员标识")
+    private Integer czrybs;
+
+    @Excel(name = "是否已处置")
+    private Integer sfycz;
+
+    @Excel(name = "核实时间")
+    private Date hssj;
+
+    @Excel(name = "核查时间")
+    private Date hcsj;
+
+    @Excel(name = "处置时间")
+    private Date czsj;
+
+    @Excel(name = "是否自发自处")
+    private Integer sfzfzc;
+
+    @Excel(name = "核查用时")
+    private BigDecimal hcys;
+
+    @Excel(name = "诉求联系人")
+    private String sqlxr;
+
+    @Excel(name = "僵尸车")
+    private Integer jsc;
+
+    @Excel(name = "到期时间")
+    private Date dqsj;
+
+    @Excel(name = "星级评定")
+    private Integer xjpd;
+
+    @Excel(name = "所属网格")
+    private String sswg;
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxRedis.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-05
+ */
+@Component
+public class WghSjxxRedis {
+    @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/WghSjxxService.java

@@ -0,0 +1,114 @@
+package com.epmet.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+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.WghSjxxResultDTO;
+import com.epmet.opendata.dto.wgh.WghSjxxDTO;
+import com.epmet.opendata.entity.WghSjxxEntity;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 事件信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-05
+ */
+public interface WghSjxxService extends BaseService<WghSjxxEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<WghSjxxDTO>
+     * @author generator
+     * @date 2022-07-05
+     */
+    PageData<WghSjxxDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<WghSjxxDTO>
+     * @author generator
+     * @date 2022-07-05
+     */
+    List<WghSjxxDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return WghSjxxDTO
+     * @author generator
+     * @date 2022-07-05
+     */
+    WghSjxxDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-05
+     */
+    void save(WghSjxxDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-05
+     */
+    void update(WghSjxxDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-07-05
+     */
+    void delete(String[] ids);
+
+    /**
+     * 调用ruoyi接口获取wgh_sjxxb数据
+     *
+     * @param dto
+     * @return void
+     * @author LZN
+     * @date 2022/7/5 14:18
+     */
+    void getWghSjxx(PreserVationFormDTO dto);
+
+    /**
+     * 新的事件信息分页
+     *
+     * @param form
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.NewWghSjxxResultDTO>
+     * @author LZN
+     * @date 2022/7/5 15:49
+     */
+    PageData<NewWghSjxxResultDTO> getWghSjxxPage(NewWghSjxxFormDTO form);
+
+    /**
+     * 查询事件信息详情
+     *
+     * @param dto
+     * @return com.epmet.opendata.dto.result.NewWghSjxxResultDTO
+     * @author LZN
+     * @date 2022/7/5 16:15
+     */
+    NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto);
+}

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

@@ -3,6 +3,10 @@ package com.epmet.opendata.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.form.WghSjxxFormDTO;
+import com.epmet.opendata.dto.form.WghSjxxbDetailFormDTO;
+import com.epmet.opendata.dto.result.WghSjxxResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO;
 import com.epmet.opendata.dto.wgh.WghSjxxbDTO;
 import com.epmet.opendata.entity.WghSjxxbEntity;
 
@@ -86,4 +90,24 @@ public interface WghSjxxbService extends BaseService<WghSjxxbEntity> {
      * @date 2022/6/14 16:02
      */
     void getPreserSjxxVation(PreserVationFormDTO dto);
+
+    /**
+     * 事件信息分页
+     *
+     * @param form
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.WghSjxxResultDTO>
+     * @author LZN
+     * @date 2022/6/29 10:43
+     */
+    PageData<WghSjxxResultDTO> getSjxxPage(WghSjxxFormDTO form);
+
+    /**
+     * 根据id查询详情
+     *
+     * @param dto
+     * @return com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO
+     * @author LZN
+     * @date 2022/6/30 14:12
+     */
+    WghSjxxbDetailResultDTO getDetailById(WghSjxxbDetailFormDTO dto);
 }

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

@@ -133,7 +133,8 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         List<CaLoudongResultDTO> result = baseDao.getPage(dto.getCommunityName(),
                 dto.getBuildingName(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getBuildingAddr());
         PageInfo<CaLoudongResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

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

@@ -127,7 +127,8 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
         List<CaPingfangResultDTO> result = baseDao.getPage(dto.getBuildingName(),
                 dto.getCommunityName(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getBuildingAddr());
         PageInfo<CaPingfangResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

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

@@ -131,7 +131,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
                 dto.getHouseName(),
                 dto.getRenterName(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getHouseAddress());
         PageInfo<CaRentalResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

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

@@ -139,7 +139,8 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
                 dto.getIdCard(),
                 dto.getTelephone(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getCurliveAddressDetail());
         PageInfo<CaResidentResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

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

@@ -135,7 +135,8 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
                 dto.getIdCard(),
                 dto.getTelephone(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getCurliveAddressDetail());
         PageInfo<CaRotatorsResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

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

@@ -4,7 +4,6 @@ import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.service.*;
 import lombok.extern.slf4j.Slf4j;
-import net.bytebuddy.asm.Advice;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -79,6 +78,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
     @Autowired
     private CaBmCategoryService caBmCategoryService;
 
+    @Autowired
+    private WghSjxxService wghSjxxService;
+
     @Override
     public void guardarDatosTask(PreserVationFormDTO dto) {
         if (StringUtils.isNotBlank(dto.getTableName())) {
@@ -122,7 +124,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
                 case CaWghDataConstant.SHARE_WGH_JYZ:
                     wghJyzService.getPreserWghJyzVation(dto);
                     break;
-                case CaWghDataConstant.SHARE_WGH_SJXX:
+                case CaWghDataConstant.SHARE_WGH_SJXXB:
                     wghSjxxbService.getPreserSjxxVation(dto);
                     break;
                 case CaWghDataConstant.SHARE_WGH_SQXX:
@@ -149,6 +151,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
                 case CaWghDataConstant.UNICOM_SYS_DICT:
                     caSysDictService.preserSysdictVation(dto);
                     break;
+                case CaWghDataConstant.SHARE_WGH_SJXX:
+                    wghSjxxService.getWghSjxx(dto);
+                    break;
             }
         } else{
             throw new Error("没传名字");

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

@@ -0,0 +1,207 @@
+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.WghSjxxDao;
+import com.epmet.opendata.dto.constant.CaWghDataConstant;
+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.WghSjxxResultDTO;
+import com.epmet.opendata.dto.wgh.WghSjxxDTO;
+import com.epmet.opendata.entity.WghSjxxEntity;
+import com.epmet.opendata.entity.WghSjxxbEntity;
+import com.epmet.opendata.redis.WghSjxxRedis;
+import com.epmet.opendata.service.WghSjxxService;
+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-05
+ */
+@Service
+public class WghSjxxServiceImpl extends BaseServiceImpl<WghSjxxDao, WghSjxxEntity> implements WghSjxxService {
+
+    @Autowired
+    private WghSjxxRedis wghSjxxRedis;
+
+    @Override
+    public PageData<WghSjxxDTO> page(Map<String, Object> params) {
+        IPage<WghSjxxEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, WghSjxxDTO.class);
+    }
+
+    @Override
+    public List<WghSjxxDTO> list(Map<String, Object> params) {
+        List<WghSjxxEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, WghSjxxDTO.class);
+    }
+
+    private QueryWrapper<WghSjxxEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<WghSjxxEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public WghSjxxDTO get(String id) {
+        WghSjxxEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, WghSjxxDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(WghSjxxDTO dto) {
+        WghSjxxEntity entity = ConvertUtils.sourceToTarget(dto, WghSjxxEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(WghSjxxDTO dto) {
+        WghSjxxEntity entity = ConvertUtils.sourceToTarget(dto, WghSjxxEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 调用ruoyi接口获取wgh_sjxxb数据
+     *
+     * @param dto
+     * @return void
+     * @author LZN
+     * @date 2022/7/5 14:18
+     */
+    @Override
+    public void getWghSjxx(PreserVationFormDTO dto) {
+        int i = baseDao.deleteAll();
+
+        if (i >= 0) {
+            dto.setPageNo(NumConstant.ONE);
+            dto.setPageSize(CaWghDataConstant.PAGE_LIMIT);
+            dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_WGH);
+            dto.setTableName(CaWghDataConstant.SHARE_WGH_SJXX);
+
+            dto.setWhereCase("1=1");
+            dto.setOrderBy("createdate,hssj,hcsj,czsj");
+
+            int pageNo = 1;
+
+            int total = 0;
+
+            do {
+                try {
+                    total = listWgh(dto);
+                    pageNo++;
+                    dto.setPageNo(pageNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (total > (pageNo * NumConstant.FIFTY));
+        }
+    }
+
+    /**
+     * 新的事件信息分页
+     *
+     * @param form
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.NewWghSjxxResultDTO>
+     * @author LZN
+     * @date 2022/7/5 15:49
+     */
+    @Override
+    public PageData<NewWghSjxxResultDTO> getWghSjxxPage(NewWghSjxxFormDTO form) {
+        PageHelper.startPage(form.getPage(), form.getLimit());
+        List<NewWghSjxxResultDTO> result = baseDao.getWghSjxxPage(form);
+        PageInfo<NewWghSjxxResultDTO> info = new PageInfo<>(result);
+        return new PageData<>(result, info.getTotal());
+    }
+
+    /**
+     * 查询事件信息详情
+     *
+     * @param dto
+     * @return com.epmet.opendata.dto.result.NewWghSjxxResultDTO
+     * @author LZN
+     * @date 2022/7/5 16:15
+     */
+    @Override
+    public NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto) {
+        return baseDao.getWghSjxxDetail(dto);
+    }
+
+    private int listWgh(PreserVationFormDTO dto) throws Exception {
+        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
+        JSONObject obj = new JSONObject();
+        obj.put(CaWghDataConstant.WGH_CONDITION, aes);
+        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_WGH, 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<WghSjxxEntity> list;
+
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public List<WghSjxxEntity> getList() {
+            return list;
+        }
+
+        public void setList(List<WghSjxxEntity> list) {
+            this.list = list;
+        }
+    }
+
+}

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

@@ -14,12 +14,17 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.opendata.dao.WghSjxxbDao;
 import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.form.WghSjxxFormDTO;
+import com.epmet.opendata.dto.form.WghSjxxbDetailFormDTO;
+import com.epmet.opendata.dto.result.WghSjxxResultDTO;
+import com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO;
 import com.epmet.opendata.dto.wgh.WghSjxxbDTO;
-import com.epmet.opendata.entity.CaLoudongEntity;
 import com.epmet.opendata.entity.WghSjxxbEntity;
 import com.epmet.opendata.redis.WghSjxxbRedis;
 import com.epmet.opendata.service.WghSjxxbService;
 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;
@@ -108,7 +113,7 @@ public class WghSjxxbServiceImpl extends BaseServiceImpl<WghSjxxbDao, WghSjxxbEn
             dto.setPageNo(NumConstant.ONE);
             dto.setPageSize(CaWghDataConstant.PAGE_LIMIT);
             dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE);
-            dto.setTableName(CaWghDataConstant.SHARE_WGH_SJXX);
+            dto.setTableName(CaWghDataConstant.SHARE_WGH_SJXXB);
 
             dto.setWhereCase("1=1");
             dto.setOrderBy("OBJECTID,OBJECTID_1,insert_time");
@@ -130,6 +135,36 @@ public class WghSjxxbServiceImpl extends BaseServiceImpl<WghSjxxbDao, WghSjxxbEn
 
     }
 
+    /**
+     * 事件信息分页
+     *
+     * @param form
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.WghSjxxResultDTO>
+     * @author LZN
+     * @date 2022/6/29 10:43
+     */
+    @Override
+    public PageData<WghSjxxResultDTO> getSjxxPage(WghSjxxFormDTO form) {
+        PageHelper.startPage(form.getPage(), form.getLimit());
+        List<WghSjxxResultDTO> result = baseDao.getSjxxPage(form);
+        PageInfo<WghSjxxResultDTO> info = new PageInfo<>(result);
+        return new PageData<>(result, info.getTotal());
+    }
+
+    /**
+     * 根据id查询详情
+     *
+     * @param dto
+     * @return com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO
+     * @author LZN
+     * @date 2022/6/30 14:12
+     */
+    @Override
+    public WghSjxxbDetailResultDTO getDetailById(WghSjxxbDetailFormDTO dto) {
+        WghSjxxbDetailResultDTO result = baseDao.getDetailById(dto.getTaskid());
+        return result;
+    }
+
 
     private int listLouDong(PreserVationFormDTO dto) throws Exception {
         String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);

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

@@ -0,0 +1,67 @@
+DROP TABLE IF EXISTS `wgh_sjxx`;
+
+CREATE TABLE `wgh_sjxx` (
+  `recid` int(11) NOT NULL COMMENT '案卷标识',
+  `sjbh` varchar(100) DEFAULT NULL COMMENT '事件编号',
+  `sjlyu` varchar(2) DEFAULT NULL COMMENT '事件领域',
+  `sjdl` varchar(4) DEFAULT NULL COMMENT '事件大类',
+  `sjxl` varchar(6) DEFAULT NULL COMMENT '事件小类',
+  `sjxil` varchar(8) DEFAULT NULL COMMENT '事件细类',
+  `sjly` varchar(100) DEFAULT NULL COMMENT '事件来源',
+  `ssqs` varchar(12) DEFAULT NULL COMMENT '所属区/市',
+  `ssjd` varchar(19) DEFAULT NULL COMMENT '所属街道',
+  `sssq` varchar(19) DEFAULT NULL COMMENT '所属社区',
+  `sjdz` text COMMENT '事件地址',
+  `sjms` text COMMENT '事件描述',
+  `wgybs` varchar(100) DEFAULT NULL COMMENT '网格员标识',
+  `wgymc` varchar(100) DEFAULT NULL COMMENT '网格员名称',
+  `ssbm` varchar(100) DEFAULT NULL COMMENT '所属部门',
+  `xzb` decimal(18,9) DEFAULT NULL COMMENT 'X坐标',
+  `yzb` decimal(18,9) DEFAULT NULL COMMENT 'Y坐标',
+  `hsyj` varchar(100) DEFAULT NULL COMMENT '核实意见',
+  `createdate` datetime DEFAULT NULL COMMENT '创建日期',
+  `sjlyubq` varchar(100) DEFAULT NULL COMMENT '事件领域标签',
+  `sjdlbq` varchar(100) DEFAULT NULL COMMENT '事件大类标签',
+  `sjxlbq` varchar(200) DEFAULT NULL COMMENT '事件小类标签',
+  `sjxilbq` varchar(200) DEFAULT NULL COMMENT '事件细类标签',
+  `ssqsbq` varchar(100) DEFAULT NULL COMMENT '所属区/市标签',
+  `ssjdbq` varchar(100) DEFAULT NULL COMMENT '所属街道标签',
+  `sssqbq` varchar(100) DEFAULT NULL COMMENT '所属社区标签',
+  `sjsbwj` text COMMENT '事件上报',
+  `sjhswj` text COMMENT '事件核实',
+  `sjczwj` text COMMENT '事件处置',
+  `sjhcwj` text COMMENT '事件核查',
+  `wxtwybs` varchar(100) DEFAULT NULL COMMENT '外系统唯一标识',
+  `slt` varchar(100) DEFAULT NULL COMMENT '缩略图',
+  `czdw` int(11) DEFAULT NULL COMMENT '处置单位',
+  `czjg` text COMMENT '处置结果',
+  `czdwbq` varchar(100) DEFAULT NULL COMMENT '处置单位标签',
+  `sftd` int(11) DEFAULT NULL COMMENT '是否退单',
+  `sfyq` int(11) DEFAULT NULL COMMENT '是否延期',
+  `hcyj` varchar(100) DEFAULT NULL COMMENT '核查意见',
+  `sfzf` int(11) DEFAULT NULL COMMENT '是否作废',
+  `sfyhs` int(11) DEFAULT NULL COMMENT '是否已核实',
+  `sfyhc` int(11) DEFAULT NULL COMMENT '是否已核查',
+  `sfydb` int(11) DEFAULT NULL COMMENT '是否已督办',
+  `zxrwbs` int(11) DEFAULT NULL COMMENT '专项任务标识',
+  `dqz` int(11) DEFAULT NULL COMMENT '待确责',
+  `rdzt` int(11) DEFAULT NULL COMMENT '熔断状态',
+  `sjlybq` varchar(100) DEFAULT NULL COMMENT '事件来源标签',
+  `ybjsj` datetime DEFAULT NULL COMMENT '应办结时间',
+  `jsbmbs` int(11) DEFAULT NULL COMMENT '接收部门标识',
+  `hsrybs` int(11) DEFAULT NULL COMMENT '核实人员标识',
+  `hcrybs` int(11) DEFAULT NULL COMMENT '核查人员标识',
+  `czrybs` int(11) DEFAULT NULL COMMENT '处置人员标识',
+  `sfycz` int(11) DEFAULT NULL COMMENT '是否已处置',
+  `hssj` datetime DEFAULT NULL COMMENT '核实时间',
+  `hcsj` datetime DEFAULT NULL COMMENT '核查时间',
+  `czsj` datetime DEFAULT NULL COMMENT '处置时间',
+  `sfzfzc` int(11) DEFAULT NULL COMMENT '是否自发自处',
+  `hcys` decimal(10,2) DEFAULT NULL COMMENT '核查用时',
+  `sqlxr` varchar(200) DEFAULT NULL COMMENT '诉求联系人',
+  `jsc` int(11) DEFAULT NULL COMMENT '僵尸车',
+  `dqsj` datetime DEFAULT NULL COMMENT '到期时间',
+  `xjpd` int(11) DEFAULT NULL COMMENT '星级评定',
+  `sswg` varchar(19) DEFAULT NULL COMMENT '所属网格',
+  PRIMARY KEY (`recid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件信息';

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

@@ -114,6 +114,9 @@
             <if test="gridId != null and gridId != ''">
                 AND vs.business_org_id = #{gridId}
             </if>
+            <if test="buildingAddr != null and buildingAddr != ''">
+                AND ca.building_addr like '%${buildingAddr}%'
+            </if>
         </where>
         order by ca.grid_id,ca.building_id,ca.community_id desc
     </select>

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

@@ -111,6 +111,9 @@
             <if test="gridId != null and gridId != ''">
                 AND vs.business_org_id = #{gridId}
             </if>
+            <if test="buildingAddr != null and buildingAddr != ''">
+                AND ca.building_addr like '%${buildingAddr}%'
+            </if>
         </where>
         order by ca.grid_id,ca.building_id,ca.community_id desc
     </select>

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

@@ -106,6 +106,9 @@
             <if test="gridId != null and gridId != ''">
                 AND vs.business_org_id = #{gridId}
             </if>
+            <if test="houseAddress != null and houseAddress != ''">
+                AND ca.house_address like '%${houseAddress}%'
+            </if>
         </where>
         order by ca.grid_id,ca.rental_id,ca.id_card desc
     </select>

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

@@ -138,6 +138,9 @@
                 <if test="gridId != null and gridId != ''">
                     AND vs.business_org_id = #{gridId}
                 </if>
+                <if test="curliveAddressDetail != null and curliveAddressDetail != ''">
+                    AND ca.curlive_address_detail like '%${curliveAddressDetail}%'
+                </if>
             </where>
             order by ca.grid_id,ca.resident_id,ca.id_card desc
     </select>

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

@@ -138,6 +138,9 @@
                 <if test="gridId != null and gridId != ''">
                     AND vs.business_org_id = #{gridId}
                 </if>
+                <if test="curliveAddressDetail != null and curliveAddressDetail != ''">
+                    AND curlive_address_detail like '%${curliveAddressDetail}%'
+                </if>
             </where>
             order by ca.grid_id,ca.rotators_id,ca.id_card desc
     </select>

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

@@ -0,0 +1,115 @@
+<?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.WghSjxxDao">
+
+    <resultMap type="com.epmet.opendata.entity.WghSjxxEntity" id="wghSjxxMap">
+        <result property="recid" column="recid"/>
+        <result property="sjbh" column="sjbh"/>
+        <result property="sjlyu" column="sjlyu"/>
+        <result property="sjdl" column="sjdl"/>
+        <result property="sjxl" column="sjxl"/>
+        <result property="sjxil" column="sjxil"/>
+        <result property="sjly" column="sjly"/>
+        <result property="ssqs" column="ssqs"/>
+        <result property="ssjd" column="ssjd"/>
+        <result property="sssq" column="sssq"/>
+        <result property="sjdz" column="sjdz"/>
+        <result property="sjms" column="sjms"/>
+        <result property="wgybs" column="wgybs"/>
+        <result property="wgymc" column="wgymc"/>
+        <result property="ssbm" column="ssbm"/>
+        <result property="xzb" column="xzb"/>
+        <result property="yzb" column="yzb"/>
+        <result property="hsyj" column="hsyj"/>
+        <result property="createdate" column="createdate"/>
+        <result property="sjlyubq" column="sjlyubq"/>
+        <result property="sjdlbq" column="sjdlbq"/>
+        <result property="sjxlbq" column="sjxlbq"/>
+        <result property="sjxilbq" column="sjxilbq"/>
+        <result property="ssqsbq" column="ssqsbq"/>
+        <result property="ssjdbq" column="ssjdbq"/>
+        <result property="sssqbq" column="sssqbq"/>
+        <result property="sjsbwj" column="sjsbwj"/>
+        <result property="sjhswj" column="sjhswj"/>
+        <result property="sjczwj" column="sjczwj"/>
+        <result property="sjhcwj" column="sjhcwj"/>
+        <result property="wxtwybs" column="wxtwybs"/>
+        <result property="slt" column="slt"/>
+        <result property="czdw" column="czdw"/>
+        <result property="czjg" column="czjg"/>
+        <result property="czdwbq" column="czdwbq"/>
+        <result property="sftd" column="sftd"/>
+        <result property="sfyq" column="sfyq"/>
+        <result property="hcyj" column="hcyj"/>
+        <result property="sfzf" column="sfzf"/>
+        <result property="sfyhs" column="sfyhs"/>
+        <result property="sfyhc" column="sfyhc"/>
+        <result property="sfydb" column="sfydb"/>
+        <result property="zxrwbs" column="zxrwbs"/>
+        <result property="dqz" column="dqz"/>
+        <result property="rdzt" column="rdzt"/>
+        <result property="sjlybq" column="sjlybq"/>
+        <result property="ybjsj" column="ybjsj"/>
+        <result property="jsbmbs" column="jsbmbs"/>
+        <result property="hsrybs" column="hsrybs"/>
+        <result property="hcrybs" column="hcrybs"/>
+        <result property="czrybs" column="czrybs"/>
+        <result property="sfycz" column="sfycz"/>
+        <result property="hssj" column="hssj"/>
+        <result property="hcsj" column="hcsj"/>
+        <result property="czsj" column="czsj"/>
+        <result property="sfzfzc" column="sfzfzc"/>
+        <result property="hcys" column="hcys"/>
+        <result property="sqlxr" column="sqlxr"/>
+        <result property="jsc" column="jsc"/>
+        <result property="dqsj" column="dqsj"/>
+        <result property="xjpd" column="xjpd"/>
+        <result property="sswg" column="sswg"/>
+    </resultMap>
+    <delete id="deleteAll">
+        delete from wgh_sjxx
+    </delete>
+    <select id="getWghSjxxPage" resultType="com.epmet.opendata.dto.result.NewWghSjxxResultDTO">
+        SELECT
+            wgymc,
+            ssjdbq,
+            sssqbq,
+            hcyj,
+            hcsj,
+            sjms,
+            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>
+            <if test="form.sssqbq != null and form.sssqbq != ''">
+                AND sssqbq like '%${form.sssqbq}%'
+            </if>
+            <if test="form.hcyj != null and form.hcyj != ''">
+                AND hcyj like '%${form.hcyj}%'
+            </if>
+        </where>
+        order by czsj desc
+    </select>
+    <select id="getWghSjxxDetail" resultType="com.epmet.opendata.dto.result.NewWghSjxxResultDTO">
+        select
+             wgymc,
+            ssjdbq,
+            sssqbq,
+            hcyj,
+            hcsj,
+            sjms
+        FROM
+	        wgh_sjxx
+	        where recid = #{dto.recid}
+    </select>
+
+
+</mapper>

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

@@ -23,6 +23,48 @@
     <delete id="deleteAll">
         delete from wgh_sjxxb
     </delete>
+    <select id="getSjxxPage" resultType="com.epmet.opendata.dto.result.WghSjxxResultDTO">
+        SELECT
+            INFOSOURCENAME,
+            INFOTYPENAME,
+            COMMUNITYNAME,
+            DESCRIPTION,
+            ADDRESS,
+            STATUSNAME,
+            STREETNAME,
+            TASKID
+        FROM
+            wgh_sjxxb
+        <where>
+            1=1
+            <if test="form.infosourcename != null and form.infosourcename != ''">
+                AND INFOSOURCENAME = #{form.infosourcename}
+            </if>
+            <if test="form.infotypename != null and form.infotypename != ''">
+                AND INFOTYPENAME = #{form.infotypename}
+            </if>
+            <if test="form.communityname != null and form.communityname != ''">
+                AND COMMUNITYNAME = #{form.communityname}
+            </if>
+            <if test="form.statusname != null and form.statusname != ''">
+                AND STATUSNAME = #{form.statusname}
+            </if>
+        </where>
+    </select>
+    <select id="getDetailById" resultType="com.epmet.opendata.dto.result.WghSjxxbDetailResultDTO">
+        SELECT
+            INFOSOURCENAME,
+            INFOTYPENAME,
+            COMMUNITYNAME,
+            DESCRIPTION,
+            ADDRESS,
+            STATUSNAME,
+            STREETNAME
+        FROM
+            wgh_sjxxb
+        where
+            TASKID = #{taskid}
+    </select>
 
 
 </mapper>