From 4b9464eb2f02673c6fc5399f9dfda5277a194741 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 6 Jul 2022 10:03:02 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/dto/form/NewWghSjxxFormDTO.java | 4 - .../dto/result/NewWghSjxxResultDTO.java | 7 +- .../dto/result/WghSjxxDetailResultDto.java | 98 +++++++++++++++++++ .../controller/WghSjxxController.java | 3 +- .../com/epmet/opendata/dao/WghSjxxDao.java | 3 +- .../opendata/service/WghSjxxService.java | 3 +- .../service/impl/WghSjxxServiceImpl.java | 3 +- .../src/main/resources/mapper/WghSjxxDao.xml | 25 +++-- 8 files changed, 127 insertions(+), 19 deletions(-) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxDetailResultDto.java diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java index 9c3d70e155..73333402cc 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/NewWghSjxxFormDTO.java +++ b/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; /** * 街道标签 diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java index db3203bb3d..56d1eaf291 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/NewWghSjxxResultDTO.java +++ b/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; + /** * 唯一标识 diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxDetailResultDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxDetailResultDto.java new file mode 100644 index 0000000000..babd867659 --- /dev/null +++ b/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; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java index fdeb46888f..15b767f22c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxController.java +++ b/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); } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java index d7a49811c6..8db8ed93b6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxDao.java +++ b/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 { * @author LZN * @date 2022/7/5 16:15 */ - NewWghSjxxResultDTO getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto); + WghSjxxDetailResultDto getWghSjxxDetail(@Param("dto") WghSjxxDetailFormDto dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java index 809b33ea05..090f0a75fc 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxService.java +++ b/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 { * @author LZN * @date 2022/7/5 16:15 */ - NewWghSjxxResultDTO getWghSjxxDetail(WghSjxxDetailFormDto dto); + WghSjxxDetailResultDto getWghSjxxDetail(WghSjxxDetailFormDto dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java index 72c94f7492..8262490101 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxServiceImpl.java +++ b/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 1=1 - - AND wgymc like '%${form.wgymc}%' - AND ssjdbq like '%${form.ssjdbq}%' @@ -98,14 +95,26 @@ order by czsj desc - 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} From 232c6ac0c66901e5e34f5f32c012889dd2c58d6d Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 6 Jul 2022 16:54:12 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/ca/CaKettleBaseDisputeProcessDTO.java | 235 +++++++++++++++++ .../CaKettleBaseDisputeProcessController.java | 83 ++++++ .../dao/CaKettleBaseDisputeProcessDao.java | 16 ++ .../CaKettleBaseDisputeProcessEntity.java | 240 ++++++++++++++++++ .../CaKettleBaseDisputeProcessExcel.java | 148 +++++++++++ .../CaKettleBaseDisputeProcessRedis.java | 30 +++ .../CaKettleBaseDisputeProcessService.java | 78 ++++++ ...CaKettleBaseDisputeProcessServiceImpl.java | 87 +++++++ .../mapper/CaKettleBaseDisputeProcessDao.xml | 8 + 9 files changed, 925 insertions(+) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaKettleBaseDisputeProcessDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaKettleBaseDisputeProcessExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaKettleBaseDisputeProcessRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaKettleBaseDisputeProcessDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaKettleBaseDisputeProcessDTO.java new file mode 100644 index 0000000000..1e4a92d86e --- /dev/null +++ b/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; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java new file mode 100644 index 0000000000..cef55de631 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java @@ -0,0 +1,83 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.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> page(@RequestParam Map params){ + PageData page = caKettleBaseDisputeProcessService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + CaKettleBaseDisputeProcessDTO data = caKettleBaseDisputeProcessService.get(id); + return new Result().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 params, HttpServletResponse response) throws Exception { + List list = caKettleBaseDisputeProcessService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CaKettleBaseDisputeProcessExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java new file mode 100644 index 0000000000..ed6156164a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-07-06 + */ +@Mapper +public interface CaKettleBaseDisputeProcessDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java new file mode 100644 index 0000000000..1058663c96 --- /dev/null +++ b/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 extends BaseEpmetEntity { + + 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; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaKettleBaseDisputeProcessExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaKettleBaseDisputeProcessExcel.java new file mode 100644 index 0000000000..d97655f6a5 --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaKettleBaseDisputeProcessRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaKettleBaseDisputeProcessRedis.java new file mode 100644 index 0000000000..4232a87f9c --- /dev/null +++ b/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; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java new file mode 100644 index 0000000000..52e01e5bf1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java @@ -0,0 +1,78 @@ +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.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 { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-07-06 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-07-06 + */ + List list(Map 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); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java new file mode 100644 index 0000000000..7b6d1af64d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.CaKettleBaseDisputeProcessDao; +import com.epmet.opendata.dto.ca.CaKettleBaseDisputeProcessDTO; +import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity; +import com.epmet.opendata.redis.CaKettleBaseDisputeProcessRedis; +import com.epmet.opendata.service.CaKettleBaseDisputeProcessService; +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 implements CaKettleBaseDisputeProcessService { + + @Autowired + private CaKettleBaseDisputeProcessRedis caKettleBaseDisputeProcessRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CaKettleBaseDisputeProcessDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CaKettleBaseDisputeProcessDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper 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)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml new file mode 100644 index 0000000000..13d8b297a1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -0,0 +1,8 @@ + + + + + + + + From 098df538e72f95e89a851527abac4b57233fd87d Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 6 Jul 2022 17:03:07 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../CaKettleBaseDisputeProcessController.java | 15 ++- .../dao/CaKettleBaseDisputeProcessDao.java | 9 ++ .../CaKettleBaseDisputeProcessService.java | 13 ++- ...CaKettleBaseDisputeProcessServiceImpl.java | 91 ++++++++++++++++++- .../mapper/CaKettleBaseDisputeProcessDao.xml | 4 +- 6 files changed, 125 insertions(+), 8 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 949522d31d..773c37c0d7 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/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"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java index cef55de631..527b5ad107 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java @@ -11,6 +11,7 @@ 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.PreserVationFormDTO; import com.epmet.opendata.excel.CaKettleBaseDisputeProcessExcel; import com.epmet.opendata.service.CaKettleBaseDisputeProcessService; import org.springframework.beans.factory.annotation.Autowired; @@ -78,6 +79,18 @@ public class CaKettleBaseDisputeProcessController { 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(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java index ed6156164a..56081fa845 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java @@ -13,4 +13,13 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface CaKettleBaseDisputeProcessDao extends BaseDao { + /** + * 全量删除 + * + * @param + * @return int + * @author LZN + * @date 2022/7/6 17:02 + */ + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java index 52e01e5bf1..2ffadb9d00 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java @@ -3,14 +3,13 @@ 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.PreserVationFormDTO; 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 */ @@ -75,4 +74,14 @@ public interface CaKettleBaseDisputeProcessService extends BaseService getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -84,4 +91,80 @@ public class CaKettleBaseDisputeProcessServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); + dto.setTableName(CaWghDataConstant.UNICOM_KETTLE); + + dto.setWhereCase("1=1"); + dto.setOrderBy("timelimit,create_time,update_time,import_time,eventdate desc"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listKettle(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + 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 list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml index 13d8b297a1..7403925152 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -4,5 +4,7 @@ - + + delete from ca_kettle_base_dispute_process + From 6548738ee5e85333d808b6960e269a740f1de243 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 6 Jul 2022 17:33:40 +0800 Subject: [PATCH 04/18] =?UTF-8?q?CaKettle=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/dto/form/KettleNewsFormDto.java | 32 ++++++++++++++ .../dto/result/KettleNewsResultDto.java | 42 +++++++++++++++++++ .../CaKettleBaseDisputeProcessController.java | 21 ++++++++++ .../dao/CaKettleBaseDisputeProcessDao.java | 17 +++++++- .../CaKettleBaseDisputeProcessService.java | 12 ++++++ ...CaKettleBaseDisputeProcessServiceImpl.java | 21 ++++++++++ .../mapper/CaKettleBaseDisputeProcessDao.xml | 22 ++++++++++ 7 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java new file mode 100644 index 0000000000..33872e7596 --- /dev/null +++ b/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 mainpartyid; + + /** + * 网格名称 + */ + private String griddingname; + + + + /** + * 事件名称 + */ + private String eventtitle; + + private Integer page; + + private Integer limit; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java new file mode 100644 index 0000000000..18b5b7d007 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java @@ -0,0 +1,42 @@ +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 String mainpartyid; + + /** + * 涉及单位 + */ + private String responsibility_unit; + + /** + * 主键 + */ + private Integer baseKeyId; +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java index 527b5ad107..5d0eef08af 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.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; @@ -11,7 +13,11 @@ 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.KettleNewsFormDto; +import com.epmet.opendata.dto.form.NewWghSjxxFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; +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; @@ -93,4 +99,19 @@ public class CaKettleBaseDisputeProcessController { 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 dto = caKettleBaseDisputeProcessService.getCaKettlePage(form); + return new Result>().ok(dto); + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java index 56081fa845..cb4f6fe4d2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java @@ -1,12 +1,15 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.dto.form.KettleNewsFormDto; +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 */ @@ -22,4 +25,14 @@ public interface CaKettleBaseDisputeProcessDao extends BaseDao + * @author LZN + * @date 2022/7/6 17:32 + */ + List getCaKettlePage(@Param("form") KettleNewsFormDto form); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java index 2ffadb9d00..e57b361667 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java @@ -3,7 +3,9 @@ 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.KettleNewsFormDto; import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.result.KettleNewsResultDto; import com.epmet.opendata.entity.CaKettleBaseDisputeProcessEntity; import java.util.List; @@ -84,4 +86,14 @@ public interface CaKettleBaseDisputeProcessService extends BaseService + * @author LZN + * @date 2022/7/6 17:32 + */ + PageData getCaKettlePage(KettleNewsFormDto form); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java index e92cf14e79..775bd10182 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java @@ -14,12 +14,17 @@ 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.KettleNewsFormDto; import com.epmet.opendata.dto.form.PreserVationFormDTO; +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; @@ -128,6 +133,22 @@ public class CaKettleBaseDisputeProcessServiceImpl extends BaseServiceImpl + * @author LZN + * @date 2022/7/6 17:32 + */ + @Override + public PageData getCaKettlePage(KettleNewsFormDto form) { + PageHelper.startPage(form.getPage(), form.getLimit()); + List result = baseDao.getCaKettlePage(form); + PageInfo info = new PageInfo<>(result); + return new PageData<>(result, info.getTotal()); + } + private int listKettle(PreserVationFormDTO dto) throws Exception { String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); JSONObject obj = new JSONObject(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml index 7403925152..69b0c1faad 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -7,4 +7,26 @@ delete from ca_kettle_base_dispute_process + From 9c86aa5772fc12a3391dc2ca35baa89d57e87be4 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 6 Jul 2022 17:47:58 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/CaKettleDetailsById.java | 13 +++++ .../dto/result/CaKettleDetailsResultDTO.java | 47 +++++++++++++++++++ .../dto/result/KettleNewsResultDto.java | 2 +- .../CaKettleBaseDisputeProcessController.java | 16 +++++++ .../dao/CaKettleBaseDisputeProcessDao.java | 12 +++++ .../CaKettleBaseDisputeProcessService.java | 12 +++++ ...CaKettleBaseDisputeProcessServiceImpl.java | 16 +++++++ .../mapper/CaKettleBaseDisputeProcessDao.xml | 15 ++++++ 8 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaKettleDetailsById.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaKettleDetailsById.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaKettleDetailsById.java new file mode 100644 index 0000000000..a236f70511 --- /dev/null +++ b/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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java new file mode 100644 index 0000000000..1ea5d33227 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java @@ -0,0 +1,47 @@ +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 responsibilityUnit; + + /** + * 主要当事人姓名 + */ + private String mainpartyid; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java index 18b5b7d007..0d10df3aeb 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java @@ -33,7 +33,7 @@ public class KettleNewsResultDto implements Serializable { /** * 涉及单位 */ - private String responsibility_unit; + private String responsibilityUnit; /** * 主键 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java index 5d0eef08af..8d7df346e0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaKettleBaseDisputeProcessController.java @@ -13,9 +13,11 @@ 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; @@ -114,4 +116,18 @@ public class CaKettleBaseDisputeProcessController { return new Result>().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); + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java index cb4f6fe4d2..b5de69ed29 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaKettleBaseDisputeProcessDao.java @@ -1,7 +1,9 @@ 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; @@ -35,4 +37,14 @@ public interface CaKettleBaseDisputeProcessDao extends BaseDao 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); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java index e57b361667..a785024c52 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaKettleBaseDisputeProcessService.java @@ -3,8 +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.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; @@ -96,4 +98,14 @@ public interface CaKettleBaseDisputeProcessService extends BaseService 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); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java index 775bd10182..700a264a06 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaKettleBaseDisputeProcessServiceImpl.java @@ -14,8 +14,10 @@ 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; @@ -149,6 +151,20 @@ public class CaKettleBaseDisputeProcessServiceImpl extends BaseServiceImpl(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(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml index 69b0c1faad..4b4ed39efa 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -29,4 +29,19 @@ order by create_time desc,update_time desc,eventdate desc + + From 5658bfd13b0293676618c32896f2d6686495dd07 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 7 Jul 2022 10:14:47 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BB=A7=E6=89=BFbaseE?= =?UTF-8?q?ntity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java index 1058663c96..66e04b0e91 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaKettleBaseDisputeProcessEntity.java @@ -18,7 +18,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("ca_kettle_base_dispute_process") -public class CaKettleBaseDisputeProcessEntity extends BaseEpmetEntity { +public class CaKettleBaseDisputeProcessEntity { private static final long serialVersionUID = 1L; From 19b05adec321e816f0468d0da74457634195a4cd Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 7 Jul 2022 10:27:18 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0flyway=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...e_table_ca_kettle_base_dispute_process.sql | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 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 diff --git a/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 b/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 new file mode 100644 index 0000000000..1c54fc1d7b --- /dev/null +++ b/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; From 9a6d633d862271bf14d435d4f32228e1856a3ef1 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 7 Jul 2022 10:36:50 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml index 4b4ed39efa..e1f719df7b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -16,7 +16,6 @@ responsibility_unit, base_key_id - 1=1 AND mainpartyid like '%${form.mainpartyid}%' From 6e6594ada695ab0cd9e2c7fae28c728b1e9ab677 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 7 Jul 2022 10:45:14 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml index e1f719df7b..8f48760335 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -15,6 +15,8 @@ mainpartyid, responsibility_unit, base_key_id + from + ca_kettle_base_dispute_process AND mainpartyid like '%${form.mainpartyid}%' From 2be8ff94cddc885e01c47ce9f271ea14d59c451a Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 7 Jul 2022 10:51:22 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml index 8f48760335..c0b313fa3a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -27,8 +27,8 @@ AND eventtitle like '%${form.eventtitle}%' - order by create_time desc,update_time desc,eventdate desc + order by create_time desc,update_time desc,eventdate desc + From 3ebd2c54bd1337ba86fa4c8d9d4fa268a8050205 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 12 Jul 2022 13:41:04 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/CaKettleBaseDisputeProcessDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml index 805b335e1a..392161cf37 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -11,7 +11,7 @@ SELECT griddingname, eventtitle, - eventdate, + eventtime as eventdate, base_key_id, eventaddrdetail, finishedmethod, @@ -35,7 +35,7 @@ select griddingname, eventtitle, - eventdate, + eventtime as eventdate, eventaddrdetail, eventtext, finishedmethod,