From b21fdfa3eae5fbd92bfabb0c0dc62ec4403df44c Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 20 Jun 2022 17:07:47 +0800 Subject: [PATCH 01/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?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/IcPointNucleicMonitoringDTO.java | 109 ++++++++++++++ .../dto/IcPointVaccinesInoculationDTO.java | 134 ++++++++++++++++++ .../IcPointNucleicMonitoringController.java | 82 +++++++++++ .../IcPointVaccinesInoculationController.java | 82 +++++++++++ .../dao/IcPointNucleicMonitoringDao.java | 16 +++ .../dao/IcPointVaccinesInoculationDao.java | 16 +++ .../IcPointNucleicMonitoringEntity.java | 79 +++++++++++ .../IcPointVaccinesInoculationEntity.java | 104 ++++++++++++++ .../excel/IcPointNucleicMonitoringExcel.java | 72 ++++++++++ .../IcPointVaccinesInoculationExcel.java | 87 ++++++++++++ .../redis/IcPointNucleicMonitoringRedis.java | 30 ++++ .../IcPointVaccinesInoculationRedis.java | 30 ++++ .../IcPointNucleicMonitoringService.java | 78 ++++++++++ .../IcPointVaccinesInoculationService.java | 78 ++++++++++ .../IcPointNucleicMonitoringServiceImpl.java | 87 ++++++++++++ ...IcPointVaccinesInoculationServiceImpl.java | 87 ++++++++++++ .../mapper/IcPointNucleicMonitoringDao.xml | 28 ++++ .../mapper/IcPointVaccinesInoculationDao.xml | 33 +++++ 18 files changed, 1232 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointNucleicMonitoringRedis.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointVaccinesInoculationRedis.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java new file mode 100644 index 0000000000..3a29fb0afc --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java @@ -0,0 +1,109 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 核酸监测点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +public class IcPointNucleicMonitoringDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属组织ID + */ + private String orgId; + + /** + * 所属组织名称 + */ + private String orgName; + + /** + * 组织ID上级 + */ + private String pid; + + /** + * 组织ID所有上级 + */ + private String pids; + + /** + * 核酸监测点名称 + */ + private String name; + + /** + * 服务时间 + */ + private String serveTime; + + /** + * 咨询电话 + */ + private String mobile; + + /** + * 监测点地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java new file mode 100644 index 0000000000..d1f397a84b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java @@ -0,0 +1,134 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 疫苗接种点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +public class IcPointVaccinesInoculationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属组织ID + */ + private String orgId; + + /** + * 所属组织名称 + */ + private String orgName; + + /** + * 组织ID上级 + */ + private String pid; + + /** + * 组织ID所有上级 + */ + private String pids; + + /** + * 疫苗接种点名称 + */ + private String name; + + /** + * 接种日期 + */ + private String inoculationDate; + + /** + * 接种上午开始时间 + */ + private String moStartTime; + + /** + * 接种上午结束时间 + */ + private String moEndTime; + + /** + * 接种下午开始时间 + */ + private String afStartTime; + + /** + * 接种下午结束时间 + */ + private String afEndTime; + + /** + * 暂无疫苗（1：是；2：否） + */ + private Integer noAvailableVaccines; + + /** + * 咨询电话 + */ + private String mobile; + + /** + * 接种点地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java new file mode 100644 index 0000000000..4b97c98389 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java @@ -0,0 +1,82 @@ +package com.epmet.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.dto.IcPointNucleicMonitoringDTO; +import com.epmet.excel.IcPointNucleicMonitoringExcel; +import com.epmet.service.IcPointNucleicMonitoringService; +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-06-20 + */ +@RestController +@RequestMapping("icPointNucleicMonitoring") +public class IcPointNucleicMonitoringController { + + @Autowired + private IcPointNucleicMonitoringService icPointNucleicMonitoringService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icPointNucleicMonitoringService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPointNucleicMonitoringDTO data = icPointNucleicMonitoringService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcPointNucleicMonitoringDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icPointNucleicMonitoringService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PutMapping("update") + public Result update(@RequestBody IcPointNucleicMonitoringDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icPointNucleicMonitoringService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icPointNucleicMonitoringService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = icPointNucleicMonitoringService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class); + } + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java new file mode 100644 index 0000000000..79e71f1dd8 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java @@ -0,0 +1,82 @@ +package com.epmet.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.dto.IcPointVaccinesInoculationDTO; +import com.epmet.excel.IcPointVaccinesInoculationExcel; +import com.epmet.service.IcPointVaccinesInoculationService; +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-06-20 + */ +@RestController +@RequestMapping("icPointVaccinesInoculation") +public class IcPointVaccinesInoculationController { + + @Autowired + private IcPointVaccinesInoculationService icPointVaccinesInoculationService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icPointVaccinesInoculationService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPointVaccinesInoculationDTO data = icPointVaccinesInoculationService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcPointVaccinesInoculationDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icPointVaccinesInoculationService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PutMapping("update") + public Result update(@RequestBody IcPointVaccinesInoculationDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icPointVaccinesInoculationService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icPointVaccinesInoculationService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = icPointVaccinesInoculationService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class); + } + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java new file mode 100644 index 0000000000..5621b19449 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcPointNucleicMonitoringEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 核酸监测点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Mapper +public interface IcPointNucleicMonitoringDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java new file mode 100644 index 0000000000..4541f80cde --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcPointVaccinesInoculationEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 疫苗接种点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Mapper +public interface IcPointVaccinesInoculationDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java new file mode 100644 index 0000000000..4a05b5d850 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java @@ -0,0 +1,79 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 核酸监测点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_point_nucleic_monitoring") +public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属组织ID + */ + private String orgId; + + /** + * 所属组织名称 + */ + private String orgName; + + /** + * 组织ID上级 + */ + private String pid; + + /** + * 组织ID所有上级 + */ + private String pids; + + /** + * 核酸监测点名称 + */ + private String name; + + /** + * 服务时间 + */ + private String serveTime; + + /** + * 咨询电话 + */ + private String mobile; + + /** + * 监测点地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java new file mode 100644 index 0000000000..c08d24575f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java @@ -0,0 +1,104 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 疫苗接种点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_point_vaccines_inoculation") +public class IcPointVaccinesInoculationEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属组织ID + */ + private String orgId; + + /** + * 所属组织名称 + */ + private String orgName; + + /** + * 组织ID上级 + */ + private String pid; + + /** + * 组织ID所有上级 + */ + private String pids; + + /** + * 疫苗接种点名称 + */ + private String name; + + /** + * 接种日期 + */ + private String inoculationDate; + + /** + * 接种上午开始时间 + */ + private String moStartTime; + + /** + * 接种上午结束时间 + */ + private String moEndTime; + + /** + * 接种下午开始时间 + */ + private String afStartTime; + + /** + * 接种下午结束时间 + */ + private String afEndTime; + + /** + * 暂无疫苗（1：是；2：否） + */ + private Integer noAvailableVaccines; + + /** + * 咨询电话 + */ + private String mobile; + + /** + * 接种点地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java new file mode 100644 index 0000000000..15dba9f57a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java @@ -0,0 +1,72 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 核酸监测点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +public class IcPointNucleicMonitoringExcel { + + @Excel(name = "ID") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "所属组织ID") + private String orgId; + + @Excel(name = "所属组织名称") + private String orgName; + + @Excel(name = "组织ID上级") + private String pid; + + @Excel(name = "组织ID所有上级") + private String pids; + + @Excel(name = "核酸监测点名称") + private String name; + + @Excel(name = "服务时间") + private String serveTime; + + @Excel(name = "咨询电话") + private String mobile; + + @Excel(name = "监测点地址") + private String address; + + @Excel(name = "经度") + private String longitude; + + @Excel(name = "纬度") + private String latitude; + + @Excel(name = "") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java new file mode 100644 index 0000000000..08bbb31df3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java @@ -0,0 +1,87 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 疫苗接种点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +public class IcPointVaccinesInoculationExcel { + + @Excel(name = "ID") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "所属组织ID") + private String orgId; + + @Excel(name = "所属组织名称") + private String orgName; + + @Excel(name = "组织ID上级") + private String pid; + + @Excel(name = "组织ID所有上级") + private String pids; + + @Excel(name = "疫苗接种点名称") + private String name; + + @Excel(name = "接种日期") + private String inoculationDate; + + @Excel(name = "接种上午开始时间") + private String moStartTime; + + @Excel(name = "接种上午结束时间") + private String moEndTime; + + @Excel(name = "接种下午开始时间") + private String afStartTime; + + @Excel(name = "接种下午结束时间") + private String afEndTime; + + @Excel(name = "暂无疫苗（1：是；2：否）") + private Integer noAvailableVaccines; + + @Excel(name = "咨询电话") + private String mobile; + + @Excel(name = "接种点地址") + private String address; + + @Excel(name = "经度") + private String longitude; + + @Excel(name = "纬度") + private String latitude; + + @Excel(name = "") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointNucleicMonitoringRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointNucleicMonitoringRedis.java new file mode 100644 index 0000000000..2ad1347ab1 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointNucleicMonitoringRedis.java @@ -0,0 +1,30 @@ +package com.epmet.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-06-20 + */ +@Component +public class IcPointNucleicMonitoringRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointVaccinesInoculationRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointVaccinesInoculationRedis.java new file mode 100644 index 0000000000..ed32ef375f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcPointVaccinesInoculationRedis.java @@ -0,0 +1,30 @@ +package com.epmet.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-06-20 + */ +@Component +public class IcPointVaccinesInoculationRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java new file mode 100644 index 0000000000..5cde04efe2 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcPointNucleicMonitoringDTO; +import com.epmet.entity.IcPointNucleicMonitoringEntity; + +import java.util.List; +import java.util.Map; + +/** + * 核酸监测点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +public interface IcPointNucleicMonitoringService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-20 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-20 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcPointNucleicMonitoringDTO + * @author generator + * @date 2022-06-20 + */ + IcPointNucleicMonitoringDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-20 + */ + void save(IcPointNucleicMonitoringDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-20 + */ + void update(IcPointNucleicMonitoringDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-20 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java new file mode 100644 index 0000000000..f9bd63cc05 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcPointVaccinesInoculationDTO; +import com.epmet.entity.IcPointVaccinesInoculationEntity; + +import java.util.List; +import java.util.Map; + +/** + * 疫苗接种点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +public interface IcPointVaccinesInoculationService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-20 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-20 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcPointVaccinesInoculationDTO + * @author generator + * @date 2022-06-20 + */ + IcPointVaccinesInoculationDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-20 + */ + void save(IcPointVaccinesInoculationDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-20 + */ + void update(IcPointVaccinesInoculationDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-20 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java new file mode 100644 index 0000000000..90707250fd --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.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.dao.IcPointNucleicMonitoringDao; +import com.epmet.dto.IcPointNucleicMonitoringDTO; +import com.epmet.entity.IcPointNucleicMonitoringEntity; +import com.epmet.redis.IcPointNucleicMonitoringRedis; +import com.epmet.service.IcPointNucleicMonitoringService; +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-06-20 + */ +@Service +public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl implements IcPointNucleicMonitoringService { + + @Autowired + private IcPointNucleicMonitoringRedis icPointNucleicMonitoringRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPointNucleicMonitoringDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPointNucleicMonitoringDTO.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 IcPointNucleicMonitoringDTO get(String id) { + IcPointNucleicMonitoringEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPointNucleicMonitoringDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPointNucleicMonitoringDTO dto) { + IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPointNucleicMonitoringDTO dto) { + IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java new file mode 100644 index 0000000000..1d5dca7b45 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.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.dao.IcPointVaccinesInoculationDao; +import com.epmet.dto.IcPointVaccinesInoculationDTO; +import com.epmet.entity.IcPointVaccinesInoculationEntity; +import com.epmet.redis.IcPointVaccinesInoculationRedis; +import com.epmet.service.IcPointVaccinesInoculationService; +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-06-20 + */ +@Service +public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl implements IcPointVaccinesInoculationService { + + @Autowired + private IcPointVaccinesInoculationRedis icPointVaccinesInoculationRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPointVaccinesInoculationDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPointVaccinesInoculationDTO.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 IcPointVaccinesInoculationDTO get(String id) { + IcPointVaccinesInoculationEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPointVaccinesInoculationDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPointVaccinesInoculationDTO dto) { + IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPointVaccinesInoculationDTO dto) { + IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml new file mode 100644 index 0000000000..e3c97b3342 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml new file mode 100644 index 0000000000..4d9d2fa764 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 12e94ba6d6cb64e2e631447194d385a054fb8860 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 21 Jun 2022 16:35:26 +0800 Subject: [PATCH 02/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20pc=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 1 + .../dto/result/CommunityInfoResultDTO.java | 41 +++ .../controller/CustomerAgencyController.java | 12 + .../java/com/epmet/dao/CustomerAgencyDao.java | 2 + .../epmet/service/CustomerAgencyService.java | 10 + .../impl/CustomerAgencyServiceImpl.java | 7 + .../resources/mapper/CustomerAgencyDao.xml | 13 + .../IcPointNucleicMonitoringController.java | 71 +++++ .../dao/IcPointNucleicMonitoringDao.java | 12 +- .../IcPointNucleicMonitoringImportExcel.java | 58 +++++ .../PointNucleicMonitoringErrorModel.java | 35 +++ .../com/epmet/feign/GovOrgFeignClient.java | 11 + .../fallback/GovOrgFeignClientFallBack.java | 6 + .../IcPointNucleicMonitoringService.java | 13 +- .../IcPointNucleicMonitoringServiceImpl.java | 244 +++++++++++++++++- .../excel/ic_point_nucleic_monitoring.xlsx | Bin 0 -> 11348 bytes .../mapper/IcPointNucleicMonitoringDao.xml | 9 +- 17 files changed, 537 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 8c439aa218..9c461a1f18 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -19,6 +19,7 @@ public interface ImportTaskConstants { String BIZ_TYPE_ATTENTION_VACCINATION = "attention_vaccination"; String BIZ_TYPE_ATTENTION_TRIP_REPORT = "attention_vaccination"; String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member"; + String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring"; /** * 核酸检测 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java new file mode 100644 index 0000000000..46300096d5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 社区所属组织基本信息 + * @Author wgf + * @Date 2020/4/26 22:35 + */ +@Data +public class CommunityInfoResultDTO implements Serializable { + private static final long serialVersionUID = 4360690752084258055L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 社区组织ID + */ + private String deptId; + + /** + * 社区名称 + */ + private String deptName; + + /** + * 网格的上级组织 + */ + private String pid; + + /** + * 网格的所有上级组织 + */ + private String pids; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 5325163074..24008e536e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -463,5 +463,17 @@ public class CustomerAgencyController { return new Result().ok(customerAgencyService.getDelAgencyGridIdList(agencyId)); } + /** + * @param orgName + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据社区名称查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + @GetMapping("getCommunityInfo/{orgName}") + public Result getCommunityInfo(@PathVariable("orgName") String orgName) { + return customerAgencyService.getCommunityInfo(orgName); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 02e483d9f2..17fb8356f3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -344,5 +344,7 @@ public interface CustomerAgencyDao extends BaseDao { @Param("customerId") String customerId); List getDelAgencyIdList(@Param("agencyId") String agencyId); + + CommunityInfoResultDTO getCommunityInfo(@Param("orgName") String orgName); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index dcdc1d44a8..d6651bc29b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -24,6 +24,7 @@ import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; import java.util.Map; @@ -317,4 +318,13 @@ public interface CustomerAgencyService extends BaseService * @Description 获取当前组织及下级无效组织、网格Id列表 **/ DelAgencyGridIdResultDTO getDelAgencyGridIdList(String agencyId); + + /** + * @param orgName + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据社区名称查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + Result getCommunityInfo(String orgName); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index adaf547abf..7c6cfa6d50 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1566,4 +1566,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getCommunityInfo(String orgName) { + CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(orgName); + + return new Result().ok(communityInfoResultDTO); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 2fd5aa5feb..e5d635d88f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -880,4 +880,17 @@ AND pids LIKE CONCAT('%', #{agencyId}, '%') + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java index 4b97c98389..b1bc4385a3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java @@ -1,7 +1,13 @@ package com.epmet.controller; +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -9,13 +15,22 @@ 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.constants.ImportTaskConstants; import com.epmet.dto.IcPointNucleicMonitoringDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPointNucleicMonitoringExcel; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcPointNucleicMonitoringService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,11 +43,15 @@ import java.util.Map; */ @RestController @RequestMapping("icPointNucleicMonitoring") +@Slf4j public class IcPointNucleicMonitoringController { @Autowired private IcPointNucleicMonitoringService icPointNucleicMonitoringService; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @RequestMapping("page") public Result> page(@RequestParam Map params){ PageData page = icPointNucleicMonitoringService.page(params); @@ -78,5 +97,57 @@ public class IcPointNucleicMonitoringController { } + /** + * Desc: 【核酸检测点】导入 + * @param + * @author wgf + * @date 2022/6/21 13:40 + */ + @PostMapping("pointNucleicMonitoringImport") + public Result pointNucleicMonitoringImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){ + if (file.isEmpty()) { + throw new EpmetException("请上传文件"); + } + // 校验文件类型 + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + if (!"xls".equals(extension) && !"xlsx".equals(extension)) { + throw new EpmetException("文件类型不匹配"); + } + + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOriginFileName(file.getOriginalFilename()); + importTaskForm.setOperatorId(tokenDto.getUserId()); + importTaskForm.setBizType(ImportTaskConstants.IC_POINT_NUCLEIC_MONITORING); + Result result = commonServiceOpenFeignClient.createImportTask(importTaskForm); + if (!result.success()) { + throw new EpmetException(9999,"存在进行中的导入"); + } + InputStream inputStream = null; + try { + inputStream = file.getInputStream(); + }catch (Exception e){ + ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); + input.setOperatorId(tokenDto.getUserId()); + input.setTaskId(result.getData().getTaskId()); + input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + commonServiceOpenFeignClient.finishImportTask(input); + log.error("读取文件失败"); + } + icPointNucleicMonitoringService.importFile(tokenDto,inputStream,result.getData().getTaskId()); + return new Result(); + } + + /** + * 导出模板 + * @param response + * @throws Exception + */ + @PostMapping("exporttemplate") + public void exportTemplate( HttpServletResponse response) throws Exception { + TemplateExportParams templatePath = new TemplateExportParams("excel/ic_point_nucleic_monitoring.xlsx"); + ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"核酸检测点录入表",response); + } + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index 5621b19449..563d33553d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -4,6 +4,8 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcPointNucleicMonitoringEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 核酸监测点 * @@ -12,5 +14,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPointNucleicMonitoringDao extends BaseDao { - -} \ No newline at end of file + + /** + * 获取所有地点名称 + * @return + */ + List getAllAddressName(); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java new file mode 100644 index 0000000000..22c04a2b51 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java @@ -0,0 +1,58 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelIgnore; +import lombok.Data; + +import java.util.Date; + +/** + * 核酸监测点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +public class IcPointNucleicMonitoringImportExcel { + + @Excel(name = "所属组织名称") + private String orgName; + + @Excel(name = "核酸监测点名称") + private String name; + + @Excel(name = "服务时间") + private String serveTime; + + @Excel(name = "咨询电话") + private String mobile; + + @Excel(name = "监测点地址") + private String address; + + @ExcelIgnore + private Boolean addStatus = false; + + @ExcelIgnore + private Integer num; + + /** + * 所属组织ID + */ + @ExcelIgnore + private String orgId; + + /** + * 组织ID上级 + */ + @ExcelIgnore + private String pid; + + /** + * 组织ID所有上级 + */ + @ExcelIgnore + private String pids; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java new file mode 100644 index 0000000000..722142e35b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java @@ -0,0 +1,35 @@ +package com.epmet.excel.error; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Author wgf + * @DateTime 2022/6/21 16:57 + * @DESC + */ +@Data +public class PointNucleicMonitoringErrorModel { + + @Excel(name = "行号",width = 10) + private Integer num; + + @Excel(name = "所属组织名称",width = 30) + private String orgName; + + @Excel(name = "核酸监测点名称",width = 30) + private String name; + + @Excel(name = "服务时间",width = 20) + private String serveTime; + + @Excel(name = "电话",width = 30) + private String mobile; + + @Excel(name = "监测点地址",width = 40) + private String address; + + @Excel(name = "错误信息", width = 200) + private String errorMsg; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index e0f881766e..b364fa689d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.feign.fallback.GovOrgFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; @@ -63,4 +64,14 @@ public interface GovOrgFeignClient { //@PostMapping("/gov/org/grid/getbaseinfo") //Result getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO); + /** + * @param orgName + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据社区名称查询所属组织信息 + * @Date 2020/4/26 23:16 + **/ + @GetMapping("/gov/org/customeragency/getCommunityInfo/{orgName}") + Result getCommunityInfo(@PathVariable("orgName") String orgName); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index 047208bdc4..f01da41601 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.feign.GovOrgFeignClient; import org.springframework.stereotype.Component; @@ -39,4 +40,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient { //public Result getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO) { // return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridBaseInfoByGridId", customerGridFormDTO); //} + + @Override + public Result getCommunityInfo(String orgName) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",orgName); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java index 5cde04efe2..d74f89f861 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java @@ -2,9 +2,11 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.entity.IcPointNucleicMonitoringEntity; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -75,4 +77,13 @@ public interface IcPointNucleicMonitoringService extends BaseService implements IcPointNucleicMonitoringService { @Autowired private IcPointNucleicMonitoringRedis icPointNucleicMonitoringRedis; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + + @Autowired + private OssFeignClient ossFeignClient; + + @Autowired + private GovOrgFeignClient govOrgFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -84,4 +128,196 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl errorInfo = new ArrayList<>(); + + try { + List list = ExcelPoiUtils.importExcel(inputStream, 0,1,IcPointNucleicMonitoringImportExcel.class); + if (CollectionUtils.isEmpty(list)){ + closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,""); + return; + } + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息"+tokenDto.getUserId()); + } + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId()); + if (null == agencyInfo){ + throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId()); + } + // 获取所有地点名称 + List addressList = baseDao.getAllAddressName(); + for (int i = 0; i < list.size(); i++) { + list.get(i).setNum(i+1); + if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "所属组织名称不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getName()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getServeTime()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "服务时间不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getMobile()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "咨询电话不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getAddress()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "监测点地址不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + // 校验数据库是否存在该地点名称 + if (addressList.contains(list.get(i).getName()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称已存在",i+1)); + list.get(i).setAddStatus(true); + continue; + } + + // 校验所属组织通过名称能否匹配到ID + Result resultDTOResult = govOrgFeignClient.getCommunityInfo(list.get(i).getOrgName()); + CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData(); + if(communityInfoResultDTO == null && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "所属组织匹配失败",i+1)); + list.get(i).setAddStatus(true); + continue; + }else{ + list.get(i).setOrgId(communityInfoResultDTO.getDeptId()); + list.get(i).setPid(communityInfoResultDTO.getPid()); + list.get(i).setPids(communityInfoResultDTO.getPids()); + } + + } + if (list.size() > errorInfo.size()){ + Map groupByName = list.stream().collect(Collectors.groupingBy(IcPointNucleicMonitoringImportExcel::getName, Collectors.counting())); + groupByName.forEach((name,count) -> { + if (Integer.valueOf(count.toString()).compareTo(1) != 0){ + for (IcPointNucleicMonitoringImportExcel i : list) { + if (name.equals(i.getName()) && !i.getAddStatus()){ + errorInfo.add(getErrorInfo(i,"数据重复",i.getNum())); + i.setAddStatus(true); + } + } + } + }); + } + Map> groupByStatus = list.stream().collect(Collectors.groupingBy(IcPointNucleicMonitoringImportExcel::getAddStatus)); + List needInsert = groupByStatus.get(false); + if (CollectionUtils.isNotEmpty(needInsert)){ + List entities = ConvertUtils.sourceToTarget(needInsert, IcPointNucleicMonitoringEntity.class); + entities.forEach(e -> { + // 设置客户ID + e.setCustomerId(tokenDto.getCustomerId()); + }); + insertBatch(entities); + } + if (CollectionUtils.isNotEmpty(errorInfo)){ + String url = importOssUpload(errorInfo, EpidemicSpecialAttentionErrorModel.class); + closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,url); + }else { + closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,""); + } + }catch (Exception e){ + log.error(e.getMessage()); + closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,""); + } + } + + /** + * Desc: 关闭任务 + * @param taskId + * @param userId + * @param status + * @param url + * @author wgf + * @date 2022/3/30 09:05 + */ + public void closeTask(String taskId,String userId,String status,String url){ + ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); + input.setOperatorId(userId); + input.setTaskId(taskId); + input.setProcessStatus(status); + input.setResultDescFilePath(url); + commonServiceOpenFeignClient.finishImportTask(input); + } + + /** + * Desc: 构造错误信息 + * @param dto + * @param info + * @param num + * @author wgf + * @date 2022/3/29 17:17 + */ + public PointNucleicMonitoringErrorModel getErrorInfo(IcPointNucleicMonitoringImportExcel dto, String info, Integer num){ + PointNucleicMonitoringErrorModel result = ConvertUtils.sourceToTarget(dto, PointNucleicMonitoringErrorModel.class); + result.setErrorMsg(info); + result.setNum(num); + return result; + } + + /** + * Desc: 文件上传并返回url + * @param errorRows + * @param tClass + * @author zxc + * @date 2022/3/30 09:16 + */ + public String importOssUpload(Collection errorRows, Class tClass) throws IOException { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表","导入失败的数据列表"), + tClass, errorRows); + + // 文件名 + String resultDescFileName = UUID.randomUUID().toString().concat(".xls"); + + FileItemFactory factory = new DiskFileItemFactory(16, null); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName); + OutputStream os = fileItem.getOutputStream(); + Result uploadResult = null; + try { + workbook.write(os); + uploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + } catch (Exception e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("上传错误描述文件:{}", errormsg); + } finally { + try { + os.close(); + } catch (IOException e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("上传错误描述文件关闭输出流:{}", errormsg); + } + try { + fileItem.delete(); + } catch (Exception e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("上传错误描述文件删除临时文件:{}", errormsg); + } + } + + if (uploadResult == null || !uploadResult.success()) { + log.error("调用OSS上传结果描述文件失败"); + return null; + } + return uploadResult.getData().getUrl(); + } + + +} diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..5afef2dc0a41cdd614b64316e8feaf2cc14c88f2 GIT binary patch literal 11348 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 literal 0 HcmV?d00001 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index e3c97b3342..2cb4e10db6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -24,5 +24,12 @@ + - \ No newline at end of file + + From d4d92ec092022740158e1085bb70d71abe436581 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 24 Jun 2022 10:38:59 +0800 Subject: [PATCH 03/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20pc=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 1 + .../constant/UserMessageTypeConstant.java | 10 + .../dto/result/OrgListTreeResultDTO.java | 34 +++ .../epmet/controller/AgencyController.java | 12 + .../controller/CustomerAgencyController.java | 12 + .../java/com/epmet/dao/CustomerAgencyDao.java | 4 + .../java/com/epmet/service/AgencyService.java | 11 +- .../epmet/service/CustomerAgencyService.java | 9 + .../epmet/service/impl/AgencyServiceImpl.java | 9 + .../impl/CustomerAgencyServiceImpl.java | 7 + .../resources/mapper/CustomerAgencyDao.xml | 25 ++ .../dto/IcPointVaccinesInoculationDTO.java | 6 +- .../com/epmet/dto/form/MapInfoFormDTO.java | 46 +++ .../dto/form/SendPointNoticeFormDTO.java | 63 ++++ .../epmet/dto/result/MapInfoResultDTO.java | 82 +++++ .../dto/result/SendPointNoticeResultDTO.java | 34 +++ .../epmet/controller/IcNoticeController.java | 28 ++ .../controller/IcPointAppController.java | 47 +++ .../IcPointNucleicMonitoringController.java | 26 +- .../IcPointVaccinesInoculationController.java | 76 ++++- .../dao/IcPointNucleicMonitoringDao.java | 18 ++ .../dao/IcPointVaccinesInoculationDao.java | 30 +- .../java/com/epmet/dao/IcResiUserDao.java | 12 +- .../IcPointVaccinesInoculationEntity.java | 2 +- .../IcPointVaccinesInoculationExcel.java | 4 +- ...IcPointVaccinesInoculationImportExcel.java | 71 +++++ .../PointVaccinesInoculationErrorModel.java | 50 +++ .../com/epmet/feign/GovOrgFeignClient.java | 10 + .../fallback/GovOrgFeignClientFallBack.java | 5 + .../com/epmet/service/IcNoticeService.java | 13 +- .../com/epmet/service/IcPointAppService.java | 33 ++ .../IcPointNucleicMonitoringService.java | 19 ++ .../IcPointVaccinesInoculationService.java | 34 ++- .../com/epmet/service/IcResiUserService.java | 7 + .../service/impl/IcNoticeServiceImpl.java | 92 +++++- .../service/impl/IcPointAppServiceImpl.java | 88 ++++++ .../IcPointNucleicMonitoringServiceImpl.java | 23 +- ...IcPointVaccinesInoculationServiceImpl.java | 285 +++++++++++++++++- .../service/impl/IcResiUserServiceImpl.java | 7 + .../excel/ic_point_nucleic_monitoring.xlsx | Bin 11348 -> 11305 bytes .../excel/ic_point_vaccines_inoculation.xlsx | Bin 0 -> 11577 bytes .../mapper/IcPointNucleicMonitoringDao.xml | 60 ++++ .../mapper/IcPointVaccinesInoculationDao.xml | 74 ++++- .../main/resources/mapper/IcResiUserDao.xml | 12 + 44 files changed, 1457 insertions(+), 34 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendPointNoticeFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SendPointNoticeResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointVaccinesInoculationErrorModel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_point_vaccines_inoculation.xlsx diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 9c461a1f18..4072db576c 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -20,6 +20,7 @@ public interface ImportTaskConstants { String BIZ_TYPE_ATTENTION_TRIP_REPORT = "attention_vaccination"; String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member"; String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring"; + String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation"; /** * 核酸检测 */ diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java index 08991d8a8b..b94b1b252a 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java @@ -169,6 +169,16 @@ public interface UserMessageTypeConstant { */ String ANTIEPIDEMIC="antiepidemic"; + /** + * 核酸检测点通知 + */ + String NUCLEIC="nucleic"; + + /** + * 疫苗接种点通知 + */ + String VACCINES="vaccines"; + /** * 发布党建声音 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java new file mode 100644 index 0000000000..d6df3d9b87 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgListTreeResultDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.result; + + +import com.epmet.commons.tools.utils.NodeTree; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class OrgListTreeResultDTO extends NodeTree implements Serializable { + + private static final long serialVersionUID = -1993037593855768962L; + + /** + * 父id + */ + private String pid; + + /** + * 名字 + */ + private String label; + + /** + * 值 + */ + private String value; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index e917eacf59..b6a6ec5ec4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -467,6 +467,18 @@ public class AgencyController { return new Result>().ok(agencyService.getCommunityList(tokenDto)); } + /** + * Desc: 查询工作人员所属组织下的所有街道社区 + * + * @param tokenDto + * @author wgf + * @date 2022/6/23 09:13 + */ + @PostMapping("getOrgTreeListByCustomerId") + public Result> getOrgTreeListByCustomerId(@LoginUser TokenDto tokenDto) { + return new Result>().ok(agencyService.getOrgTreeListByCustomerId(tokenDto)); + } + /** * 通讯录树状结构 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 24008e536e..153ffb26fe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -475,5 +475,17 @@ public class CustomerAgencyController { return customerAgencyService.getCommunityInfo(orgName); } + /** + * @param userId + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据用户ID查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + @GetMapping("getCommunityInfoByUserId/{userId}") + public Result getCommunityInfoByUserId(@PathVariable("userId") String userId) { + return customerAgencyService.getCommunityInfoByUserId(userId); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 17fb8356f3..0a6875acbc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -331,6 +331,8 @@ public interface CustomerAgencyDao extends BaseDao { */ List getOrgTreeByUserAndType(OrgTreeByUserAndTypeFormDTO formDto); + List getOrgTreeListByCustomerId(@Param("customerId") String customerId); + /** * 通讯录树 * @@ -346,5 +348,7 @@ public interface CustomerAgencyDao extends BaseDao { List getDelAgencyIdList(@Param("agencyId") String agencyId); CommunityInfoResultDTO getCommunityInfo(@Param("orgName") String orgName); + + CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java index ea43abd53e..34bd0c7b55 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java @@ -150,6 +150,15 @@ public interface AgencyService { */ List getCommunityList(TokenDto tokenDto); + /** + * Desc: 查询工作人员所属组织下的所有街道社区 + * + * @param tokenDto + * @author wgf + * @date 2022/6/23 09:13 + */ + List getOrgTreeListByCustomerId(TokenDto tokenDto); + /** * 通讯录树状结构 * @@ -160,4 +169,4 @@ public interface AgencyService { * @date 2022/5/16 10:43 */ List getAddressTree(String name, String customerId); -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index d6651bc29b..bc950586a9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -327,4 +327,13 @@ public interface CustomerAgencyService extends BaseService * @Date 2022/6/21 22:41 **/ Result getCommunityInfo(String orgName); + + /** + * @param userId + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据用户ID查询所属组织信息 + * @Date 2022/6/21 22:41 + **/ + Result getCommunityInfoByUserId(String userId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index ceee6804eb..aff8e76bb3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -870,6 +870,15 @@ public class AgencyServiceImpl implements AgencyService { return customerAgencyDao.getCommunityList(tokenDto.getCustomerId(), agencyId); } + @Override + public List getOrgTreeListByCustomerId(TokenDto tokenDto) { + if (null == tokenDto.getCustomerId()) { + throw new EpmetException("未查询到工作人员信息"); + } + List list = customerAgencyDao.getOrgTreeListByCustomerId(tokenDto.getCustomerId()); + return NodeTreeUtils.build(list); + } + /** * 通讯录树 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 7c6cfa6d50..3b6317e4f4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1573,4 +1573,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl().ok(communityInfoResultDTO); } + @Override + public Result getCommunityInfoByUserId(String userId) { + CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfoByUserId(userId); + + return new Result().ok(communityInfoResultDTO); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index e5d635d88f..a167a9e803 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -756,6 +756,16 @@ AND CUSTOMER_ID = #{customerId} AND CONCAT(PIDS,':',ID) LIKE CONCAT('%',#{agencyId},'%') + + + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java index d1f397a84b..2d1c465ecb 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointVaccinesInoculationDTO.java @@ -79,7 +79,7 @@ public class IcPointVaccinesInoculationDTO implements Serializable { /** * 暂无疫苗（1：是；2：否） */ - private Integer noAvailableVaccines; + private String noAvailableVaccines; /** * 咨询电话 @@ -102,7 +102,7 @@ public class IcPointVaccinesInoculationDTO implements Serializable { private String latitude; /** - * + * */ private Integer delFlag; @@ -131,4 +131,4 @@ public class IcPointVaccinesInoculationDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java new file mode 100644 index 0000000000..d97acc0d24 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java @@ -0,0 +1,46 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + + +/** + * 获取地图信息入参 + * + * @author wgf + * @since v1.0.0 2022-06-20 + */ +@Data +public class MapInfoFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 地点类型（1：核酸检测点； 2：疫苗接种点） + */ + @NotBlank(message = "地点类型不能为空") + private String type; + + /** + * 经度 + */ + @NotBlank(message = "经度不能为空") + private String longitude; + + /** + * 纬度 + */ + @NotBlank(message = "纬度不能为空") + private String latitude; + + /** + * 地点名称 + */ + private String name; + + + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendPointNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendPointNoticeFormDTO.java new file mode 100644 index 0000000000..52eb7ca00a --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendPointNoticeFormDTO.java @@ -0,0 +1,63 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author wgf + * @Date 2022/3/28 14:14 + */ +@NoArgsConstructor +@Data +public class SendPointNoticeFormDTO implements Serializable { + private static final long serialVersionUID = 4800907725063604885L; + private String customerId; + private String staffId; + /** + * 用户列表 + */ + private List userList; + /** + * 通知渠道通知渠道 0小程序通知，1短信通知 + */ + @NotEmpty(message = "请选择通知渠道", groups = CustomerClientShowGroup.class) + private List channel; + /** + * 通知来源 0 行程上报，1 疫苗接种，2 核酸检测,3核酸检测点，4疫苗接种点 + */ + @NotEmpty(message = "通知来源不能为空", groups = CustomerClientShowGroup.class) + private String origin; + /** + * 通知内容 + */ + @Size(min = 1, max = 500, message = "通知内容不超过500字", groups = CustomerClientShowGroup.class) + private String content; + /** + * 组织名 + */ + private String orgName; + + @NoArgsConstructor + @Data + public static class UserListBean { + /** + * 用户ID + */ + private String userId; + /** + * 手机号 + */ + private String mobile; + /** + * 身份证 + */ + private String idCard; + } +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java new file mode 100644 index 0000000000..896d1195fc --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java @@ -0,0 +1,82 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 获取地图信息返参 + * + * @author wgf + * @since v1.0.0 2022-06-20 + */ +@Data +public class MapInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 时间随机数标识 + */ + private Integer markerId; + + /** + * 疫苗接种点名称 + */ + private String name; + + /** + * 距离当前位置千米数 + */ + private String km; + + /** + * 暂无疫苗（1：是；2：否） + */ + private String noAvailableVaccines; + + /** + * 距离（1：1公里以内；3：3公里以内；5：5公里以内；99：5公里以外） + */ + private String kmNum; + + /** + * 日期 + */ + private String date; + + /** + * 上午时间 + */ + private String moTime; + + /** + * 下午时间 + */ + private String afTime; + + /** + * 电话 + */ + private String mobile; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SendPointNoticeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SendPointNoticeResultDTO.java new file mode 100644 index 0000000000..04f8b2b4f9 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SendPointNoticeResultDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author wgf + * @Date 2022/3/28 14:14 + */ +@Data +public class SendPointNoticeResultDTO implements Serializable { + private static final long serialVersionUID = 4800907725063604885L; + + + /** + * 用户ID + */ + private String userId; + /** + * 手机号 + */ + private String mobile; + /** + * 身份证 + */ + private String idCard; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java index ab0529b158..325eb71c31 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java @@ -4,6 +4,7 @@ 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.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -14,10 +15,16 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcNoticeDTO; import com.epmet.dto.form.IcNoticeFormDTO; import com.epmet.dto.form.SendNoticeFormDTO; +import com.epmet.dto.form.SendPointNoticeFormDTO; +import com.epmet.dto.result.CommunityInfoResultDTO; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.service.IcNoticeService; +import com.epmet.service.IcResiUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 防疫通知 @@ -32,6 +39,12 @@ public class IcNoticeController { @Autowired private IcNoticeService icNoticeService; + @Autowired + private GovOrgFeignClient govOrgFeignClient; + + @Autowired + private IcResiUserService icResiUserService; + @RequestMapping("page") public Result> page(@LoginUser TokenDto tokenDto, @RequestBody IcNoticeFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -80,4 +93,19 @@ public class IcNoticeController { return new Result(); } + @PostMapping("sendPointNotice") + public Result sendPointNotice(@LoginUser TokenDto tokenDto, @RequestBody SendPointNoticeFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, CustomerClientShowGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + // 查询用户列表 + Result communityInfoResultDTOResult = govOrgFeignClient.getCommunityInfoByUserId(tokenDto.getUserId()); + // 能点击发送按钮的人肯定有社区ID + String communityId = communityInfoResultDTOResult.getData().getDeptId(); + List userList = icResiUserService.getUserListByCommunityId(communityId); + formDTO.setUserList(userList); + icNoticeService.sendPointNotice(formDTO); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java new file mode 100644 index 0000000000..babae7655b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java @@ -0,0 +1,47 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.result.MapInfoResultDTO; +import com.epmet.service.IcPointAppService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 核酸监测点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@RestController +@RequestMapping("appPoint") +@Slf4j +public class IcPointAppController { + + @Autowired + private IcPointAppService icPointAppService; + + /** + * 根据地点类型获取地图数据 + * @param formDTO + * @return + */ + @PostMapping("getMapInfoByPointType") + public Result> getMapInfoByPointType(@RequestBody MapInfoFormDTO formDTO){ + // 效验数据 + ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class); + + return icPointAppService.getMapInfoByPointType(formDTO); + } + + + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java index b1bc4385a3..c320c5cb56 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java @@ -18,9 +18,11 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.service.IcPointNucleicMonitoringService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; @@ -52,9 +54,13 @@ public class IcPointNucleicMonitoringController { @Autowired private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Autowired + private GovOrgFeignClient govOrgFeignClient; + @RequestMapping("page") public Result> page(@RequestParam Map params){ - PageData page = icPointNucleicMonitoringService.page(params); +// PageData page = icPointNucleicMonitoringService.page(params); + PageData page = icPointNucleicMonitoringService.getPhrasePage(params); return new Result>().ok(page); } @@ -65,7 +71,7 @@ public class IcPointNucleicMonitoringController { } @NoRepeatSubmit - @PostMapping("save") + @PostMapping public Result save(@RequestBody IcPointNucleicMonitoringDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -74,7 +80,7 @@ public class IcPointNucleicMonitoringController { } @NoRepeatSubmit - @PutMapping("update") + @PutMapping public Result update(@RequestBody IcPointNucleicMonitoringDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -96,6 +102,16 @@ public class IcPointNucleicMonitoringController { ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class); } + /** + * 获取【发送通知】按钮显示隐藏状态 + * @param tokenDto + * @return + */ + @PostMapping("getShowType") + public Result getShowType(@LoginUser TokenDto tokenDto){ + return govOrgFeignClient.getCommunityInfoByUserId(tokenDto.getUserId()); + } + /** * Desc: 【核酸检测点】导入 @@ -103,8 +119,8 @@ public class IcPointNucleicMonitoringController { * @author wgf * @date 2022/6/21 13:40 */ - @PostMapping("pointNucleicMonitoringImport") - public Result pointNucleicMonitoringImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){ + @PostMapping("pointImport") + public Result pointImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){ if (file.isEmpty()) { throw new EpmetException("请上传文件"); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java index 79e71f1dd8..141bb3e75d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java @@ -1,7 +1,12 @@ package com.epmet.controller; +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -9,13 +14,22 @@ 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.constants.ImportTaskConstants; import com.epmet.dto.IcPointVaccinesInoculationDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPointVaccinesInoculationExcel; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcPointVaccinesInoculationService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,14 +42,19 @@ import java.util.Map; */ @RestController @RequestMapping("icPointVaccinesInoculation") +@Slf4j public class IcPointVaccinesInoculationController { @Autowired private IcPointVaccinesInoculationService icPointVaccinesInoculationService; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @RequestMapping("page") public Result> page(@RequestParam Map params){ - PageData page = icPointVaccinesInoculationService.page(params); +// PageData page = icPointVaccinesInoculationService.page(params); + PageData page = icPointVaccinesInoculationService.getPhrasePage(params); return new Result>().ok(page); } @@ -46,7 +65,7 @@ public class IcPointVaccinesInoculationController { } @NoRepeatSubmit - @PostMapping("save") + @PostMapping() public Result save(@RequestBody IcPointVaccinesInoculationDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -55,7 +74,7 @@ public class IcPointVaccinesInoculationController { } @NoRepeatSubmit - @PutMapping("update") + @PutMapping() public Result update(@RequestBody IcPointVaccinesInoculationDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -77,6 +96,57 @@ public class IcPointVaccinesInoculationController { ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class); } + /** + * Desc: 【疫苗接种点】导入 + * @param + * @author wgf + * @date 2022/6/21 13:40 + */ + @PostMapping("pointImport") + public Result pointImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){ + if (file.isEmpty()) { + throw new EpmetException("请上传文件"); + } + // 校验文件类型 + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + if (!"xls".equals(extension) && !"xlsx".equals(extension)) { + throw new EpmetException("文件类型不匹配"); + } + + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOriginFileName(file.getOriginalFilename()); + importTaskForm.setOperatorId(tokenDto.getUserId()); + importTaskForm.setBizType(ImportTaskConstants.IC_POINT_VACCINES_INOCULATION); + Result result = commonServiceOpenFeignClient.createImportTask(importTaskForm); + if (!result.success()) { + throw new EpmetException(9999,"存在进行中的导入"); + } + InputStream inputStream = null; + try { + inputStream = file.getInputStream(); + }catch (Exception e){ + ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); + input.setOperatorId(tokenDto.getUserId()); + input.setTaskId(result.getData().getTaskId()); + input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + commonServiceOpenFeignClient.finishImportTask(input); + log.error("读取文件失败"); + } + icPointVaccinesInoculationService.importFile(tokenDto,inputStream,result.getData().getTaskId()); + return new Result(); + } + + /** + * 导出模板 + * @param response + * @throws Exception + */ + @PostMapping("exporttemplate") + public void exportTemplate( HttpServletResponse response) throws Exception { + TemplateExportParams templatePath = new TemplateExportParams("excel/ic_point_vaccines_inoculation.xlsx"); + ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"疫苗接种点录入表",response); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index 563d33553d..995ac2a81e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -1,10 +1,14 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcPointNucleicMonitoringDTO; +import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointNucleicMonitoringEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 核酸监测点 @@ -21,4 +25,18 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getAllAddressName(); + /** + * 条件查询 + * @param params + * @return + */ + List getPhrasePage(Map params); + + /** + * 获取地图信息 + * @param formDTO + * @return + */ + List getMapInfoList(MapInfoFormDTO formDTO); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java index 4541f80cde..debf41daeb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java @@ -1,9 +1,15 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcPointVaccinesInoculationDTO; +import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointVaccinesInoculationEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 疫苗接种点 * @@ -12,5 +18,25 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPointVaccinesInoculationDao extends BaseDao { - -} \ No newline at end of file + + /** + * 获取所有地点名称 + * @return + */ + List getAllAddressName(); + + /** + * 条件查询 + * @param params + * @return + */ + List getPhrasePage(Map params); + + /** + * 获取地图信息 + * @param formDTO + * @return + */ + List getMapInfoList(MapInfoFormDTO formDTO); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index f145fadd97..1208d07507 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -22,10 +22,7 @@ import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.dto.IcResiUserConfirmDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.IcVolunteerPolyDTO; -import com.epmet.dto.form.EpidemicPreventionFormDTO; -import com.epmet.dto.form.MoveOutMemberFormDTO; -import com.epmet.dto.form.RentTenantDataFormDTO; -import com.epmet.dto.form.ResiUserQueryValueDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; import org.apache.ibatis.annotations.MapKey; @@ -370,4 +367,11 @@ public interface IcResiUserDao extends BaseDao { * @return com.epmet.entity.IcResiUserEntity */ IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + + /** + * 通过社区ID获取所属人员 + * @param communityId + * @return + */ + List getUserListByCommunityId(@Param("communityId") String communityId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java index c08d24575f..3f31a38485 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointVaccinesInoculationEntity.java @@ -79,7 +79,7 @@ public class IcPointVaccinesInoculationEntity extends BaseEpmetEntity { /** * 暂无疫苗（1：是；2：否） */ - private Integer noAvailableVaccines; + private String noAvailableVaccines; /** * 咨询电话 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java index 08bbb31df3..e88e19b906 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java @@ -51,7 +51,7 @@ public class IcPointVaccinesInoculationExcel { private String afEndTime; @Excel(name = "暂无疫苗（1：是；2：否）") - private Integer noAvailableVaccines; + private String noAvailableVaccines; @Excel(name = "咨询电话") private String mobile; @@ -84,4 +84,4 @@ public class IcPointVaccinesInoculationExcel { private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java new file mode 100644 index 0000000000..bbc7e202b9 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationImportExcel.java @@ -0,0 +1,71 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelIgnore; +import lombok.Data; + +/** + * 疫苗接种点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +public class IcPointVaccinesInoculationImportExcel { + +// @Excel(name = "所属组织名称") +// private String orgName; + + @Excel(name = "疫苗接种点名称") + private String name; + + @Excel(name = "接种日期") + private String inoculationDate; + + @Excel(name = "接种上午开始时间") + private String moStartTime; + + @Excel(name = "接种上午结束时间") + private String moEndTime; + + @Excel(name = "接种下午开始时间") + private String afStartTime; + + @Excel(name = "接种下午结束时间") + private String afEndTime; + + @Excel(name = "暂无疫苗", replace = {"否_1","是_2"}) + private String noAvailableVaccines; + + @Excel(name = "咨询电话") + private String mobile; + + @Excel(name = "接种点地址") + private String address; + + @ExcelIgnore + private Boolean addStatus = false; + + @ExcelIgnore + private Integer num; + + /** + * 所属组织ID + */ +// @ExcelIgnore +// private String orgId; + + /** + * 组织ID上级 + */ +// @ExcelIgnore +// private String pid; + + /** + * 组织ID所有上级 + */ +// @ExcelIgnore +// private String pids; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointVaccinesInoculationErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointVaccinesInoculationErrorModel.java new file mode 100644 index 0000000000..7f7d3c3109 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointVaccinesInoculationErrorModel.java @@ -0,0 +1,50 @@ +package com.epmet.excel.error; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Author wgf + * @DateTime 2022/6/21 16:57 + * @DESC + */ +@Data +public class PointVaccinesInoculationErrorModel { + + @Excel(name = "行号",width = 10) + private Integer num; + +// @Excel(name = "所属组织名称",width = 30) +// private String orgName; + + @Excel(name = "核酸监测点名称",width = 30) + private String name; + + @Excel(name = "接种日期",width = 30) + private String inoculationDate; + + @Excel(name = "接种上午开始时间",width = 30) + private String moStartTime; + + @Excel(name = "接种上午结束时间",width = 30) + private String moEndTime; + + @Excel(name = "接种下午开始时间",width = 30) + private String afStartTime; + + @Excel(name = "接种下午结束时间",width = 30) + private String afEndTime; + + @Excel(name = "暂无疫苗",width = 20, replace = {"否_1","是_2"}) + private String noAvailableVaccines; + + @Excel(name = "电话",width = 30) + private String mobile; + + @Excel(name = "监测点地址",width = 40) + private String address; + + @Excel(name = "错误信息", width = 200) + private String errorMsg; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index b364fa689d..4d97431514 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -74,4 +74,14 @@ public interface GovOrgFeignClient { @GetMapping("/gov/org/customeragency/getCommunityInfo/{orgName}") Result getCommunityInfo(@PathVariable("orgName") String orgName); + /** + * @param userId + * @return com.epmet.commons.tools.utils.Result + * @Author wgf + * @Description 根据社区名称查询所属组织信息 + * @Date 2020/4/26 23:16 + **/ + @GetMapping("/gov/org/customeragency/getCommunityInfoByUserId/{userId}") + Result getCommunityInfoByUserId(@PathVariable("userId") String userId); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index f01da41601..b2968f313f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -45,4 +45,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient { public Result getCommunityInfo(String orgName) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",orgName); } + + @Override + public Result getCommunityInfoByUserId(String userId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfoByUserId",userId); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNoticeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNoticeService.java index 3f72855558..9c65229972 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNoticeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNoticeService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcNoticeDTO; import com.epmet.dto.form.IcNoticeFormDTO; import com.epmet.dto.form.SendNoticeFormDTO; +import com.epmet.dto.form.SendPointNoticeFormDTO; import com.epmet.entity.IcNoticeEntity; import java.util.Date; @@ -89,6 +90,16 @@ public interface IcNoticeService extends BaseService { */ void sendNotice(SendNoticeFormDTO formDTO); + /** + * 发送通知(疫苗，核酸地点) + * + * @Param formDTO + * @Return + * @Author wgf + * @Date 2022/6/23 14:19 + */ + void sendPointNotice(SendPointNoticeFormDTO formDTO); + /** * 获取人员最新一条通知 * @Param idCard @@ -104,4 +115,4 @@ public interface IcNoticeService extends BaseService { * @return */ Map getUserLatestNoticeTime(String customerId,List idCardSet); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java new file mode 100644 index 0000000000..6d6f7626d9 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java @@ -0,0 +1,33 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcPointNucleicMonitoringDTO; +import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.result.MapInfoResultDTO; +import com.epmet.entity.IcPointNucleicMonitoringEntity; +import org.springframework.web.bind.annotation.RequestBody; + +import java.io.InputStream; +import java.util.List; +import java.util.Map; + +/** + * 地图信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +public interface IcPointAppService { + + /** + * 根据地点类型获取地图数据 + * @param formDTO + * @return + */ + Result> getMapInfoByPointType(MapInfoFormDTO formDTO); + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java index d74f89f861..8aaf21fe7d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java @@ -4,6 +4,8 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcPointNucleicMonitoringDTO; +import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointNucleicMonitoringEntity; import java.io.InputStream; @@ -28,6 +30,13 @@ public interface IcPointNucleicMonitoringService extends BaseService page(Map params); + /** + * 分页条件查询 + * @param params + * @return + */ + PageData getPhrasePage(Map params); + /** * 默认查询 * @@ -86,4 +95,14 @@ public interface IcPointNucleicMonitoringService extends BaseService + * @author wgf + * @date 2022-06-20 + */ + List getMapInfoList(MapInfoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java index f9bd63cc05..9dc56f6779 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointVaccinesInoculationService.java @@ -2,9 +2,13 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcPointVaccinesInoculationDTO; +import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointVaccinesInoculationEntity; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,6 +30,13 @@ public interface IcPointVaccinesInoculationService extends BaseService page(Map params); + /** + * 分页条件查询 + * @param params + * @return + */ + PageData getPhrasePage(Map params); + /** * 默认查询 * @@ -75,4 +86,25 @@ public interface IcPointVaccinesInoculationService extends BaseService + * @author wgf + * @date 2022-06-20 + */ + List getMapInfoList(MapInfoFormDTO formDTO); + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 3ef76601bc..51619b8579 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -436,4 +436,11 @@ public interface IcResiUserService extends BaseService { * @Date 2022/6/16 15:30 */ List getUserId(String icResiUserId); + + /** + * 根据社区ID获取该社区下的所有用户 + * @param communityId + * @return + */ + List getUserListByCommunityId(String communityId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java index 28fd02753b..1abb00b5f3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java @@ -16,10 +16,7 @@ import com.epmet.constant.UserMessageTypeConstant; import com.epmet.dao.IcNoticeDao; import com.epmet.dto.IcNoticeDTO; import com.epmet.dto.UserBaseInfoDTO; -import com.epmet.dto.form.IcNoticeFormDTO; -import com.epmet.dto.form.ProjectSendMsgFormDTO; -import com.epmet.dto.form.SendNoticeFormDTO; -import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.dto.form.*; import com.epmet.entity.IcNoticeEntity; import com.epmet.feign.MessageFeignClient; import com.epmet.service.IcNoticeService; @@ -197,6 +194,91 @@ public class IcNoticeServiceImpl extends BaseServiceImpl userBeanList = formDTO.getUserList().stream().collect(Collectors.collectingAndThen( + Collectors.toCollection(() -> new TreeSet<>( + Comparator.comparing( SendPointNoticeFormDTO.UserListBean::getIdCard))), ArrayList::new)); + List entityList = userBeanList.stream().map(item -> { + IcNoticeEntity entity = new IcNoticeEntity(); + entity.setCustomerId(formDTO.getCustomerId()); + entity.setChannel(channel); + entity.setContent(formDTO.getContent()); + entity.setOrigin(formDTO.getOrigin()); + entity.setUserId(item.getUserId()); + entity.setMobile(item.getMobile()); + entity.setIdCard(item.getIdCard()); + entity.setOrgName(finalOrgName); + return entity; + }).collect(Collectors.toList()); + insertBatch(entityList); + + //通知 + List msgList = new ArrayList<>(); + //短信消息 + List smsList = new ArrayList<>(); + + entityList.forEach(item -> { + if (StringUtils.isNotBlank(item.getIdCard())) { + //根据身份证获取居民ID + List userList = userBaseInfoService.getCommonIdNumUser(item.getCustomerId(), item.getIdCard()); + if (CollectionUtils.isNotEmpty(userList)) { + userList.forEach(user -> { + UserMessageFormDTO messageFormDTO = new UserMessageFormDTO(); + messageFormDTO.setCustomerId(item.getCustomerId()); + messageFormDTO.setApp(AppClientConstant.APP_GOV); + messageFormDTO.setGridId(StrConstant.STAR); + messageFormDTO.setUserId(user.getUserId()); + messageFormDTO.setTitle("您有一条通知消息！"); + messageFormDTO.setMessageContent(item.getContent()); + messageFormDTO.setReadFlag(Constant.UNREAD); + if("3".equals(formDTO.getOrigin())){ + // 核酸检测点 + messageFormDTO.setMessageType(UserMessageTypeConstant.NUCLEIC); + }else{ + // 疫苗接种点 + messageFormDTO.setMessageType(UserMessageTypeConstant.VACCINES); + } + messageFormDTO.setTargetId(item.getId()); + msgList.add(messageFormDTO); + }); + } + } + //TODO 短信消息 + if (StringUtils.isNotBlank(item.getMobile())) { + ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO(); + sms.setCustomerId(item.getCustomerId()); + sms.setMobile(item.getMobile()); + sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_OVERDUE); + sms.setParameterKey("send_msg"); + smsList.add(sms); + } + }); + //发送小程序消息 + Result result = messageFeignClient.saveUserMessageList(msgList); + if (!result.success()) { + log.error("发送小程序消息失败" + JSON.toJSONString(result)); + } + //TODO 发送短信 + } + /** * 获取人员最新一条通知 * @@ -244,4 +326,4 @@ public class IcNoticeServiceImpl extends BaseServiceImpl> getMapInfoByPointType(MapInfoFormDTO formDTO) { + List mapInfoResultDTO = new ArrayList(); + // 地点类型（1：核酸检测点； 2：疫苗接种点） + if("1".equals(formDTO.getType())){ + // 核酸检测点地图数据 + mapInfoResultDTO = icPointNucleicMonitoringService.getMapInfoList(formDTO); + + }else if("2".equals(formDTO.getType())){ + // 疫苗接种点地图数据 + mapInfoResultDTO = icPointVaccinesInoculationService.getMapInfoList(formDTO); + } + return new Result>().ok(mapInfoResultDTO); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index 9256d6f9fa..a5dacb5bc6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -22,7 +22,9 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcPointNucleicMonitoringDao; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; +import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcEpidemicSpecialAttentionEntity; import com.epmet.entity.IcPointNucleicMonitoringEntity; @@ -85,6 +87,18 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + IPage page = getPage(params); + List list = baseDao.getPhrasePage(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); @@ -229,7 +243,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl getMapInfoList(MapInfoFormDTO formDTO) { + List list = baseDao.getMapInfoList(formDTO); + return list; + } + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java index 1d5dca7b45..9b89513936 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java @@ -1,24 +1,57 @@ package com.epmet.service.impl; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; 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.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.ExcelPoiUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcPointVaccinesInoculationDao; import com.epmet.dto.IcPointVaccinesInoculationDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.result.CommunityInfoResultDTO; +import com.epmet.dto.result.MapInfoResultDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcPointVaccinesInoculationEntity; +import com.epmet.excel.IcPointVaccinesInoculationImportExcel; +import com.epmet.excel.error.PointVaccinesInoculationErrorModel; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.GovOrgFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.redis.IcPointVaccinesInoculationRedis; import com.epmet.service.IcPointVaccinesInoculationService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.commons.CommonsMultipartFile; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.*; +import java.util.stream.Collectors; /** * 疫苗接种点 @@ -27,11 +60,21 @@ import java.util.Map; * @since v1.0.0 2022-06-20 */ @Service +@Slf4j public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl implements IcPointVaccinesInoculationService { @Autowired private IcPointVaccinesInoculationRedis icPointVaccinesInoculationRedis; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + + @Autowired + private OssFeignClient ossFeignClient; + + @Autowired + private GovOrgFeignClient govOrgFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -41,6 +84,18 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + IPage page = getPage(params); + List list = baseDao.getPhrasePage(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); @@ -84,4 +139,226 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl errorInfo = new ArrayList<>(); + + try { + List list = ExcelPoiUtils.importExcel(inputStream, 0,1,IcPointVaccinesInoculationImportExcel.class); + if (CollectionUtils.isEmpty(list)){ + closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,""); + return; + } + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息"+tokenDto.getUserId()); + } + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId()); + if (null == agencyInfo){ + throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId()); + } + // 获取所有地点名称 + List addressList = baseDao.getAllAddressName(); + for (int i = 0; i < list.size(); i++) { + list.get(i).setNum(i+1); +// if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){ +// errorInfo.add(getErrorInfo(list.get(i), "所属组织名称不能为空",i+1)); +// list.get(i).setAddStatus(true); +// continue; +// } + if (StringUtils.isBlank(list.get(i).getName()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getInoculationDate()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "接种日期不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getMoStartTime()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "接种上午开始时间不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getMoEndTime()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "接种上午结束时间不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getAfStartTime()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "接种下午开始时间不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getAfEndTime()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "接种下午结束时间不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (list.get(i).getNoAvailableVaccines() == null && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "暂无疫苗不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getMobile()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "咨询电话不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + if (StringUtils.isBlank(list.get(i).getAddress()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "监测点地址不能为空",i+1)); + list.get(i).setAddStatus(true); + continue; + } + // 校验数据库是否存在该地点名称 + if (addressList.contains(list.get(i).getName()) && !list.get(i).getAddStatus()){ + errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称已存在",i+1)); + list.get(i).setAddStatus(true); + continue; + } + + // 校验所属组织通过名称能否匹配到ID +// Result resultDTOResult = govOrgFeignClient.getCommunityInfo(list.get(i).getOrgName()); +// CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData(); +// if(communityInfoResultDTO == null && !list.get(i).getAddStatus()){ +// errorInfo.add(getErrorInfo(list.get(i), "所属组织匹配失败",i+1)); +// list.get(i).setAddStatus(true); +// continue; +// }else{ +// list.get(i).setOrgId(communityInfoResultDTO.getDeptId()); +// list.get(i).setPid(communityInfoResultDTO.getPid()); +// list.get(i).setPids(communityInfoResultDTO.getPids()); +// } + + } + if (list.size() > errorInfo.size()){ + Map groupByName = list.stream().collect(Collectors.groupingBy(IcPointVaccinesInoculationImportExcel::getName, Collectors.counting())); + groupByName.forEach((name,count) -> { + if (Integer.valueOf(count.toString()).compareTo(1) != 0){ + for (IcPointVaccinesInoculationImportExcel i : list) { + if (name.equals(i.getName()) && !i.getAddStatus()){ + errorInfo.add(getErrorInfo(i,"数据重复",i.getNum())); + i.setAddStatus(true); + } + } + } + }); + } + Map> groupByStatus = list.stream().collect(Collectors.groupingBy(IcPointVaccinesInoculationImportExcel::getAddStatus)); + List needInsert = groupByStatus.get(false); + if (CollectionUtils.isNotEmpty(needInsert)){ + List entities = ConvertUtils.sourceToTarget(needInsert, IcPointVaccinesInoculationEntity.class); + entities.forEach(e -> { + // 设置客户ID + e.setCustomerId(tokenDto.getCustomerId()); + }); + insertBatch(entities); + } + if (CollectionUtils.isNotEmpty(errorInfo)){ + String url = importOssUpload(errorInfo, PointVaccinesInoculationErrorModel.class); + closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,url); + }else { + closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,""); + } + }catch (Exception e){ + log.error(e.getMessage()); + closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,""); + } + } + + /** + * Desc: 关闭任务 + * @param taskId + * @param userId + * @param status + * @param url + * @author wgf + * @date 2022/3/30 09:05 + */ + public void closeTask(String taskId,String userId,String status,String url){ + ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); + input.setOperatorId(userId); + input.setTaskId(taskId); + input.setProcessStatus(status); + input.setResultDescFilePath(url); + commonServiceOpenFeignClient.finishImportTask(input); + } + + /** + * Desc: 构造错误信息 + * @param dto + * @param info + * @param num + * @author wgf + * @date 2022/3/29 17:17 + */ + public PointVaccinesInoculationErrorModel getErrorInfo(IcPointVaccinesInoculationImportExcel dto, String info, Integer num){ + PointVaccinesInoculationErrorModel result = ConvertUtils.sourceToTarget(dto, PointVaccinesInoculationErrorModel.class); + result.setErrorMsg(info); + result.setNum(num); + return result; + } + + /** + * Desc: 文件上传并返回url + * @param errorRows + * @param tClass + * @author zxc + * @date 2022/3/30 09:16 + */ + public String importOssUpload(Collection errorRows, Class tClass) throws IOException { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表","导入失败的数据列表"), + tClass, errorRows); + + // 文件名 + String resultDescFileName = UUID.randomUUID().toString().concat(".xls"); + + FileItemFactory factory = new DiskFileItemFactory(16, null); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName); + OutputStream os = fileItem.getOutputStream(); + Result uploadResult = null; + try { + workbook.write(os); + uploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + } catch (Exception e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("上传错误描述文件:{}", errormsg); + } finally { + try { + os.close(); + } catch (IOException e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("上传错误描述文件关闭输出流:{}", errormsg); + } + try { + fileItem.delete(); + } catch (Exception e) { + String errormsg = ExceptionUtils.getErrorStackTrace(e); + log.error("上传错误描述文件删除临时文件:{}", errormsg); + } + } + + if (uploadResult == null || !uploadResult.success()) { + log.error("调用OSS上传结果描述文件失败"); + return null; + } + return uploadResult.getData().getUrl(); + } + + @Override + public List getMapInfoList(MapInfoFormDTO formDTO) { + List list = baseDao.getMapInfoList(formDTO); + return list; + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index a7d1183196..80f5a27910 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2631,4 +2631,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getAllUserIds(String idCard, String customerId) { return baseDao.getAllUserIds(idCard, customerId); } + + @Override + public List getUserListByCommunityId(String communityId) { + List userList = baseDao.getUserListByCommunityId(communityId); + List list = ConvertUtils.sourceToTarget(userList,SendPointNoticeFormDTO.UserListBean.class); + return list; + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx index 5afef2dc0a41cdd614b64316e8feaf2cc14c88f2..bec686be9df8d2f1690a1904815c63dacde4b860 100644 GIT binary patch delta 4482 zcmZ8lbx_pp8r@yGySrIhSW0k_MjE73K)Op%l%-u@$sgSapENF_ARr+qos!bEN;gPz z{l4$c+?o6S@zy+Zo_FTFbLKhEgjt0dx&VyRCiUo(4Nw9WLNv=NO^5f_GUJ<2?<@I9 z#p_t4ZZxPLaC~KYr|R8s5+|g<_>< zcgUtu_577F*o>$uSdKfilmatTeE&u%L^UXGg>~bmtRh&t%=9#{EFPC#CI-UI@9sk% zb>8EysCDeDT;d_?==Cc-*OewHS2$SEYhD8IMvZU6vbuGMGZns?mW&@e87Y{a*2)yY zDDwPB1~cy8SjZzj%QpkdHEyk6A{gZS23UWwC;r_0HLibkv}eKGtA8Z)O|y?nlE_`A&dO10aKL6_S|PsLiwYb_LW?Y6ps8mTMaTVL<^ zPq?Kzdkfwvp;-0ISnt3H-4rSoBp3uLfq+2NAP^|nLo~q7-ow%V-{qc2u&0M->XK%c z7JieIWUsF)_<@r5_T zr>~$u0Qy1e-Y5*94M;zVkKw2iIZMvNz@0ANc1OQX6H#4AZtLhx5$WzPQCo!35tC8i zf_(!l@#&9Fwj+D!UOhveK;67hk08@RpYjB2F_K@nY2AQ*zM@q^gNiEQ%>8W&ZI?`a z2C-xQ}V`rXPxHS2~kKm(?uq!nfE|Z-C_^&KG-bAsWS# zkrt{<(spNK*ab|wRPd9wq>!;)<8xnDmQbB#f8e|mxo?H-oMd-(+;UUknp+q(L{_(a z>3DESz3`IQW?y_}p4-C?d2_K75ZPi9BlNZOo@hqu^^k{_B(xUIh-cVi%d1og>z2t? zu~fe+4K~*#XWK3;nPvf?Fhjs9t> z+?xy?&B&jhSA0L@f5hv{V>A>JQ}K%EHI$IY z&h@FKV#0%19O2}X7DGv|p0l*}SkcBeB^E(1&bURc^20@0*fy)uK6Gb8xLhkgWj?dQ zIKF(Y@63~gv~e}z*>RZ5BllJQR+DCO&fLF10J$C-544_;6iGcbL431`{C-UDGj<;~ zX;`#;Y@XGTpYW^R%7E@>BRiUNZF=*>p&!ahu0S2&wFli<2y&#l~1;Pqor?bw`#SN?r10^ZnrZOn+y)z#s7Ooyf_QUI@JYtwR8% zMvHrtLfPgC>L>TBgIRTn(0&HVA%g%3J*UGMT+T)$Sr77r98o8uh9adHaQM2(5uyFN zEb%Z5SrL)1dYQ^t7bDtPYrLBk6Y+sB#k*;@Yza~1sx&DWxqgin+B^db$i)tSUmsPD zzIT2}E8G361YZ`hr6uxj4Z%057_VZ!MwDC0a=#8a}48{8Xtb@TLeouX*+> zN)`$`XJ;{D<0&fK2yp#GMau%bt!YhgijJ?3swu>b5k^kKi@d~3HkwbJ&)l8-s1sR z?%a;BXZ*>;^k@>Wuz?gf?u1_eZAsmmpgEcVK^AK zZ(6vQNq+NtTYWvkS>l*xB=D!!5j#Mh?#jVGJ#>^7x)VNn_0jz}9rpIBkb>4ybnn$q z%Sz|1-~LfhgMBaWQ%Iq#`E&rKJ9dQn~eeH?KGjsL>YfrI1eR*852+RIE;;wgch3 z(;8`lO*)3bKchIXwXI&oN0Z)SV_$ql+?jqruf-oTjG{qvkE8(Img zEaIY1z7IqzTm@;2_BsH>ZjG{BT;6EovRd)9bP`#y;bC#NS~)c38Ii^Q>$AGIYjs>q zU)T@kMN;kCho;r_8P!AtS_X1y#$nr&ZY7o3&BfUo84qS>PFsdkumXb6U4@GO3fXVDTu;JA+ZIIP7@XwQF6O@)@l6;`pE*gGZO3Fa{9iQ8GU&_!9#+%w#8 zN-&9m@;q;7#mKhe^ClFxAi{3dzi{Lz;Tlk%ti0Kty$bgZ@iC8suHGRj8*-kQR#d3r z1)CzP4Ssa-7sa3ROd!wN(83wucr+S{WYB6t3mg25XdXpSB8B-xCR{S?!)@xZ<3Hs7 z^@*6p^8RHJD#chmkux`uSy7EeHm>@91VkLxBeN-I9W?VApZ$prp*X}h>gt<*6MOvA zbJ%EQtbufYU`gdPa;UzNZkr>DSryx|d}vGQ4+fEJ1WII`f4Is)ntt!O?rN2`g-B`k zq(4Wj$~Yn#W*%rA#v{u%5K#mDj3VheQWX@=b{J`s znn+B={BmMV>U>2TYnDsR8Gn?gy7{|S>Wki?vy9!QtI(xGJKzTaS7W49shrPtvhZ@r zqERC*T>9aqsyfyBjlkJTagYZXF_=HE`1sj$=O!X;!8Qr=Bx#W}vUgME9EIE8@QWtB z9z>a=NvKX5Oho>uU3zC^Obd)=N;>Y$qmxtQIpBT}!PQT*Gr;&aoPbHs8?Ps-1(6b_Iskrh% z+|rkemC+&#OYuln>7!qbSTF*z8V4=SFu7BD1?x#|;!XNsNJ9AL4YGIAiSfKOt8L1_ zYMjteaB3DTy?Rh*J;NZ&HrL5rt${`E-PbwXCBs1hCt{Qp@>!OwlO(6Cw$Rq{3rCc^ zQ~o(cl-qRC0rl!%fs~;cUiUn;lOWyS>vUpXOpP9r$xBWT?3GFX=O{QL!xQ>Df9Kor z+yUKev}xiCy2V8G#}PPl*UK|m;U2tLwrdwU@w%2{L|e~3GZh{hflSRxw0>M3qNv|> zk|oOZPSB3t>(ZZpm^8`jKX|@}$WyX|h21qNGpwedu!RX37uFvbI!!Dv+1I+5!4R z+w_a5IW-=}*rNp3RoBkV2xtP2uD@(7mSjPU4Nwrb4I^_0LZk0ugx3h&jt@m8S3$P& zEee+xBg61p~FXrys z=+)|e98)cvM#FP&DwacfuYE87K`{K*c$MPwQD1o}{N=^fuO|zKwhD3Iz7eIM@Y`J^ z+|xyQ%WMlD$iKQc!~+-*wVVN^PAqq8BhGwmyh5rQVKbB)rL*`m6uoaSM#CC3P@(R^ zg1lE}ayU7LoD`bt3&XCj`1EdJm#44E`PcMrQ_15F!1a%!c;_i8DU{F;xj3@rZ<)0v z+Kz+c^6^V5snv~|o?2mf2FG_;#7A-PXbvKs+lfJFF+L8>Q?*V6(}QjCM5xMV=``g-`B zEJ^J*LZUe+=z7zXpa#iGZq_Lhn1*YAUo#$AsmY}-J}BWFkB-Q!mtKrwL~bk{kiNZMCn}9Fp!^2LsI%_uMs<_21}mROb{Df z@24!eJHoomnXGlg>B#Z1E8ZKOGwql^#&{vmXE5wiGH{bO zFpW@gpR4)^RyBO^SD=sgA>@o5AmS4TGXiiv;J>YiDLx}G3n0k<5F7}2@QZVrAOH>p;sxZv!9cHo95@fa7E}Ze18Ra& y%>OfpAQ1iED1XMk`ATtteF7SwMo<(INbqON2%HNFKq83#xs?^7!S(0;JNQ3$wqR%g delta 4548 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 L3cMVSe~kYFBY1bR diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_vaccines_inoculation.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_vaccines_inoculation.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..3901ecd5f408e256ef0ca02e77bb3d32000cef25 GIT binary patch literal 11577 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 Jz;lHH`X4AbdEfv5 literal 0 HcmV?d00001 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index 2cb4e10db6..490a890faa 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -31,5 +31,65 @@ where DEL_FLAG = 0 + + + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml index 4d9d2fa764..d44fa7358c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml @@ -29,5 +29,77 @@ + - \ No newline at end of file + + + + + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index edb2455bee..2d9dc76c92 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1132,4 +1132,16 @@ AND customer_id = #{customerId} AND DEL_FLAG = '0' + + From 66750e9e9f82fc9d85ea165f2edd35c62324ea38 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 24 Jun 2022 14:37:15 +0800 Subject: [PATCH 04/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20pc=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 2d9dc76c92..bc3e505d41 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1142,6 +1142,6 @@ left join user_base_info ub on ub.ID_NUM = ru.ID_CARD and ub.DEL_FLAG = 0 where ru.DEL_FLAG = 0 and ub.USER_ID is not null - and ru.AGENCY_ID = #{communityId} + and FIND_IN_SET(#{communityId},ru.PIDS) From 45cd47b2d1c3044f1ca0d522a505ea42a568d40f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 24 Jun 2022 14:56:57 +0800 Subject: [PATCH 05/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20pc=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index bc3e505d41..15a138a594 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1142,6 +1142,6 @@ left join user_base_info ub on ub.ID_NUM = ru.ID_CARD and ub.DEL_FLAG = 0 where ru.DEL_FLAG = 0 and ub.USER_ID is not null - and FIND_IN_SET(#{communityId},ru.PIDS) + and ru.PIDS like CONCAT('%',#{communityId},'%') From 3ac41ae49dcc3bc41760f813726a1f05adb158d7 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 24 Jun 2022 16:12:49 +0800 Subject: [PATCH 06/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20pc=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/PointHSYMFormDTO.java | 33 +++++++++++++++ .../IcPointNucleicMonitoringController.java | 27 +++++++++++- .../IcPointVaccinesInoculationController.java | 24 +++++++++++ .../dao/IcPointNucleicMonitoringDao.java | 8 ++++ .../dao/IcPointVaccinesInoculationDao.java | 8 ++++ .../excel/IcPointNucleicMonitoringExcel.java | 33 +-------------- .../IcPointVaccinesInoculationExcel.java | 42 +------------------ .../mapper/IcPointNucleicMonitoringDao.xml | 34 +++++++++++++++ .../mapper/IcPointVaccinesInoculationDao.xml | 36 ++++++++++++++++ 9 files changed, 171 insertions(+), 74 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PointHSYMFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PointHSYMFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PointHSYMFormDTO.java new file mode 100644 index 0000000000..d7a2228e0c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PointHSYMFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/3/28 10:30 + * @DESC + */ +@Data +public class PointHSYMFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = -498378993902522370L; + + /** + * 手机号 + */ + private String mobile; + + /** + * 地点名称 + */ + private String name; + + /** + * user所属组织ID + */ + private String orgId; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java index c320c5cb56..7b8b299bb4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java @@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -16,11 +17,16 @@ 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.constants.ImportTaskConstants; +import com.epmet.dao.IcPointNucleicMonitoringDao; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.PointHSYMFormDTO; +import com.epmet.dto.form.VaccinationListFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPointNucleicMonitoringExcel; +import com.epmet.excel.NatExportExcel; +import com.epmet.excel.VaccinationExportExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.service.IcPointNucleicMonitoringService; @@ -57,6 +63,9 @@ public class IcPointNucleicMonitoringController { @Autowired private GovOrgFeignClient govOrgFeignClient; + @Autowired + private IcPointNucleicMonitoringDao icPointNucleicMonitoringDao; + @RequestMapping("page") public Result> page(@RequestParam Map params){ // PageData page = icPointNucleicMonitoringService.page(params); @@ -98,10 +107,26 @@ public class IcPointNucleicMonitoringController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = icPointNucleicMonitoringService.list(params); + List list = icPointNucleicMonitoringDao.getPhrasePage(params); ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class); } + /** + * Desc: 【核酸检测点】导出 + * @param response + * @param formDTO + * @param tokenDto + * @author wgf + * @date 2022/6/24 13:57 + */ + @PostMapping("point-export") + public void vaccinationExport(HttpServletResponse response, @RequestBody PointHSYMFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception { + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + List list = icPointNucleicMonitoringDao.getPhrasePageByDTO(formDTO); + ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class); + + } + /** * 获取【发送通知】按钮显示隐藏状态 * @param tokenDto diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java index 141bb3e75d..2891705f97 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java @@ -3,6 +3,7 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -15,9 +16,13 @@ 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.constants.ImportTaskConstants; +import com.epmet.dao.IcPointVaccinesInoculationDao; +import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.IcPointVaccinesInoculationDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.PointHSYMFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.excel.IcPointNucleicMonitoringExcel; import com.epmet.excel.IcPointVaccinesInoculationExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcPointVaccinesInoculationService; @@ -51,6 +56,9 @@ public class IcPointVaccinesInoculationController { @Autowired private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Autowired + private IcPointVaccinesInoculationDao icPointVaccinesInoculationDao; + @RequestMapping("page") public Result> page(@RequestParam Map params){ // PageData page = icPointVaccinesInoculationService.page(params); @@ -96,6 +104,22 @@ public class IcPointVaccinesInoculationController { ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class); } + /** + * Desc: 【疫苗接种点】导出 + * @param response + * @param formDTO + * @param tokenDto + * @author wgf + * @date 2022/6/24 13:57 + */ + @PostMapping("point-export") + public void vaccinationExport(HttpServletResponse response, @RequestBody PointHSYMFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception { + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + List list = icPointVaccinesInoculationDao.getPhrasePageByDTO(formDTO); + ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class); + + } + /** * Desc: 【疫苗接种点】导入 * @param diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index 995ac2a81e..bfeaa9c34a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.form.PointHSYMFormDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointNucleicMonitoringEntity; import org.apache.ibatis.annotations.Mapper; @@ -32,6 +33,13 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getPhrasePage(Map params); + /** + * 条件查询 + * @param formDTO + * @return + */ + List getPhrasePageByDTO(PointHSYMFormDTO formDTO); + /** * 获取地图信息 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java index debf41daeb..09e1ece8f7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcPointVaccinesInoculationDTO; import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.form.PointHSYMFormDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointVaccinesInoculationEntity; import org.apache.ibatis.annotations.Mapper; @@ -32,6 +33,13 @@ public interface IcPointVaccinesInoculationDao extends BaseDao getPhrasePage(Map params); + /** + * 条件查询 + * @param formDTO + * @return + */ + List getPhrasePageByDTO(PointHSYMFormDTO formDTO); + /** * 获取地图信息 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java index 15dba9f57a..a6ee9cba7f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringExcel.java @@ -14,24 +14,9 @@ import java.util.Date; @Data public class IcPointNucleicMonitoringExcel { - @Excel(name = "ID") - private String id; - - @Excel(name = "客户ID") - private String customerId; - - @Excel(name = "所属组织ID") - private String orgId; - @Excel(name = "所属组织名称") private String orgName; - @Excel(name = "组织ID上级") - private String pid; - - @Excel(name = "组织ID所有上级") - private String pids; - @Excel(name = "核酸监测点名称") private String name; @@ -50,23 +35,7 @@ public class IcPointNucleicMonitoringExcel { @Excel(name = "纬度") private String latitude; - @Excel(name = "") - private Integer delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - @Excel(name = "更新时间") - private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java index e88e19b906..39bc9540db 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointVaccinesInoculationExcel.java @@ -14,24 +14,6 @@ import java.util.Date; @Data public class IcPointVaccinesInoculationExcel { - @Excel(name = "ID") - private String id; - - @Excel(name = "客户ID") - private String customerId; - - @Excel(name = "所属组织ID") - private String orgId; - - @Excel(name = "所属组织名称") - private String orgName; - - @Excel(name = "组织ID上级") - private String pid; - - @Excel(name = "组织ID所有上级") - private String pids; - @Excel(name = "疫苗接种点名称") private String name; @@ -50,7 +32,7 @@ public class IcPointVaccinesInoculationExcel { @Excel(name = "接种下午结束时间") private String afEndTime; - @Excel(name = "暂无疫苗（1：是；2：否）") + @Excel(name = "暂无疫苗", replace = {"是_1","否_2"}) private String noAvailableVaccines; @Excel(name = "咨询电话") @@ -59,29 +41,7 @@ public class IcPointVaccinesInoculationExcel { @Excel(name = "接种点地址") private String address; - @Excel(name = "经度") - private String longitude; - - @Excel(name = "纬度") - private String latitude; - - @Excel(name = "") - private Integer delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - @Excel(name = "更新时间") - private Date updatedTime; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index 490a890faa..612062aef0 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -65,6 +65,40 @@ order by CREATED_TIME desc + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml index 25bb366707..688c7baf5a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml @@ -111,6 +111,9 @@ AND vs.business_org_id = #{gridId} + + AND ca.building_addr like '%${buildingAddr}%' + order by ca.grid_id,ca.building_id,ca.community_id desc diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml index f87e62be7f..ebe3b66a73 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml @@ -106,6 +106,9 @@ AND vs.business_org_id = #{gridId} + + AND ca.house_address like '%${houseAddress}%' + order by ca.grid_id,ca.rental_id,ca.id_card desc diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml index 98049c9977..b720dacb29 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml @@ -138,6 +138,9 @@ AND vs.business_org_id = #{gridId} + + AND ca.curlive_address_detail like '%${curliveAddressDetail}%' + order by ca.grid_id,ca.resident_id,ca.id_card desc diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml index dbe97aecb8..2cb42cbcf3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml @@ -138,6 +138,9 @@ AND vs.business_org_id = #{gridId} + + AND curlive_address_detail like '%${curliveAddressDetail}%' + order by ca.grid_id,ca.rotators_id,ca.id_card desc From e0d928535cea1e08b4bf94427d2496910e4558e2 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 29 Jun 2022 10:11:13 +0800 Subject: [PATCH 15/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPointNucleicMonitoringServiceImpl.java | 7 +++++++ .../impl/IcPointVaccinesInoculationServiceImpl.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index a5dacb5bc6..541dc3d43f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -124,6 +125,12 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + // 校验数据库是否存在该地点名称 + if (addressList.contains(dto.getName())){ + throw new RenException("该监测点名称已存在"); + } IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class); insert(entity); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java index 9b89513936..8367d53b36 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -121,6 +122,12 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + // 校验数据库是否存在该地点名称 + if (addressList.contains(dto.getName())){ + throw new RenException("该接种点名称已存在"); + } IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class); insert(entity); } From ce6a9057a582958c3aad7b2a7e40047ff199bf37 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 29 Jun 2022 10:17:32 +0800 Subject: [PATCH 16/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.57__user_point_update.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.57__user_point_update.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.57__user_point_update.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.57__user_point_update.sql new file mode 100644 index 0000000000..ca5e3dc32b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.57__user_point_update.sql @@ -0,0 +1,2 @@ +ALTER TABLE ic_point_nucleic_monitoring MODIFY COLUMN MOBILE varchar(50) NOT NULL COMMENT '咨询电话'; +ALTER TABLE ic_point_vaccines_inoculation MODIFY COLUMN MOBILE varchar(50) NOT NULL COMMENT '咨询电话'; From 6c0d6973060ce5c046edaeb851a2952da896050d Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 29 Jun 2022 10:44:16 +0800 Subject: [PATCH 17/53] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/dto/form/WghSjxxFormDTO.java | 37 +++++++++++++++ .../opendata/dto/result/WghSjxxResultDTO.java | 47 +++++++++++++++++++ .../controller/WghSjxxbController.java | 20 ++++++++ .../com/epmet/opendata/dao/WghSjxxbDao.java | 16 +++++++ .../opendata/service/WghSjxxbService.java | 12 +++++ .../service/impl/WghSjxxbServiceImpl.java | 21 +++++++++ .../src/main/resources/mapper/WghSjxxbDao.xml | 27 +++++++++++ 7 files changed, 180 insertions(+) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxFormDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxFormDTO.java new file mode 100644 index 0000000000..b0e96441bf --- /dev/null +++ b/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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java new file mode 100644 index 0000000000..709e21f049 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java @@ -0,0 +1,47 @@ +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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java index 4d3a6cd04b..2c15dcd393 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java +++ b/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,9 @@ 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.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.WghSjxxResultDTO; import com.epmet.opendata.dto.wgh.WghSjxxbDTO; import com.epmet.opendata.excel.WghSjxxbExcel; import com.epmet.opendata.service.WghSjxxbService; @@ -92,4 +97,19 @@ public class WghSjxxbController { return new Result(); } + /** + * 事件信息分页 + * + * @param form + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result> + * @author LZN + * @date 2022/6/29 10:42 + */ + @PostMapping("getPage") + public Result> getSjxxPage(@RequestBody WghSjxxFormDTO form, @LoginUser TokenDto tokenDto) { + PageData dto = wghSjxxbService.getSjxxPage(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/WghSjxxbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java index d2806b93fe..3b82cc612b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java @@ -1,8 +1,13 @@ 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.entity.WghSjxxbEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 事件信息 @@ -14,4 +19,15 @@ import org.apache.ibatis.annotations.Mapper; public interface WghSjxxbDao extends BaseDao { int deleteAll(); + + + /** + * 事件信息分页 + * + * @param form + * @return java.util.List + * @author LZN + * @date 2022/6/29 10:43 + */ + List getSjxxPage(@Param("form") WghSjxxFormDTO form); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java index 1185b76fcb..791059b024 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java @@ -3,6 +3,8 @@ 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.result.WghSjxxResultDTO; import com.epmet.opendata.dto.wgh.WghSjxxbDTO; import com.epmet.opendata.entity.WghSjxxbEntity; @@ -86,4 +88,14 @@ public interface WghSjxxbService extends BaseService { * @date 2022/6/14 16:02 */ void getPreserSjxxVation(PreserVationFormDTO dto); + + /** + * 事件信息分页 + * + * @param form + * @return com.epmet.commons.tools.page.PageData + * @author LZN + * @date 2022/6/29 10:43 + */ + PageData getSjxxPage(WghSjxxFormDTO form); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java index ad2dee773b..c0f823a9f4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java +++ b/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.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.WghSjxxResultDTO; 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; @@ -130,6 +135,22 @@ public class WghSjxxbServiceImpl extends BaseServiceImpl + * @author LZN + * @date 2022/6/29 10:43 + */ + @Override + public PageData getSjxxPage(WghSjxxFormDTO form) { + PageHelper.startPage(form.getPage(), form.getLimit()); + List result = baseDao.getSjxxPage(form); + PageInfo info = new PageInfo<>(result); + return new PageData<>(result, info.getTotal()); + } + private int listLouDong(PreserVationFormDTO dto) throws Exception { String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml index ea94d5912f..25f8095938 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml @@ -23,6 +23,33 @@ delete from wgh_sjxxb + From b202d32885820cc55d8da0c4efcb3479d3e39fc3 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 29 Jun 2022 11:05:13 +0800 Subject: [PATCH 18/53] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/opendata/controller/WghSjxxbController.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/controller/WghSjxxbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java index 2c15dcd393..269d18c820 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java @@ -106,7 +106,7 @@ public class WghSjxxbController { * @author LZN * @date 2022/6/29 10:42 */ - @PostMapping("getPage") + @PostMapping("todo/page") public Result> getSjxxPage(@RequestBody WghSjxxFormDTO form, @LoginUser TokenDto tokenDto) { PageData dto = wghSjxxbService.getSjxxPage(form); return new Result>().ok(dto); From 5cf331f029c449e307a59940aa683087acce4b8a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 29 Jun 2022 17:10:01 +0800 Subject: [PATCH 19/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java | 2 +- .../service/impl/IcPointVaccinesInoculationServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index 541dc3d43f..59443b21eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -129,7 +129,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); // 校验数据库是否存在该地点名称 if (addressList.contains(dto.getName())){ - throw new RenException("该监测点名称已存在"); + throw new RenException("该监测点名称已存在，请重新输入"); } IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class); insert(entity); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java index 8367d53b36..d46e87b23d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java @@ -126,7 +126,7 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); // 校验数据库是否存在该地点名称 if (addressList.contains(dto.getName())){ - throw new RenException("该接种点名称已存在"); + throw new RenException("该接种点名称已存在，请重新输入"); } IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class); insert(entity); From 2ac9f2efa945e4bc1708c593704e3e32f4f4f252 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jun 2022 09:10:11 +0800 Subject: [PATCH 20/53] =?UTF-8?q?=E4=BC=98=E5=8A=BF=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E3=80=81=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86=E3=80=81=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E5=8D=B1=E5=8C=96=E3=80=81=E5=85=AC=E5=85=B1=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=AF=BC=E5=85=A5=E6=97=B6=E5=90=8C=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=8B=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80=EF=BC=8C=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E7=9B=B4=E6=8E=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?,=E6=9C=AA=E6=94=B9=E5=BD=BB=E5=BA=95=EF=BC=8C=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcCityManagementDao.java | 1 + .../java/com/epmet/dao/IcDangerousChemicalsDao.java | 2 ++ .../main/java/com/epmet/dao/IcPublicServiceDao.java | 2 ++ .../java/com/epmet/dao/IcSuperiorResourceDao.java | 2 ++ .../service/impl/IcCityManagementServiceImpl.java | 5 ++++- .../service/impl/IcDangerousChemicalsServiceImpl.java | 5 ++++- .../service/impl/IcPublicServiceServiceImpl.java | 6 +++++- .../service/impl/IcSuperiorResourceServiceImpl.java | 5 ++++- .../src/main/resources/mapper/IcCityManagementDao.xml | 11 +++++++++++ .../main/resources/mapper/IcDangerousChemicalsDao.xml | 10 ++++++++++ .../src/main/resources/mapper/IcPublicServiceDao.xml | 10 ++++++++++ .../main/resources/mapper/IcSuperiorResourceDao.xml | 10 ++++++++++ 12 files changed, 65 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java index b22f9734c6..fb9664fa0d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java @@ -24,4 +24,5 @@ public interface IcCityManagementDao extends BaseDao { void importInsert(@Param("entityList") List entityList); + void delByAgencyAndName(IcCityManagementEntity entity); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java index 5f75264465..cd0758a98f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java @@ -22,4 +22,6 @@ public interface IcDangerousChemicalsDao extends BaseDao entityList); + + void delByAgencyAndName(IcDangerousChemicalsEntity entity); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java index 3f29ecba64..d7ac4b6ef1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java @@ -23,4 +23,6 @@ public interface IcPublicServiceDao extends BaseDao { void del(IcPublicServiceEntity entity); void importInsert(@Param("entityList") List entityList); + + void delByAgencyAndName(IcPublicServiceEntity entity); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java index cbd187c7bf..361cc8c5bf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java @@ -23,4 +23,6 @@ public interface IcSuperiorResourceDao extends BaseDao void del(IcSuperiorResourceEntity entity); void importInsert(@Param("entityList") List entityList); + + void delByAgencyAndName(IcSuperiorResourceEntity entity); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java index 0562ff6f1e..a8edb5e7cd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java @@ -170,7 +170,10 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl + + + DELETE + FROM + ic_city_management + WHERE + del_flag != '0' + AND agency_id = #{agencyId} + AND `name` = #{name} + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml index ccaea77ffd..99d3138558 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml @@ -118,4 +118,14 @@ AND del_flag = '0' + + DELETE + FROM + ic_dangerous_chemicals + WHERE + del_flag != '0' + AND agency_id = #{agencyId} + AND `name` = #{name} + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index 6909d9ea5c..295ee69e36 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -107,4 +107,14 @@ AND del_flag = '0' + + DELETE + FROM + ic_public_service + WHERE + del_flag != '0' + AND agency_id = #{agencyId} + AND `name` = #{name} + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml index 0b9d9760f4..8058120afd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml @@ -107,5 +107,15 @@ AND del_flag = '0' + + DELETE + FROM + ic_superior_resource + WHERE + del_flag != '0' + AND agency_id = #{agencyId} + AND `name` = #{name} + + \ No newline at end of file From 8394c932db47916522f62aee0ee0bd2e22ebc0b7 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 30 Jun 2022 09:39:41 +0800 Subject: [PATCH 21/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPointNucleicMonitoringDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index 612062aef0..42a4a2e8af 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -60,7 +60,7 @@ and MOBILE like CONCAT('%', #{mobile}, '%') - and (ORG_ID = #{orgId} or FIND_IN_SET(#{orgId},PIDS)) + and (ORG_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%')) order by CREATED_TIME desc From d0bf6e62c0bafa4dce4d9d2181f5a93ae819ae57 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 30 Jun 2022 10:03:39 +0800 Subject: [PATCH 22/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPointNucleicMonitoringServiceImpl.java | 7 +++++++ .../main/resources/mapper/IcPointNucleicMonitoringDao.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index 59443b21eb..69929d807d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -131,6 +131,13 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getCommunityInfo(dto.getOrgName()); + CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData(); + dto.setPid(communityInfoResultDTO.getPid()); + dto.setPids(communityInfoResultDTO.getPids()); + } IcPointNucleicMonitoringEntity entity = ConvertUtils.sourceToTarget(dto, IcPointNucleicMonitoringEntity.class); insert(entity); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index 42a4a2e8af..23ea0af5d8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -94,7 +94,7 @@ and MOBILE like CONCAT('%', #{mobile}, '%') - and (ORG_ID = #{orgId} or FIND_IN_SET(#{orgId},PIDS)) + and (ORG_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%')) order by CREATED_TIME desc From 5e177952b6f5cfb9a49a75a3d1af7051a388e496 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 30 Jun 2022 10:31:28 +0800 Subject: [PATCH 23/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E3=80=90?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E3=80=91?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E5=88=B0?= =?UTF-8?q?partymember=E5=BA=93=E3=80=82=E7=9B=B8=E5=85=B3MQ=E5=8F=8A?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/ConsomerGroupConstants.java | 5 + .../rocketmq/constants/TopicConstants.java | 5 + .../messages/PartymemberSyncMQMsg.java | 60 ++++++++++ .../com/epmet/constant/SystemMessageType.java | 5 + .../impl/SystemMessageServiceImpl.java | 3 + .../resi-partymember-server/pom.xml | 23 ++++ .../epmet/mq/RocketMQConsumerRegister.java | 19 ++++ .../listener/ResiPartyMemberSyncListener.java | 106 ++++++++++++++++++ .../src/main/resources/bootstrap.yml | 7 +- .../IcResiImportDynamicExcelListener.java | 3 + .../impl/IcResiUserImportServiceImpl.java | 87 ++++++++++++-- .../service/impl/IcResiUserServiceImpl.java | 48 +++++--- 12 files changed, 341 insertions(+), 30 deletions(-) create mode 100644 epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/ResiPartyMemberSyncListener.java diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java index 1a4b303c3c..2aadd34cb4 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java @@ -93,4 +93,9 @@ public interface ConsomerGroupConstants { * 志愿者变更 */ String VOLUNTEER_CHANGE_EVENT_LISTENER_GROUP = "volunteer_change_event_listener_group"; + + /** + * 创建党员居民信息消费者组，将user库的党员信息同步到partymember库的党员表。 + */ + String CREATE_RESI_PARTYMEMBER_SYNC_GROUP = "create_resi_sync_group"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java index 66d04ff05f..cea27769bc 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java @@ -79,4 +79,9 @@ public interface TopicConstants { * 志愿者 */ String VOLUNTEER ="volunteer"; + + /** + * 居民的党员信息 + */ + String PARTYMEMBER_RESI = "partymember_resi"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java new file mode 100644 index 0000000000..d9010854e0 --- /dev/null +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartymemberSyncMQMsg.java @@ -0,0 +1,60 @@ +package com.epmet.commons.rocketmq.messages; + +import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * user库党员信息同步到partymember库的mq消息 + */ +@Data +public class PartymemberSyncMQMsg extends MqBaseFormDTO { + + /** + * 党员列表，允许一次传输多个党员信息 + */ + private List partymemberList = new ArrayList<>(); + + @Data + public static class PartyMemberSyncForm { + + private String customerId; + private String agencyId; + private String agencyPids; + private String icResiUser; + private String name; + private String idCard; + private String mobile; + private String address; + private String rdsj; + private String sszb; + /** + * 是否流动党员 + */ + private String isLd; + + /** + * 流动党员活动证号 + */ + private String ldzh; + /** + * 职务 + */ + private String partyZw; + /** + * 是否退休 + */ + private String isTx; + /** + * 是否党员中心户 + */ + private String isDyzxh; + /** + * 志愿者类型,逗号隔开 + */ + private String volunteerCategory; + + } +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java index 13f409ca36..b60b3b8fe1 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java @@ -165,4 +165,9 @@ public interface SystemMessageType { */ String FINISH_USER_DEMAND="finish_user_demand"; + /** + * 党员身份的居民信息导入 + */ + String PARTYMEMBER_RESI_IMPORT = "partymember_resi_import"; + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index 3e210d13a0..d43fc223dc 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -234,6 +234,9 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.VOLUNTEER_CHANGED: topic=TopicConstants.VOLUNTEER; break; + case SystemMessageType.PARTYMEMBER_RESI_IMPORT: + topic=TopicConstants.PARTYMEMBER_RESI; + break; default: logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index a1f564cf47..18eab5096b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -116,6 +116,13 @@ 2.0.0 compile + + + + com.epmet + epmet-commons-rocketmq + 2.0.0 + @@ -197,6 +204,10 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + + true + 192.168.1.140:9876;192.168.1.141:9876 @@ -247,6 +258,10 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + + false + 192.168.1.140:9876;192.168.1.141:9876 @@ -297,6 +312,10 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + + true + 192.168.10.161:9876 @@ -346,6 +365,10 @@ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1 + + + true + 192.168.11.187:9876;192.168.11.184:9876 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java new file mode 100644 index 0000000000..67ceeb7651 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java @@ -0,0 +1,19 @@ +package com.epmet.mq; + +import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; +import com.epmet.commons.rocketmq.constants.TopicConstants; +import com.epmet.commons.rocketmq.register.MQAbstractRegister; +import com.epmet.commons.rocketmq.register.MQConsumerProperties; +import com.epmet.mq.listener.ResiPartyMemberSyncListener; +import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; +import org.springframework.stereotype.Component; + +@Component +public class RocketMQConsumerRegister extends MQAbstractRegister { + + @Override + public void registerAllListeners(String env, MQConsumerProperties consumerProperties) { + register(consumerProperties, ConsomerGroupConstants.CREATE_RESI_PARTYMEMBER_SYNC_GROUP, MessageModel.CLUSTERING, + TopicConstants.PARTYMEMBER_RESI, "*", new ResiPartyMemberSyncListener()); + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/ResiPartyMemberSyncListener.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/ResiPartyMemberSyncListener.java new file mode 100644 index 0000000000..4304f94f95 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/ResiPartyMemberSyncListener.java @@ -0,0 +1,106 @@ +package com.epmet.mq.listener; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.rocketmq.constants.MQUserPropertys; +import com.epmet.commons.rocketmq.messages.PartymemberSyncMQMsg; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.modules.partymember.service.IcPartyMemberService; +import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; +import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; +import org.apache.rocketmq.common.message.MessageExt; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +/** + * @author wxz + * @Description 创建党员居民信息消费者组，将user库的党员信息同步到partymember库的党员表。 + + * @return + * @date 2021.06.07 16:12 + */ +public class ResiPartyMemberSyncListener implements MessageListenerConcurrently { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + private RedisUtils redisUtils; + + @Override + public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { + + if (redisUtils == null) { + redisUtils = SpringContextUtils.getBean(RedisUtils.class); + } + + try { + msgs.forEach(msg -> consumeMessage(msg)); + } catch (Exception e) { + logger.error(ExceptionUtils.getErrorStackTrace(e)); + return ConsumeConcurrentlyStatus.RECONSUME_LATER; + } + return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; + } + + /** + * 逐条消费 + * @param messageExt + */ + private void consumeMessage(MessageExt messageExt) { + //String tags = messageExt.getTags(); + String msg = new String(messageExt.getBody()); + String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL); + logger.info("居民-党员信息同步监听器-收到消息内容:{}", msg); + PartymemberSyncMQMsg msgObj = JSON.parseObject(msg, PartymemberSyncMQMsg.class); + + List partymemberList = msgObj.getPartymemberList(); + if (CollectionUtils.isEmpty(partymemberList)) { + return; + } + partymemberList.stream().forEach(p -> { + IcPartyMemberDTO icPartyMemberDTO = ConvertUtils.sourceToTarget(p, IcPartyMemberDTO.class); + try { + SpringContextUtils.getBean(IcPartyMemberService.class).icPartyMemberSync(icPartyMemberDTO); + } catch (RenException e) { + // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 + logger.error("【居民-党员信息同步】同步失败，居民id:{},错误信息:{}", p.getIcResiUser(), ExceptionUtils.getErrorStackTrace(e)); + } catch (Exception e) { + // 不是我们自己抛出的异常，可以让MQ重试 + logger.error("【居民-党员信息同步】同步失败居民id:{},错误信息:{}", p.getIcResiUser(), ExceptionUtils.getErrorStackTrace(e)); + throw e; + } + }); + + if (StringUtils.isNotBlank(pendingMsgLabel)) { + try { + removePendingMqMsgCache(pendingMsgLabel); + } catch (Exception e) { + logger.error("【居民-党员信息同步】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + + logger.info("【居民-党员信息同步】处理完成，条数:{}", partymemberList.size()); + } + + /** + * @description + * + * @param pendingMsgLabel + * @return + * @author wxz + * @date 2021.10.14 16:32:32 + */ + private void removePendingMqMsgCache(String pendingMsgLabel) { + String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel); + Boolean rst = redisUtils.delete(key); + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml index ee185fa822..751620e91d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -142,4 +142,9 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ + +# rocketmq +rocketmq: + enable: @rocketmq.enable@ + name-server: @rocketmq.nameserver@ \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java index 2e98774f6e..1d06fe5707 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java @@ -195,6 +195,9 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener idCards) { + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + IcResiUserServiceImpl resiService = SpringContextUtils.getBean(IcResiUserServiceImpl.class); + + PartymemberSyncMQMsg mqMsgBody = new PartymemberSyncMQMsg(); + + idCards.stream().forEach(idCard -> { + // 检查用户是否存在 + Map existResiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); + if (existResiInfoMap == null || existResiInfoMap.size() == 0) { + return ; + } + String resiId = existResiInfoMap.get("ID"); + + // 查询党员信息 + LambdaQueryWrapper partymemberQuery = new LambdaQueryWrapper().eq(IcPartyMemberEntity::getIcResiUser, resiId); + IcPartyMemberEntity partymemberEntity = icPartyMemberDao.selectOne(partymemberQuery); + + + String agencyId = existResiInfoMap.get("AGENCY_ID"); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + if (agencyInfo == null) { + log.error("【居民信息导入】党员信息-根据组织id未找到组织信息。组织ID:{}", agencyId); + return ; + } + String houseAddress = resiService.getHouseAddress4PartymemberInfo(customerId, idCard, existResiInfoMap.get("HOME_ID")); + + PartymemberSyncMQMsg.PartyMemberSyncForm partymemberInfo = new PartymemberSyncMQMsg.PartyMemberSyncForm(); + partymemberInfo.setCustomerId(existResiInfoMap.get("CUSTOMER_ID")); + partymemberInfo.setAgencyId(agencyId); + partymemberInfo.setAgencyPids(agencyInfo.getPids()); + partymemberInfo.setIcResiUser(resiId); + partymemberInfo.setName(existResiInfoMap.get("NAME")); + partymemberInfo.setIdCard(existResiInfoMap.get("ID_CARD")); + partymemberInfo.setMobile(existResiInfoMap.get("MOBILE")); + partymemberInfo.setAddress(houseAddress); + + partymemberInfo.setRdsj(partymemberEntity.getRdsj()); + partymemberInfo.setSszb(partymemberEntity.getSszb()); + partymemberInfo.setIsLd(partymemberEntity.getIsLd()); + partymemberInfo.setLdzh(partymemberEntity.getLdzh()); + partymemberInfo.setPartyZw(partymemberEntity.getPartyZw()); + partymemberInfo.setIsTx(partymemberEntity.getIsTx()); + partymemberInfo.setIsDyzxh(partymemberEntity.getIsDyzxh()); + + // 志愿者信息 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcVolunteerEntity::getIcResiUser, resiId); + List volunteerCategories = icVolunteerDao.selectList(query).stream().map(v -> v.getVolunteerCategory()).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(volunteerCategories)) { + partymemberInfo.setVolunteerCategory(String.join(",", volunteerCategories)); + } + + mqMsgBody.getPartymemberList().add(partymemberInfo); + }); + + SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendRocketMqMsg(SystemMessageType.PARTYMEMBER_RESI_IMPORT, mqMsgBody); + } + /** * 去掉多余的列 * @param originColumnAndValues diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index fb8384b4a0..5c7bae23f4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -314,23 +314,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Thu, 30 Jun 2022 11:21:32 +0800 Subject: [PATCH 24/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20pc=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 8 ++--- .../java/com/epmet/dao/CustomerAgencyDao.java | 3 +- .../epmet/service/CustomerAgencyService.java | 4 +-- .../impl/CustomerAgencyServiceImpl.java | 4 +-- .../resources/mapper/CustomerAgencyDao.xml | 3 +- .../epmet/dto/form/OrgInfoPointFormDTO.java | 32 +++++++++++++++++++ .../com/epmet/feign/GovOrgFeignClient.java | 7 ++-- .../fallback/GovOrgFeignClientFallBack.java | 5 +-- .../IcPointNucleicMonitoringServiceImpl.java | 9 ++++-- 9 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 153ffb26fe..b06cd60d22 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -464,15 +464,15 @@ public class CustomerAgencyController { } /** - * @param orgName + * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author wgf * @Description 根据社区名称查询所属组织信息 * @Date 2022/6/21 22:41 **/ - @GetMapping("getCommunityInfo/{orgName}") - public Result getCommunityInfo(@PathVariable("orgName") String orgName) { - return customerAgencyService.getCommunityInfo(orgName); + @PostMapping("getCommunityInfo/{orgName}") + public Result getCommunityInfo(@RequestBody OrgInfoPointFormDTO formDTO) { + return customerAgencyService.getCommunityInfo(formDTO); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index bd271cd2f0..1c4aa9394c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.form.OrgTreeByUserAndTypeFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; @@ -349,7 +350,7 @@ public interface CustomerAgencyDao extends BaseDao { List getDelAgencyIdList(@Param("agencyId") String agencyId); - CommunityInfoResultDTO getCommunityInfo(@Param("orgName") String orgName); + CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO); CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index bc950586a9..21e6f17320 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -320,13 +320,13 @@ public interface CustomerAgencyService extends BaseService DelAgencyGridIdResultDTO getDelAgencyGridIdList(String agencyId); /** - * @param orgName + * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author wgf * @Description 根据社区名称查询所属组织信息 * @Date 2022/6/21 22:41 **/ - Result getCommunityInfo(String orgName); + Result getCommunityInfo(OrgInfoPointFormDTO formDTO); /** * @param userId diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 3b6317e4f4..6d46ba3b3a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1567,8 +1567,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getCommunityInfo(String orgName) { - CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(orgName); + public Result getCommunityInfo(OrgInfoPointFormDTO formDTO) { + CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(formDTO); return new Result().ok(communityInfoResultDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 45b5b066a7..136341dc18 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -901,7 +901,7 @@ AND pids LIKE CONCAT('%', #{agencyId}, '%') - select ID as deptId, CUSTOMER_ID, @@ -911,6 +911,7 @@ from customer_agency where DEL_FLAG = '0' and ORGANIZATION_NAME = #{orgName} + and CUSTOMER_ID = #{customerId} limit 1 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java new file mode 100644 index 0000000000..6c306b5429 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrgInfoPointFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 所属部门 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-20 + */ +@Data +public class OrgInfoPointFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属组织名称 + */ + private String orgName; + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index 4d97431514..8f3c43251c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.feign.fallback.GovOrgFeignClientFallBack; @@ -65,14 +66,14 @@ public interface GovOrgFeignClient { //Result getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO); /** - * @param orgName + * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author wgf * @Description 根据社区名称查询所属组织信息 * @Date 2020/4/26 23:16 **/ - @GetMapping("/gov/org/customeragency/getCommunityInfo/{orgName}") - Result getCommunityInfo(@PathVariable("orgName") String orgName); + @PostMapping("/gov/org/customeragency/getCommunityInfo") + Result getCommunityInfo(OrgInfoPointFormDTO formDTO); /** * @param userId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index b2968f313f..0c1f3a6342 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.feign.GovOrgFeignClient; @@ -42,8 +43,8 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient { //} @Override - public Result getCommunityInfo(String orgName) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",orgName); + public Result getCommunityInfo(OrgInfoPointFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",formDTO); } @Override diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index 69929d807d..4987d470f2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.dao.IcPointNucleicMonitoringDao; import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.MapInfoFormDTO; +import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.dto.result.UploadImgResultDTO; @@ -133,7 +134,8 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getCommunityInfo(dto.getOrgName()); + OrgInfoPointFormDTO formDTO = ConvertUtils.sourceToTarget(dto, OrgInfoPointFormDTO.class); + Result resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO); CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData(); dto.setPid(communityInfoResultDTO.getPid()); dto.setPids(communityInfoResultDTO.getPids()); @@ -220,7 +222,10 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getCommunityInfo(list.get(i).getOrgName()); + OrgInfoPointFormDTO formDTO = new OrgInfoPointFormDTO(); + formDTO.setOrgName(list.get(i).getOrgName()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + Result resultDTOResult = govOrgFeignClient.getCommunityInfo(formDTO); CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData(); if(communityInfoResultDTO == null && !list.get(i).getAddStatus()){ errorInfo.add(getErrorInfo(list.get(i), "所属组织匹配失败",i+1)); From c239f28a2250cb52adca5f9f19c5c3a4f525d640 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 30 Jun 2022 13:37:42 +0800 Subject: [PATCH 25/53] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E3=80=90?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E3=80=91?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E5=88=B0?= =?UTF-8?q?partymember=E5=BA=93-=E6=9F=A5=E8=AF=A2=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=AD=E6=96=87=E6=8F=8F=E8=BF=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index ed6e500138..dd594976b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -849,7 +849,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res log.error("【居民信息导入】党员信息-根据组织id未找到组织信息。组织ID:{}", agencyId); return ; } - String houseAddress = resiService.getHouseAddress4PartymemberInfo(customerId, idCard, existResiInfoMap.get("HOME_ID")); + String houseAddress = resiService.getHouseAddress4PartymemberInfo(customerId, existResiInfoMap.get("GRID_ID"), existResiInfoMap.get("HOME_ID")); PartymemberSyncMQMsg.PartyMemberSyncForm partymemberInfo = new PartymemberSyncMQMsg.PartyMemberSyncForm(); partymemberInfo.setCustomerId(existResiInfoMap.get("CUSTOMER_ID")); From da63e371928f0d23d0a21a24cca1afacf128aeb4 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 30 Jun 2022 14:01:29 +0800 Subject: [PATCH 26/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20pc=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/CustomerAgencyController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index b06cd60d22..ec9d682d76 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -470,7 +470,7 @@ public class CustomerAgencyController { * @Description 根据社区名称查询所属组织信息 * @Date 2022/6/21 22:41 **/ - @PostMapping("getCommunityInfo/{orgName}") + @PostMapping("getCommunityInfo") public Result getCommunityInfo(@RequestBody OrgInfoPointFormDTO formDTO) { return customerAgencyService.getCommunityInfo(formDTO); } From 451a908d19d066f818317036a31d8c66bbf274fa Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 30 Jun 2022 14:15:07 +0800 Subject: [PATCH 27/53] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/WghSjxxbDetailFormDTO.java | 16 +++++++ .../dto/result/WghSjxxbDetailResultDTO.java | 46 +++++++++++++++++++ .../controller/WghSjxxbController.java | 16 +++++++ .../com/epmet/opendata/dao/WghSjxxbDao.java | 11 +++++ .../opendata/service/WghSjxxbService.java | 12 +++++ .../service/impl/WghSjxxbServiceImpl.java | 16 +++++++ .../src/main/resources/mapper/WghSjxxbDao.xml | 17 ++++++- 7 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxbDetailFormDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxbDetailResultDTO.java diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxbDetailFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxbDetailFormDTO.java new file mode 100644 index 0000000000..0e159dccea --- /dev/null +++ b/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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxbDetailResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxbDetailResultDTO.java new file mode 100644 index 0000000000..618665f63a --- /dev/null +++ b/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; +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java index 269d18c820..a09e7b69cf 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java @@ -13,8 +13,10 @@ 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; @@ -112,4 +114,18 @@ public class WghSjxxbController { return new Result>().ok(dto); } + /** + * 根据id查询详情 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/30 14:12 + */ + @PostMapping("sjxx/getDetailById") + public Result getDetailById(@RequestBody WghSjxxbDetailFormDTO dto) { + WghSjxxbDetailResultDTO result = wghSjxxbService.getDetailById(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/WghSjxxbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java index 3b82cc612b..a23776f5e0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java @@ -3,6 +3,7 @@ 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; @@ -30,4 +31,14 @@ public interface WghSjxxbDao extends BaseDao { * @date 2022/6/29 10:43 */ List 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); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java index 791059b024..9726debd07 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java @@ -4,7 +4,9 @@ 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; @@ -98,4 +100,14 @@ public interface WghSjxxbService extends BaseService { * @date 2022/6/29 10:43 */ PageData 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); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java index c0f823a9f4..f544232319 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java @@ -15,8 +15,10 @@ 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.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.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghSjxxbEntity; @@ -151,6 +153,20 @@ public class WghSjxxbServiceImpl extends BaseServiceImpl(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); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml index 25f8095938..1f0e3fd53e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml @@ -31,7 +31,8 @@ DESCRIPTION, ADDRESS, STATUSNAME, - STREETNAME + STREETNAME, + TASKID FROM wgh_sjxxb @@ -50,6 +51,20 @@ + From d17a3a93ce91103b443f74c48d299dc3c6a3e53a Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 30 Jun 2022 14:23:32 +0800 Subject: [PATCH 28/53] =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java index 709e21f049..1e5bb43138 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java @@ -44,4 +44,9 @@ public class WghSjxxResultDTO extends PageFormDTO implements Serializable { * 街道名称 */ private String streetname; + + /** + * 唯一id + */ + private String taskid; } From e896c620cf2a64f38be4656065bd3738fb34a96e Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 30 Jun 2022 14:28:36 +0800 Subject: [PATCH 29/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20pc=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcPointNucleicMonitoringController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java index 7b8b299bb4..d9d3726757 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java @@ -81,9 +81,10 @@ public class IcPointNucleicMonitoringController { @NoRepeatSubmit @PostMapping - public Result save(@RequestBody IcPointNucleicMonitoringDTO dto){ + public Result save(@RequestBody IcPointNucleicMonitoringDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icPointNucleicMonitoringService.save(dto); return new Result(); } From a81fe11a3e47c210a49c84eb8ff8313fb8f31194 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jun 2022 14:39:56 +0800 Subject: [PATCH 30/53] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcResiUserDao.java | 17 +++++++++-------- .../impl/IcResiUserImportServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/IcResiUserDao.xml | 3 ++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 9babaf57fc..0a83b820c1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -262,7 +262,7 @@ public interface IcResiUserDao extends BaseDao { Map getCategoryListMap(@Param("columns") List columns, @Param("icUserId") String icUserId); - Map selectResiInfoMap(@Param("idCard") String idCard, @Param("resiId") String resiId); + Map selectResiInfoMap(@Param("customerId") String customerId, @Param("idCard") String idCard, @Param("resiId") String resiId); List> selectResiUsers(@Param("types") List types, @Param("orgId") String orgId); @@ -394,18 +394,19 @@ public interface IcResiUserDao extends BaseDao { @Param("customerId") String customerId); /** - * @describe: 通过身份证号查询实体类 - * @author wangtong - * @date 2022/6/13 17:32 - * @params [idCard, customerId] - * @return com.epmet.entity.IcResiUserEntity - */ - IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + * @return com.epmet.entity.IcResiUserEntity + * @describe: 通过身份证号查询实体类 + * @author wangtong + * @date 2022/6/13 17:32 + * @params [idCard, customerId] + */ + IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); List getListIcResiUserDTO(@Param("icResiUserIdList") List icResiUserIdList); /** * desc:获取客户内 每个房屋内的居民数 + * * @param customerId * @return */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index fc0b35888e..fce74a839e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -462,7 +462,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res //默认新增 columnAndValues.put("SUB_STATUS", IcResiUserSubStatusEnum.IMPORT.getSubStatus()); String idCard = columnAndValues.get("ID_CARD"); - Map existingResiMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map existingResiMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null); if (existingResiMap == null) { // 新导入的居民，因为还没有读取子sheet，所以这些居民类别没有办法获取，先默认设置成0，后面读取子sheet的时候再更新 @@ -705,7 +705,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } // 检查用户是否存在 - Map existResiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map existResiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null); if (existResiInfoMap == null || existResiInfoMap.size() == 0) { throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard)); @@ -790,7 +790,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res "身份证号未填写"); } - Map resiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null); if (resiInfoMap == null || resiInfoMap.size() == 0) { throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard)); @@ -1654,7 +1654,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res Map oldCategories = oldData.getCategories(); Map newCategories = newData.getCategories(); - Map resiInfoMap = icResiUserDao.selectResiInfoMap(null, resiId); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId); fillResiSubCategoryInfo4TransferAndCategoryChange(oldData, newData, resiInfoMap); @@ -1785,7 +1785,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res for (Map.Entry resi : transferedResis.entrySet()) { String resiId = resi.getKey(); - Map resiInfoMap = icResiUserDao.selectResiInfoMap(null, resiId); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId); String resiName = resiInfoMap.get("NAME"); String pids = resiInfoMap.get("PIDS"); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 711505d7ea..b693502628 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -716,7 +716,8 @@ + + From 4515f23465d82c2e78027acd187131748773659d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jun 2022 19:18:16 +0800 Subject: [PATCH 40/53] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 0a176da4c0..0d25761062 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -789,8 +789,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res "身份证号未填写", "身份证号未填写"); } - - Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null); + String loginUserCustomerId = EpmetRequestHolder.getLoginUserCustomerId(); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null); if (resiInfoMap == null || resiInfoMap.size() == 0) { throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard)); @@ -1785,7 +1785,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res for (Map.Entry resi : transferedResis.entrySet()) { String resiId = resi.getKey(); - Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, null, resiId); String resiName = resiInfoMap.get("NAME"); String pids = resiInfoMap.get("PIDS"); From 4fe73d0171d6f6552219a407f6756efeebb36860 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jun 2022 19:25:27 +0800 Subject: [PATCH 41/53] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 88a0f06f01..e854bb493d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -829,10 +829,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res IcResiUserServiceImpl resiService = SpringContextUtils.getBean(IcResiUserServiceImpl.class); PartymemberSyncMQMsg mqMsgBody = new PartymemberSyncMQMsg(); - + String loginUserCustomerId = EpmetRequestHolder.getLoginUserCustomerId(); idCards.stream().forEach(idCard -> { // 检查用户是否存在 - Map existResiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map existResiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null); if (existResiInfoMap == null || existResiInfoMap.size() == 0) { return ; } From 25df6e4518669ec3e1411d02d23e6e60c6a921ed Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 1 Jul 2022 09:19:18 +0800 Subject: [PATCH 42/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=20=E5=AF=BC=E5=87=BA=E4=B8=80=E6=88=B7?= =?UTF-8?q?=E4=B8=80=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java | 3 +++ .../src/main/java/com/epmet/controller/HouseController.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java index bfff2b0709..4c32424b09 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -92,6 +92,9 @@ public class IcHouseListFormDTO extends PageFormDTO { private String customerId; + /** + * 是按照Id还是agencyId查询 + */ private String selectType; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 0e556df1ea..8be7cae188 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -367,8 +367,8 @@ public class HouseController implements ResultDataResolver { if (StringUtils.isBlank(formDTO.getAgencyId())) { LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(tokenDto, "【查询房屋】查询当前staff所在组织信息失败"); formDTO.setAgencyId(loginUserDetail.getAgencyId()); - formDTO.setSelectType("agency"); } + formDTO.setSelectType("agency"); ValidatorUtils.validateEntity(formDTO); ExcelWriter excelWriter = null; From 80af8c8e663fa006d4faecf89d5b1c25c6e95c73 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 1 Jul 2022 09:59:07 +0800 Subject: [PATCH 43/53] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E6=AF=8F=E6=AC=A11w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/HouseController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 8be7cae188..473430f076 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -237,6 +237,7 @@ public class HouseController implements ResultDataResolver { public void exporthouseinfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { ValidatorUtils.validateEntity(formDTO); formDTO.setIsPage(false); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); houseService.exportBuildinginfo(formDTO, response); } From 72433c71b57f261be8f1c8c092c5dc3b97d18f26 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 1 Jul 2022 10:24:54 +0800 Subject: [PATCH 44/53] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0customerId=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcPointNucleicMonitoringController.java | 3 ++- .../IcPointVaccinesInoculationController.java | 9 ++++++--- .../com/epmet/dao/IcPointNucleicMonitoringDao.java | 4 ++-- .../com/epmet/dao/IcPointVaccinesInoculationDao.java | 4 +++- .../impl/IcPointNucleicMonitoringServiceImpl.java | 6 +++--- .../impl/IcPointVaccinesInoculationServiceImpl.java | 10 ++++++++-- .../resources/mapper/IcPointNucleicMonitoringDao.xml | 3 +++ .../mapper/IcPointVaccinesInoculationDao.xml | 11 +++++++++++ 8 files changed, 38 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java index 291479ea96..b3f97f7437 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java @@ -67,8 +67,9 @@ public class IcPointNucleicMonitoringController { private IcPointNucleicMonitoringDao icPointNucleicMonitoringDao; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params, @LoginUser TokenDto tokenDto){ // PageData page = icPointNucleicMonitoringService.page(params); + params.put("customerId",tokenDto.getCustomerId()); PageData page = icPointNucleicMonitoringService.getPhrasePage(params); return new Result>().ok(page); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java index 2891705f97..6bde7117b4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java @@ -60,8 +60,9 @@ public class IcPointVaccinesInoculationController { private IcPointVaccinesInoculationDao icPointVaccinesInoculationDao; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params, @LoginUser TokenDto tokenDto){ // PageData page = icPointVaccinesInoculationService.page(params); + params.put("customerId",tokenDto.getCustomerId()); PageData page = icPointVaccinesInoculationService.getPhrasePage(params); return new Result>().ok(page); } @@ -74,18 +75,20 @@ public class IcPointVaccinesInoculationController { @NoRepeatSubmit @PostMapping() - public Result save(@RequestBody IcPointVaccinesInoculationDTO dto){ + public Result save(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icPointVaccinesInoculationService.save(dto); return new Result(); } @NoRepeatSubmit @PutMapping() - public Result update(@RequestBody IcPointVaccinesInoculationDTO dto){ + public Result update(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icPointVaccinesInoculationService.update(dto); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index 5dcc3fad6f..eae4085362 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -25,8 +25,8 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getAllAddressName(); - List getAllAddressNameNoCurrent(@Param("id") String id); + List getAllAddressName(@Param("customerId") String customerId); + List getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id); /** * 条件查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java index 09e1ece8f7..d495fd6da1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.PointHSYMFormDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointVaccinesInoculationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -24,7 +25,8 @@ public interface IcPointVaccinesInoculationDao extends BaseDao getAllAddressName(); + List getAllAddressName(@Param("customerId") String customerId); + List getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id); /** * 条件查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index 98cc32d68f..cb2b516b13 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -127,7 +127,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + List addressList = baseDao.getAllAddressName(dto.getCustomerId()); // 校验数据库是否存在该地点名称 if (addressList.contains(dto.getName())){ throw new RenException("该监测点名称已存在，请重新输入"); @@ -148,7 +148,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressNameNoCurrent(dto.getId()); + List addressList = baseDao.getAllAddressNameNoCurrent(dto.getCustomerId(),dto.getId()); // 校验数据库是否存在该地点名称 if (addressList.contains(dto.getName())){ throw new RenException("该监测点名称已存在，请重新输入"); @@ -200,7 +200,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + List addressList = baseDao.getAllAddressName(tokenDto.getUserId()); for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1); if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java index 011cc946e7..b1ccaede98 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java @@ -123,7 +123,7 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + List addressList = baseDao.getAllAddressName(dto.getCustomerId()); // 校验数据库是否存在该地点名称 if (addressList.contains(dto.getName())){ throw new RenException("该接种点名称已存在，请重新输入"); @@ -135,6 +135,12 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressNameNoCurrent(dto.getCustomerId(),dto.getId()); + // 校验数据库是否存在该地点名称 + if (addressList.contains(dto.getName())){ + throw new RenException("该接种点名称已存在，请重新输入"); + } IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class); updateById(entity); } @@ -174,7 +180,7 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + List addressList = baseDao.getAllAddressName(tokenDto.getCustomerId()); for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1); // if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index d55f4fddce..859b70029b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -29,6 +29,7 @@ NAME from ic_point_nucleic_monitoring where DEL_FLAG = 0 + and CUSTOMER_ID = #{customerId} + + + SELECT + wgymc, + ssjdbq, + sssqbq, + hcyj, + hcsj, + sjms + FROM + wgh_sjxx + + 1=1 + + AND wgymc like '%${form.wgymc}%' + + + AND ssjdbq like '%${form.ssjdbq}%' + + + AND sssqbq like '%${form.sssqbq}%' + + + AND hcyj like '%${form.hcyj}%' + + + From 1e0fea80c598c5fe3e3dd972f2d88a845b02cd7b Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 5 Jul 2022 16:16:46 +0800 Subject: [PATCH 51/53] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/dto/form/WghSjxxDetailFormDto.java | 13 +++++++++++++ .../opendata/dto/result/NewWghSjxxResultDTO.java | 5 +++++ .../opendata/controller/WghSjxxController.java | 15 +++++++++++++++ .../java/com/epmet/opendata/dao/WghSjxxDao.java | 11 +++++++++++ .../epmet/opendata/service/WghSjxxService.java | 11 +++++++++++ .../opendata/service/impl/WghSjxxServiceImpl.java | 14 ++++++++++++++ .../src/main/resources/mapper/WghSjxxDao.xml | 12 ++++++++++++ 7 files changed, 81 insertions(+) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxDetailFormDto.java diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxDetailFormDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxDetailFormDto.java new file mode 100644 index 0000000000..ad0078058e --- /dev/null +++ b/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; +} 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 f59cf0a603..db3203bb3d 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 @@ -40,4 +40,9 @@ public class NewWghSjxxResultDTO implements Serializable { * 事件描述 */ private String sjms; + + /** + * 唯一标识 + */ + private Integer recid; } 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 2cfeb3ee54..fdeb46888f 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 @@ -14,6 +14,7 @@ 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; @@ -112,4 +113,18 @@ public class WghSjxxController { PageData dto = wghSjxxService.getWghSjxxPage(form); return new Result>().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); + } } 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 b973b33d6b..d7a49811c6 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 @@ -3,6 +3,7 @@ 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; @@ -38,4 +39,14 @@ public interface WghSjxxDao extends BaseDao { * @date 2022/7/5 15:49 */ List 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); } 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 f538877e6f..809b33ea05 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 @@ -4,6 +4,7 @@ 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; @@ -100,4 +101,14 @@ public interface WghSjxxService extends BaseService { * @date 2022/7/5 15:49 */ PageData getWghSjxxPage(NewWghSjxxFormDTO form); + + /** + * 查询事件信息详情 + * + * @param dto + * @return com.epmet.opendata.dto.result.NewWghSjxxResultDTO + * @author LZN + * @date 2022/7/5 16:15 + */ + NewWghSjxxResultDTO 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 07a50b92a2..72c94f7492 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 @@ -15,6 +15,7 @@ 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; @@ -151,6 +152,19 @@ public class WghSjxxServiceImpl extends BaseServiceImpl(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(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml index c4b1dd6fba..efd85b7e97 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml @@ -96,6 +96,18 @@ + From 0a74e2f1a547cc397250c79d61bdd00bfabcb1fb Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 5 Jul 2022 16:26:48 +0800 Subject: [PATCH 52/53] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WghSjxxDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml index efd85b7e97..aaf0872494 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml @@ -77,7 +77,8 @@ sssqbq, hcyj, hcsj, - sjms + sjms, + recid FROM wgh_sjxx From 8b09f28af5b6cc0825a79f7a9fa4afd28bc7e5df Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 5 Jul 2022 16:47:18 +0800 Subject: [PATCH 53/53] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WghSjxxDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml index aaf0872494..3bcd047057 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxDao.xml @@ -96,6 +96,7 @@ AND hcyj like '%${form.hcyj}%' + order by czsj desc