From 90f96d8c0ee2caeb0fc20ae654fc1f0163e6a467 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 16 Aug 2022 14:49:17 +0800 Subject: [PATCH 001/621] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcEnterpriseChangeRecordDTO.java | 134 ++++++++++++++++++ .../IcEnterpriseChangeRecordController.java | 82 +++++++++++ .../dao/IcEnterpriseChangeRecordDao.java | 16 +++ .../IcEnterpriseChangeRecordEntity.java | 104 ++++++++++++++ .../excel/IcEnterpriseChangeRecordExcel.java | 89 ++++++++++++ .../redis/IcEnterpriseChangeRecordRedis.java | 30 ++++ .../IcEnterpriseChangeRecordService.java | 78 ++++++++++ .../IcEnterpriseChangeRecordServiceImpl.java | 87 ++++++++++++ .../mapper/IcEnterpriseChangeRecordDao.xml | 32 +++++ 9 files changed, 652 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java new file mode 100644 index 0000000000..3af710f1d0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.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-08-16 + */ +@Data +public class IcEnterpriseChangeRecordDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 网格Id【场所区域】 + */ + private String gridId; + + /** + * 网格所属的组织Id + */ + private String agencyId; + + /** + * agency_id的所有上级 + */ + private String agencyPids; + + /** + * 场所类型：来源于ic_coverage_category_dict + */ + private String placeType; + + /** + * 场所名称 + */ + private String placeOrgName; + + /** + * 场所地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 字典value,场所规模【 +0:10人以下 +1:10-20人 +2:21-40人 +3:41-100人 +4:100人以上】 + */ + private String scale; + + /** + * 场所负责人 + */ + private String personInCharge; + + /** + * 负责人电话 + */ + private String mobile; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 最新巡查结果【0:合格 1:不合格】 + */ + private String latestResult; + + /** + * 最新检查时间 + */ + private Date latestPatrolTime; + + /** + * 删除标识：0.未删除 1.已删除 + */ + 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-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java new file mode 100644 index 0000000000..426e21cc97 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.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.IcEnterpriseChangeRecordDTO; +import com.epmet.excel.IcEnterpriseChangeRecordExcel; +import com.epmet.service.IcEnterpriseChangeRecordService; +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-08-16 + */ +@RestController +@RequestMapping("icEnterpriseChangeRecord") +public class IcEnterpriseChangeRecordController { + + @Autowired + private IcEnterpriseChangeRecordService icEnterpriseChangeRecordService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEnterpriseChangeRecordService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcEnterpriseChangeRecordDTO data = icEnterpriseChangeRecordService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcEnterpriseChangeRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icEnterpriseChangeRecordService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcEnterpriseChangeRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icEnterpriseChangeRecordService.update(dto); + return new Result(); + } + + @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icEnterpriseChangeRecordService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = icEnterpriseChangeRecordService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcEnterpriseChangeRecordExcel.class); + } + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java new file mode 100644 index 0000000000..31f0611791 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 企事业单位变更记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +@Mapper +public interface IcEnterpriseChangeRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java new file mode 100644 index 0000000000..e544e0ef56 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.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-08-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_enterprise_change_record") +public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 网格Id【场所区域】 + */ + private String gridId; + + /** + * 网格所属的组织Id + */ + private String agencyId; + + /** + * agency_id的所有上级 + */ + private String agencyPids; + + /** + * 场所类型：来源于ic_coverage_category_dict + */ + private String placeType; + + /** + * 场所名称 + */ + private String placeOrgName; + + /** + * 场所地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 字典value,场所规模【 +0:10人以下 +1:10-20人 +2:21-40人 +3:41-100人 +4:100人以上】 + */ + private String scale; + + /** + * 场所负责人 + */ + private String personInCharge; + + /** + * 负责人电话 + */ + private String mobile; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 最新巡查结果【0:合格 1:不合格】 + */ + private String latestResult; + + /** + * 最新检查时间 + */ + private Date latestPatrolTime; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java new file mode 100644 index 0000000000..2149506355 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java @@ -0,0 +1,89 @@ +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-08-16 + */ +@Data +public class IcEnterpriseChangeRecordExcel { + + @Excel(name = "唯一标识") + private String id; + + @Excel(name = "客户Id") + private String customerId; + + @Excel(name = "网格Id【场所区域】") + private String gridId; + + @Excel(name = "网格所属的组织Id") + private String agencyId; + + @Excel(name = "agency_id的所有上级") + private String agencyPids; + + @Excel(name = "场所类型：来源于ic_coverage_category_dict") + private String placeType; + + @Excel(name = "场所名称") + private String placeOrgName; + + @Excel(name = "场所地址") + private String address; + + @Excel(name = "经度") + private String longitude; + + @Excel(name = "纬度") + private String latitude; + + @Excel(name = "字典value,场所规模【 +0:10人以下 +1:10-20人 +2:21-40人 +3:41-100人 +4:100人以上】") + private String scale; + + @Excel(name = "场所负责人") + private String personInCharge; + + @Excel(name = "负责人电话") + private String mobile; + + @Excel(name = "来源【新增:add 导入:import 】") + private String sourceType; + + @Excel(name = "最新巡查结果【0:合格 1:不合格】") + private String latestResult; + + @Excel(name = "最新检查时间") + private Date latestPatrolTime; + + @Excel(name = "删除标识：0.未删除 1.已删除") + 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-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.java new file mode 100644 index 0000000000..4a03f6057c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcEnterpriseChangeRecordRedis.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-08-16 + */ +@Component +public class IcEnterpriseChangeRecordRedis { + @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-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.java new file mode 100644 index 0000000000..de47def1b9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseChangeRecordService.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.IcEnterpriseChangeRecordDTO; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; + +import java.util.List; +import java.util.Map; + +/** + * 企事业单位变更记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-16 + */ +public interface IcEnterpriseChangeRecordService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-16 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-16 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEnterpriseChangeRecordDTO + * @author generator + * @date 2022-08-16 + */ + IcEnterpriseChangeRecordDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-16 + */ + void save(IcEnterpriseChangeRecordDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-16 + */ + void update(IcEnterpriseChangeRecordDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-16 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java new file mode 100644 index 0000000000..dbbc97aa4f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.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.IcEnterpriseChangeRecordDao; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; +import com.epmet.redis.IcEnterpriseChangeRecordRedis; +import com.epmet.service.IcEnterpriseChangeRecordService; +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-08-16 + */ +@Service +public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl implements IcEnterpriseChangeRecordService { + + @Autowired + private IcEnterpriseChangeRecordRedis icEnterpriseChangeRecordRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcEnterpriseChangeRecordDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcEnterpriseChangeRecordDTO.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 IcEnterpriseChangeRecordDTO get(String id) { + IcEnterpriseChangeRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcEnterpriseChangeRecordDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEnterpriseChangeRecordDTO dto) { + IcEnterpriseChangeRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcEnterpriseChangeRecordEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEnterpriseChangeRecordDTO dto) { + IcEnterpriseChangeRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcEnterpriseChangeRecordEntity.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-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml new file mode 100644 index 0000000000..2255ae431f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b70aebc7e64bc33c6b3d37e953fe63302270b05b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 16 Aug 2022 15:39:02 +0800 Subject: [PATCH 002/621] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcEnterpriseChangeRecordDTO.java | 10 +++++ .../IcEnterpriseChangeRecordController.java | 44 ------------------- .../IcEnterpriseChangeRecordEntity.java | 10 +++++ .../service/impl/IcEnterpriseServiceImpl.java | 35 +++++++++++++++ .../mapper/IcEnterpriseChangeRecordDao.xml | 2 + 5 files changed, 57 insertions(+), 44 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java index 3af710f1d0..b965382a6f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java @@ -131,4 +131,14 @@ public class IcEnterpriseChangeRecordDTO implements Serializable { */ private Date updatedTime; + /** + * 原始记录id + */ + private String originId; + + /** + * 操作类型,upd,del + */ + private String type; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java index 426e21cc97..e45d9538eb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java @@ -1,22 +1,12 @@ 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.IcEnterpriseChangeRecordDTO; -import com.epmet.excel.IcEnterpriseChangeRecordExcel; import com.epmet.service.IcEnterpriseChangeRecordService; 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; @@ -45,38 +35,4 @@ public class IcEnterpriseChangeRecordController { return new Result().ok(data); } - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcEnterpriseChangeRecordDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icEnterpriseChangeRecordService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcEnterpriseChangeRecordDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icEnterpriseChangeRecordService.update(dto); - return new Result(); - } - - @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icEnterpriseChangeRecordService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = icEnterpriseChangeRecordService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IcEnterpriseChangeRecordExcel.class); - } - - - } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java index e544e0ef56..119362360c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java @@ -101,4 +101,14 @@ public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity { */ private Date latestPatrolTime; + /** + * 原始记录id + */ + private String originId; + + /** + * 操作类型,upd,del + */ + private String type; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index a0feee5fba..576726412c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.*; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; import com.epmet.entity.IcEnterpriseEntity; import com.epmet.entity.IcEnterprisePatrolAttachmentEntity; import com.epmet.entity.IcEnterprisePatrolRecordEntity; @@ -38,6 +39,7 @@ import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.service.CoverageService; +import com.epmet.service.IcEnterpriseChangeRecordService; import com.epmet.service.IcEnterpriseService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -90,6 +92,8 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper(); @@ -258,12 +266,17 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl selectForUniqueName(String gridId, String placeOrgName, String enterpriseId) { return baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId); } + + /** + * 记录操作日志 + * + * @param origin + * @param type + * @return void + * @author zhy + * @date 2022/8/16 15:36 + */ + private void log(IcEnterpriseEntity origin, String type){ + // 历史记录 + IcEnterpriseChangeRecordEntity record = ConvertUtils.sourceToTarget(origin, IcEnterpriseChangeRecordEntity.class); + record.setId(null); + record.setCreatedBy(null); + record.setCreatedTime(null); + record.setUpdatedBy(null); + record.setUpdatedTime(null); + record.setOriginId(origin.getId()); + record.setType(type); + icEnterpriseChangeRecordService.insert(record); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml index 2255ae431f..eedffe6b44 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml @@ -26,6 +26,8 @@ + + From 72898614f4288a425a49c1eb91612ef8315d240a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 16 Aug 2022 15:48:01 +0800 Subject: [PATCH 003/621] bug --- .../com/epmet/excel/IcEnterpriseChangeRecordExcel.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java index 2149506355..921cb0b549 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcEnterpriseChangeRecordExcel.java @@ -44,12 +44,7 @@ public class IcEnterpriseChangeRecordExcel { @Excel(name = "纬度") private String latitude; - @Excel(name = "字典value,场所规模【 -0:10人以下 -1:10-20人 -2:21-40人 -3:41-100人 -4:100人以上】") + @Excel(name = "字典value,场所规模") private String scale; @Excel(name = "场所负责人") From 9124c19d1894d31408674434955963dbc7a93746 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 16 Aug 2022 17:06:31 +0800 Subject: [PATCH 004/621] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcEnterpriseController.java | 15 ++++++++ .../epmet/service/IcEnterpriseService.java | 12 +++++++ .../IcEnterpriseChangeRecordServiceImpl.java | 2 ++ .../service/impl/IcEnterpriseServiceImpl.java | 34 +++++++++++++++++++ 4 files changed, 63 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index 244711596d..ab2d7cdcb9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; @@ -100,6 +101,20 @@ public class IcEnterpriseController implements ResultDataResolver { return new Result>().ok(icEnterpriseService.list(formDTO)); } + /** + * 操作日志基础表 + * + * @param params + * @return com.epmet.commons.tools.utils.Result> + * @author zhy + * @date 2022/8/16 16:52 + */ + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEnterpriseService.page(params); + return new Result>().ok(page); + } + /** * 企事业单位列表导出 * @param tokenDto diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java index 82057fb0cd..40cb66edfb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; @@ -10,6 +11,7 @@ import com.epmet.dto.result.EnterprisePatrolResultDTO; import com.epmet.entity.IcEnterpriseEntity; import java.nio.file.Path; +import java.util.Map; /** * 企事业单位表 @@ -68,4 +70,14 @@ public interface IcEnterpriseService extends BaseService { PageData list(EnterprisePageFormDTO formDTO); void execAsyncExcelImport(Path fileSavePath, String taskId, String customerId, String userId); + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-16 + */ + PageData page(Map params); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java index dbbc97aa4f..593306e5d9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java @@ -50,9 +50,11 @@ public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String originId = (String)params.get("originId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(originId), "ORIGIN_ID", originId); return wrapper; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 576726412c..cb8774154d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -2,8 +2,11 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -23,6 +26,7 @@ import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; @@ -413,6 +417,36 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, EnterpriseDetailDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + String placeOrgName = (String)params.get("placeOrgName"); + String mobile = (String)params.get("mobile"); + String gridId = (String)params.get("gridId"); + String placeType = (String)params.get("placeType"); + String scale = (String)params.get("scale"); + String result = (String)params.get("result"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(placeOrgName), "PLACE_ORG_NAME", placeOrgName); + wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile); + wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId); + wrapper.eq(StringUtils.isNotBlank(placeType), "PLACE_TYPE", placeType); + wrapper.eq(StringUtils.isNotBlank(scale), "SCALE", scale); + wrapper.eq(StringUtils.isNotBlank(result), "LATEST_RESULT", result); + + return wrapper; + } + private CustomerStaffInfoCacheResult queryCurrentStaff(String customerId, String userId) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); if (null == staffInfo) { From 554024dbaca1252b502cc73de7480a86a47628f2 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 10:07:26 +0800 Subject: [PATCH 005/621] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8E=9F=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcEnterpriseController.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index ab2d7cdcb9..dd72bff61a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -110,8 +110,21 @@ public class IcEnterpriseController implements ResultDataResolver { * @date 2022/8/16 16:52 */ @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icEnterpriseService.page(params); + public Result> page(@LoginUser TokenDto tokenDto, @RequestParam Map params){ + EnterprisePageFormDTO formDTO = new EnterprisePageFormDTO(); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setCurrentStaffId(tokenDto.getUserId()); + formDTO.setPageFlag(true); + formDTO.setPageNo(Integer.parseInt(params.get("page"))); + formDTO.setPageSize(Integer.parseInt(params.get("limit"))); + formDTO.setPlaceOrgName(params.get("placeOrgName")); + formDTO.setMobile(params.get("mobile")); + formDTO.setGridId(params.get("gridId")); + formDTO.setPlaceType(params.get("placeType")); + formDTO.setScale(params.get("scale")); + formDTO.setResult(params.get("result")); + + PageData page = icEnterpriseService.list(formDTO); return new Result>().ok(page); } From 98e50701deb8459d1eded9e0a146e77c6f7fb4c9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 13:31:12 +0800 Subject: [PATCH 006/621] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/IcEnterpriseChangeRecordDao.java | 15 +- .../IcEnterpriseChangeRecordServiceImpl.java | 27 ++-- .../service/impl/IcEnterpriseServiceImpl.java | 130 ++++++++++++------ .../mapper/IcEnterpriseChangeRecordDao.xml | 11 ++ 4 files changed, 130 insertions(+), 53 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java index 31f0611791..548d9ccb40 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseChangeRecordDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.entity.IcEnterpriseChangeRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 企事业单位变更记录表 * @@ -12,5 +16,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcEnterpriseChangeRecordDao extends BaseDao { - + + /** + * 分页列表 + * + * @param params + * @return java.util.List + * @author zhy + * @date 2022/8/9 17:23 + */ + List listPage(Map params); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java index 593306e5d9..7b0f3882ef 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseChangeRecordServiceImpl.java @@ -1,14 +1,21 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcEnterpriseChangeRecordDao; import com.epmet.dto.IcEnterpriseChangeRecordDTO; +import com.epmet.dto.IcWorkLogDTO; import com.epmet.entity.IcEnterpriseChangeRecordEntity; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.redis.IcEnterpriseChangeRecordRedis; import com.epmet.service.IcEnterpriseChangeRecordService; import org.apache.commons.lang3.StringUtils; @@ -31,14 +38,16 @@ public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcEnterpriseChangeRecordDTO.class); + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); + IPage page = getPage(params); + List list = baseDao.listPage(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -48,9 +57,9 @@ public class IcEnterpriseChangeRecordServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String originId = (String)params.get("originId"); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String originId = (String) params.get("originId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index cb8774154d..59ec2d331b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -21,22 +22,19 @@ 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.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; -import com.epmet.dto.IcEnterpriseChangeRecordDTO; import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.EnterpriseFormDTO; import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.*; -import com.epmet.entity.IcEnterpriseChangeRecordEntity; -import com.epmet.entity.IcEnterpriseEntity; -import com.epmet.entity.IcEnterprisePatrolAttachmentEntity; -import com.epmet.entity.IcEnterprisePatrolRecordEntity; +import com.epmet.entity.*; import com.epmet.excel.EnterpriseImportExcelDTO; import com.epmet.excel.handler.IcEnterpriseExcelImportListener; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -98,6 +96,10 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId,origin.getEnterpriseId()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, origin.getEnterpriseId()); if (NumConstant.ZERO == enterprisePatrolRecordDao.selectCount(queryWrapper)) { - baseDao.updateLatestPatrol(origin.getEnterpriseId(),null,StrConstant.EPMETY_STR,currentUserId); + baseDao.updateLatestPatrol(origin.getEnterpriseId(), null, StrConstant.EPMETY_STR, currentUserId); } } /** * 巡查记录列表 * 暂时不分页 + * * @param enterpriseId * @return */ @@ -242,9 +245,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode()); Map placeTypeMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); //2、规模名称 Result> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode()); - Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel,SysDictDataDTO::getDictValue)) : new HashMap<>(); + Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); //3、当前工作人员所属组织下的网格列表 List gridList = customerGridDao.selectGridList(staffInfo.getAgencyId()); if (CollectionUtils.isEmpty(gridList)) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下没有网格", "当前组织下没有直属网格"); } - Map gridMap=gridList.stream().collect(Collectors.toMap(GridListResultDTO::getGridName,GridListResultDTO::getGridId)); + Map gridMap = gridList.stream().collect(Collectors.toMap(GridListResultDTO::getGridName, GridListResultDTO::getGridId)); - IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this,placeTypeMap,scaleMap,gridMap); + IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId, staffInfo, this, placeTypeMap, scaleMap, gridMap); EasyExcel.read(filePath.toFile(), EnterpriseImportExcelDTO.class, listener).headRowNumber(1).sheet(0).doRead(); Path errorDescFile = null; @@ -426,14 +429,14 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String placeOrgName = (String)params.get("placeOrgName"); - String mobile = (String)params.get("mobile"); - String gridId = (String)params.get("gridId"); - String placeType = (String)params.get("placeType"); - String scale = (String)params.get("scale"); - String result = (String)params.get("result"); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String placeOrgName = (String) params.get("placeOrgName"); + String mobile = (String) params.get("mobile"); + String gridId = (String) params.get("gridId"); + String placeType = (String) params.get("placeType"); + String scale = (String) params.get("scale"); + String result = (String) params.get("result"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -456,7 +459,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl selectForUniqueName(String gridId, String placeOrgName, String enterpriseId) { - return baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId); + return baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId); } /** @@ -468,9 +471,50 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl").concat(formDTO.getPlaceType())); + List categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); + Map categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); + record.setPlaceType(categoryMap.get(record.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); + } + + if (!origin.getGridId().equals(formDTO.getGridId())) { + CustomerGridEntity originGrid = customerGridDao.selectById(record.getGridId()); + CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId()); + record.setGridId(record.getGridId().concat("->").concat(thisGrid.getGridName())); + if (originGrid != null && thisGrid != null) { + record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId())); + } + } + if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) { + record.setPlaceOrgName(record.getPlaceOrgName().concat("->").concat(record.getPlaceOrgName())); + } + if (!origin.getScale().equals(formDTO.getScale())) { + record.setScale(record.getScale().concat("->").concat(formDTO.getScale())); + Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + if (!result.success() || null == result.getData()) { + throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); + } else { + Map scaleMap = result.getData(); + record.setScale(scaleMap.get(record.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); + } + } + if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { + record.setPersonInCharge(record.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); + } + if (!origin.getMobile().equals(formDTO.getMobile())) { + record.setMobile(record.getMobile().concat("->").concat(formDTO.getMobile())); + } + if (!origin.getAddress().equals(formDTO.getAddress())) { + record.setAddress(record.getAddress().concat("->").concat(formDTO.getAddress())); + } + } + record.setId(null); record.setCreatedBy(null); record.setCreatedTime(null); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml index eedffe6b44..f69c54e9bd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml @@ -30,5 +30,16 @@ + \ No newline at end of file From 0ecd1ea8d27acbb63baa140dacac0453f0cea8e4 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 14:22:51 +0800 Subject: [PATCH 007/621] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.44__add_enterprise_change_record.sql | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__add_enterprise_change_record.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__add_enterprise_change_record.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__add_enterprise_change_record.sql new file mode 100644 index 0000000000..be6f30d58e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__add_enterprise_change_record.sql @@ -0,0 +1,52 @@ +/* + Navicat Premium Data Transfer + + Source Server : epmet_cloud_dev_org + Source Server Type : MySQL + Source Server Version : 50726 + Source Host : 192.168.1.140:3306 + Source Schema : epmet_gov_org + + Target Server Type : MySQL + Target Server Version : 50726 + File Encoding : 65001 + + Date: 17/08/2022 14:20:39 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for ic_enterprise_change_record +-- ---------------------------- +DROP TABLE IF EXISTS `ic_enterprise_change_record`; +CREATE TABLE `ic_enterprise_change_record` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户Id', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格Id【场所区域】', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格所属的组织Id', + `AGENCY_PIDS` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'agency_id的所有上级', + `PLACE_TYPE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场所类型：来源于ic_coverage_category_dict', + `PLACE_ORG_NAME` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场所名称', + `ADDRESS` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场所地址', + `LONGITUDE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经度', + `LATITUDE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '纬度', + `SCALE` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字典value,场所规模【\r\n0:10人以下\r\n1:10-20人\r\n2:21-40人\r\n3:41-100人\r\n4:100人以上】', + `PERSON_IN_CHARGE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场所负责人', + `MOBILE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '负责人电话', + `SOURCE_TYPE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '来源【新增:add 导入:import 】', + `LATEST_RESULT` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最新巡查结果【0:合格 1:不合格】', + `LATEST_PATROL_TIME` datetime NULL DEFAULT NULL COMMENT '最新检查时间', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '原始记录ID', + `TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作类型,upd,del', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企事业单位变更记录表' ROW_FORMAT = COMPACT; + +SET FOREIGN_KEY_CHECKS = 1; From 1d80a52a2d5e8e5325d0898ee43027ee761af9f5 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 16:43:03 +0800 Subject: [PATCH 008/621] bug --- .../service/impl/IcEnterpriseServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 59ec2d331b..265a2018d5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -477,41 +477,41 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl").concat(formDTO.getPlaceType())); + record.setPlaceType(origin.getPlaceType().concat("->").concat(formDTO.getPlaceType())); List categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); Map categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); - record.setPlaceType(categoryMap.get(record.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); + record.setPlaceType(categoryMap.get(origin.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); } if (!origin.getGridId().equals(formDTO.getGridId())) { - CustomerGridEntity originGrid = customerGridDao.selectById(record.getGridId()); + CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId()); CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId()); - record.setGridId(record.getGridId().concat("->").concat(thisGrid.getGridName())); + record.setGridId(origin.getGridId().concat("->").concat(thisGrid.getGridName())); if (originGrid != null && thisGrid != null) { record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId())); } } if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) { - record.setPlaceOrgName(record.getPlaceOrgName().concat("->").concat(record.getPlaceOrgName())); + record.setPlaceOrgName(origin.getPlaceOrgName().concat("->").concat(formDTO.getPlaceOrgName())); } if (!origin.getScale().equals(formDTO.getScale())) { - record.setScale(record.getScale().concat("->").concat(formDTO.getScale())); + record.setScale(origin.getScale().concat("->").concat(formDTO.getScale())); Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); if (!result.success() || null == result.getData()) { throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); } else { Map scaleMap = result.getData(); - record.setScale(scaleMap.get(record.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); + record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); } } if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { - record.setPersonInCharge(record.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); + record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); } if (!origin.getMobile().equals(formDTO.getMobile())) { - record.setMobile(record.getMobile().concat("->").concat(formDTO.getMobile())); + record.setMobile(origin.getMobile().concat("->").concat(formDTO.getMobile())); } if (!origin.getAddress().equals(formDTO.getAddress())) { - record.setAddress(record.getAddress().concat("->").concat(formDTO.getAddress())); + record.setAddress(origin.getAddress().concat("->").concat(formDTO.getAddress())); } } From 7fdb445cc211f1254c7ad205cbd91cf0b31554ac Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 17:13:14 +0800 Subject: [PATCH 009/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcEnterpriseChangeRecordController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java index e45d9538eb..a3a3be78a1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java @@ -7,6 +7,7 @@ import com.epmet.service.IcEnterpriseChangeRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.Map; @@ -24,15 +25,23 @@ public class IcEnterpriseChangeRecordController { private IcEnterpriseChangeRecordService icEnterpriseChangeRecordService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = icEnterpriseChangeRecordService.page(params); return new Result>().ok(page); } @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { IcEnterpriseChangeRecordDTO data = icEnterpriseChangeRecordService.get(id); return new Result().ok(data); } + @RequestMapping("history/{originId}") + public Result> page(@PathVariable("originId") String originId) { + Map params = new HashMap<>(); + params.put("originId", originId); + PageData page = icEnterpriseChangeRecordService.page(params); + return new Result>().ok(page); + } + } From 5ffc92eecc80b361840bcacb9b1d46242f907b1a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 17 Aug 2022 17:37:12 +0800 Subject: [PATCH 010/621] bug --- .../epmet/controller/IcEnterpriseChangeRecordController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java index a3a3be78a1..6865c9dbe3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java @@ -37,8 +37,7 @@ public class IcEnterpriseChangeRecordController { } @RequestMapping("history/{originId}") - public Result> page(@PathVariable("originId") String originId) { - Map params = new HashMap<>(); + public Result> page(@PathVariable("originId") String originId, @RequestParam Map params) { params.put("originId", originId); PageData page = icEnterpriseChangeRecordService.page(params); return new Result>().ok(page); From 36b0a7b59f78f73d9eed8b4b6406ddeba0126d75 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 18 Aug 2022 09:56:53 +0800 Subject: [PATCH 011/621] bug --- .../service/impl/IcEnterpriseServiceImpl.java | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 265a2018d5..56f2ceda49 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -475,35 +475,45 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); + Map categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); + + CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId()); + + Map scaleMap; + Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + if (!result.success() || null == result.getData()) { + throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); + } else { + scaleMap = result.getData(); + } + if (formDTO != null) { if (!origin.getPlaceType().equals(formDTO.getPlaceType())) { - record.setPlaceType(origin.getPlaceType().concat("->").concat(formDTO.getPlaceType())); - List categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); - Map categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); record.setPlaceType(categoryMap.get(origin.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); + } else { + record.setPlaceType(categoryMap.get(origin.getPlaceType())); } if (!origin.getGridId().equals(formDTO.getGridId())) { - CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId()); CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId()); record.setGridId(origin.getGridId().concat("->").concat(thisGrid.getGridName())); if (originGrid != null && thisGrid != null) { record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId())); } + } else { + record.setGridId(originGrid.getGridName()); } + if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) { record.setPlaceOrgName(origin.getPlaceOrgName().concat("->").concat(formDTO.getPlaceOrgName())); } if (!origin.getScale().equals(formDTO.getScale())) { - record.setScale(origin.getScale().concat("->").concat(formDTO.getScale())); - Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); - if (!result.success() || null == result.getData()) { - throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); - } else { - Map scaleMap = result.getData(); - record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); - } + record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); + } else { + record.setScale(scaleMap.get(origin.getScale())); } + if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); } From 313f8e3e047634522c5b09127d553a99e437399f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 30 Sep 2022 08:21:20 +0800 Subject: [PATCH 012/621] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.18__alter_issue_type.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql new file mode 100644 index 0000000000..ea9a1f3eb1 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql @@ -0,0 +1,2 @@ +ALTER TABLE issue MODIFY COLUMN SOURCE_ID varchar(32) NULL COMMENT '来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)，issue时为空' AFTER SOURCE_TYPE; +ALTER TABLE issue MODIFY COLUMN SOURCE_TYPE varchar(32) NULL COMMENT '来源类型 话题：resi_topic；直接立议题：issue；' AFTER ISSUE_STATUS; From 96065a076081af65d73e96e1f75249714e4f2f2d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 30 Sep 2022 14:03:52 +0800 Subject: [PATCH 013/621] =?UTF-8?q?/resi/hall/issue/votinglist=E8=BF=94?= =?UTF-8?q?=E5=9B=9EissueImgs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/VotingIssueListResultDTO.java | 11 ++++++ .../epmet/service/impl/IssueServiceImpl.java | 3 +- .../src/main/resources/mapper/IssueDao.xml | 37 +++++++++++++------ .../dto/result/VotingIssueListResultDTO.java | 10 +++++ 4 files changed, 49 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java index 2ac18595ea..6725684610 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description 政府端/居民段查看表决中议题列表返参 @@ -38,4 +39,14 @@ public class VotingIssueListResultDTO implements Serializable { * 来源话题的id */ private String sourceId; + + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String sourceType; + + /** + * 发布议题的图片 + */ + private List issueImgs; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 8722a0c027..30054255d2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -606,7 +606,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public List votingList(CommonIssueListFormDTO issueListForm) { PageHelper.startPage(issueListForm.getPageNo(), issueListForm.getPageSize(), issueListForm.getIsPage()); - return baseDao.selectVotingList(issueListForm); + List resultList=baseDao.selectVotingList(issueListForm); + return resultList; } /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 4dbcbb2e9a..acd64f9758 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -202,22 +202,37 @@ + + + + + + + + + + + - SELECT - ID AS issueId, - IFNULL(ISSUE_TITLE,'') AS issueTitle, - IFNULL(SUGGESTION,'')AS suggestion, - UNIX_TIMESTAMP( created_time ) AS issuePublishTime, - SOURCE_ID AS sourceId + i.ID AS issueId, + IFNULL(i.ISSUE_TITLE,'') AS issueTitle, + IFNULL(i.SUGGESTION,'')AS suggestion, + UNIX_TIMESTAMP( i.created_time ) AS issuePublishTime, + i.SOURCE_ID AS sourceId, + i.SOURCE_TYPE as sourceType, + ia.url FROM - issue + issue i + left join issue_attachment ia + on(i.id=ia.BUSINESS_ID) WHERE - DEL_FLAG = '0' - AND GRID_ID = #{gridId} - AND ISSUE_STATUS = 'voting' + i.DEL_FLAG = '0' + AND i.GRID_ID = #{gridId} + AND i.ISSUE_STATUS = 'voting' ORDER BY - created_time DESC + i.created_time DESC,ia.SORT asc diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java index 3b9bee2505..4209446f79 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java @@ -40,11 +40,21 @@ public class VotingIssueListResultDTO implements Serializable { */ private String sourceId; + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String sourceType; + /** * 话题图片列表 */ private List topicImgs; + /** + * 发布议题的图片 + */ + private List issueImgs; + /** * 话题语音 */ From 0ae7ee65678ea53e94f97e96d0b38d4129e1fbd0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 30 Sep 2022 14:21:25 +0800 Subject: [PATCH 014/621] =?UTF-8?q?=E6=9A=82=E6=8F=90=E4=B8=80=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IssueAttachmentDTO.java | 116 ++++++++++++++++++ .../src/main/java/com/epmet/dto/IssueDTO.java | 32 ++++- .../com/epmet/controller/IssueController.java | 8 ++ .../com/epmet/dao/IssueAttachmentDao.java | 16 +++ .../epmet/entity/IssueAttachmentEntity.java | 82 +++++++++++++ .../java/com/epmet/entity/IssueEntity.java | 15 +++ .../epmet/service/IssueAttachmentService.java | 78 ++++++++++++ .../java/com/epmet/service/IssueService.java | 2 + .../impl/IssueAttachmentServiceImpl.java | 82 +++++++++++++ .../epmet/service/impl/IssueServiceImpl.java | 91 +++++++++++++- .../java/com/epmet/utils/ModuleConstants.java | 4 + .../migration/V0.0.18__alter_issue_type.sql | 30 +++++ .../resources/mapper/IssueAttachmentDao.xml | 6 + 13 files changed, 556 insertions(+), 6 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueAttachmentDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueAttachmentDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueAttachmentEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueAttachmentService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueAttachmentServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueAttachmentDao.xml diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueAttachmentDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueAttachmentDTO.java new file mode 100644 index 0000000000..d9d7f2b723 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueAttachmentDTO.java @@ -0,0 +1,116 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * issue库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-09-30 + */ +@Data +public class IssueAttachmentDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 业务id + */ + private String businessId; + + /** + * 议题：issue + */ + private String attachTo; + + /** + * 附件名 + */ + private String name; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String format; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String type; + + /** + * 附件地址 + */ + private String url; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 附件状态（审核中：auditing； +auto_passed: 自动通过； +review：结果不确定，需要人工审核； +block: 结果违规； +rejected：人工审核驳回; +approved：人工审核通过） +现在图片是同步审核的，所以图片只有auto_passed一种状态 + */ + private String status; + + /** + * 失败原因 + */ + private String reason; + + /** + * 语音或视频时长,秒 + */ + private Integer duration; + + /** + * 删除标记 0：未删除，1：已删除 + */ + private String 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-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java index 5e7a6c8fdb..fd86c07eb7 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java @@ -19,8 +19,10 @@ package com.epmet.dto; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -34,6 +36,8 @@ public class IssueDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface IssueForm{} + /** * 议题ID */ @@ -67,12 +71,14 @@ public class IssueDTO implements Serializable { /** * 议题名称 最多20字 */ - private String issueTitle; + @NotBlank(message = "issueTitle不能为空",groups = IssueForm.class) + private String issueTitle; /** * 建议 最多1000字 */ - private String suggestion; + @NotBlank(message = "suggestion不能为空",groups = IssueForm.class) + private String suggestion; /** * 客户ID @@ -82,7 +88,8 @@ public class IssueDTO implements Serializable { /** * 网格ID 居民端议题对应一个网格Id */ - private String gridId; + @NotBlank(message = "gridId不能为空",groups = IssueForm.class) + private String gridId; /** * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制 @@ -160,4 +167,23 @@ public class IssueDTO implements Serializable { private String projectId; private String issueId; + + /** + * 地址 + */ + @NotBlank(message = "address不能为空",groups = IssueForm.class) + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + private String userId; + + private List attachmentList; } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index ec49c3bb81..aebbd3789e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -333,5 +333,13 @@ public class IssueController { return new Result().ok(issueService.issueAuditReset(gridId)); } + @PostMapping("createIssue") + public Result createIssue(@LoginUser TokenDto tokenDto,@RequestBody IssueDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + issueService.createIssue(formDTO); + return new Result(); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueAttachmentDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueAttachmentDao.java new file mode 100644 index 0000000000..828bea698e --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueAttachmentDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueAttachmentEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * issue库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-09-30 + */ +@Mapper +public interface IssueAttachmentDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueAttachmentEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueAttachmentEntity.java new file mode 100644 index 0000000000..b7016bd587 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueAttachmentEntity.java @@ -0,0 +1,82 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * issue库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-09-30 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_attachment") +public class IssueAttachmentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 业务id + */ + private String businessId; + + /** + * 议题：issue + */ + private String attachTo; + + /** + * 附件名 + */ + private String name; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String format; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String type; + + /** + * 附件地址 + */ + private String url; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 附件状态（审核中：auditing； +auto_passed: 自动通过； +review：结果不确定，需要人工审核； +block: 结果违规； +rejected：人工审核驳回; +approved：人工审核通过） +现在图片是同步审核的，所以图片只有auto_passed一种状态 + */ + private String status; + + /** + * 失败原因 + */ + private String reason; + + /** + * 语音或视频时长,秒 + */ + private Integer duration; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java index fa33418bc6..825e16cbbc 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java @@ -112,4 +112,19 @@ public class IssueEntity extends BaseEpmetEntity { */ private Date closedTime; + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueAttachmentService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueAttachmentService.java new file mode 100644 index 0000000000..1ca53e2103 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueAttachmentService.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.IssueAttachmentDTO; +import com.epmet.entity.IssueAttachmentEntity; + +import java.util.List; +import java.util.Map; + +/** + * issue库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-09-30 + */ +public interface IssueAttachmentService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-09-30 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-09-30 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueAttachmentDTO + * @author generator + * @date 2022-09-30 + */ + IssueAttachmentDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-09-30 + */ + void save(IssueAttachmentDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-09-30 + */ + void update(IssueAttachmentDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-09-30 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 1296374261..8ac38fb970 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -384,4 +384,6 @@ public interface IssueService extends BaseService { */ Boolean issueAuditReset(String gridId); + void createIssue(IssueDTO issueDTO); + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueAttachmentServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueAttachmentServiceImpl.java new file mode 100644 index 0000000000..e9d0c69b54 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueAttachmentServiceImpl.java @@ -0,0 +1,82 @@ +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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.IssueAttachmentDao; +import com.epmet.dto.IssueAttachmentDTO; +import com.epmet.entity.IssueAttachmentEntity; +import com.epmet.service.IssueAttachmentService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * issue库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-09-30 + */ +@Service +public class IssueAttachmentServiceImpl extends BaseServiceImpl implements IssueAttachmentService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueAttachmentDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueAttachmentDTO.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 IssueAttachmentDTO get(String id) { + IssueAttachmentEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueAttachmentDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueAttachmentDTO dto) { + IssueAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, IssueAttachmentEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueAttachmentDTO dto) { + IssueAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, IssueAttachmentEntity.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-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 30054255d2..a4ca334de5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -17,7 +17,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; 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; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; @@ -39,9 +41,7 @@ import com.epmet.dto.form.IssueAuditionFormDTO; import com.epmet.dto.form.IssueShiftedFromTopicFormDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.entity.IssueEntity; -import com.epmet.entity.IssueProcessEntity; -import com.epmet.entity.IssueProjectRelationEntity; +import com.epmet.entity.*; import com.epmet.feign.*; import com.epmet.redis.GovIssueRedis; import com.epmet.redis.IssueVoteDetailRedis; @@ -140,12 +140,16 @@ public class IssueServiceImpl extends BaseServiceImpl imp private IssueVoteDetailService issueVoteDetailService; @Autowired private DistributedLock distributedLock; + @Autowired + private IssueAttachmentService issueAttachmentService; @Value("${openapi.scan.server.url}") private String scanApiUrl; @Value("${openapi.scan.method.textSyncScan}") private String textSyncScanMethod; + @Value("${openapi.scan.method.imgSyncScan}") + private String imgSyncScanMethod; @Override public PageData page(Map params) { @@ -1767,5 +1771,86 @@ public class IssueServiceImpl extends BaseServiceImpl imp return false; } + @Override + public void createIssue(IssueDTO issueDTO) { + // 先审核 + /*if (org.apache.commons.lang3.StringUtils.isNotBlank(issueDTO.getIssueTitle()) || org.apache.commons.lang3.StringUtils.isNotBlank(issueDTO.getSuggestion())) { + TextScanParamDTO textScan = new TextScanParamDTO(); + //标题 + TextTaskDTO taskTitle = new TextTaskDTO(); + taskTitle.setContent(issueDTO.getIssueTitle()); + taskTitle.setDataId(IdWorker.getIdStr()); + textScan.getTasks().add(taskTitle); + //建议 + TextTaskDTO taskSuggestion = new TextTaskDTO(); + taskSuggestion.setDataId(IdWorker.getIdStr()); + taskSuggestion.setContent(issueDTO.getSuggestion()); + textScan.getTasks().add(taskSuggestion); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScan); + if (!textSyncScanResult.success()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + logger.error(String.format(TopicConstant.SHIFT_ISSUE, issueDTO.getIssueTitle(), issueDTO.getSuggestion())); + throw new EpmetException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + } + } + } + if (CollectionUtils.isNotEmpty(issueDTO.getAttachmentList())){ + ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO(); + issueDTO.getAttachmentList().forEach(url -> { + ImgTaskDTO task = new ImgTaskDTO(); + task.setDataId(IdWorker.getIdStr()); + task.setUrl(url.getUrl()); + imgScanParamDTO.getTasks().add(task); + }); + Result imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO); + if (!imgScanResult.success()){ + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!imgScanResult.getData().isAllPass()) { + throw new EpmetException(EpmetErrorCode.IMG_SCAN_FAILED.getCode()); + } + } + }*/ + + // 是否开启 + String openStatus = configurationParameterService.checkIssueAuditSwitchIfOpen(issueDTO.getCustomerId()); + if (ModuleConstants.AUDIT_SWITCH_OPEN.equals(openStatus)){ + // 审核表 历史表 + IssueApplicationEntity iae = ConvertUtils.sourceToTarget(issueDTO, IssueApplicationEntity.class); + iae.setApplyStatus(ModuleConstants.UNDER_AUDITING); + applicationService.insert(iae); + IssueApplicationHistoryEntity iahe = new IssueApplicationHistoryEntity(); + iahe.setCustomerId(issueDTO.getCustomerId()); + iahe.setIssueApplicationId(iae.getId()); + iahe.setActionType(ModuleConstants.UNDER_AUDITING); + historyService.insert(iahe); + insertAtt(issueDTO.getAttachmentList(),iae.getId(),ModuleConstants.ISSUE_APPLICATION,issueDTO.getCustomerId()); + }else { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(issueDTO.getGridId()); + if(null == gridInfo){ + throw new EpmetException("查询网格信息失败"+issueDTO.getGridId()); + } + issueDTO.setOrgId(gridInfo.getPid()); + issueDTO.setOrgIdPath(gridInfo.getPids()); + } + + } + private void insertAtt(Collection sourceList,String businessId,String attachTo,String customerId){ + if (CollectionUtils.isNotEmpty(sourceList)){ + List list = ConvertUtils.sourceToTarget(sourceList, IssueAttachmentEntity.class); + Integer sort = NumConstant.ZERO; + for (IssueAttachmentEntity e : list) { + e.setCustomerId(customerId); + e.setBusinessId(businessId); + e.setAttachTo(attachTo); + e.setStatus(ModuleConstants.AUDITION_TYPE_AUTO_PASSED); + e.setSort(sort); + sort++; + } + issueAttachmentService.insertBatch(list); + } + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java index b6a7f4cd49..1a7f4dbffd 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java @@ -178,4 +178,8 @@ public interface ModuleConstants { * 是否禁用 disable:禁用 */ String IS_DISABLE = "disable"; + + String UNDER_AUDITING = "under_auditing"; + + String ISSUE_APPLICATION = "issue_application"; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql index ea9a1f3eb1..446d74a28f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql @@ -1,2 +1,32 @@ ALTER TABLE issue MODIFY COLUMN SOURCE_ID varchar(32) NULL COMMENT '来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)，issue时为空' AFTER SOURCE_TYPE; ALTER TABLE issue MODIFY COLUMN SOURCE_TYPE varchar(32) NULL COMMENT '来源类型 话题：resi_topic；直接立议题：issue；' AFTER ISSUE_STATUS; + +ALTER TABLE issue_application MODIFY COLUMN GROUP_ID varchar(64) NULL COMMENT '小组id' AFTER TOPIC_ID; +ALTER TABLE issue_application MODIFY COLUMN TOPIC_ID varchar(32) NULL COMMENT '话题id' AFTER APPLY_STATUS; + + +alter table issue add column ADDRESS VARCHAR(255) DEFAULT '' COMMENT '地址' AFTER `SUGGESTION`; +alter table issue add COLUMN LONGITUDE VARCHAR(64) DEFAULT'' COMMENT '经度' AFTER ADDRESS; +alter table issue add COLUMN LATITUDE VARCHAR(64) DEFAULT'' COMMENT '纬度' AFTER LONGITUDE; + +CREATE TABLE `issue_attachment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `BUSINESS_ID` varchar(64) NOT NULL COMMENT '业务id', + `ATTACH_TO` varchar(32) DEFAULT NULL COMMENT '议题：issue', + `NAME` varchar(64) DEFAULT NULL COMMENT '附件名', + `FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', + `TYPE` varchar(64) NOT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', + `URL` varchar(255) NOT NULL COMMENT '附件地址', + `SORT` int(1) NOT NULL COMMENT '排序字段', + `STATUS` varchar(32) NOT NULL DEFAULT 'auto_passed' COMMENT '附件状态（审核中：auditing； \r\nauto_passed: 自动通过；\r\nreview：结果不确定，需要人工审核；\r\nblock: 结果违规；\r\nrejected：人工审核驳回;\r\napproved：人工审核通过）\r\n现在图片是同步审核的，所以图片只有auto_passed一种状态', + `REASON` varchar(255) DEFAULT NULL COMMENT '失败原因', + `DURATION` int(11) DEFAULT NULL COMMENT '语音或视频时长,秒', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='issue库附件表'; \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueAttachmentDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueAttachmentDao.xml new file mode 100644 index 0000000000..02e8513b09 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueAttachmentDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 7d9b15185b5675c0dc4e4464f8048a319b3f8458 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 30 Sep 2022 14:31:44 +0800 Subject: [PATCH 015/621] =?UTF-8?q?/resi/hall/issue/closedlist=E8=BF=94?= =?UTF-8?q?=E5=9B=9EissueImgs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ClosedIssueListResultDTO.java | 12 ++++++ .../epmet/service/impl/IssueServiceImpl.java | 3 +- .../src/main/resources/mapper/IssueDao.xml | 41 +++++++++++++------ .../com/epmet/controller/IssueController.java | 5 +-- .../epmet/service/impl/IssueServiceImpl.java | 2 +- 5 files changed, 44 insertions(+), 19 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java index 08bfdca9e6..68b2b4367e 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description @@ -38,4 +39,15 @@ public class ClosedIssueListResultDTO implements Serializable { * 话题id */ private String sourceId; + + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String sourceType; + + /** + * 发布议题的图片 + */ + private List issueImgs; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 30054255d2..4761577b1c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -620,7 +620,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public List closedList(CommonIssueListFormDTO issueListForm) { PageHelper.startPage(issueListForm.getPageNo(), issueListForm.getPageSize(), issueListForm.getIsPage()); - return baseDao.selectClosedList(issueListForm); + List resultDTOList=baseDao.selectClosedList(issueListForm); + return resultDTOList; } /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index acd64f9758..a1e3a4acd1 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -226,7 +226,7 @@ FROM issue i left join issue_attachment ia - on(i.id=ia.BUSINESS_ID) + on(i.id=ia.BUSINESS_ID and ia.del_flag='0') WHERE i.DEL_FLAG = '0' AND i.GRID_ID = #{gridId} @@ -235,23 +235,38 @@ i.created_time DESC,ia.SORT asc + + + + + + + + + + + - SELECT - ID AS issueId, - IFNULL(ISSUE_TITLE,'') AS issueTitle, - IFNULL(CLOSE_REASON,'') AS solution, - UNIX_TIMESTAMP( created_time ) AS issueClosedTime, - SOURCE_ID AS sourceId + i.ID AS issueId, + IFNULL(i.ISSUE_TITLE,'') AS issueTitle, + IFNULL(i.CLOSE_REASON,'') AS solution, + UNIX_TIMESTAMP( i.created_time ) AS issueClosedTime, + i.SOURCE_ID AS sourceId, + i.SOURCE_TYPE, + ia.URL FROM - issue + issue i + left join issue_attachment ia + on(i.id=ia.BUSINESS_ID and ia.del_flag='0') WHERE - DEL_FLAG = '0' - AND GRID_ID = #{gridId} - AND ISSUE_STATUS = 'closed' - AND RESOLVE_TYPE = 'resolved' + i.DEL_FLAG = '0' + AND i.GRID_ID = #{gridId} + AND i.ISSUE_STATUS = 'closed' + AND i.RESOLVE_TYPE = 'resolved' ORDER BY - created_time DESC + i.created_time DESC,ia.sort asc + + SELECT + COUNT(DISTINCT USER_ID) + FROM register_relation + WHERE DEL_FLAG = 0 + AND FIRST_REGISTER = '1' + AND CUSTOMER_ID = #{gridId} + + From b9fab93c9d59b99a8f2d10127e501b88fb82bfc8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 8 Oct 2022 13:32:10 +0800 Subject: [PATCH 024/621] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/IssueProfileDTO.java | 19 +++++ .../epmet/feign/GovIssueOpenFeignClient.java | 8 +++ .../GovIssueOpenFeignClientFallBack.java | 11 +++ .../com/epmet/controller/IssueController.java | 13 ++++ .../src/main/java/com/epmet/dao/IssueDao.java | 6 ++ .../java/com/epmet/service/IssueService.java | 6 ++ .../epmet/service/impl/IssueServiceImpl.java | 21 ++++-- .../src/main/resources/mapper/IssueDao.xml | 14 ++++ .../epmet/dto/result/PendingResultDTO.java | 35 +++++++++- .../main/java/com/epmet/dao/ProjectDao.java | 8 +++ .../service/impl/ProjectServiceImpl.java | 4 +- .../src/main/resources/mapper/ProjectDao.xml | 25 +++++++ .../result/ResiTopicDetailResultDTO.java | 2 +- .../service/impl/ResiTopicServiceImpl.java | 1 + .../com/epmet/controller/IssueController.java | 3 +- .../java/com/epmet/service/IssueService.java | 3 +- .../epmet/service/impl/IssueServiceImpl.java | 69 +++++++++++++------ 17 files changed, 214 insertions(+), 34 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProfileDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProfileDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProfileDTO.java new file mode 100644 index 0000000000..1fb3b336e7 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProfileDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/10/8 12:58 + */ +@Data +public class IssueProfileDTO { + private String issueId; + private String sourceId; + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String sourceType; +} + diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 2392e4d2fa..5b79e535ac 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -395,4 +395,12 @@ public interface GovIssueOpenFeignClient { @PostMapping(value = "/gov/issue/issueprojectcategorydict/first/{customerId}") Result> queryFirstCategory(@PathVariable("customerId") String customerId); + + /** + * 根据议题ids查询议题简要信息 + * @param issueIds + * @return + */ + @PostMapping("/gov/issue/issue/getIssueProfile") + Result> getIssueProfile(@RequestBody List issueIds); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index be2f187945..5f81cd7501 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -332,5 +332,16 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryFirstCategory", customerId); } + /** + * 根据议题ids查询议题简要信息 + * + * @param issueIds + * @return + */ + @Override + public Result> getIssueProfile(List issueIds) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getIssueProfile", issueIds); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index aebbd3789e..c074d16352 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -13,6 +13,7 @@ import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO; import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO; import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.service.IssueService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -341,5 +342,17 @@ public class IssueController { return new Result(); } + /** + * 根据议题ids查询议题简要信息 + * @param issueIds + * @return + */ + @PostMapping("getIssueProfile") + public Result> getIssueProfile(@RequestBody List issueIds) { + if (CollectionUtils.isEmpty(issueIds)) { + return new Result<>(); + } + return new Result>().ok(issueService.getIssueProfile(issueIds)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 1c5ae213ee..24811e442e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -308,4 +308,10 @@ public interface IssueDao extends BaseDao { */ Integer selectAuditIssue(@Param("gridId")String gridId); + /** + * 根据议题ids查询议题简要信息 + * @param issueIds + * @return + */ + List selectIssueProfile(@Param("issueIds") List issueIds); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 8ac38fb970..3ccc105c94 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -386,4 +386,10 @@ public interface IssueService extends BaseService { void createIssue(IssueDTO issueDTO); + /** + * 根据议题ids查询议题简要信息 + * @param issueIds + * @return + */ + List getIssueProfile(List issueIds); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 561a5dcd35..2e9a377e79 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -217,13 +217,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp //议题信息 IssueResultDTO issueResult = issueDao.issueDetail(issueDetail); if (null != issueResult && StringUtils.isNotBlank(issueResult.getGridId())) { - /*BelongGridNameFormDTO formDTO = new BelongGridNameFormDTO(); - formDTO.setGridId(issueResult.getGridId()); - Result result = govOrgOpenFeignClient.getGridNameByGridId(formDTO); - logger.info("根据网格id查询网格名称接口返参：" + JSON.toJSONString(result)); - if (result.success() && null != result.getData()) { - issueResult.setGridName(result.getData().getBelongsGridName()); - }*/ GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(issueResult.getGridId()); issueResult.setGridName(null != gridInfoCache ? gridInfoCache.getGridNamePath() : StrConstant.EPMETY_STR); } @@ -1895,4 +1888,18 @@ public class IssueServiceImpl extends BaseServiceImpl imp issueAttachmentService.insertBatch(list); } } + + /** + * 根据议题ids查询议题简要信息 + * + * @param issueIds + * @return + */ + @Override + public List getIssueProfile(List issueIds) { + if(CollectionUtils.isEmpty(issueIds)){ + return new ArrayList<>(); + } + return baseDao.selectIssueProfile(issueIds); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 080f01afe6..762876ad3e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -819,4 +819,18 @@ AND APPLY_STATUS = 'under_auditing' AND GRID_ID = #{gridId} + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java index ed9f0d8d16..5d50dccb33 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.result; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,14 +19,46 @@ public class PendingResultDTO implements Serializable { private static final long serialVersionUID = 2545519820222637112L; private String issueId; private String issueTitle; + /** + * 议题转成项目时间 + */ private Long issueShiftedTime; + /** + * 话题内容 + */ private String topicContent; + /** + * 当前处理部门名称数组 + */ private List currentHandleDepartMent; + /** + * 话题语音url列表 + */ private List topicVoices; + /** + * 话题内容 + */ private List topicImgs; + /** + * 项目的来源Id(话题或议题Id) + * sourceId=议题id + */ private String sourceId; - @JsonIgnore + // @JsonIgnore private String projectId; private String longitude; private String latitude; + /** + * 项目来源： + * 来源议题 issue + * 项目立项 agency + * 旧版事件上报 resi_event + * 工作人员上报(巡查) work_event + * 新版事件上报 ic_event + */ + private String projectOrigin; + /** + * 话题id + */ + private String topicId; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 316fbc8de6..07786f5585 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -189,6 +189,14 @@ public interface ProjectDao extends BaseDao { */ List selectPendingListByGrid(@Param("gridId")String gridId); + /** + * 居民端议事厅-处理中列表 + * 查询的是已经转项目的议题，这里是查询来源于议题的项目 + * @param gridId + * @return + */ + List selectPendingListByGridV2(@Param("gridId")String gridId); + /** * 获取党建声音已结案列表 * @author zhaoqifeng diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 9e679c824b..dd36dd7694 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2883,8 +2883,10 @@ public class ProjectServiceImpl extends BaseServiceImpl getPendingList(ShiftProjectListFromDTO fromDTO) { + // PageInfo result = + // PageHelper.startPage(fromDTO.getPageNo(), fromDTO.getPageSize(), fromDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPendingListByGrid(fromDTO.getGridId())); PageInfo result = - PageHelper.startPage(fromDTO.getPageNo(), fromDTO.getPageSize(), fromDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPendingListByGrid(fromDTO.getGridId())); + PageHelper.startPage(fromDTO.getPageNo(), fromDTO.getPageSize(), fromDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPendingListByGridV2(fromDTO.getGridId())); if (CollectionUtils.isNotEmpty(result.getList())) { result.getList().forEach(item -> { ProjectDTO dto = new ProjectDTO(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 73c2f11384..73291bb680 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -336,6 +336,31 @@ AND a.ORIGIN = 'issue' ORDER BY a.CREATED_TIME DESC + + + + + - SELECT i.id AS issueId, - i.SOURCE_TYPE AS sourceType, - IFNULL( i.SOURCE_ID, '' ) AS sourceId + i.SOURCE_TYPE AS issueSourceType, + IFNULL( i.SOURCE_ID, '' ) AS sourceId, + ia.url FROM issue i + left join issue_attachment ia + on(i.id=ia.BUSINESS_ID and ia.del_flag='0') WHERE i.DEL_FLAG = '0' diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java index 5d50dccb33..f4b76f8b96 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java @@ -61,4 +61,13 @@ public class PendingResultDTO implements Serializable { * 话题id */ private String topicId; + + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String issueSourceType; + /** + * 发布议题的图片 + */ + private List issueImgs; } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 89528c9f4b..0c7d9ded4c 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -2,6 +2,8 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; @@ -28,6 +30,7 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -499,40 +502,53 @@ public class IssueServiceImpl implements IssueService { @Override public List getProcessing(ShiftProjectListFromDTO formDTO) { //1、查询由议题转的项目，且正在处理中的 - List resultList = govProjectOpenFeignClient.getPendingList(formDTO).getData(); + Result> projectRes=govProjectOpenFeignClient.getPendingList(formDTO); + if(!projectRes.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg()); + } + List resultList =projectRes.getData(); if (org.apache.commons.collections4.CollectionUtils.isEmpty(resultList)) { return new ArrayList<>(); } + // 话题信息 + HashMap rtm=new HashMap<>(); + // 议题信息 //2、根据议题id查询话题id List issueIds = resultList.stream().map(PendingResultDTO::getIssueId).collect(Collectors.toList()); - if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(issueIds)){ - //根据议题id查询话题id - Result> issueRes=govIssueOpenFeignClient.getIssueProfile(issueIds); - if (issueRes.success() && !CollectionUtils.isEmpty(issueRes.getData())) { - // 3、如果存在议题来源于话题 - List topicIds = issueRes.getData().stream().filter(t->t.getSourceType().equals("resi_topic")).map(IssueProfileDTO::getSourceId).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(topicIds)){ - //3.1 查询话题详情 - TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO(); - form.setTopicIdList(topicIds); - Result> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form); - if (topicDetailsResult.success() && !CollectionUtils.isEmpty(topicDetailsResult.getData())) { - List topicDetails = topicDetailsResult.getData(); - HashMap rtm = convertTopicDetailList2MapV2(topicDetails); - resultList.forEach(vi -> { - ResiTopicDetailResultDTO rr = rtm.get(vi.getIssueId()); - vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs()); - vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs()); - vi.setTopicContent(rr == null ? "" : rr.getTopicContent()); - vi.setLongitude(rr == null ? "" : rr.getLongitude()); - vi.setLatitude(rr == null ? "" : rr.getLatitude()); - vi.setTopicId(null == rr ? "" : rr.getTopicId()); - }); - } + // 根据议题id查询话题id + Result> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds); + + if (issueRes.success() && !CollectionUtils.isEmpty(issueRes.getData())) { + // 3、如果存在议题来源于话题 + List topicIds = issueRes.getData().stream().filter(t -> t.getIssueSourceType().equals("resi_topic")).map(IssueProfileDTO::getSourceId).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(topicIds)) { + // 3.1 查询话题详情 + TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO(); + form.setTopicIdList(topicIds); + Result> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form); + if (topicDetailsResult.success() && !CollectionUtils.isEmpty(topicDetailsResult.getData())) { + List topicDetails = topicDetailsResult.getData(); + topicDetails.stream().forEach(t -> { + if(StringUtils.isNotBlank(t.getIssueId())){ + rtm.put(t.getIssueId(), t); + } + }); } - } - + Map issueMap=issueRes.getData().stream().collect(Collectors.toMap(IssueProfileDTO::getIssueId, o -> o, (o1, o2) -> o1)); + // 赋值话题信息、议题来源、议题图片 + resultList.forEach(vi -> { + ResiTopicDetailResultDTO rr = rtm.get(vi.getIssueId()); + vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs()); + vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs()); + vi.setTopicContent(rr == null ? StrConstant.EPMETY_STR : rr.getTopicContent()); + vi.setLongitude(rr == null ? StrConstant.EPMETY_STR : rr.getLongitude()); + vi.setLatitude(rr == null ? StrConstant.EPMETY_STR : rr.getLatitude()); + vi.setTopicId(null == rr ? StrConstant.EPMETY_STR : rr.getTopicId()); + IssueProfileDTO issue = issueMap.get(vi.getIssueId()); + vi.setIssueSourceType(null != issue ? issue.getIssueSourceType() : StrConstant.EPMETY_STR); + vi.setIssueImgs(null != issue ? issue.getIssueImgs() : new ArrayList<>()); + }); } return resultList; } From cc3a3fa3b010427328a77c9233498deda1e9b5f3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 8 Oct 2022 14:23:04 +0800 Subject: [PATCH 026/621] ClosedIssueListResultDTO --- .../com/epmet/dto/result/ClosedIssueListResultDTO.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java index da7574183f..74483df1b1 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java @@ -56,4 +56,13 @@ public class ClosedIssueListResultDTO implements Serializable { private String topicContent; private String longitude; private String latitude; + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String sourceType; + + /** + * 发布议题的图片 + */ + private List issueImgs; } From bb6b615d79f351f6a258dc776ebeb52909e8a094 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 8 Oct 2022 14:51:41 +0800 Subject: [PATCH 027/621] =?UTF-8?q?/issue/closedproject=E5=B7=B2=E5=A4=84?= =?UTF-8?q?=E7=90=86-=E5=B7=B2=E7=BB=93=E6=A1=88=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/ResolvedResultDTO.java | 22 ++++++++ .../src/main/resources/mapper/ProjectDao.xml | 7 ++- .../epmet/service/impl/IssueServiceImpl.java | 56 ++++++++++++++----- 3 files changed, 68 insertions(+), 17 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java index 14187406e3..3c676185b9 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java @@ -13,6 +13,7 @@ import java.util.List; @Data public class ResolvedResultDTO implements Serializable { private static final long serialVersionUID = -6670213622289052352L; + private String projectId; /** * 议题Id */ @@ -53,4 +54,25 @@ public class ResolvedResultDTO implements Serializable { private String longitude; private String latitude; + /** + * 项目来源： + * 来源议题 issue + * 项目立项 agency + * 旧版事件上报 resi_event + * 工作人员上报(巡查) work_event + * 新版事件上报 ic_event + */ + private String projectOrigin; + /** + * 话题id + */ + private String topicId; + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String issueSourceType; + /** + * 发布议题的图片 + */ + private List issueImgs; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 73291bb680..8c3f58f3f5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -361,17 +361,20 @@ ORDER BY a.CREATED_TIME DESC + - SELECT - ID AS issueId, - IFNULL(ISSUE_TITLE,'') AS issueTitle, - IFNULL(CLOSE_REASON,'') AS solution, - UNIX_TIMESTAMP( CLOSED_TIME ) AS closedTime, - SOURCE_ID AS sourceId + i.ID AS issueId, + IFNULL(i.ISSUE_TITLE,'') AS issueTitle, + IFNULL(i.CLOSE_REASON,'') AS solution, + UNIX_TIMESTAMP( i.CLOSED_TIME ) AS closedTime, + i.SOURCE_ID AS sourceId, + i.SOURCE_TYPE as issueSourceType, + i.LONGITUDE, + i.LATITUDE, + i.SOURCE_ID as topicId, + ia.url FROM - issue + issue i + left join issue_attachment ia + on(i.id=ia.BUSINESS_ID and ia.del_flag='0') WHERE - DEL_FLAG = '0' - AND GRID_ID = #{gridId} - AND ISSUE_STATUS = 'closed' - AND RESOLVE_TYPE = 'unresolved' + i.DEL_FLAG = '0' + AND i.GRID_ID = #{gridId} + AND i.ISSUE_STATUS = 'closed' + AND i.RESOLVE_TYPE = 'unresolved' @@ -824,6 +847,8 @@ + + @@ -834,6 +859,8 @@ i.id AS issueId, i.SOURCE_TYPE AS issueSourceType, IFNULL( i.SOURCE_ID, '' ) AS sourceId, + i.LONGITUDE, + i.LATITUDE, ia.url FROM issue i diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java index 53f183c389..cd3e689745 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java @@ -52,4 +52,27 @@ public class UnResolvedResultDTO implements Serializable { private String topicContent; private String longitude; private String latitude; + + /** + * 项目来源： + * 来源议题 issue + * 项目立项 agency + * 旧版事件上报 resi_event + * 工作人员上报(巡查) work_event + * 新版事件上报 ic_event + */ + private String projectOrigin; + /** + * 话题id + */ + private String topicId; + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String issueSourceType; + /** + * 发布议题的图片 + */ + private List issueImgs; + private String projectId; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 8c3f58f3f5..ba340a2464 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -373,9 +373,10 @@ a.ORIGIN as projectOrigin FROM project a - INNER JOIN project_related_personnel b ON a.ID = b.PROJECT_ID - AND b.SOURCE_TYPE = 'issue' - AND b.GRID_ID = #{gridId} + INNER JOIN project_related_personnel b ON (a.ID = b.PROJECT_ID + AND b.SOURCE_TYPE = 'issue' + AND b.GRID_ID = #{gridId} + ) LEFT JOIN project_process c ON a.ID = c.PROJECT_ID AND c.OPERATION = 'close' WHERE @@ -385,20 +386,28 @@ AND a.CLOSED_STATUS = 'resolved' ORDER BY a.UPDATED_TIME DESC + From 8d05a101874d93d7b10f88517edd5ccf74feab99 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 8 Oct 2022 15:51:30 +0800 Subject: [PATCH 031/621] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index dd36dd7694..42f3b122a5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -649,6 +649,7 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Sat, 8 Oct 2022 15:55:08 +0800 Subject: [PATCH 032/621] url --- .../src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 5e7348b757..50861d9f3f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -931,6 +931,6 @@ public interface EpmetUserOpenFeignClient { * @author zxc * @date 2022/10/8 10:41 */ - @PostMapping("/epmetuser/resirelation/getAllResiByGrid") + @PostMapping("/epmetuser/registerrelation/getAllResiByGrid") Result getAllResiByGrid(@RequestBody AllResiByGridFormDTO formDTO); } From 5fe1e05166a9980c9fd8386734af7956b134b4d2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 8 Oct 2022 16:31:39 +0800 Subject: [PATCH 033/621] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E8=AE=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IssueProcessDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml index 00122cfade..2df1c162ba 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml @@ -102,7 +102,7 @@ SELECT - '转议题' AS processName, + '发起议题' AS processName, UNIX_TIMESTAMP( created_time ) AS processTime, operation_explain AS progressDesc, org_name AS departmentName, From ad62f03d10f518fbbe3144bf22616090a0f2d06a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 8 Oct 2022 16:43:14 +0800 Subject: [PATCH 034/621] =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=B8=8D=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/IssueController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 4befb7b97b..f27113c3e8 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -348,6 +348,7 @@ public class IssueController { public Result createIssue(@LoginUser TokenDto tokenDto,@RequestBody IssueDTO formDTO){ formDTO.setUserId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,IssueDTO.IssueForm.class); issueService.createIssue(formDTO); return new Result(); } From 04564196b52d62098d8a6a6ba862a0e63414d6f9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 9 Oct 2022 10:14:31 +0800 Subject: [PATCH 035/621] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IssueDTO.java | 2 +- .../epmet/constant/UserMessageConstant.java | 5 + .../java/com/epmet/entity/IssueEntity.java | 2 +- .../epmet/service/impl/IssueServiceImpl.java | 115 ++++++++++++------ .../service/impl/ProjectServiceImpl.java | 55 ++++++--- 5 files changed, 120 insertions(+), 59 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java index fd86c07eb7..93d5602612 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java @@ -49,7 +49,7 @@ public class IssueDTO implements Serializable { private String issueStatus; /** - * 来源类型 eg:resi_topic + * 来源类型 话题：resi_topic；直接立议题：issue； */ private String sourceType; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java index 2a0cf7b35f..8cb2d2d0da 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java @@ -36,4 +36,9 @@ public interface UserMessageConstant { */ String PROJECT_RESOLVED_MSG = "您收到一条【%s】的新信息，请您尽快处理。"; + /** + * 议题转项目消息模板 + */ + String PUB_ISSUE_SHIFT_PROJECT_MSG = "您发表的议题\"%s\"的问题,已由%s部门处理，请查看。"; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java index 825e16cbbc..90a04596fb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java @@ -43,7 +43,7 @@ public class IssueEntity extends BaseEpmetEntity { private String issueStatus; /** - * 来源类型 eg:resi_topic + * 来源类型 话题：resi_topic；直接立议题：issue； */ private String sourceType; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 80b36d2c33..4aac38aee6 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1025,18 +1025,21 @@ public class IssueServiceImpl extends BaseServiceImpl imp //因需要保证议题表中的转项目时间与创建项目时间一致 因此先新增项目数据再更新议题数据 //2:调用resi-group查询话题创建人数据(目前议题来源只有来自话题),为了到项目服务初始数据以及发送消息使用 - Result resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId()); - if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),IssueConstant.SELECT_TOPIC_EXCEPTION,IssueConstant.SELECT_TOPIC_EXCEPTION); + if("resi_topic".equals(entity.getSourceType())){ + Result resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId()); + if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),IssueConstant.SELECT_TOPIC_EXCEPTION,IssueConstant.SELECT_TOPIC_EXCEPTION); + } + ResiTopicDTO topicDTO = resultTopicDTO.getData(); + formDTO.setTopicDTO(topicDTO); } - ResiTopicDTO topicDTO = resultTopicDTO.getData(); - formDTO.setTopicDTO(topicDTO); //3:调用gov-project服务，新增项目各业务表初始数据 formDTO.setCategoryList(categoryList); formDTO.setGridId(entity.getGridId()); List tagList = issueTagsService.getTagsByIssue(formDTO.getIssueId()); formDTO.setTagList(tagList); + // 议题转项目！！！！！！！！！！！！在这步 Result resultDTO = govProjectFeignClient.issueShiftProject(formDTO); if (!resultDTO.success() || null == resultDTO.getData()) { logger.error(resultDTO.getInternalMsg()); @@ -1124,32 +1127,50 @@ public class IssueServiceImpl extends BaseServiceImpl imp List msgList = new ArrayList<>(); //1:创建话题发起人、议题发表人消息对象 - UserMessageFormDTO msgDTO = new UserMessageFormDTO(); - msgDTO.setCustomerId(entity.getCustomerId()); - msgDTO.setGridId(entity.getGridId()); - msgDTO.setApp(AppClientConstant.APP_RESI); - msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE); - String topicIssueMessage = String.format(UserMessageConstant.ISSUE_SHIFT_PROJECT_MSG, formDTO.getTopicDTO().getTopicContent(), issueProjectResultDTO.getOrgName()); - msgDTO.setMessageContent(topicIssueMessage); - msgDTO.setReadFlag(ReadFlagConstant.UN_READ); - msgDTO.setUserId(formDTO.getTopicDTO().getCreatedBy()); + if ("resi_topic".equals(entity.getSourceType()) && null != formDTO.getTopicDTO()) { + UserMessageFormDTO msgDTO = new UserMessageFormDTO(); + msgDTO.setCustomerId(entity.getCustomerId()); + msgDTO.setGridId(entity.getGridId()); + msgDTO.setApp(AppClientConstant.APP_RESI); + msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE); + String topicIssueMessage = String.format(UserMessageConstant.ISSUE_SHIFT_PROJECT_MSG, formDTO.getTopicDTO().getTopicContent(), issueProjectResultDTO.getOrgName()); + msgDTO.setMessageContent(topicIssueMessage); + msgDTO.setReadFlag(ReadFlagConstant.UN_READ); + msgDTO.setUserId(formDTO.getTopicDTO().getCreatedBy()); - //21.09.10:记录消息类型和对应的业务id - msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT); - msgDTO.setTargetId(entity.getId()); + //21.09.10:记录消息类型和对应的业务id + msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT); + msgDTO.setTargetId(entity.getId()); - msgList.add(msgDTO); - //话题人和议题人是同一个人时则只发送一条居民消息 - if (!formDTO.getTopicDTO().getCreatedBy().equals(entity.getCreatedBy())) { - UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO, UserMessageFormDTO.class); - msgIssue.setUserId(entity.getCreatedBy()); + msgList.add(msgDTO); - //21.09.10:记录消息类型和对应的业务id - msgIssue.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT); - msgIssue.setTargetId(entity.getId()); + //话题人和议题人是同一个人时则只发送一条居民消息 + if (!formDTO.getTopicDTO().getCreatedBy().equals(entity.getCreatedBy())) { + UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO, UserMessageFormDTO.class); + msgIssue.setUserId(entity.getCreatedBy()); - msgList.add(msgIssue); + //21.09.10:记录消息类型和对应的业务id + msgIssue.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT); + msgIssue.setTargetId(entity.getId()); + + msgList.add(msgIssue); + } + }else{ + //居民端发布的议题，只给议题发布人发送消息 + UserMessageFormDTO msgDTO = new UserMessageFormDTO(); + msgDTO.setCustomerId(entity.getCustomerId()); + msgDTO.setGridId(entity.getGridId()); + msgDTO.setApp(AppClientConstant.APP_RESI); + msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE); + String issueMessage = String.format(UserMessageConstant.PUB_ISSUE_SHIFT_PROJECT_MSG, entity.getIssueTitle(), issueProjectResultDTO.getOrgName()); + msgDTO.setMessageContent(issueMessage); + msgDTO.setReadFlag(ReadFlagConstant.UN_READ); + msgDTO.setUserId(entity.getCreatedBy()); + msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT); + msgDTO.setTargetId(entity.getId()); + msgList.add(msgDTO); } + //2:创建项目工作人员消息对象 String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, entity.getIssueTitle()); //所选人员如果即在部门下又在网格下则只发一条消息 @@ -1181,20 +1202,34 @@ public class IssueServiceImpl extends BaseServiceImpl imp */ private Result wxmpShiftProjectMessage(IssueProjectResultDTO issueProjectResultDTO, ShiftProjectFormDTO formDTO, IssueEntity entity) { List msgList = new ArrayList<>(); - //1:创建话题发起人、议题发表人消息对象 - WxSubscribeMessageFormDTO msgDTO = new WxSubscribeMessageFormDTO(); - msgDTO.setCustomerId(entity.getCustomerId()); - msgDTO.setClientType(AppClientConstant.APP_RESI); - msgDTO.setUserId(formDTO.getTopicDTO().getCreatedBy()); - msgDTO.setBehaviorType(UserMessageConstant.WXMP_ISSUE_TITLE); - String topicIssueMessage = String.format(UserMessageConstant.ISSUE_SHIFT_PROJECT_MSG, formDTO.getTopicDTO().getTopicContent(), issueProjectResultDTO.getOrgName()); - msgDTO.setMessageContent(topicIssueMessage); - msgDTO.setMessageTime(new Date()); - msgDTO.setGridId(entity.getGridId()); - msgList.add(msgDTO); - //话题人和议题人是同一个人时则只发送一条居民消息 - if (!formDTO.getTopicDTO().getCreatedBy().equals(entity.getCreatedBy())) { - WxSubscribeMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO, WxSubscribeMessageFormDTO.class); + if ("resi_topic".equals(entity.getSourceType()) && null != formDTO.getTopicDTO()) { + //1:创建话题发起人、议题发表人消息对象 + WxSubscribeMessageFormDTO msgDTO = new WxSubscribeMessageFormDTO(); + msgDTO.setCustomerId(entity.getCustomerId()); + msgDTO.setClientType(AppClientConstant.APP_RESI); + msgDTO.setUserId(formDTO.getTopicDTO().getCreatedBy()); + msgDTO.setBehaviorType(UserMessageConstant.WXMP_ISSUE_TITLE); + String topicIssueMessage = String.format(UserMessageConstant.ISSUE_SHIFT_PROJECT_MSG, formDTO.getTopicDTO().getTopicContent(), issueProjectResultDTO.getOrgName()); + msgDTO.setMessageContent(topicIssueMessage); + msgDTO.setMessageTime(new Date()); + msgDTO.setGridId(entity.getGridId()); + msgList.add(msgDTO); + //话题人和议题人是同一个人时则只发送一条居民消息 + if (!formDTO.getTopicDTO().getCreatedBy().equals(entity.getCreatedBy())) { + WxSubscribeMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO, WxSubscribeMessageFormDTO.class); + msgIssue.setUserId(entity.getCreatedBy()); + msgList.add(msgIssue); + } + }else{ + //只给议题发布人发送微信消息 + WxSubscribeMessageFormDTO msgIssue = new WxSubscribeMessageFormDTO(); + msgIssue.setCustomerId(entity.getCustomerId()); + msgIssue.setClientType(AppClientConstant.APP_RESI); + msgIssue.setBehaviorType(UserMessageConstant.WXMP_ISSUE_TITLE); + String topicIssueMessage = String.format(UserMessageConstant.PUB_ISSUE_SHIFT_PROJECT_MSG, entity.getIssueTitle(), issueProjectResultDTO.getOrgName()); + msgIssue.setMessageContent(topicIssueMessage); + msgIssue.setMessageTime(new Date()); + msgIssue.setGridId(entity.getGridId()); msgIssue.setUserId(entity.getCreatedBy()); msgList.add(msgIssue); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 42f3b122a5..f4b8aa9907 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -1186,9 +1186,15 @@ public class ProjectServiceImpl extends BaseServiceImpl list = new ArrayList<>(); - ProjectRelatedPersonnelEntity entity1 = new ProjectRelatedPersonnelEntity(); - entity1.setCustomerId(issueDTO.getCustomerId()); - entity1.setProjectId(projectEntity.getId()); - entity1.setApp(AppClientConstant.APP_RESI); - entity1.setGridId(issueDTO.getGridId()); - entity1.setUserId(formDTO.getTopicDTO().getCreatedBy()); - entity1.setSourceType(AppClientConstant.TOPIC); - entity1.setSourceId(formDTO.getTopicDTO().getId()); - ProjectRelatedPersonnelEntity entity2 = ConvertUtils.sourceToTarget(entity1,ProjectRelatedPersonnelEntity.class); - entity2.setUserId(issueDTO.getCreatedBy()); - entity2.setSourceType(AppClientConstant.ISSUE); - entity2.setSourceId(issueDTO.getId()); - list.add(entity1); - list.add(entity2); + if("resi_topic".equals(formDTO.getIssueDTO().getSourceType())){ + //话题 + ProjectRelatedPersonnelEntity topic = new ProjectRelatedPersonnelEntity(); + topic.setCustomerId(issueDTO.getCustomerId()); + topic.setProjectId(projectEntity.getId()); + topic.setApp(AppClientConstant.APP_RESI); + topic.setGridId(issueDTO.getGridId()); + topic.setUserId(formDTO.getTopicDTO().getCreatedBy()); + topic.setSourceType(AppClientConstant.TOPIC); + topic.setSourceId(formDTO.getTopicDTO().getId()); + list.add(topic); + //议题 + ProjectRelatedPersonnelEntity issue = ConvertUtils.sourceToTarget(topic,ProjectRelatedPersonnelEntity.class); + issue.setUserId(issueDTO.getCreatedBy()); + issue.setSourceType(AppClientConstant.ISSUE); + issue.setSourceId(issueDTO.getId()); + list.add(issue); + }else{ + //只插入议题 + ProjectRelatedPersonnelEntity issue = new ProjectRelatedPersonnelEntity(); + issue.setCustomerId(issueDTO.getCustomerId()); + issue.setProjectId(projectEntity.getId()); + issue.setApp(AppClientConstant.APP_RESI); + issue.setGridId(issueDTO.getGridId()); + issue.setUserId(formDTO.getIssueDTO().getCreatedBy()); + issue.setSourceType(AppClientConstant.ISSUE); + issue.setSourceId(formDTO.getIssueDTO().getId()); + list.add(issue); + } projectRelatedPersonnelService.insertBatch(list); //项目分类和标签表初始数据 From c692768a8fc7d7d8439f257d676e8f9001f9cf8b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 9 Oct 2022 10:37:22 +0800 Subject: [PATCH 036/621] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IssueVoteStatisticalService.java | 5 +-- .../epmet/service/impl/IssueServiceImpl.java | 4 +- .../impl/IssueVoteStatisticalServiceImpl.java | 37 +++++++++++++------ 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java index 165bbc2c38..d9f8c8c7dc 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java @@ -28,6 +28,7 @@ import com.epmet.dto.result.EvaluationListResultDTO; import com.epmet.dto.result.MyPartIssuesResultDTO; import com.epmet.dto.result.VoteResultDTO; import com.epmet.dto.result.VotingTrendResultDTO; +import com.epmet.entity.IssueEntity; import com.epmet.entity.IssueVoteStatisticalEntity; import java.util.List; @@ -153,14 +154,12 @@ public interface IssueVoteStatisticalService extends BaseService imp } try{ - issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null); + issueVoteStatisticalService.syncVotingCacheToDbByParams(entity,null); }catch(RenException e){ logger.error(e.getInternalMsg()); } @@ -1088,7 +1088,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp //6:缓存中网格下表决中的议题总数减1 govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId()); try{ - issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null); + issueVoteStatisticalService.syncVotingCacheToDbByParams(entity,null); }catch(RenException e){ logger.error(e.getInternalMsg()); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index 05963e6baa..8312ee3c6d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -607,36 +607,49 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl votableCount = - resiGroupFeignClient.votableCount(gridParam); - if(votableCount.success() && null != votableCount.getData()){ + if ("resi_topic".equals(issueEntity.getSourceType())) { + CommonGridIdFormDTO gridParam = new CommonGridIdFormDTO(); + gridParam.setGridId(issueEntity.getGridId()); + Result votableCount = + resiGroupFeignClient.votableCount(gridParam); + if (votableCount.success() && null != votableCount.getData()) { toUpd.setVotableCount(votableCount.getData()); - } + }else{ + //先默认赋值0吧 + toUpd.setVotableCount(NumConstant.ZERO); + } + } else { + AllResiByGridFormDTO allResiByGridFormDTO=new AllResiByGridFormDTO(); + allResiByGridFormDTO.setGridId(issueEntity.getGridId()); + Result allResiByGrid=epmetUserOpenFeignClient.getAllResiByGrid(allResiByGridFormDTO); + if(allResiByGrid.success()){ + toUpd.setVotableCount(allResiByGrid.getData()); + }else{ + //先默认赋值0吧 + toUpd.setVotableCount(NumConstant.ZERO); + } + } if(StringUtils.isNotBlank(statisticalId)){ toUpd.setId(statisticalId); update(toUpd); }else{ - IssueVoteStatisticalDTO existedStatistical = getByIssueId(issueId); + IssueVoteStatisticalDTO existedStatistical = getByIssueId(issueEntity.getId()); if(null != existedStatistical && StringUtils.isNotBlank(existedStatistical.getId())){ toUpd.setId(existedStatistical.getId()); update(toUpd); From b386eebfa8e09949566731509916ef37dae71ccd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 9 Oct 2022 10:48:13 +0800 Subject: [PATCH 037/621] issue_vote_statistical.issue_id --- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- .../com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 8fc490774f..2e8a14304a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1090,7 +1090,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp try{ issueVoteStatisticalService.syncVotingCacheToDbByParams(entity,null); }catch(RenException e){ - logger.error(e.getInternalMsg()); + logger.error("subtractWorkGrassrootsIssueRedDotValue报错："+e.getInternalMsg()); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index 8312ee3c6d..d1d0856063 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -622,6 +622,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl Date: Sun, 9 Oct 2022 11:02:21 +0800 Subject: [PATCH 038/621] canEvaluateProjectCount --- .../com/epmet/service/impl/IssueServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2e8a14304a..53f86de42b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1555,12 +1555,14 @@ public class IssueServiceImpl extends BaseServiceImpl imp if (!CollectionUtils.isEmpty(votedCount)){ userIds.addAll(votedCount); } - // 话题创建者 - Result topicCreatedUser = resiGroupOpenFeignClient.topicCreatedUser(issueEntity.getSourceId()); - if (!topicCreatedUser.success()){ - throw new RenException("【查询话题创建者失败】["+topicCreatedUser.getMsg()+"]"); + if("resi_topic".equals(issueEntity.getSourceType())){ + // 话题创建者 + Result topicCreatedUser = resiGroupOpenFeignClient.topicCreatedUser(issueEntity.getSourceId()); + if (!topicCreatedUser.success()){ + throw new RenException("【查询话题创建者失败】["+topicCreatedUser.getMsg()+"]"); + } + userIds.add(topicCreatedUser.getData()); } - userIds.add(topicCreatedUser.getData()); // 去重 return userIds.stream().distinct().collect(Collectors.toList()); } From 9be438913dc37cf10d3d5a9aa90ab25411a619a7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 9 Oct 2022 11:04:07 +0800 Subject: [PATCH 039/621] warn --- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index f4b8aa9907..c3c4976c79 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -730,7 +730,7 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Sun, 9 Oct 2022 11:14:09 +0800 Subject: [PATCH 040/621] =?UTF-8?q?=E4=B8=8A=E9=93=BE=E5=A4=B1=E8=B4=A5war?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index c3c4976c79..ffb61404ea 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2385,7 +2385,7 @@ public class ProjectServiceImpl extends BaseServiceImpl(), null); } catch (Exception e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); - log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + log.warn("【项目流转】上链失败，错误信息:{}", errorMsg); } } From c2c445beb4bc58d2c9a76ce7a9f78c1bf147ce41 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 9 Oct 2022 11:22:36 +0800 Subject: [PATCH 041/621] transferV2 --- .../epmet/service/impl/ProjectProcessServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index b8b01aa5b9..4ab41b17a6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -725,7 +725,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl Date: Sun, 9 Oct 2022 12:08:59 +0800 Subject: [PATCH 042/621] /trace/return-v2 warn --- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index ffb61404ea..ede20937fc 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2241,7 +2241,7 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Sun, 9 Oct 2022 16:16:35 +0800 Subject: [PATCH 043/621] =?UTF-8?q?OPERATION=5FTYPE,OPERATION=5Fid,?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcEventDTO.java | 4 ++-- .../src/main/java/com/epmet/entity/IcEventEntity.java | 4 ++-- .../main/resources/db/migration/V0.0.27__icevent_to_issue.sql | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.27__icevent_to_issue.sql diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java index 3b14fc3266..3be3954934 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java @@ -103,12 +103,12 @@ public class IcEventDTO implements Serializable { private Date closeCaseTime; /** - * 0:已回复 1:已转项目 1:已转需求 + * 0:已回复 1:已转项目 2:已转需求3:转议题 */ private String operationType; /** - * 项目、需求ID + * 项目、需求ID、议题id */ private String operationId; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java index ce8d9bdd6a..db740ced18 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java @@ -102,12 +102,12 @@ public class IcEventEntity extends BaseEpmetEntity { private Date closeCaseTime; /** - * 0:已回复 1:已转项目 2:已转需求 + * 0:已回复 1:已转项目 2:已转需求3:转议题 */ private String operationType; /** - * 项目、需求ID + * 项目、需求ID、议题id */ private String operationId; diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.27__icevent_to_issue.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.27__icevent_to_issue.sql new file mode 100644 index 0000000000..2d539f2729 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.27__icevent_to_issue.sql @@ -0,0 +1,2 @@ +ALTER TABLE ic_event MODIFY COLUMN `OPERATION_TYPE` CHAR ( 1 ) DEFAULT NULL COMMENT '0:已回复 1:已转项目 2:已转需求3:转议题'; +ALTER TABLE ic_event MODIFY COLUMN `OPERATION_ID` VARCHAR ( 32 ) DEFAULT NULL COMMENT '项目、需求ID、议题id'; \ No newline at end of file From 5bb22c85217aec7188148af6edc9fd1dd64d0fe7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 9 Oct 2022 17:30:38 +0800 Subject: [PATCH 044/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=BD=AC=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E5=8D=95=E7=8B=AC=E7=9A=84api=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcEventToIssueFormDTO.java | 58 ++++++++++++++++++ .../epmet/controller/IcEventController.java | 15 +++++ .../com/epmet/dao/IcEventCategoryDao.java | 1 + .../java/com/epmet/entity/IcEventEntity.java | 6 +- .../entity/IcEventOperationLogEntity.java | 1 + .../epmet/service/IcEventCategoryService.java | 2 + .../com/epmet/service/IcEventService.java | 5 ++ .../impl/IcEventCategoryServiceImpl.java | 8 ++- .../service/impl/IcEventServiceImpl.java | 60 ++++++++++++++++++- .../resources/mapper/IcEventCategoryDao.xml | 4 +- 10 files changed, 153 insertions(+), 7 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventToIssueFormDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventToIssueFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventToIssueFormDTO.java new file mode 100644 index 0000000000..2bfbce4810 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventToIssueFormDTO.java @@ -0,0 +1,58 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/10/9 16:46 + */ +@Data +public class IcEventToIssueFormDTO implements Serializable { + private static final long serialVersionUID = -7227815962561508949L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 转议题默认传3即可；0:已回复 1:已转项目 2:已转需求3:转议题 + */ + @NotBlank(message = "处理方式不能为空", groups = {IcEventToIssueFormDTO.AddUserInternalGroup.class}) + private String operationType; + + @NotBlank(message = "事件id不能为空", groups = IcEventToIssueFormDTO.AddUserInternalGroup.class) + private String icEventId; + + // /** + // * 二类分类Id + // */ + // private String categoryId; + + /** + * 项目所选分类集合，不可为空 + */ + @Valid + @NotEmpty(message = "事件分类不能为空", groups = IcEventToIssueFormDTO.AddUserShowGroup.class) + private List categoryList; + + @NotBlank(message = "议题标题不能为空", groups = IcEventToIssueFormDTO.AddUserShowGroup.class) + private String issueTitle; + @NotBlank(message = "处理建议不能为空", groups = IcEventToIssueFormDTO.AddUserShowGroup.class) + private String suggestion; + + @NotBlank(message = "customerId不能为空", groups = {IcEventToIssueFormDTO.AddUserInternalGroup.class}) + private String customerId; + @NotBlank(message = "currentUserId不能为空", groups = {IcEventToIssueFormDTO.AddUserInternalGroup.class}) + private String currentUserId; +} + diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 5105ca27bf..3b667b222c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -242,6 +242,21 @@ public class IcEventController { return new Result(); } + /** + * 事件转议题 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("icEventToIssue") + public Result icEventToIssue(@LoginUser TokenDto tokenDto, @RequestBody IcEventToIssueFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setCurrentUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, IcEventToIssueFormDTO.AddUserShowGroup.class, IcEventToIssueFormDTO.AddUserInternalGroup.class); + icEventService.icEventToIssue(formDTO); + return new Result(); + } + /** * 事件分类分析-一级分类下事件数量 * diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventCategoryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventCategoryDao.java index e8829fda7a..6c96758c64 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventCategoryDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventCategoryDao.java @@ -16,4 +16,5 @@ public interface IcEventCategoryDao extends BaseDao { IcEventCategoryEntity selectByEventId(@Param("icEventId") String icEventId); + int deleteByIcEventId(@Param("icEventId") String icEventId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java index db740ced18..81c5635aaf 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java @@ -61,9 +61,9 @@ public class IcEventEntity extends BaseEpmetEntity { */ private String idCard; - /** - * 反映渠道【字典表】 - */ + /** + * 反映渠道【字典表】dictTypeKey:ic_event_source_type;随手拍随时讲0、多媒体反应1、社区电话2、12345:3、网格员手持终端：4 + */ private String sourceType; /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventOperationLogEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventOperationLogEntity.java index 209d70d4f3..d41ff83514 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventOperationLogEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventOperationLogEntity.java @@ -48,6 +48,7 @@ public class IcEventOperationLogEntity extends BaseEpmetEntity { * 4、转需求：shift_demand * 5、办结：close_case; * 6、需求办结：close_demand + * 转议题：shift_to_issue */ private String actionCode; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java index 90c9fd9524..4ebabf00b8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java @@ -82,4 +82,6 @@ public interface IcEventCategoryService extends BaseService categoryEntities); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index 40a9f2e55d..ede1854804 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -225,4 +225,9 @@ public interface IcEventService extends BaseService { PageData icEventPageUserReported(PageUserReportEventFormDTO formDTO); + /** + * 事件转议题 + * @param formDTO + */ + void icEventToIssue(IcEventToIssueFormDTO formDTO); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java index c1d4d6fac9..bc12413641 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java @@ -1,6 +1,5 @@ package com.epmet.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -86,4 +85,11 @@ public class IcEventCategoryServiceImpl extends BaseServiceImpl categoryEntities) { + baseDao.deleteByIcEventId(icEventId); + this.insertBatch(categoryEntities); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index dda3a90647..d032ddc0fe 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -379,8 +379,8 @@ public class IcEventServiceImpl extends BaseServiceImpl resultDTOResult = govIssueOpenFeignClient.getCategoryTagList(categoryTag); - if (!resultDTOResult.success()) { - throw new RenException("项目立项，调用issue服务查询分类、标签基础信息失败"); + if (!resultDTOResult.success() || CollectionUtils.isEmpty(resultDTOResult.getData().getCategoryList())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "调用issue服务查询分类基础信息失败", "分类信息查询异常"); } return resultDTOResult.getData(); } @@ -1672,4 +1672,60 @@ public class IcEventServiceImpl extends BaseServiceImpl(pageInfo.getList(), pageInfo.getTotal()); } + /** + * 事件转议题 + * + * @param formDTO + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void icEventToIssue(IcEventToIssueFormDTO formDTO) { + //校验下数据 + IcEventEntity icEventEntity=baseDao.selectById(formDTO.getIcEventId()); + if (null == icEventEntity || !"processing".equals(icEventEntity.getStatus())) { + log.error(String.format("事件不存在icEventId:%s",formDTO.getIcEventId())); + return; + } + //查询分类信息 + List categoryIdList = formDTO.getCategoryList().stream().map(CategoryOrTagFormDTO::getId).collect(Collectors.toList()); + CategoryTagResultDTO category = queryCategory(formDTO.getCustomerId(), categoryIdList); + Date nowTime = new Date(); + //转议题 + // todo + //校验通过之后..... + //1、修改事件 + icEventEntity.setOperationType(formDTO.getOperationType()); + icEventEntity.setOperationId("xxxxxtodo"); + if("0".equals(icEventEntity.getSourceType())){ + //来源于随手拍的，居民端需要显示红点 + icEventEntity.setRedDot(NumConstant.ONE); + } + icEventEntity.setLatestOperatedTime(nowTime); + icEventEntity.setUpdatedTime(nowTime); + baseDao.updateById(icEventEntity); + //2、ic_event_category + //分类全删全增吧 + List categoryEntities=new ArrayList<>(); + for (IssueProjectCategoryDictDTO ca : category.getCategoryList()){ + IcEventCategoryEntity icEventCategoryEntity=new IcEventCategoryEntity(); + icEventCategoryEntity.setCustomerId(formDTO.getCustomerId()); + icEventCategoryEntity.setIcEventId(formDTO.getIcEventId()); + icEventCategoryEntity.setCategoryId(ca.getId()); + icEventCategoryEntity.setCategoryPids(ca.getPids()); + icEventCategoryEntity.setCategoryCode(ca.getCategoryCode()); + categoryEntities.add(icEventCategoryEntity); + } + icEventCategoryService.delInsert(formDTO.getIcEventId(),categoryEntities); + //3、ic_event_operation_log + IcEventOperationLogEntity logEntity = new IcEventOperationLogEntity(); + logEntity.setCustomerId(formDTO.getCustomerId()); + logEntity.setIcEventId(formDTO.getIcEventId()); + logEntity.setUserId(formDTO.getCurrentUserId()); + logEntity.setUserIdentity("staff"); + logEntity.setActionCode("shift_to_issue"); + logEntity.setActionDesc("转议题"); + logEntity.setOperateTime(nowTime); + icEventOperationLogService.insert(logEntity); + } + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventCategoryDao.xml index afb3965750..62ac857408 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventCategoryDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventCategoryDao.xml @@ -17,5 +17,7 @@ del_flag = '0' AND ic_event_id = #{icEventId} - + + delete from ic_event_category where ic_event_id = #{icEventId} + \ No newline at end of file From 66ee7a5d501484447055ed70814ac50d6bfbd664 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 09:21:38 +0800 Subject: [PATCH 045/621] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=9A=82=E6=8F=90?= =?UTF-8?q?=E4=B8=80=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/AllIssueListFormDTO.java | 26 +++++++++ .../com/epmet/dto/form/AuditListFormDTO.java | 31 +++++++++++ .../dto/result/AllIssueListResultDTO.java | 55 +++++++++++++++++++ .../epmet/dto/result/AuditListResultDTO.java | 39 +++++++++++++ .../controller/IssueAuditController.java | 22 ++++++-- .../com/epmet/controller/IssueController.java | 17 ++++++ .../src/main/java/com/epmet/dao/IssueDao.java | 2 + .../service/IssueApplicationService.java | 4 ++ .../java/com/epmet/service/IssueService.java | 9 +++ .../impl/IssueApplicationServiceImpl.java | 7 +++ .../epmet/service/impl/IssueServiceImpl.java | 29 ++++++++++ .../src/main/resources/mapper/IssueDao.xml | 39 +++++++++++++ 12 files changed, 276 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AllIssueListFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AuditListFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AuditListResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AllIssueListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AllIssueListFormDTO.java new file mode 100644 index 0000000000..619ae8baad --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AllIssueListFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/9 16:52 + * @DESC + */ +@Data +public class AllIssueListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = -9150357859854770833L; + + private String startTime; + private String endTime; + private String issueStatus; + private String issueTitle; + private String orgId; + private String orgType; + private String customerId; + private String userId; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AuditListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AuditListFormDTO.java new file mode 100644 index 0000000000..0fefeb06d2 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AuditListFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/9 17:07 + * @DESC + */ +@Data +public class AuditListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 5924913199706972596L; + + private String startTime; + private String endTime; + private String issueTitle; + private String orgId; + private String orgType; + + /** + * under_auditing:待审核；rejected:驳回; + */ + private String applyStatus; + + private String customerId; + private String userId; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java new file mode 100644 index 0000000000..7c01ab375a --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java @@ -0,0 +1,55 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/9 16:49 + * @DESC + */ +@Data +public class AllIssueListResultDTO implements Serializable { + + private static final long serialVersionUID = -3447913619727610107L; + + /** + * 所属网格 + */ + private String gridName; + private String gridId; + private String orgId; + + /** + * 议题标题 + */ + private String issueTitle; + + /** + * 议题建议 + */ + private String suggestion; + + /** + * 议题创建时间 + */ + private String createdTime; + + /** + * 支持数 + */ + private Integer supportCount; + + /** + * 反对数 + */ + private Integer oppositionCount; + + /** + * 议题状态 + */ + private String issueStatus; + private String issueStatusName; + private String issueId; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AuditListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AuditListResultDTO.java new file mode 100644 index 0000000000..26a3ac0edd --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AuditListResultDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/9 17:04 + * @DESC + */ +@Data +public class AuditListResultDTO implements Serializable { + + private static final long serialVersionUID = -9143726703244316997L; + + + /** + * 所属网格 + */ + private String gridName; + + /** + * 议题标题 + */ + private String issueTitle; + + /** + * 议题建议 + */ + private String suggestion; + + private String applyStatus; + private String applyStatusName; + + private String applyTime; + + private String issueApplicationId; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java index 8317eb8ab0..adde0e0bd4 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java @@ -2,16 +2,15 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.enums.RequirePermissionEnum; +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.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IssueConstant; import com.epmet.dto.form.*; -import com.epmet.dto.result.ApplicationDetailWorkResultDTO; -import com.epmet.dto.result.ApplicationHistoryResDTO; -import com.epmet.dto.result.ApplicationHistoryWorkResultDTO; -import com.epmet.dto.result.IssueApplicationResDTO; +import com.epmet.dto.result.*; import com.epmet.service.IssueApplicationHistoryService; import com.epmet.service.IssueApplicationService; import com.epmet.service.IssueService; @@ -130,4 +129,19 @@ public class IssueAuditController { public Result audit(@LoginUser TokenDto token, @RequestBody IssueAuditionFormDTO param){ return new Result().ok(issueService.audit(token,param)); } + + /** + * Desc: 审核列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/10/9 17:11 + */ + @PostMapping("auditList") + public Result> auditList(@RequestBody AuditListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(issueApplicationService.auditList(formDTO)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index f27113c3e8..96946b1223 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.dto.form.PageFormDTO; +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.commons.tools.validator.ValidatorUtils; @@ -365,5 +367,20 @@ public class IssueController { } return new Result>().ok(issueService.getIssueProfile(issueIds)); } + + /** + * Desc: 查询所有议题 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/10/9 16:59 + */ + @PostMapping("allIssueList") + public Result> allIssueList(@RequestBody AllIssueListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(issueService.allIssueList(formDTO)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 24811e442e..ce3dc28a1c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -314,4 +314,6 @@ public interface IssueDao extends BaseDao { * @return */ List selectIssueProfile(@Param("issueIds") List issueIds); + + List allIssueList(AllIssueListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java index aecc10b0b5..e51bec4d6b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java @@ -20,8 +20,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IssueApplicationDTO; +import com.epmet.dto.form.AuditListFormDTO; import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.dto.form.UserPubAuditingIssueFormDTO; +import com.epmet.dto.result.AuditListResultDTO; import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.dto.result.UserPubAuditingIssueResDTO; import com.epmet.entity.IssueApplicationEntity; @@ -150,4 +152,6 @@ public interface IssueApplicationService extends BaseService notIssueToTopicIds(List topicIdList); + + PageData auditList(AuditListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 39ffbca330..b2fbe9a227 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -13,6 +13,7 @@ import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO; import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO; import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO; import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; +import com.github.pagehelper.Page; import java.util.List; import java.util.Map; @@ -399,4 +400,12 @@ public interface IssueService extends BaseService { * @return */ List getIssueProfile(List issueIds); + + /** + * Desc: 查询所有议题 + * @param formDTO + * @author zxc + * @date 2022/10/9 16:58 + */ + PageData allIssueList(AllIssueListFormDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java index 074b7bcd39..e69bbba811 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java @@ -25,8 +25,10 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IssueApplicationDao; import com.epmet.dto.IssueApplicationDTO; +import com.epmet.dto.form.AuditListFormDTO; import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.dto.form.UserPubAuditingIssueFormDTO; +import com.epmet.dto.result.AuditListResultDTO; import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.dto.result.UserPubAuditingIssueResDTO; import com.epmet.entity.IssueApplicationEntity; @@ -186,4 +188,9 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl auditList(AuditListFormDTO formDTO) { + return null; + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 53f86de42b..9bc48a612d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1955,4 +1955,33 @@ public class IssueServiceImpl extends BaseServiceImpl imp } return baseDao.selectIssueProfile(issueIds); } + + /** + * Desc: 查询所有议题 + * @param formDTO + * @author zxc + * @date 2022/10/9 16:58 + */ + @Override + public PageData allIssueList(AllIssueListFormDTO formDTO) { + if (org.apache.commons.lang3.StringUtils.isBlank(formDTO.getOrgId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员信息失败："+formDTO.getUserId()); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType(ModuleConstants.ISSUE_PROCESS_ORG_TYPE_AGENCY); + } + PageData result = new PageData<>(new ArrayList(),NumConstant.ZERO_L); + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.allIssueList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + List allIssueListResultDTOS = baseDao.allIssueList(formDTO); + result.setList(allIssueListResultDTOS); + result.setTotal(allIssueListResultDTOS.size()); + } + return result; + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 8f9c25afe3..c802a6244a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -872,4 +872,43 @@ i.ID = #{issueId} + + + \ No newline at end of file From a8e09f7cbbcadbc323f0e29ba2cd7d059e2ade58 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 09:36:44 +0800 Subject: [PATCH 046/621] ai --- .../src/main/resources/mapper/IssueDao.xml | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index c802a6244a..06f323277a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -876,18 +876,22 @@ \ No newline at end of file From 8ffec63243c0880689a887b98edfd727509bdff6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 10:38:09 +0800 Subject: [PATCH 048/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=BD=AC=E8=AE=AE?= =?UTF-8?q?=E9=A2=981?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IssueDTO.java | 2 +- .../epmet/dto/form/PublishIssueFormDTO.java | 122 ++++++++++++++++++ .../epmet/feign/GovIssueOpenFeignClient.java | 8 ++ .../GovIssueOpenFeignClientFallBack.java | 11 +- .../com/epmet/controller/IssueController.java | 11 ++ .../java/com/epmet/entity/IssueEntity.java | 2 +- .../java/com/epmet/service/IssueService.java | 8 ++ .../epmet/service/impl/IssueServiceImpl.java | 45 +++++++ .../db/migration/V0.0.19__issue_source.sql | 1 + .../service/impl/IcEventServiceImpl.java | 34 ++++- .../migration/V0.0.27__icevent_to_issue.sql | 6 +- 11 files changed, 240 insertions(+), 10 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/PublishIssueFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__issue_source.sql diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java index 93d5602612..487ca68aee 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java @@ -49,7 +49,7 @@ public class IssueDTO implements Serializable { private String issueStatus; /** - * 来源类型 话题：resi_topic；直接立议题：issue； + * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event */ private String sourceType; diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/PublishIssueFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/PublishIssueFormDTO.java new file mode 100644 index 0000000000..36fd0866d3 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/PublishIssueFormDTO.java @@ -0,0 +1,122 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description + * @Author yzm + * @Date 2022/10/10 9:32 + */ +@Data +public class PublishIssueFormDTO implements Serializable { + private static final long serialVersionUID = 1713711343683095564L; + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed + */ + @NotBlank(message = "议题状态不能为空", groups = AddUserShowGroup.class) + private String issueStatus; + + /** + * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event + */ + @NotBlank(message = "议题来源不能为空", groups = AddUserShowGroup.class) + private String sourceType; + + /** + * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID) + */ + private String sourceId; + + /** + * 议题名称 最多20字 + */ + @NotBlank(message = "issueTitle不能为空", groups = AddUserShowGroup.class) + private String issueTitle; + + /** + * 建议 最多1000字 + */ + @NotBlank(message = "suggestion不能为空", groups = AddUserShowGroup.class) + private String suggestion; + + /** + * 客户ID + */ + @NotBlank(message = "customerId不能为空", groups = AddUserShowGroup.class) + private String customerId; + + /** + * 网格ID 居民端议题对应一个网格Id + */ + @NotBlank(message = "gridId不能为空", groups = AddUserShowGroup.class) + private String gridId; + + /** + * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制 + */ + @NotBlank(message = "", groups = AddUserShowGroup.class) + private String orgIdPath; + + /** + * 组织ID 【数据权限-非必填】agencyId + */ + @NotBlank(message = "", groups = AddUserShowGroup.class) + private String orgId; + + /** + * 表决发起日期（转议题日期） + */ + @NotBlank(message = "表决发起日期(转议题日期)不能为空", groups = AddUserShowGroup.class) + private Date decidedTime; + + /** + * 地址 + */ + @NotBlank(message = "address不能为空", groups = AddUserShowGroup.class) + private String address; + + /** + * 经度 + */ + @NotBlank(message = "经度不能为空", groups = AddUserShowGroup.class) + private String longitude; + + /** + * 纬度 + */ + @NotBlank(message = "纬度不能为空", groups = AddUserShowGroup.class) + private String latitude; + + /** + * 创建人 + */ + @NotBlank(message = "议题发起人(createdBy)不能为空", groups = AddUserShowGroup.class) + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + private String eventReportUserName; +} + diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 5b79e535ac..c0310ac6a0 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -403,4 +403,12 @@ public interface GovIssueOpenFeignClient { */ @PostMapping("/gov/issue/issue/getIssueProfile") Result> getIssueProfile(@RequestBody List issueIds); + + /** + * 事件转议题 + * @param issueFormDTO + * @return + */ + @PostMapping("/gov/issue/issue/publishIssue") + Result publishIssue(@RequestBody PublishIssueFormDTO issueFormDTO); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 5f81cd7501..8037939a4c 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -343,5 +343,14 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getIssueProfile", issueIds); } - + /** + * 事件转议题 + * + * @param issueFormDTO + * @return + */ + @Override + public Result publishIssue(PublishIssueFormDTO issueFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "publishIssue", issueFormDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index f27113c3e8..e9d7d0dca3 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -365,5 +365,16 @@ public class IssueController { } return new Result>().ok(issueService.getIssueProfile(issueIds)); } + /** + * 发布议题 + * 事件转议题 + * @param issueFormDTO + * @return + */ + @PostMapping("publishIssue") + public Result publishIssue(@RequestBody PublishIssueFormDTO issueFormDTO) { + ValidatorUtils.validateEntity(issueFormDTO, PublishIssueFormDTO.AddUserShowGroup.class); + return new Result().ok(issueService.publishIssue(issueFormDTO)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java index 90a04596fb..7f47f3cfa1 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java @@ -43,7 +43,7 @@ public class IssueEntity extends BaseEpmetEntity { private String issueStatus; /** - * 来源类型 话题：resi_topic；直接立议题：issue； + * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event */ private String sourceType; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 39ffbca330..57b6414dab 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -399,4 +399,12 @@ public interface IssueService extends BaseService { * @return */ List getIssueProfile(List issueIds); + + /** + * 发布议题 + * 事件转议题 + * @param issueFormDTO + * @return + */ + IssueDTO publishIssue(PublishIssueFormDTO issueFormDTO); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 53f86de42b..5dbdcff32c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1955,4 +1955,49 @@ public class IssueServiceImpl extends BaseServiceImpl imp } return baseDao.selectIssueProfile(issueIds); } + + /** + * 发布议题 + * 事件转议题 + * + * @param issueFormDTO + * @return + */ + @Transactional(rollbackFor = Exception.class) + @Override + public IssueDTO publishIssue(PublishIssueFormDTO issueFormDTO) { + // 事件转议题，是由工作端无需审核 + IssueEntity issueEntity = ConvertUtils.sourceToTarget(issueFormDTO, IssueEntity.class); + baseDao.insert(issueEntity); + + IssueProcessEntity issueProcessEntity = new IssueProcessEntity(); + issueProcessEntity.setIssueId(issueEntity.getId()); + issueProcessEntity.setIssueStatus(issueEntity.getIssueStatus()); + issueProcessEntity.setOrgType(ModuleConstants.ISSUE_PROCESS_ORG_TYPE_AGENCY); + CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(issueFormDTO.getCustomerId(),issueFormDTO.getCreatedBy()); + issueProcessEntity.setOrgId(staffInfo.getAgencyId()); + issueProcessEntity.setOperationExplain(String.format("【%s】发表的事件被【%s】转为议题", issueFormDTO.getEventReportUserName(), staffInfo.getAgencyName())); + issueProcessEntity.setOrgName(staffInfo.getAgencyName()); + issueProcessEntity.setCustomerId(issueFormDTO.getCustomerId()); + issueProcessService.insert(issueProcessEntity); + + //查询网格的所属居民数 + AllResiByGridFormDTO allResiByGridFormDTO=new AllResiByGridFormDTO(); + allResiByGridFormDTO.setGridId(issueEntity.getGridId()); + Result regUserTotalRes=userOpenFeignClient.getAllResiByGrid(allResiByGridFormDTO); + //3.新增议题表决统计表 + IssueVoteStatisticalDTO voteStatistical = new IssueVoteStatisticalDTO(); + voteStatistical.setIssueId(issueEntity.getId()); + //应表决数，该网格下所有的居民 + voteStatistical.setVotableCount(regUserTotalRes.success() ? regUserTotalRes.getData() : NumConstant.ZERO); + issueVoteStatisticalService.save(voteStatistical); + VoteRedisFormDTO voteInitCache = new VoteRedisFormDTO(); + voteInitCache.setIssueId(issueEntity.getId()); + voteInitCache.setShouldVoteCount(regUserTotalRes.success() ? regUserTotalRes.getData() : NumConstant.ZERO); + issueVoteDetailRedis.set(voteInitCache); + + IssueDTO issueDTO = ConvertUtils.sourceToTarget(issueEntity, IssueDTO.class); + issueDTO.setIssueId(issueEntity.getId()); + return issueDTO; + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__issue_source.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__issue_source.sql new file mode 100644 index 0000000000..ac49a686de --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__issue_source.sql @@ -0,0 +1 @@ +alter table issue MODIFY COLUMN `SOURCE_TYPE` varchar(32) DEFAULT NULL COMMENT '来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event'; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index d032ddc0fe..8ca9e087dd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -1690,12 +1691,33 @@ public class IcEventServiceImpl extends BaseServiceImpl categoryIdList = formDTO.getCategoryList().stream().map(CategoryOrTagFormDTO::getId).collect(Collectors.toList()); CategoryTagResultDTO category = queryCategory(formDTO.getCustomerId(), categoryIdList); Date nowTime = new Date(); - //转议题 - // todo + //调用issue服务转议题 + PublishIssueFormDTO issueFormDTO=new PublishIssueFormDTO(); + issueFormDTO.setIssueStatus("voting"); + issueFormDTO.setAddress(icEventEntity.getAddress()); + issueFormDTO.setLatitude(icEventEntity.getLatitude()); + issueFormDTO.setLongitude(icEventEntity.getLongitude()); + issueFormDTO.setIssueTitle(formDTO.getIssueTitle()); + issueFormDTO.setSuggestion(formDTO.getSuggestion()); + issueFormDTO.setGridId(icEventEntity.getGridId()); + issueFormDTO.setOrgId(icEventEntity.getAgencyId()); + issueFormDTO.setOrgIdPath(icEventEntity.getGridPids()); + issueFormDTO.setSourceType("ic_event"); + issueFormDTO.setSourceId(icEventEntity.getId()); + issueFormDTO.setCreatedBy(formDTO.getCurrentUserId()); + issueFormDTO.setUpdatedBy(formDTO.getCurrentUserId()); + issueFormDTO.setCreatedTime(nowTime); + issueFormDTO.setUpdatedTime(nowTime); + issueFormDTO.setDecidedTime(nowTime); + issueFormDTO.setEventReportUserName(icEventEntity.getName()); + Result issueRes=govIssueOpenFeignClient.publishIssue(issueFormDTO); + if (!issueRes.success() || null == issueRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件转议题异常,返参：" + JSON.toJSONString(issueRes), "事件转议题异常"); + } //校验通过之后..... - //1、修改事件 + //1、修改事件相关信息 icEventEntity.setOperationType(formDTO.getOperationType()); - icEventEntity.setOperationId("xxxxxtodo"); + icEventEntity.setOperationId(issueRes.getData().getIssueId()); if("0".equals(icEventEntity.getSourceType())){ //来源于随手拍的，居民端需要显示红点 icEventEntity.setRedDot(NumConstant.ONE); @@ -1703,7 +1725,7 @@ public class IcEventServiceImpl extends BaseServiceImpl categoryEntities=new ArrayList<>(); for (IssueProjectCategoryDictDTO ca : category.getCategoryList()){ @@ -1716,7 +1738,7 @@ public class IcEventServiceImpl extends BaseServiceImpl已读；工作人员待处理=>处理中；转议题：shift_to_issue'; From 55f7dda712470805a1af1db2f8312f5a3092ac87 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 10 Oct 2022 10:39:34 +0800 Subject: [PATCH 049/621] =?UTF-8?q?-=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96-=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=BE=83=E4=B8=8A?= =?UTF-8?q?=E6=9C=88=E7=9A=84=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constant/DataSourceConstant.java | 1 + .../stats/UserHouseStatsQueryFormDTO.java | 23 ++++ .../feign/DataReportOpenFeignClient.java | 12 ++ .../DataReportOpenFeignClientFallBack.java | 7 ++ .../epmet/stats/UserHouseStatsResultDTO.java | 18 +++ .../controller/stats/UserHouseController.java | 37 ++++++ .../stats/FactAgencyUserHouseDailyDao.java | 17 +++ .../dao/stats/FactGridUserHouseDailyDao.java | 17 +++ .../stats/FactAgencyUserHouseDailyEntity.java | 115 ++++++++++++++++++ .../stats/FactGridUserHouseDailyEntity.java | 106 ++++++++++++++++ .../service/stats/UserHouseStatsService.java | 19 +++ .../stats/impl/UserHouseStatsServiceImpl.java | 87 +++++++++++++ .../stats/FactAgencyUserHouseDailyDao.xml | 33 +++++ .../stats/FactGridUserHouseDailyDao.xml | 32 +++++ .../epmet/dto/result/HouseChartResultDTO.java | 20 +++ .../epmet/service/impl/HouseServiceImpl.java | 23 +++- 16 files changed, 563 insertions(+), 4 deletions(-) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/stats/UserHouseStatsQueryFormDTO.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/stats/UserHouseStatsResultDTO.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/stats/UserHouseController.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactAgencyUserHouseDailyDao.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactGridUserHouseDailyDao.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactAgencyUserHouseDailyEntity.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactGridUserHouseDailyEntity.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/UserHouseStatsService.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/impl/UserHouseStatsServiceImpl.java create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java index d1e438d81a..d73da4247f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java @@ -7,5 +7,6 @@ public interface DataSourceConstant { */ String EVALUATION_INDEX = "evaluationIndex"; String STATS_DISPLAY = "statsDisplay"; + String STATS = "stats"; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/stats/UserHouseStatsQueryFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/stats/UserHouseStatsQueryFormDTO.java new file mode 100644 index 0000000000..ca6ea589fb --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/stats/UserHouseStatsQueryFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form.stats; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +/** + * 人房信息查询dto + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class UserHouseStatsQueryFormDTO { + + private String orgId; + private String orgType; + + @NotBlank(message = "dateId不能为空") + private String dateId; + +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java index 862013f1a6..97771d20f0 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java @@ -2,11 +2,15 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO; import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.feign.impl.DataReportOpenFeignClientFallBackFactory; +import com.epmet.stats.UserHouseStatsResultDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -24,4 +28,12 @@ public interface DataReportOpenFeignClient { **/ @GetMapping("/data/report/screen/agency/querystaffagencytree/{agencyId}") Result queryStaffAgencyTree(@PathVariable("agencyId") String agencyId); + + /** + * 通过dateId查询人房统计信息 + * @param input 3个参数，就不用dto了，类太多： + * @return + */ + @PostMapping("/data/report/userHouse/getUserHouseDailyStatsByDateId") + Result getUserHouseDailyStatsByDateId(@RequestBody UserHouseStatsQueryFormDTO input); } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java index 247fe4499b..efc784a8b3 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java @@ -3,8 +3,10 @@ package com.epmet.feign.impl; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO; import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.feign.DataReportOpenFeignClient; +import com.epmet.stats.UserHouseStatsResultDTO; //@Component public class DataReportOpenFeignClientFallBack implements DataReportOpenFeignClient { @@ -17,4 +19,9 @@ public class DataReportOpenFeignClientFallBack implements DataReportOpenFeignCli public Result queryStaffAgencyTree(String agencyId) { return ModuleUtils.feignConError(ServiceConstant.DATA_REPORT_SERVER, "queryStaffAgencyTree",agencyId); } + + @Override + public Result getUserHouseDailyStatsByDateId(UserHouseStatsQueryFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.DATA_REPORT_SERVER, "getUserHouseDailyStatsByDateId",input); + } } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/stats/UserHouseStatsResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/stats/UserHouseStatsResultDTO.java new file mode 100644 index 0000000000..654bfed4cf --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/stats/UserHouseStatsResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.stats; + +import lombok.Data; + +/** + * 人房信息统计 + */ +@Data +public class UserHouseStatsResultDTO { + private Integer houseTotal = 0; + private Integer zzHouseTotal = 0; + private Integer czHouseTotal = 0; + private Integer xzHouseTotal = 0; + private Integer userTotal = 0; + private Integer czUserTotal = 0; + private Integer ldUserTotal = 0; + private Integer usingCommunityNum = 0; +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/stats/UserHouseController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/stats/UserHouseController.java new file mode 100644 index 0000000000..9556299271 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/stats/UserHouseController.java @@ -0,0 +1,37 @@ +package com.epmet.datareport.controller.stats; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.datareport.service.stats.UserHouseStatsService; +import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO; +import com.epmet.stats.UserHouseStatsResultDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("userHouse") +public class UserHouseController { + + @Autowired + private UserHouseStatsService userHouseStatsService; + + /** + * 通过dateId查询人房统计信息 + * @param input + * @return + */ + @PostMapping("getUserHouseDailyStatsByDateId") + public Result getUserHouseDailyStatsByDateId(@RequestBody UserHouseStatsQueryFormDTO input) { + ValidatorUtils.validateEntity(input); + String orgId = input.getOrgId(); + String orgType = input.getOrgType(); + String dateId = input.getDateId(); + + UserHouseStatsResultDTO r = userHouseStatsService.getUserHouseDailyStats(orgId, orgType, dateId); + return new Result().ok(r); + } + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactAgencyUserHouseDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactAgencyUserHouseDailyDao.java new file mode 100644 index 0000000000..bb2c98b36c --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactAgencyUserHouseDailyDao.java @@ -0,0 +1,17 @@ +package com.epmet.datareport.dao.stats; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.datareport.entity.stats.FactAgencyUserHouseDailyEntity; +import org.apache.ibatis.annotations.Mapper; + + +/** + * 人房信息统计数，按天统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-27 + */ +@Mapper +public interface FactAgencyUserHouseDailyDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactGridUserHouseDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactGridUserHouseDailyDao.java new file mode 100644 index 0000000000..da22c4a27b --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactGridUserHouseDailyDao.java @@ -0,0 +1,17 @@ +package com.epmet.datareport.dao.stats; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.datareport.entity.stats.FactGridUserHouseDailyEntity; +import org.apache.ibatis.annotations.Mapper; + + +/** + * 网格的人房信息统计数，按天统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-27 + */ +@Mapper +public interface FactGridUserHouseDailyDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactAgencyUserHouseDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactAgencyUserHouseDailyEntity.java new file mode 100644 index 0000000000..8bae60daeb --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactAgencyUserHouseDailyEntity.java @@ -0,0 +1,115 @@ +package com.epmet.datareport.entity.stats; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 人房信息统计数，按天统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-27 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("fact_agency_user_house_daily") +public class FactAgencyUserHouseDailyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 数据更新至：yyyyMMdd; + */ + private String dateId; + + /** + * 组织id + */ + private String agencyId; + + /** + * agency_id所属的机关级别（社区级：community， +乡（镇、街道）级:street, +区县级: district, +市级: city +省级:province） + */ + private String level; + + /** + * 组织i所属的组织id + */ + private String pid; + + /** + * 组织i所有上级id + */ + private String pids; + + /** + * 小区总数 + */ + private Integer neighbourhoodsCount; + + /** + * 房屋总数 + */ + private Integer houseCount; + + /** + * 自住房屋总数 + */ + private Integer houseSelfCount; + + /** + * 出租房屋总数 + */ + private Integer houseLeaseCount; + + /** + * 闲置房屋总数 + */ + private Integer houseIdleCount; + + /** + * 居民总数 + */ + private Integer userCount; + + /** + * 常住居民总数 + */ + private Integer userResiCount; + + /** + * 流动居民总数 + */ + private Integer userFloatCount; + + /** + * 当日新增房屋数 + */ + private Integer houseIncr; + + /** + * 当日修改房屋数 + */ + private Integer houseModify; + + /** + * 当日新增居民数 + */ + private Integer userIncr; + + /** + * 当日修改居民数 + */ + private Integer userModify; + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactGridUserHouseDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactGridUserHouseDailyEntity.java new file mode 100644 index 0000000000..f2aded5df4 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactGridUserHouseDailyEntity.java @@ -0,0 +1,106 @@ +package com.epmet.datareport.entity.stats; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 网格的人房信息统计数，按天统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-27 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("fact_grid_user_house_daily") +public class FactGridUserHouseDailyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 数据更新至：yyyyMMdd; + */ + private String dateId; + + /** + * 网格id + */ + private String gridId; + + /** + * 网格所属的组织id + */ + private String pid; + + /** + * 网格所有上级id + */ + private String pids; + + /** + * 小区总数 + */ + private Integer neighbourhoodsCount; + + /** + * 房屋总数 + */ + private Integer houseCount; + + /** + * 自住房屋总数 + */ + private Integer houseSelfCount; + + /** + * 出租房屋总数 + */ + private Integer houseLeaseCount; + + /** + * 闲置房屋总数 + */ + private Integer houseIdleCount; + + /** + * 居民总数 + */ + private Integer userCount; + + /** + * 常住居民总数 + */ + private Integer userResiCount; + + /** + * 流动居民总数 + */ + private Integer userFloatCount; + + /** + * 当日新增房屋数 + */ + private Integer houseIncr; + + /** + * 当日修改房屋数 + */ + private Integer houseModify; + + /** + * 当日新增居民数 + */ + private Integer userIncr; + + /** + * 当日修改居民数 + */ + private Integer userModify; + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/UserHouseStatsService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/UserHouseStatsService.java new file mode 100644 index 0000000000..c898ed5ced --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/UserHouseStatsService.java @@ -0,0 +1,19 @@ +package com.epmet.datareport.service.stats; + +import com.epmet.stats.UserHouseStatsResultDTO; +import lombok.extern.slf4j.Slf4j; + +/** + * 人房统计service + */ +public interface UserHouseStatsService { + + /** + * 查询指定dateId的人房统计信息 + * @param orgId + * @param orgType + * @param dateId + * @return + */ + UserHouseStatsResultDTO getUserHouseDailyStats(String orgId, String orgType, String dateId); +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/impl/UserHouseStatsServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/impl/UserHouseStatsServiceImpl.java new file mode 100644 index 0000000000..e03c81ac8a --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/impl/UserHouseStatsServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.datareport.service.stats.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.constant.DataSourceConstant; +import com.epmet.datareport.dao.stats.FactAgencyUserHouseDailyDao; +import com.epmet.datareport.dao.stats.FactGridUserHouseDailyDao; +import com.epmet.datareport.entity.stats.FactAgencyUserHouseDailyEntity; +import com.epmet.datareport.entity.stats.FactGridUserHouseDailyEntity; +import com.epmet.datareport.service.stats.UserHouseStatsService; +import com.epmet.stats.UserHouseStatsResultDTO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@DataSource(DataSourceConstant.STATS) +public class UserHouseStatsServiceImpl implements UserHouseStatsService { + + @Autowired + private FactGridUserHouseDailyDao factGridUserHouseDailyDao; + + @Autowired + private FactAgencyUserHouseDailyDao factAgencyUserHouseDailyDao; + + @Override + public UserHouseStatsResultDTO getUserHouseDailyStats(String orgId, String orgType, String dateId) { + // 没有传参，使用当前登录人的 + if (StringUtils.isEmpty(orgId) || StringUtils.isEmpty(orgType)) { + String userId = EpmetRequestHolder.getLoginUserId(); + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败:%s", userId)); + } + + orgId = staffInfo.getAgencyId(); + orgType = "agency"; + } + + // 结果对象初始化 + UserHouseStatsResultDTO result = new UserHouseStatsResultDTO(); + + if ("agency".equals(orgType)) { + // 查询的目标是组织 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(FactAgencyUserHouseDailyEntity::getDateId, dateId); + query.eq(FactAgencyUserHouseDailyEntity::getAgencyId, orgId); + FactAgencyUserHouseDailyEntity agencyDailyStats = factAgencyUserHouseDailyDao.selectOne(query); + if (agencyDailyStats != null) { + result.setHouseTotal(agencyDailyStats.getHouseCount()); + result.setCzHouseTotal(agencyDailyStats.getHouseLeaseCount()); + result.setXzHouseTotal(agencyDailyStats.getHouseIdleCount()); + result.setZzHouseTotal(agencyDailyStats.getHouseSelfCount()); + result.setUserTotal(agencyDailyStats.getUserCount()); + result.setCzUserTotal(agencyDailyStats.getUserResiCount()); + result.setLdUserTotal(agencyDailyStats.getUserFloatCount()); + } + } else { + // 查询的目标是网格 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(FactGridUserHouseDailyEntity::getDateId, dateId); + query.eq(FactGridUserHouseDailyEntity::getGridId, orgId); + FactGridUserHouseDailyEntity gridDailyStats = factGridUserHouseDailyDao.selectOne(query); + if (gridDailyStats != null) { + result.setHouseTotal(gridDailyStats.getHouseCount()); + result.setCzHouseTotal(gridDailyStats.getHouseLeaseCount()); + result.setXzHouseTotal(gridDailyStats.getHouseIdleCount()); + result.setZzHouseTotal(gridDailyStats.getHouseSelfCount()); + result.setUserTotal(gridDailyStats.getUserCount()); + result.setCzUserTotal(gridDailyStats.getUserResiCount()); + result.setLdUserTotal(gridDailyStats.getUserFloatCount()); + } + } + + return result; + } +} diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml new file mode 100644 index 0000000000..8168105c8b --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml new file mode 100644 index 0000000000..37ae699771 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java index 61bee2a9cc..eb7ee86152 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java @@ -56,6 +56,26 @@ public class HouseChartResultDTO implements Serializable { */ private Double wscHouseRatio = 0.0; + /** + * 房屋总数-较上月 + */ + private Integer houseTotalJSY; + + /** + * 自住房屋树-较上月 + */ + private Integer zzHouseTotalJSY; + + /** + * 出租房屋总数-较上月 + */ + private Integer czHouseTotalJSY; + + /** + * 闲置房屋总数-较上月 + */ + private Integer xzHouseTotalJSY; + @JsonIgnore private Integer num; //1：出租 0：自住 2：闲置 3:未出售 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index de8806a781..d5daa597e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.HouseQrcodeEnum; @@ -34,17 +35,16 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; +import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.enums.*; -import com.epmet.feign.EpmetAdminOpenFeignClient; -import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.OssFeignClient; +import com.epmet.feign.*; import com.epmet.model.HouseInfoModel; import com.epmet.model.ImportHouseInfoListener; import com.epmet.redis.IcHouseRedis; import com.epmet.service.*; +import com.epmet.stats.UserHouseStatsResultDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.cache.Cache; @@ -68,6 +68,7 @@ import java.awt.image.BufferedImage; import java.io.*; import java.net.URLEncoder; import java.text.NumberFormat; +import java.time.LocalDate; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; @@ -132,6 +133,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Autowired private IcBuildingUnitDao icBuildingUnitDao; + @Autowired + private DataReportOpenFeignClient dataReportOpenFeignClient; + @Override @Transactional(rollbackFor = Exception.class) @@ -716,6 +720,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { resultDTO.setWscHouseRatio(Double.valueOf((resultDTO.getHouseTotal() == 0 || resultDTO.getWscHouseTotal() > resultDTO.getHouseTotal()) ? "0" : numberFormat.format(((float) resultDTO.getWscHouseTotal() / (float) resultDTO.getHouseTotal()) * 100))); resultDTO.setOrgId(formDTO.getOrgId()); resultDTO.setOrgType(formDTO.getOrgType()); + + // 加载上个月，该组织的人房统计信息，并且计算较上月信息 + Date lastDayOfLastMonth = DateUtils.getLastDayOfMonth(DateUtils.addDateMonths(new Date(), -1)); + UserHouseStatsQueryFormDTO form = new UserHouseStatsQueryFormDTO(formDTO.getOrgId(), formDTO.getOrgType(), DateUtils.format(lastDayOfLastMonth, "yyyyMMdd")); + UserHouseStatsResultDTO lastMonthUserHouseStats = getResultDataOrThrowsException(dataReportOpenFeignClient.getUserHouseDailyStatsByDateId(form), ServiceConstant.DATA_REPORT_SERVER, + EpmetErrorCode.SERVER_ERROR.getCode(), null, null); + + resultDTO.setHouseTotalJSY(resultDTO.getHouseTotal() - lastMonthUserHouseStats.getHouseTotal()); + resultDTO.setCzHouseTotalJSY(resultDTO.getCzHouseTotal() - lastMonthUserHouseStats.getCzHouseTotal()); + resultDTO.setXzHouseTotalJSY(resultDTO.getXzHouseTotal() - lastMonthUserHouseStats.getXzHouseTotal()); + resultDTO.setZzHouseTotalJSY(resultDTO.getZzHouseTotal() - lastMonthUserHouseStats.getZzHouseTotal()); return resultDTO; } From 76302314de4d0ff497432df837720fe225bb165b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 10:47:43 +0800 Subject: [PATCH 050/621] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govissue/IssueApplicationDTO.java | 2 + .../govissue/IssueApplicationEntity.java | 3 ++ .../com/epmet/dto/IssueApplicationDTO.java | 2 + .../com/epmet/dao/IssueApplicationDao.java | 4 ++ .../epmet/entity/IssueApplicationEntity.java | 3 ++ .../epmet/service/impl/IssueServiceImpl.java | 9 +++- .../V0.0.19__alter_issue_application.sql | 2 + .../resources/mapper/IssueApplicationDao.xml | 41 +++++++++++++++++++ 8 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__alter_issue_application.sql diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueApplicationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueApplicationDTO.java index 4565baf59c..a6a7f8f18c 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueApplicationDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueApplicationDTO.java @@ -73,6 +73,8 @@ public class IssueApplicationDTO implements Serializable { * 网格ID 居民端议题对应一个网格Id */ private String gridId; + private String orgId; + private String orgIdPath; /** * 审核通过后对应的 议题id diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueApplicationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueApplicationEntity.java index 1e6671bfa7..ff45b8a88c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueApplicationEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueApplicationEntity.java @@ -70,6 +70,9 @@ public class IssueApplicationEntity extends BaseEpmetEntity { */ private String gridId; + private String orgId; + private String orgIdPath; + /** * 审核通过后对应的 议题id */ diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java index 69185b4280..1138c33c7b 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java @@ -73,6 +73,8 @@ public class IssueApplicationDTO implements Serializable { * 网格ID 居民端议题对应一个网格Id */ private String gridId; + private String orgId; + private String orgIdPath; /** * 审核通过后对应的 议题id diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java index 33296076b6..5218d9a1e3 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java @@ -19,8 +19,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IssueApplicationDTO; +import com.epmet.dto.form.AuditListFormDTO; import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.dto.form.UserPubAuditingIssueFormDTO; +import com.epmet.dto.result.AuditListResultDTO; import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.dto.result.UserPubAuditingIssueResDTO; import com.epmet.entity.IssueApplicationEntity; @@ -74,4 +76,6 @@ public interface IssueApplicationDao extends BaseDao { */ List selectTopicIdList(@Param("topicIdList") List topicIdList); + List auditList(AuditListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java index fb2d141926..f61f5e6917 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java @@ -70,6 +70,9 @@ public class IssueApplicationEntity extends BaseEpmetEntity { */ private String gridId; + private String orgId; + private String orgIdPath; + /** * 审核通过后对应的 议题id */ diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 89a9a04222..315894265d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -379,8 +379,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp result.setAuditSwitch(ifOpen ? ModuleConstants.AUDIT_SWITCH_OPEN : ModuleConstants.AUDIT_SWITCH_CLOSE); //2.居民端组长提交议题审核 - - //默认打开 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(param.getGridId()); + if (null == gridInfo){ + throw new EpmetException("查询网格信息失败："+param.getGridId()); + } + //默认打开 //2.1查询是否存在application记录 Map applicationParam = new HashMap<>(); applicationParam.put(ModuleConstants.FIELD_JAVA_TOPIC_ID, param.getTopicId()); @@ -393,6 +396,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp if(ifOpen) { //首次提交 新增application IssueApplicationDTO newApplication = ConvertUtils.sourceToTarget(param, IssueApplicationDTO.class); + newApplication.setOrgId(gridInfo.getPid()); + newApplication.setOrgIdPath(gridInfo.getPids()); newApplication.setApplyStatus(defaultStatusUnderAuditing); newApplication.setId(UUID.randomUUID().toString().replace("-", "")); applicationService.save(newApplication); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__alter_issue_application.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__alter_issue_application.sql new file mode 100644 index 0000000000..256b0ab6b6 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__alter_issue_application.sql @@ -0,0 +1,2 @@ +alter table issue_application add COLUMN ORG_ID VARCHAR(64) DEFAULT'' COMMENT '组织ID' AFTER GRID_ID; +alter table issue_application add COLUMN ORG_ID_PATH VARCHAR(1024) DEFAULT'' COMMENT '组织ID全路径，包括ORG_ID' AFTER ORG_ID; \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml index 2820a43019..dca932e4e0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml @@ -86,4 +86,45 @@ + + + \ No newline at end of file From 3338d6544cdff96ea78f77ef9bc5ebf3ec12ea20 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 10:47:58 +0800 Subject: [PATCH 051/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/IcEventListResultDTO.java | 6 +++--- .../src/main/resources/mapper/IcEventDao.xml | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index beac1277a0..349db1d45c 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -117,15 +117,15 @@ public class IcEventListResultDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date closeCaseTime; /** - * 0:已回复 1:已转项目 1:已转需求 + * 0:已回复 1:已转项目 2:已转需求3:转议题 */ private String operationType; /** - * 0:已回复 1:已转项目 1:已转需求 + * 0:已回复 1:已转项目 2:已转需求3:转议题 */ private String operationTypeName; /** - * 项目、需求ID + * 项目、需求ID、议题id */ private String operationId; /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index dd94828eb2..f1602eb237 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -169,7 +169,14 @@ ie.satisfaction, IF(ie.satisfaction = 'bad','不满意',IF (ie.satisfaction = 'good','基本满意',IF (ie.satisfaction = 'perfect','非常满意',''))) satisfactionName, ie.operation_type, - IF(ie.operation_type = '0','已回复',IF (ie.operation_type = '1','已转项目',IF (ie.operation_type = '2','已转需求',''))) operationTypeName, + ( + case when ie.operation_type = '0' then '已回复' + when ie.operation_type = '1' then '已转项目' + when ie.operation_type = '2' then '已转需求' + when ie.operation_type = '3' then '已转议题' + else '' + end + )as operationTypeName ie.operation_id, ie.read_flag, ie.red_dot, From 5b2ffda7e6166102f89629e205447da0ea63883c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 11:05:54 +0800 Subject: [PATCH 052/621] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E8=B0=83=E6=95=B4=EF=BC=9B=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95=E6=9C=AA=E5=AE=8C=E5=BE=85?= =?UTF-8?q?=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovIssueOpenFeignClient.java | 8 +++++ .../GovIssueOpenFeignClientFallBack.java | 11 +++++++ .../controller/IssueManageController.java | 1 + .../service/impl/IssueProcessServiceImpl.java | 14 ++++----- .../service/impl/IcEventServiceImpl.java | 31 ++++++++++++------- 5 files changed, 46 insertions(+), 19 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index c0310ac6a0..2d65ee9126 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -411,4 +411,12 @@ public interface GovIssueOpenFeignClient { */ @PostMapping("/gov/issue/issue/publishIssue") Result publishIssue(@RequestBody PublishIssueFormDTO issueFormDTO); + + /** + * 议题处理进展，这个接口小程序也在用，服务之间也在用 + * @param issueId + * @return + */ + @PostMapping("/gov/issue/manage/progress") + Result> queryIssueProcess(@RequestBody IssueIdFormDTO issueId); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 8037939a4c..fee75badad 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -353,4 +353,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result publishIssue(PublishIssueFormDTO issueFormDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "publishIssue", issueFormDTO); } + + /** + * 议题处理进展，这个接口小程序也在用，服务之间也在用 + * + * @param formDTO + * @return + */ + @Override + public Result> queryIssueProcess(IssueIdFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", formDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java index aa9c671e6d..3d0ca597c0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java @@ -201,6 +201,7 @@ public class IssueManageController { @PostMapping("progress") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result> processList(@RequestBody IssueIdFormDTO issueId){ + ValidatorUtils.validateEntity(issueId); return new Result>().ok(issueProcessService.processList(issueId)); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java index 5e47cc5a4a..6d33f38258 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java @@ -155,16 +155,14 @@ public class IssueProcessServiceImpl extends BaseServiceImpl(); + } + //转议题信息 + ProcessListResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId); + if (null != issueProcessResultDTO) { + listResult.add(issueProcessResultDTO); } return listResult; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 8ca9e087dd..bcf82b4bf9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1202,29 +1202,38 @@ public class IcEventServiceImpl extends BaseServiceImpl event = icEventReplyService.getByEventId(formDTO.getIcEventId()); - + // operationType 0:已回复 1:已转项目 2:已转需求3:转议题 //3.判断查询事件项目进展或需求进展信息 - //项目进展 if ("1".equals(entity.getOperationType())) { + // 项目进展 ProcessListV2FormDTO processListV2FormDTO = new ProcessListV2FormDTO(); processListV2FormDTO.setProjectId(entity.getOperationId()); List project = projectTraceService.processListV2(processListV2FormDTO); List projectList = ConvertUtils.sourceToTarget(project, IcEventProcessListResultDTO.class); - projectList.forEach(p->p.setType("project")); + projectList.forEach(p -> p.setType("project")); resultList.addAll(projectList); - } - //需求进展 - if ("2".equals(entity.getOperationType())) { + } else if ("2".equals(entity.getOperationType())) { + // 需求进展 LinkedList demand = icEventOperationLogService.getByEventId(formDTO.getIcEventId()); resultList.addAll(demand); + } else if ("3".equals(entity.getOperationType())) { + // 议题处理进展 + IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO(); + issueIdFormDTO.setIssueId(entity.getOperationId()); + Result> issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO); + if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件已转议题，议题处理进展查询异常", "事件已转议题，议题处理进展查询异常"); + } + // todo + + } + //最后拼上回复的 + //2.查询事件回复信息 + LinkedList event = icEventReplyService.getByEventId(formDTO.getIcEventId()); resultList.addAll(event); - return resultList; } From 4e0b7d4373f98634680d860e30915045398026d5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 11:13:40 +0800 Subject: [PATCH 053/621] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssueAuditController.java | 11 ++++++ .../com/epmet/dao/IssueApplicationDao.java | 4 +++ .../service/IssueApplicationService.java | 2 ++ .../impl/IssueApplicationServiceImpl.java | 34 +++++++++++++++++++ .../resources/mapper/IssueApplicationDao.xml | 26 ++++++++++++++ 5 files changed, 77 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java index adde0e0bd4..0a9d0a4304 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java @@ -144,4 +144,15 @@ public class IssueAuditController { formDTO.setUserId(tokenDto.getUserId()); return new Result>().ok(issueApplicationService.auditList(formDTO)); } + + /** + * Desc: 补全议题审核表历史数据 + * @param + * @author zxc + * @date 2022/10/10 10:55 + */ + public Result initIssueApplicationHistoryData(){ + issueApplicationService.initIssueApplicationHistoryData(); + return new Result(); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java index 5218d9a1e3..a1d2c89468 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java @@ -78,4 +78,8 @@ public interface IssueApplicationDao extends BaseDao { List auditList(AuditListFormDTO formDTO); + List initIssueApplicationHistoryData(); + + void updateIssueApplication(List list); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java index e51bec4d6b..023bb20a0e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java @@ -154,4 +154,6 @@ public interface IssueApplicationService extends BaseService notIssueToTopicIds(List topicIdList); PageData auditList(AuditListFormDTO formDTO); + + void initIssueApplicationHistoryData(); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java index e69bbba811..24806fd924 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java @@ -21,7 +21,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +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.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IssueApplicationDao; import com.epmet.dto.IssueApplicationDTO; @@ -41,6 +45,8 @@ import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO; import com.epmet.service.IssueApplicationService; import com.epmet.utils.ModuleConstants; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -193,4 +199,32 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> baseDao.initIssueApplicationHistoryData()); + List list = pageInfo.getList(); + size = list.size(); + if (CollectionUtils.isNotEmpty(list)){ + list.forEach(l -> { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId()); + if (null == gridInfo){ + throw new EpmetException("查询网格信息失败："+l.getGridId()); + } + l.setOrgId(gridInfo.getPid()); + l.setOrgIdPath(gridInfo.getPids()); + }); + updateIssueApplication(list); + } + no++; + }while (size.compareTo(NumConstant.ONE_HUNDRED) == NumConstant.ZERO); + } + + @Transactional(rollbackFor = Exception.class) + public void updateIssueApplication(List list){ + baseDao.updateIssueApplication(list); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml index dca932e4e0..c205c2004f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml @@ -2,6 +2,28 @@ + + UPDATE issue_application + + + + when ID = #{i.ID} then #{orgId} + + + + + when ID = #{i.ID} then #{ORG_ID_PATH} + + + updated_time = now() + where 1=1 + + + ID = #{i.ID} + + + + + + \ No newline at end of file From a7ccac3dc23022cef0976205294f3f19233f0b21 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 10 Oct 2022 11:17:52 +0800 Subject: [PATCH 054/621] =?UTF-8?q?-=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96-=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=BE=83=E4=B8=8A?= =?UTF-8?q?=E6=9C=88=E7=9A=84=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/UserChartResultDTO.java | 13 +++++++++++++ .../epmet/service/impl/IcResiUserServiceImpl.java | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java index 12f87fd20d..fb484d72b7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserChartResultDTO.java @@ -40,6 +40,19 @@ public class UserChartResultDTO implements Serializable { */ private Double ldUserRatio = 0.0; + /** + * 用户总数-较上月 + */ + private Integer userTotalJSY; + /** + * 常住用户-较上月 + */ + private Integer czUserTotalJSY; + /** + * 流动人口-较上月 + */ + private Integer ldUserTotalJSY; + @JsonIgnore private Integer num; //是否是流动人口【是:1 否:0】 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 ec9bf3043c..e2fb13dd7a 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 @@ -57,6 +57,7 @@ import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; +import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; @@ -70,6 +71,7 @@ import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; import com.epmet.opendata.feign.GuardarDatosFeignClient; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; +import com.epmet.stats.UserHouseStatsResultDTO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -162,6 +164,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params) { @@ -2045,6 +2050,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Mon, 10 Oct 2022 11:22:05 +0800 Subject: [PATCH 055/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E8=B0=83=E6=95=B4=EF=BC=9A=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?+=E4=BA=8B=E4=BB=B6=E5=9B=9E=E5=A4=8D=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=B1=95+=E4=BA=8B=E4=BB=B6=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E3=80=81=E8=AE=AE=E9=A2=98=E8=BF=9B=E5=B1=95=EF=BC=88?= =?UTF-8?q?=E5=90=AB=E9=A1=B9=E7=9B=AE=EF=BC=89+=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcEventServiceImpl.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index bcf82b4bf9..189811df46 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1205,7 +1205,7 @@ public class IcEventServiceImpl extends BaseServiceImpl event = icEventReplyService.getByEventId(formDTO.getIcEventId()); resultList.addAll(event); return resultList; From fe09f4c88ebe61c325954fc5bf71dcefb11236a4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 13:11:47 +0800 Subject: [PATCH 056/621] =?UTF-8?q?=E3=80=90%s=E3=80=91=E5=8F=91=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E4=BA=8B=E4=BB=B6=E8=A2=AB=E3=80=90%s=E3=80=91?= =?UTF-8?q?=E8=BD=AC=E4=B8=BA=E8=AE=AE=E9=A2=98=E3=80=90%s=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 315894265d..1e39c91726 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -2019,7 +2019,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp issueProcessEntity.setOrgType(ModuleConstants.ISSUE_PROCESS_ORG_TYPE_AGENCY); CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(issueFormDTO.getCustomerId(),issueFormDTO.getCreatedBy()); issueProcessEntity.setOrgId(staffInfo.getAgencyId()); - issueProcessEntity.setOperationExplain(String.format("【%s】发表的事件被【%s】转为议题", issueFormDTO.getEventReportUserName(), staffInfo.getAgencyName())); + issueProcessEntity.setOperationExplain(String.format("【%s】发表的事件被【%s】转为议题【%s】", issueFormDTO.getEventReportUserName(), staffInfo.getAgencyName(), issueEntity.getIssueTitle())); issueProcessEntity.setOrgName(staffInfo.getAgencyName()); issueProcessEntity.setCustomerId(issueFormDTO.getCustomerId()); issueProcessService.insert(issueProcessEntity); From 32238d6977615bbb57af68cfcea3372ec28b7db4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 13:18:35 +0800 Subject: [PATCH 057/621] operationTypeName, --- .../java/com/epmet/controller/IcEventController.java | 12 ++++++++++++ .../src/main/resources/mapper/IcEventDao.xml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 3b667b222c..f905215a44 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -59,6 +59,12 @@ public class IcEventController { @Autowired private IcEventReplyService icEventReplyService; + /** + * 事件管理-列表 + * @param tokenDto + * @param formDTO + * @return + */ @RequestMapping("list") public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -83,6 +89,12 @@ public class IcEventController { return new Result().ok(data); } + /** + * 事件管理-新增 + * @param tokenDto + * @param formDTO + * @return + */ @NoRepeatSubmit @PostMapping("add") public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcEventAddEditFormDTO formDTO){ diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index f1602eb237..8f2e8049ba 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -176,7 +176,7 @@ when ie.operation_type = '3' then '已转议题' else '' end - )as operationTypeName + )as operationTypeName, ie.operation_id, ie.read_flag, ie.red_dot, From b444159b2c000cac8fc9620da6b8e8b1b8cb8e7f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 13:21:26 +0800 Subject: [PATCH 058/621] =?UTF-8?q?warn=E8=A7=A3=E6=9E=90=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?,a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/LoginServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index 211fce084e..a343fce601 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -133,10 +133,10 @@ public class LoginServiceImpl implements LoginService { log.error("->[getMaOpenId]::error[{}]", "解析微信code失败",e); } if (null == wxMaJscode2SessionResult) { - log.error(String.format("解析微信用户信息失败,app[%s],wxCode[%s],result:[%S]",app,wxCode, JSON.toJSONString(wxMaJscode2SessionResult))); + log.warn(String.format("解析微信用户信息失败,app[%s],wxCode[%s],result:[%S]",app,wxCode, JSON.toJSONString(wxMaJscode2SessionResult))); throw new RenException("解析微信用户信息失败"); } else if (StringUtils.isBlank(wxMaJscode2SessionResult.getOpenid())) { - log.error(String.format("获取微信openid失败,app[%s],wxCode[%s]",app,wxCode)); + log.warn(String.format("获取微信openid失败,app[%s],wxCode[%s]",app,wxCode)); throw new RenException("获取微信openid失败"); } return wxMaJscode2SessionResult; From c88865c88d6f5343a5401c55cb9316912a29676b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 13:21:40 +0800 Subject: [PATCH 059/621] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/IssueAuditController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java index 0a9d0a4304..87dfa6027c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java @@ -151,6 +151,7 @@ public class IssueAuditController { * @author zxc * @date 2022/10/10 10:55 */ + @PostMapping("initIssueApplicationHistoryData") public Result initIssueApplicationHistoryData(){ issueApplicationService.initIssueApplicationHistoryData(); return new Result(); From 72b62e31765da320e1005b79d0c2cab480a4a460 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 13:22:21 +0800 Subject: [PATCH 060/621] log.warn("->[getMaOpenId]::err --- .../src/main/java/com/epmet/service/impl/LoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index a343fce601..25524fa9e0 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -130,7 +130,7 @@ public class LoginServiceImpl implements LoginService { } } } catch (WxErrorException e) { - log.error("->[getMaOpenId]::error[{}]", "解析微信code失败",e); + log.warn("->[getMaOpenId]::error[{}]", "解析微信code失败",e); } if (null == wxMaJscode2SessionResult) { log.warn(String.format("解析微信用户信息失败,app[%s],wxCode[%s],result:[%S]",app,wxCode, JSON.toJSONString(wxMaJscode2SessionResult))); From 2dfb87e3ada412309fc8e09b77e4607d1b34a311 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 13:41:55 +0800 Subject: [PATCH 061/621] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueApplicationServiceImpl.java | 9 ++++++--- .../src/main/resources/mapper/IssueApplicationDao.xml | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java index 24806fd924..1dc8212e67 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java @@ -46,6 +46,7 @@ import com.epmet.service.IssueApplicationService; import com.epmet.utils.ModuleConstants; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -62,6 +63,7 @@ import java.util.Map; * @since v1.0.0 2020-11-17 */ @Service +@Slf4j public class IssueApplicationServiceImpl extends BaseServiceImpl implements IssueApplicationService { @Override @@ -208,14 +210,15 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl list = pageInfo.getList(); size = list.size(); if (CollectionUtils.isNotEmpty(list)){ - list.forEach(l -> { + for (IssueApplicationDTO l : list) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId()); if (null == gridInfo){ - throw new EpmetException("查询网格信息失败："+l.getGridId()); + log.warn("查询网格信息失败："+l.getGridId()); + continue; } l.setOrgId(gridInfo.getPid()); l.setOrgIdPath(gridInfo.getPids()); - }); + } updateIssueApplication(list); } no++; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml index c205c2004f..293d28f383 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml @@ -7,19 +7,19 @@ - when ID = #{i.ID} then #{orgId} + when ID = #{i.id} then #{i.orgId} - when ID = #{i.ID} then #{ORG_ID_PATH} + when ID = #{i.id} then #{i.orgIdPath} updated_time = now() where 1=1 - ID = #{i.ID} + ID = #{i.id} From af0653a296c33224a6e849a4fdd4a7ec2096a854 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 14:08:37 +0800 Subject: [PATCH 062/621] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=20=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AuditListResultDTO.java | 2 ++ .../com/epmet/dao/IssueApplicationDao.java | 18 ++++++++++ .../impl/IssueApplicationServiceImpl.java | 33 ++++++++++++++++++- .../resources/mapper/IssueApplicationDao.xml | 19 ++++++----- 4 files changed, 63 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AuditListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AuditListResultDTO.java index 26a3ac0edd..5878ca9864 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AuditListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AuditListResultDTO.java @@ -19,6 +19,8 @@ public class AuditListResultDTO implements Serializable { * 所属网格 */ private String gridName; + private String gridId; + private String orgId; /** * 议题标题 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java index a1d2c89468..4f2ede6325 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java @@ -76,10 +76,28 @@ public interface IssueApplicationDao extends BaseDao { */ List selectTopicIdList(@Param("topicIdList") List topicIdList); + /** + * Desc: 待审核，驳回列表 + * @param formDTO + * @author zxc + * @date 2022/10/10 13:42 + */ List auditList(AuditListFormDTO formDTO); + /** + * Desc: 补全数据 + * @param + * @author zxc + * @date 2022/10/10 13:42 + */ List initIssueApplicationHistoryData(); + /** + * Desc: 批量更新议题审核组织信息 + * @param list + * @author zxc + * @date 2022/10/10 13:42 + */ void updateIssueApplication(List list); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java index 1dc8212e67..a37a1aad89 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java @@ -22,9 +22,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; 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.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.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IssueApplicationDao; @@ -32,6 +34,7 @@ import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.form.AuditListFormDTO; import com.epmet.dto.form.IssueAppQueryFormDTO; import com.epmet.dto.form.UserPubAuditingIssueFormDTO; +import com.epmet.dto.result.AllIssueListResultDTO; import com.epmet.dto.result.AuditListResultDTO; import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.dto.result.UserPubAuditingIssueResDTO; @@ -52,6 +55,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -198,7 +202,34 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl auditList(AuditListFormDTO formDTO) { - return null; + if (StringUtils.isBlank(formDTO.getOrgId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员信息失败："+formDTO.getUserId()); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType(ModuleConstants.ISSUE_PROCESS_ORG_TYPE_AGENCY); + } + PageData result = new PageData<>(new ArrayList(),NumConstant.ZERO_L); + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.auditList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + List auditListResultDTOS = baseDao.auditList(formDTO); + result.setList(auditListResultDTOS); + result.setTotal(auditListResultDTOS.size()); + } + if (CollectionUtils.isNotEmpty(result.getList())){ + result.getList().forEach(l -> { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId()); + if(null == gridInfo){ + throw new EpmetException("查询网格信息失败："+l.getGridId()); + } + l.setGridName(gridInfo.getGridNamePath()); + }); + } + return result; } @Override diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml index 293d28f383..64541d95c6 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml @@ -112,31 +112,34 @@ + + From 63b4e6448bb77e37e3501d1373421fb8a5a5d8fe Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 14:51:54 +0800 Subject: [PATCH 066/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 1e39c91726..2f26eea2f0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -643,6 +643,10 @@ public class IssueServiceImpl extends BaseServiceImpl imp public GovIssueDetailResultDTO issueDetailGov(IssueDetailFormDTO issueParam) { //1.得到议题信息 IssueEntity issueDetail = selectById(issueParam.getIssueId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(issueDetail.getGridId()); + if(null == gridInfo){ + throw new EpmetException("查询网格信息失败"+issueDetail.getGridId()); + } GovIssueDetailResultDTO issueInfo = new GovIssueDetailResultDTO(); //2.1如果此条议题来源自话题 if(StringUtils.equals(ModuleConstants.ISSUE_FROM_TOPIC,issueDetail.getSourceType())){ @@ -672,10 +676,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp //查询话题失败异常 }else if (ModuleConstants.ISSUE.equals(issueDetail.getSourceType())){ issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class); - GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(issueDetail.getGridId()); - if(null == gridInfo){ - throw new EpmetException("查询网格信息失败"+issueDetail.getGridId()); - } Result> userResult = userOpenFeignClient.queryUserBaseInfo(Arrays.asList(issueDetail.getCreatedBy())); if (!userResult.success() || CollectionUtils.isEmpty(userResult.getData())){ throw new EpmetException("查询居民信息失败"); @@ -685,6 +685,16 @@ public class IssueServiceImpl extends BaseServiceImpl imp issueInfo.setIssuePublisherMobile(user.getMobile()); issueInfo.setBelongsGridName(gridInfo.getGridNamePath()); return issueInfo; + }else { + issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(issueDetail.getCustomerId(), issueDetail.getCreatedBy()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员信息失败："+issueDetail.getCreatedBy()); + } + issueInfo.setIssueInitiator(staffInfo.getRealName()); + issueInfo.setIssuePublisherMobile(staffInfo.getMobile()); + issueInfo.setBelongsGridName(gridInfo.getGridNamePath()); + return issueInfo; } return null; From b1048e7509077f1527f8909bfcf6cb68899bf8b0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 15:00:02 +0800 Subject: [PATCH 067/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2f26eea2f0..522a72f868 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -663,6 +663,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp issueInfo.setIssueStatus(issueDetail.getIssueStatus()); issueInfo.setIssueSuggestion(issueDetail.getSuggestion()); issueInfo.setIssueTitle(issueDetail.getIssueTitle()); + issueInfo.setSourceId(issueDetail.getSourceId()); issueInfo.setVotingDeadline(null == issueDetail.getVotingDeadline() ? NumConstant.ZERO_L : issueDetail.getVotingDeadline().getTime()/NumConstant.ONE_THOUSAND); issueInfo.setTopicInfo(topicInfo); From c5425ccc1fcc02d67b4a438c2460f9992ec7d3b4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 15:07:44 +0800 Subject: [PATCH 068/621] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E8=A1=A8?= =?UTF-8?q?=E5=86=B3=E4=B8=AD=E8=B6=8A=E6=9D=A5=E8=B6=8A=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/TopicInfoDTO.java | 5 +++ .../com/epmet/dto/result/HallIcEventDTO.java | 17 +++++++ .../dto/result/VotingIssueListResultDTO.java | 13 +++++- .../com/epmet/controller/IssueController.java | 2 +- .../java/com/epmet/service/IssueService.java | 5 +++ .../epmet/service/impl/IssueServiceImpl.java | 45 ++++++++++++------- 6 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java index faa0f39e1b..3ac912d4c2 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java @@ -30,6 +30,11 @@ public class TopicInfoDTO implements Serializable { */ private List topicImgs; + /** + * 话题语音-2022.10.10 + */ + private List topicVoices; + /** * 话题发表人（山东路168-尹女士） */ diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java new file mode 100644 index 0000000000..dba0b2cac3 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/10/10 14:47 + */ +@Data +public class HallIcEventDTO implements Serializable { + private static final long serialVersionUID = -6245586010939647194L; + // todo +} + diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java index 4209446f79..807a98e55c 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.epmet.dto.TopicInfoDTO; import lombok.Data; import java.io.Serializable; @@ -41,10 +42,11 @@ public class VotingIssueListResultDTO implements Serializable { private String sourceId; /** - * 来源类型 话题：resi_topic；直接立议题：issue； + * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event */ private String sourceType; + //最开始 那一版，话题的东西，是放在下面这几列的，做事件转议题时， 单独出来了topicInfoDTO，icEventInfo /** * 话题图片列表 */ @@ -67,4 +69,13 @@ public class VotingIssueListResultDTO implements Serializable { private String longitude; private String latitude; + + /** + * 话题信息-2022.10.10 + */ + private TopicInfoDTO topicInfoDTO; + /** + * 事件信息-2022.10.10 + */ + private HallIcEventDTO icEventInfo; } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java index 2da4bf2e29..881b45bb13 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java @@ -179,7 +179,7 @@ public class IssueController { } /** - * @Description 获取表决中议题列表 + * @Description 居民端议事厅-获取表决中议题列表 * @param issueListFormDTO * @return Result> * @author wangc diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java index 7771cb503b..d10e341a06 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java @@ -118,6 +118,11 @@ public interface IssueService { **/ PublishSuggestionResultDTO publisSuggestion(PublishSuggestionFormDTO formDTO); + /** + * 居民端议事厅-表决中议题列表 + * @param issueListFormDTO + * @return + */ List listVotingIssues(CommonIssueListFormDTO issueListFormDTO); /** diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index b9515de5bc..24e8bd1801 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -405,31 +405,44 @@ public class IssueServiceImpl implements IssueService { return govIssueFeignClient.processList(issueId).getData(); } + /** + * 居民端议事厅-表决中议题列表 + * @param issueListFormDTO + * @return + */ @Override public List listVotingIssues(CommonIssueListFormDTO issueListFormDTO) { + //1、查询表决中的议题列表，issue.created_time降序 Result> votingIssueListResult = govIssueFeignClient.votingList(issueListFormDTO); if (!votingIssueListResult.success()) { throw new RenException(String.format("调用gov-issue查询表决中列表失败")); } List votingIssueList = votingIssueListResult.getData(); if (votingIssueList != null && !CollectionUtils.isEmpty(votingIssueList)) { - List topicIds = votingIssueList.stream().map(i -> i.getSourceId()).collect(Collectors.toList()); - TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO(); - form.setTopicIdList(topicIds); - Result> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form); - if (!topicDetailsResult.success()) { - logger.error("调用resi-group批量查询详情失败"); - } else { + // 来源于话题的 + List topicIds = votingIssueList.stream().filter(t -> t.getSourceType().equals("resi_topic")).map(i -> i.getSourceId()).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(topicIds)) { + TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO(); + form.setTopicIdList(topicIds); + Result> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form); List topicDetails = topicDetailsResult.getData(); - HashMap rtm = convertTopicDetailList2Map(topicDetails); - votingIssueList.forEach(vi -> { - ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId()); - vi.setTopicImgs(rr == null ? null : rr.getTopicImgs()); - vi.setTopicVoices(rr == null ? null : rr.getTopicImgs()); - vi.setTopicContent(rr == null ? "" : rr.getTopicContent()); - vi.setLongitude(rr == null ? "" : rr.getLongitude()); - vi.setLatitude(rr == null ? "" : rr.getLatitude()); - }); + if (!CollectionUtils.isEmpty(topicDetails)) { + HashMap rtm = convertTopicDetailList2Map(topicDetails); + votingIssueList.forEach(vi -> { + ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId()); + vi.setTopicImgs(rr == null ? null : rr.getTopicImgs()); + vi.setTopicVoices(rr == null ? null : rr.getTopicImgs()); + vi.setTopicContent(rr == null ? "" : rr.getTopicContent()); + vi.setLongitude(rr == null ? "" : rr.getLongitude()); + vi.setLatitude(rr == null ? "" : rr.getLatitude()); + // todo 赋值话题详情 + }); + } + } + //来源于事件的 + List icEventIds = votingIssueList.stream().filter(t -> t.getSourceType().equals("ic_event")).map(i -> i.getSourceId()).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(icEventIds)){ + // todo 查询事件详情 } } return votingIssueList; From f0787029d451e81cf48f78a705c83b8230f3a4b4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 10 Oct 2022 15:09:17 +0800 Subject: [PATCH 069/621] =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IssueVoteStatisticalServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index d1d0856063..1b33806f47 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -266,13 +266,15 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl allResiByGrid = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(issueEntity.getGridId())); - if (!allResiByGrid.success()){ - throw new EpmetException("查询网格下注册居民失败："+issueEntity.getGridId()); - } //缓存获取议题表决详情 VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.getVoteStatistical(issueId.getIssueId()); - voteRedisFormDTO.setShouldVoteCount(allResiByGrid.getData()); + if (!issueEntity.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)){ + Result allResiByGrid = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(issueEntity.getGridId())); + if (!allResiByGrid.success()){ + throw new EpmetException("查询网格下注册居民失败："+issueEntity.getGridId()); + } + voteRedisFormDTO.setShouldVoteCount(allResiByGrid.getData()); + } VotingTrendResultDTO votingTrendResultDTO = new VotingTrendResultDTO(); BeanUtils.copyProperties(voteRedisFormDTO, votingTrendResultDTO); votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount() + voteRedisFormDTO.getOppositionAmount()); From 2eac4b620d754a5f50ac374b176e9f6f341d4489 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 15:10:43 +0800 Subject: [PATCH 070/621] PublishIssueFormDTO --- .../main/java/com/epmet/dto/form/PublishIssueFormDTO.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/PublishIssueFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/PublishIssueFormDTO.java index 36fd0866d3..a965c22ed4 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/PublishIssueFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/PublishIssueFormDTO.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -63,19 +64,19 @@ public class PublishIssueFormDTO implements Serializable { /** * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制 */ - @NotBlank(message = "", groups = AddUserShowGroup.class) + @NotBlank(message = "orgIdPath不能为空", groups = AddUserShowGroup.class) private String orgIdPath; /** * 组织ID 【数据权限-非必填】agencyId */ - @NotBlank(message = "", groups = AddUserShowGroup.class) + @NotBlank(message = "orgId不能为空", groups = AddUserShowGroup.class) private String orgId; /** * 表决发起日期（转议题日期） */ - @NotBlank(message = "表决发起日期(转议题日期)不能为空", groups = AddUserShowGroup.class) + @NotNull(message = "表决发起日期(转议题日期)不能为空", groups = AddUserShowGroup.class) private Date decidedTime; /** From d09741d5a44d000680409e2a778dc0afc1c7c34e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 15:18:55 +0800 Subject: [PATCH 071/621] PublishIssueFormDTO --- .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index b2b100fbe9..9208d805fa 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -296,6 +296,8 @@ public class IcEventServiceImpl extends BaseServiceImpl Date: Mon, 10 Oct 2022 15:27:04 +0800 Subject: [PATCH 072/621] fuzhi --- .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 9208d805fa..ae897745f5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -297,7 +297,6 @@ public class IcEventServiceImpl extends BaseServiceImpl Date: Mon, 10 Oct 2022 16:34:39 +0800 Subject: [PATCH 073/621] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E8=A1=A8?= =?UTF-8?q?=E5=86=B3=E4=B8=AD=E8=AE=AE=E9=A2=98=E5=88=97=E8=A1=A8-todo=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/TopicInfoDTO.java | 4 ++++ .../java/com/epmet/service/impl/IssueServiceImpl.java | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java index 3ac912d4c2..60b4c527c9 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java @@ -45,6 +45,9 @@ public class TopicInfoDTO implements Serializable { */ private Long publishedTime; + + private String releaseTime; + /** * 小组类型(ordinary:楼院小组 branch:支部小组) */ @@ -59,4 +62,5 @@ public class TopicInfoDTO implements Serializable { * 话题所属小组名称 */ private String groupName; + } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 24e8bd1801..025349791a 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -435,7 +435,15 @@ public class IssueServiceImpl implements IssueService { vi.setTopicContent(rr == null ? "" : rr.getTopicContent()); vi.setLongitude(rr == null ? "" : rr.getLongitude()); vi.setLatitude(rr == null ? "" : rr.getLatitude()); - // todo 赋值话题详情 + // 赋值话题详情 + TopicInfoDTO topicInfoDTO=new TopicInfoDTO(); + topicInfoDTO.setTopicId(rr.getTopicId()); + topicInfoDTO.setTopicContent(rr.getTopicContent()); + topicInfoDTO.setTopicImgs(rr.getTopicImgs()); + topicInfoDTO.setTopicVoices(rr.getTopicVoices()); + topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); + topicInfoDTO.setReleaseTime(rr.getReleaseTime()); + vi.setTopicInfoDTO(topicInfoDTO); }); } } From 33c32b66edd9317bf9d5aeda1d4f12de314a88eb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 10 Oct 2022 17:01:25 +0800 Subject: [PATCH 074/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=BB=84=E7=BB=87=E4=B8=8B=E6=89=80=E6=9C=89=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E7=9A=84=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/redis/common/CustomerOrgRedis.java | 33 ++++++++++++++++ .../form/CommunityUserHouseStatsFormDTO.java | 15 +++++++ .../com/epmet/controller/HouseController.java | 16 ++++++++ .../java/com/epmet/dao/CustomerAgencyDao.java | 2 + .../java/com/epmet/service/HouseService.java | 2 + .../epmet/service/impl/HouseServiceImpl.java | 39 +++++++++++++++++++ .../resources/mapper/CustomerAgencyDao.xml | 9 +++++ 7 files changed, 116 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityUserHouseStatsFormDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java index 7cb132b0f5..3945081261 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; @@ -111,4 +112,36 @@ public class CustomerOrgRedis { customerOrgRedis.redisUtils.delete(key); } + /** + * 拼接orgIdPath + * @param orgId + * @param orgType + * @return + */ + public static String getOrgIdPath(String orgId, String orgType) { + String orgPids = null; + + if ("grid".equals(orgType)) { + GridInfoCache gridInfo = getGridInfo(orgId); + if (gridInfo == null) { + log.error("查询网格信息失败:{}", orgId); + return null; + } + orgPids = gridInfo.getPids(); + } else if ("agency".equals(orgType)) { + AgencyInfoCache agencyInfo = getAgencyInfo(orgId); + if (agencyInfo == null) { + log.error("查询组织信息失败:{}", orgId); + return null; + } + orgPids = agencyInfo.getPids(); + } + + if (StringUtils.isBlank(orgPids) || "0".equals(orgPids)) { + return orgId; + } + + return orgPids.concat(":").concat(orgId); + } + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityUserHouseStatsFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityUserHouseStatsFormDTO.java new file mode 100644 index 0000000000..075dc08b7c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommunityUserHouseStatsFormDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dto.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CommunityUserHouseStatsFormDTO { + private String orgId; + private String orgType; + private Integer pageNo = 1; + private Integer pageSize = 10; +} 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 35b3bc0e6f..dd1d7c37af 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 @@ -629,4 +629,20 @@ public class HouseController implements ResultDataResolver { return new Result>().ok(houseService.houseStatisListDetail(formDTO)); } + /** + * 针对社区的人房统计列表 + * @return + */ + @PostMapping("communityUserHouseStats") + public Result> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) { + + String orgId = input.getOrgId(); + String orgType = input.getOrgType(); + Integer pageNo = input.getPageNo(); + Integer pageSize = input.getPageSize(); + + List r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize); + return new Result>().ok(r); + } + } 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 0e90d851e3..072a877e94 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 @@ -396,5 +396,7 @@ public interface CustomerAgencyDao extends BaseDao { * @return */ Integer getUsingCommunityStats(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); + + List getCommunitysByOrgIdPath(@Param("orgId") String orgId, @Param("orgIdPath") String orgIdPath); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 239e844523..41ffd5709d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -197,4 +197,6 @@ public interface HouseService { PageData listHouses4ReportTest(String houseId, Integer pageNo, Integer pageSize); PageData houseStatisListDetail(HouseChartFormDTO formDTO); + + List communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index d8389ffc37..d5838a78a7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -42,6 +42,7 @@ import com.epmet.enums.*; import com.epmet.feign.*; import com.epmet.model.HouseInfoModel; import com.epmet.model.ImportHouseInfoListener; +import com.epmet.redis.CustomerAgencyRedis; import com.epmet.redis.IcHouseRedis; import com.epmet.service.*; import com.epmet.stats.UserHouseStatsResultDTO; @@ -1392,5 +1393,43 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { return new PageData<>(list, pageInfo.getTotal()); } + @Override + public List communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { + + PageHelper.startPage(pageNo, pageSize); + List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); + + // 填充组织信息 + Map communityMap = communityIds.stream().collect(Collectors.toMap(id -> id, id -> concatAgencyNamePath(id))); + List communityUserHouseStats = houseUserChartList(communityIds, communityMap, "agency"); + return communityUserHouseStats; + } + + public String concatAgencyNamePath(String agencyId) { + List agencyNamePathList = new ArrayList(); + + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + if (agencyInfo == null) { + return null; + } + agencyNamePathList.add(0, agencyInfo.getOrganizationName()); + + String pidsStr = agencyInfo.getPids(); + if (StringUtils.isBlank(pidsStr)) { + // 没有pids，是顶级，直接返回 + return String.join("-", agencyNamePathList); + } + + String[] pidList = pidsStr.split(":"); + for (String pAgencyId : pidList) { + AgencyInfoCache pAgencyInfo = CustomerOrgRedis.getAgencyInfo(pAgencyId); + if (pAgencyInfo == null) { + continue; + } + agencyNamePathList.add(pAgencyInfo.getOrganizationName()); + } + + return String.join("-", agencyNamePathList); + } } 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 9a0dfa1d51..cf75164bfc 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 @@ -1028,4 +1028,13 @@ group by ca.ID, ca.ORGANIZATION_NAME having community_count > 0) t + + From c1ec604dc7ac57e5deaa101536e943d173e5f747 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 17:14:57 +0800 Subject: [PATCH 075/621] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E8=A1=A8?= =?UTF-8?q?=E5=86=B3=E4=B8=AD=E8=AE=AE=E9=A2=98=E5=88=97=E8=A1=A8=E3=80=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/GovProjectOpenFeignClient.java | 8 +++++++ .../GovProjectOpenFeignClientFallback.java | 12 +++++++++++ .../epmet/controller/IcEventController.java | 14 ++++++++++++- .../com/epmet/service/IcEventService.java | 7 +++++++ .../service/impl/IcEventServiceImpl.java | 12 +++++++++++ .../com/epmet/dto/result/HallIcEventDTO.java | 9 +++++++- .../dto/result/VotingIssueListResultDTO.java | 2 +- .../epmet/service/impl/IssueServiceImpl.java | 21 +++++++++++++++---- 8 files changed, 78 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index 7907ac7ec5..c86a871a8a 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcEventDTO; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.form.*; @@ -178,4 +179,11 @@ public interface GovProjectOpenFeignClient { @PostMapping("gov/project/project/staffpendingproject") Result> staffPendingProject(@RequestBody ProjectListFromDTO formDTO); + /** + * 批量查询事件信息 + * @param icEventIds + * @return + */ + @PostMapping("gov/project/icEvent/batchSelectById") + Result> batchSelectById(@RequestBody List icEventIds); } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index 51f7922ba5..5854347118 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java @@ -3,6 +3,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcEventDTO; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.form.*; @@ -174,4 +175,15 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli public Result> staffPendingProject(ProjectListFromDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "staffPendingProject",formDTO); } + + /** + * 批量查询事件信息 + * + * @param icEventIds + * @return + */ + @Override + public Result> batchSelectById(List icEventIds) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "batchSelectById",icEventIds); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index d26aec98e5..c0a2924c84 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -542,6 +542,18 @@ public class IcEventController { return new Result>().ok(icEventService.icEventPageUserReported(formDTO)); } - + /** + * 批量查询事件信息 + * + * @param icEventIds + * @return + */ + @PostMapping("gov/project/icEvent/batchSelectById") + public Result> batchSelectById(@RequestBody List icEventIds) { + if (CollectionUtils.isEmpty(icEventIds)) { + return new Result<>(); + } + return new Result>().ok(icEventService.batchSelectById(icEventIds)); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index ede1854804..7421853c13 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -230,4 +230,11 @@ public interface IcEventService extends BaseService { * @param formDTO */ void icEventToIssue(IcEventToIssueFormDTO formDTO); + + /** + * 批量查询事件信息 + * @param icEventIds + * @return + */ + List batchSelectById(List icEventIds); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index ae897745f5..916b57661d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1803,4 +1803,16 @@ public class IcEventServiceImpl extends BaseServiceImpl batchSelectById(List icEventIds) { + Listlist=baseDao.selectBatchIds(icEventIds); + return ConvertUtils.sourceToTarget(list,IcEventDTO.class); + } + } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java index dba0b2cac3..37abb5cd03 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java @@ -12,6 +12,13 @@ import java.io.Serializable; @Data public class HallIcEventDTO implements Serializable { private static final long serialVersionUID = -6245586010939647194L; - // todo + /** + * 事件Id + */ + private String icEventId; + /** + * 事件内容 + */ + private String eventContent; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java index 807a98e55c..4025307ca0 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java @@ -73,7 +73,7 @@ public class VotingIssueListResultDTO implements Serializable { /** * 话题信息-2022.10.10 */ - private TopicInfoDTO topicInfoDTO; + private TopicInfoDTO topicInfo; /** * 事件信息-2022.10.10 */ diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 025349791a..528a7da03a 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constat.HallConstat; +import com.epmet.dto.IcEventDTO; import com.epmet.dto.IssueSuggestionDTO; import com.epmet.dto.TopicInfoDTO; import com.epmet.dto.form.*; @@ -443,14 +444,26 @@ public class IssueServiceImpl implements IssueService { topicInfoDTO.setTopicVoices(rr.getTopicVoices()); topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); topicInfoDTO.setReleaseTime(rr.getReleaseTime()); - vi.setTopicInfoDTO(topicInfoDTO); + vi.setTopicInfo(topicInfoDTO); }); } } - //来源于事件的 + // 来源于事件的 List icEventIds = votingIssueList.stream().filter(t -> t.getSourceType().equals("ic_event")).map(i -> i.getSourceId()).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(icEventIds)){ - // todo 查询事件详情 + if (!CollectionUtils.isEmpty(icEventIds)) { + Result> eventInfoRes = govProjectOpenFeignClient.batchSelectById(icEventIds); + if (eventInfoRes.success() && !CollectionUtils.isEmpty(eventInfoRes.getData())) { + Map eventMap = eventInfoRes.getData().stream().collect(Collectors.toMap(IcEventDTO::getId, o -> o, (o1, o2) -> o1)); + votingIssueList.forEach(vi -> { + IcEventDTO event = eventMap.get(vi.getSourceId()); + if (null != event) { + HallIcEventDTO hallIcEventDTO = new HallIcEventDTO(); + hallIcEventDTO.setIcEventId(event.getId()); + hallIcEventDTO.setEventContent(event.getEventContent()); + vi.setIcEventInfo(hallIcEventDTO); + } + }); + } } } return votingIssueList; From 6eee4b541724bec79e0a2de2daa56b8f91ee8a65 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Oct 2022 08:52:59 +0800 Subject: [PATCH 076/621] =?UTF-8?q?=E8=A1=A8=E5=86=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IssueVoteDetailServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index 0996cfb503..44812532ab 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -159,18 +159,18 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl allResi = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(issueDTO.getGridId())); - if (!allResi.success()){ - throw new EpmetException("查询网格下的注册居民失败:"+issueDTO.getGridId()); - } - redisData.setShouldVoteCount(allResi.getData()); - }else { + if (formDTO.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)){ Result integerResult = resiGroupFeignClient.votableCount(dto); if (!integerResult.success()){ throw new EpmetException("查询应表决人数失败..."); } redisData.setShouldVoteCount(integerResult.getData()); + }else { + Result allResi = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(issueDTO.getGridId())); + if (!allResi.success()){ + throw new EpmetException("查询网格下的注册居民失败:"+issueDTO.getGridId()); + } + redisData.setShouldVoteCount(allResi.getData()); } issueVoteDetailRedis.set(redisData); Integer checkoutVoteCount = baseDao.checkoutVote(formDTO); From 2a865b13ed7d473e59db214f4614bdcf5888759d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 09:05:42 +0800 Subject: [PATCH 077/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E6=B2=A1=E5=AE=8C=E4=BA=8B=E5=91=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/GovIssueOpenFeignClient.java | 4 ++-- .../feign/fallback/GovIssueOpenFeignClientFallBack.java | 4 ++-- .../java/com/epmet/service/impl/IcEventServiceImpl.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 2d65ee9126..bf3ce4bf2c 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -417,6 +417,6 @@ public interface GovIssueOpenFeignClient { * @param issueId * @return */ - @PostMapping("/gov/issue/manage/progress") - Result> queryIssueProcess(@RequestBody IssueIdFormDTO issueId); + // @PostMapping("/gov/issue/manage/progress") + // Result> queryIssueProcess(@RequestBody IssueIdFormDTO issueId); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index fee75badad..f7c44e4a75 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -360,8 +360,8 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient * @param formDTO * @return */ - @Override + /*@Override public Result> queryIssueProcess(IssueIdFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", formDTO); - } + }*/ } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 916b57661d..6d5dfb66bf 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1256,8 +1256,8 @@ public class IcEventServiceImpl extends BaseServiceImpl demand = icEventOperationLogService.getByEventId(formDTO.getIcEventId()); resultList.addAll(demand); } else if ("3".equals(entity.getOperationType())) { - // 议题处理进展 - IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO(); + // 议题处理进展 有问题 todo + /*IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO(); issueIdFormDTO.setIssueId(entity.getOperationId()); Result> issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO); if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData())){ @@ -1271,7 +1271,7 @@ public class IcEventServiceImpl extends BaseServiceImpl Date: Tue, 11 Oct 2022 09:22:30 +0800 Subject: [PATCH 078/621] operationType = 3 --- .../src/main/java/com/epmet/service/impl/IcEventServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 6d5dfb66bf..7505386fcc 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -283,6 +283,7 @@ public class IcEventServiceImpl extends BaseServiceImpl Date: Tue, 11 Oct 2022 09:23:59 +0800 Subject: [PATCH 079/621] operationType = 3; --- .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 7505386fcc..7977e57971 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -283,7 +283,7 @@ public class IcEventServiceImpl extends BaseServiceImpl Date: Tue, 11 Oct 2022 11:09:34 +0800 Subject: [PATCH 080/621] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=AE=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/SelectIssueVotingDetailFormDTO.java | 5 +++ .../epmet/service/impl/IssueServiceImpl.java | 43 ++++++++++--------- .../impl/IssueVoteDetailServiceImpl.java | 19 +++++--- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SelectIssueVotingDetailFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SelectIssueVotingDetailFormDTO.java index fb51463348..d0f2ad3c41 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SelectIssueVotingDetailFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SelectIssueVotingDetailFormDTO.java @@ -17,4 +17,9 @@ public class SelectIssueVotingDetailFormDTO implements Serializable { private String issueId; private String gridId; + + /** + * 来源类型 不为空的时候根据类型处理 + */ + private String sourceType; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 522a72f868..ceed78ae16 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -766,26 +766,28 @@ public class IssueServiceImpl extends BaseServiceImpl imp issueProcessDao.insert(processEntity); //4:调用epmet-message服务，给居民端话题创建人和议题发起人发送消息 - //4.1:调用resi-group查询话题创建人数据(目前议题来源只有来自话题) - Result resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId()); - if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) { - throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION); - } - ResiTopicDTO topicDTO = resultTopicDTO.getData(); - //4.2:创建消息模板 - String messageContent = ""; - if (IssueConstant.ISSUE_RESOLVED.equals(formDTO.getResolveType())) { - messageContent = String.format(UserMessageConstant.ISSUE_RESOLVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); - } else if (IssueConstant.ISSUE_UNRESOLVED.equals(formDTO.getResolveType())) { - messageContent = String.format(UserMessageConstant.ISSUE_UNRESOLVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); - } - //4.3:调用服务，发送消息 - if (!saveUserMessageList(topicDTO, messageContent, entity).success()) { - throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION); - } - //4.4:2020.10.26 添加推送微信订阅消息功能 sun - if (!saveWxmpMessageList(topicDTO, messageContent, entity).success()) { - logger.error("议题关闭，推送微信订阅消息失败！"); + if (entity.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)){ + //4.1:调用resi-group查询话题创建人数据(目前议题来源只有来自话题) + Result resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId()); + if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) { + throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION); + } + ResiTopicDTO topicDTO = resultTopicDTO.getData(); + //4.2:创建消息模板 + String messageContent = ""; + if (IssueConstant.ISSUE_RESOLVED.equals(formDTO.getResolveType())) { + messageContent = String.format(UserMessageConstant.ISSUE_RESOLVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); + } else if (IssueConstant.ISSUE_UNRESOLVED.equals(formDTO.getResolveType())) { + messageContent = String.format(UserMessageConstant.ISSUE_UNRESOLVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); + } + //4.3:调用服务，发送消息 + if (!saveUserMessageList(topicDTO, messageContent, entity).success()) { + throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION); + } + //4.4:2020.10.26 添加推送微信订阅消息功能 sun + if (!saveWxmpMessageList(topicDTO, messageContent, entity).success()) { + logger.error("议题关闭，推送微信订阅消息失败！"); + } } try { @@ -793,6 +795,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp SelectIssueVotingDetailFormDTO dto = new SelectIssueVotingDetailFormDTO(); dto.setGridId(entity.getGridId()); dto.setIssueId(formDTO.getIssueId()); + dto.setSourceType(entity.getSourceType()); issueVoteDetailService.updateVote(dto); }catch (RenException e){ logger.error(e.getInternalMsg()); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index 44812532ab..eedfd2bb77 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -250,12 +250,21 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl votableCount = resiGroupFeignClient.votableCount(gridId); - if(votableCount.success() && null != votableCount.getData()){ - voteCache.setShouldVoteCount(votableCount.getData()); - }else{ - voteCache.setShouldVoteCount(NumConstant.ZERO); + if (StringUtils.isBlank(formDTO.getSourceType())){ + Result votableCount = resiGroupFeignClient.votableCount(gridId); + if(votableCount.success() && null != votableCount.getData()){ + voteCache.setShouldVoteCount(votableCount.getData()); + }else{ + voteCache.setShouldVoteCount(NumConstant.ZERO); + } + }else { + Result allResi = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(formDTO.getGridId())); + if (!allResi.success()){ + throw new EpmetException("查询网格下的注册居民失败:"+formDTO.getGridId()); + } + voteCache.setShouldVoteCount(allResi.getData()); } + return voteCache; } From 137ef6c4e7e3848c5a5e08110f9ac44b93cc66c0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 11:43:02 +0800 Subject: [PATCH 081/621] =?UTF-8?q?GovProjectFeignClient.projectProcessLis?= =?UTF-8?q?t=E6=8C=AA=E5=88=B0GovProjectOpenFeignClient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/GovProjectFeignClient.java | 8 +++----- .../feign/fallback/GovProjectFeignClientFallBack.java | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java index 38331b5780..d0e29cf063 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java @@ -2,11 +2,9 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.ProcessProjectIdFormDTO; import com.epmet.dto.form.ShiftProjectFormDTO; import com.epmet.dto.form.ShiftProjectsFromDTO; import com.epmet.dto.result.IssueProjectResultDTO; -import com.epmet.dto.result.ProcessListResultDTO; import com.epmet.dto.result.ShiftProjectResultDTO; import com.epmet.feign.fallback.GovProjectFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; @@ -43,9 +41,9 @@ public interface GovProjectFeignClient { /** * @Description 议题处理进展——已转项目 - * @param formDTO + * @param formDTO 该方法已经放到了GovProjectOpenFeignClient * @author zxc - */ + *//* @PostMapping("/gov/project/projectprocess/projectprocesslist") - Result> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO); + Result> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO);*/ } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java index c8185fa47e..a120f582ac 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java @@ -3,11 +3,9 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.ProcessProjectIdFormDTO; import com.epmet.dto.form.ShiftProjectFormDTO; import com.epmet.dto.form.ShiftProjectsFromDTO; import com.epmet.dto.result.IssueProjectResultDTO; -import com.epmet.dto.result.ProcessListResultDTO; import com.epmet.dto.result.ShiftProjectResultDTO; import com.epmet.feign.GovProjectFeignClient; import org.springframework.stereotype.Component; @@ -26,10 +24,11 @@ public class GovProjectFeignClientFallBack implements GovProjectFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getProjectByIssue", fromDTO); } - @Override + //该方法已经放到了GovProjectOpenFeignClient + /*@Override public Result> projectProcessList(ProcessProjectIdFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectProcessList", formDTO); - } + }*/ @Override public Result issueShiftProject(ShiftProjectFormDTO formDTO) { From 7e6aa62ffc72aa6a303caaf05e1151a1c308132d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 11:43:44 +0800 Subject: [PATCH 082/621] @PostMapping("issueprocess") --- .../epmet/dto/result/IssueAdvanceResDTO.java | 21 ++++++++++ .../dto/result/ProcessListResultDTOBak.java | 38 +++++++++++++++++++ .../controller/IssueProcessController.java | 10 +++++ .../epmet/service/IssueProcessService.java | 8 ++++ .../service/impl/IssueProcessServiceImpl.java | 38 ++++++++++++++++--- .../epmet/service/impl/IssueServiceImpl.java | 2 + 6 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueAdvanceResDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueAdvanceResDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueAdvanceResDTO.java new file mode 100644 index 0000000000..9fa5741fe3 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueAdvanceResDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.util.List; + +/** + * @Description 议题的处理进展（包含转项目后的进展）内部服务之间调用 + * @Author yzm + * @Date 2022/10/11 9:43 + */ +@Data +public class IssueAdvanceResDTO { + private String issueId; + /** + * 议题状态(voting 已转项目：shift_project 已关闭：closed) + */ + private String issueStatus; + private List processList; +} + diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java new file mode 100644 index 0000000000..dc6c8787b9 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/10/11 11:13 + */ +@Data +public class ProcessListResultDTOBak { + + /** + * 处理进展名称(表决中、转项目、流转中已结案、已关闭) + */ + private String processName; + + /** + * 已转项目进展记录时间 + */ + private Long processTime; + + /** + * 处理部门（处理人所属的机关单位名称） + */ + private String departmentName; + + /** + * 进展说明 + */ + private String progressDesc; + + /** + * 进展id（操作记录表id） + */ + private String processId; +} + diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java index 737b187ad1..5250066ed8 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IssueProcessDTO; import com.epmet.dto.form.IssueIdFormDTO; +import com.epmet.dto.result.IssueAdvanceResDTO; import com.epmet.dto.result.ProcessListResultDTO; import com.epmet.excel.IssueProcessExcel; import com.epmet.service.IssueProcessService; @@ -103,4 +104,13 @@ public class IssueProcessController { return new Result>().ok(issueProcessService.processList(issueId)); } + /** + * 议题的处理进展，(只包含发起议题、关闭议题) + * @param issueId + * @return + */ + @PostMapping("issueprocess") + public Result queryIssueProcess(@RequestBody IssueIdFormDTO issueId){ + return new Result().ok(issueProcessService.queryIssueProcess(issueId)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java index b3b8a300ab..025d10baca 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IssueProcessDTO; import com.epmet.dto.form.IssueIdFormDTO; +import com.epmet.dto.result.IssueAdvanceResDTO; import com.epmet.dto.result.ProcessListResultDTO; import com.epmet.entity.IssueProcessEntity; @@ -109,4 +110,11 @@ public interface IssueProcessService extends BaseService { * @date 2020.05.13 16:42 **/ int insertOne(IssueProcessDTO issueProcessDTO); + + /** + * 议题的处理进展，(只包含发起议题、关闭议题) + * @param issueId + * @return + */ + IssueAdvanceResDTO queryIssueProcess(IssueIdFormDTO issueId); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java index 6d33f38258..d4dc58fbaf 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java @@ -32,9 +32,12 @@ import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueProcessDTO; import com.epmet.dto.form.IssueIdFormDTO; import com.epmet.dto.form.ProcessProjectIdFormDTO; +import com.epmet.dto.result.IssueAdvanceResDTO; import com.epmet.dto.result.ProcessListResultDTO; +import com.epmet.dto.result.ProcessListResultDTOBak; +import com.epmet.dto.result.ProjectProcessListResultDTO; import com.epmet.entity.IssueProcessEntity; -import com.epmet.feign.GovProjectFeignClient; +import com.epmet.feign.GovProjectOpenFeignClient; import com.epmet.service.IssueProcessService; import com.epmet.service.IssueService; import org.apache.commons.lang3.StringUtils; @@ -60,11 +63,11 @@ public class IssueProcessServiceImpl extends BaseServiceImpl page(Map params) { @@ -150,12 +153,12 @@ public class IssueProcessServiceImpl extends BaseServiceImpl> resultDTO = govProjectFeignClient.projectProcessList(formDTO); + Result> resultDTO = govProjectOpenFeignClient.projectProcessList(formDTO); if (!resultDTO.success()){ throw new RenException(IssueConstant.PROJECT_PROCESS_LIST_FAILURE); } if (!CollectionUtils.isEmpty(resultDTO.getData())){ - listResult.addAll(resultDTO.getData()); + listResult.addAll(ConvertUtils.sourceToTarget(resultDTO.getData(),ProcessListResultDTO.class)); } } } @@ -167,4 +170,29 @@ public class IssueProcessServiceImpl extends BaseServiceImpl processList=new ArrayList<>(); + if (issueDTO.getIssueStatus().equals(IssueConstant.ISSUE_CLOSED)){ + //已关闭——处理进展 + processList = baseDao.issueProcess(issueId); + } + //转议题信息 + ProcessListResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId); + if (null != issueProcessResultDTO) { + processList.add(issueProcessResultDTO); + } + IssueAdvanceResDTO issueAdvanceResDTO=new IssueAdvanceResDTO(); + issueAdvanceResDTO.setIssueId(issueDTO.getId()); + issueAdvanceResDTO.setIssueStatus(issueDTO.getIssueStatus()); + issueAdvanceResDTO.setProcessList(ConvertUtils.sourceToTarget(processList, ProcessListResultDTOBak.class)); + return issueAdvanceResDTO; + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 522a72f868..f3bf6ffc83 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -677,6 +677,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp //查询话题失败异常 }else if (ModuleConstants.ISSUE.equals(issueDetail.getSourceType())){ issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class); + issueInfo.setIssueSuggestion(issueDetail.getSuggestion()); Result> userResult = userOpenFeignClient.queryUserBaseInfo(Arrays.asList(issueDetail.getCreatedBy())); if (!userResult.success() || CollectionUtils.isEmpty(userResult.getData())){ throw new EpmetException("查询居民信息失败"); @@ -688,6 +689,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp return issueInfo; }else { issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class); + issueInfo.setIssueSuggestion(issueDetail.getSuggestion()); CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(issueDetail.getCustomerId(), issueDetail.getCreatedBy()); if (null == staffInfo){ throw new EpmetException("查询工作人员信息失败："+issueDetail.getCreatedBy()); From 8b7ef8c274599d3f58e3622109da3eb8beb432da Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 11:44:15 +0800 Subject: [PATCH 083/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=EF=BC=88=E4=BA=8B=E4=BB=B6-=E8=AE=AE?= =?UTF-8?q?=E9=A2=98-=E8=BD=AC=E9=A1=B9=E7=9B=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ProcessListResultDTO.java | 2 +- .../epmet/feign/GovIssueOpenFeignClient.java | 8 +++--- .../GovIssueOpenFeignClientFallBack.java | 11 ++++---- .../result/IcEventProcessListResultDTO.java | 2 +- .../feign/GovProjectOpenFeignClient.java | 9 ++++++ .../GovProjectOpenFeignClientFallback.java | 7 +++++ .../service/impl/IcEventServiceImpl.java | 28 +++++++++++++++---- 7 files changed, 50 insertions(+), 17 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java index 05b17f9d57..394d617df8 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * @Author zxc + * @Author zxc 就是他issue * 议题处理进展 */ @Data diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index bf3ce4bf2c..b2e939d9e9 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -413,10 +413,10 @@ public interface GovIssueOpenFeignClient { Result publishIssue(@RequestBody PublishIssueFormDTO issueFormDTO); /** - * 议题处理进展，这个接口小程序也在用，服务之间也在用 - * @param issueId + * 议题处理进展:(只包含发起议题、关闭议题) + * @param formDTO * @return */ - // @PostMapping("/gov/issue/manage/progress") - // Result> queryIssueProcess(@RequestBody IssueIdFormDTO issueId); + @PostMapping("/gov/issue/issueprocess/issueprocess") + Result queryIssueProcess(@RequestBody IssueIdFormDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index f7c44e4a75..590afb6b41 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -355,13 +355,14 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient } /** - * 议题处理进展，这个接口小程序也在用，服务之间也在用 + * 议题处理进展，(只包含发起议题、关闭议题) * * @param formDTO * @return */ - /*@Override - public Result> queryIssueProcess(IssueIdFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", formDTO); - }*/ + @Override + public Result queryIssueProcess(IssueIdFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryIssueProcess", formDTO); + } + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java index 7b4b805e7e..4379252a67 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java @@ -14,7 +14,7 @@ import java.util.List; public class IcEventProcessListResultDTO implements Serializable { private static final long serialVersionUID = 5762152044573235897L; - + private String issueId; /** * 项目ID */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index c86a871a8a..d4fd341b7f 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -186,4 +186,13 @@ public interface GovProjectOpenFeignClient { */ @PostMapping("gov/project/icEvent/batchSelectById") Result> batchSelectById(@RequestBody List icEventIds); + + /** + * @Description 议题处理进展——已转项目 + * @param formDTO + * @author zxc + */ + @PostMapping("/gov/project/projectprocess/projectprocesslist") + Result> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO); + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index 5854347118..bfb6d57f89 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java @@ -186,4 +186,11 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli public Result> batchSelectById(List icEventIds) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "batchSelectById",icEventIds); } + + @Override + public Result> projectProcessList(ProcessProjectIdFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectProcessList", formDTO); + } + + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 7977e57971..c2d7aac1b3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1257,22 +1257,38 @@ public class IcEventServiceImpl extends BaseServiceImpl demand = icEventOperationLogService.getByEventId(formDTO.getIcEventId()); resultList.addAll(demand); } else if ("3".equals(entity.getOperationType())) { - // 议题处理进展 有问题 todo - /*IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO(); + // 议题处理进展 + IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO(); issueIdFormDTO.setIssueId(entity.getOperationId()); - Result> issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO); - if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData())){ + Result issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO); + if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData().getProcessList())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件已转议题，议题处理进展查询异常", "事件已转议题，议题处理进展查询异常"); } - for(ProcessListResultDTO issueProcess:issueProcessRes.getData()){ + IssueAdvanceResDTO issueAdvanceResDTO=issueProcessRes.getData(); + //如果议题已转项目，先放项目的处理进展 + if("shift_project".equals(issueAdvanceResDTO.getIssueStatus())){ + //根据议题id查询项目 + List projectEntityList=SpringContextUtils.getBean(ProjectService.class).getByOriginId(issueAdvanceResDTO.getIssueId()); + if(!CollectionUtils.isEmpty(projectEntityList)){ + // 项目进展 + ProcessListV2FormDTO processListV2FormDTO = new ProcessListV2FormDTO(); + processListV2FormDTO.setProjectId(projectEntityList.get(0).getId()); + List project = projectTraceService.processListV2(processListV2FormDTO); + List projectList = ConvertUtils.sourceToTarget(project, IcEventProcessListResultDTO.class); + projectList.forEach(p -> p.setType("project")); + resultList.addAll(projectList); + } + } + for(ProcessListResultDTOBak issueProcess:issueAdvanceResDTO.getProcessList()){ IcEventProcessListResultDTO eventProcess=new IcEventProcessListResultDTO(); eventProcess.setDepartmentName(issueProcess.getDepartmentName()); eventProcess.setProcessId(issueProcess.getProcessId()); eventProcess.setProcessName(issueProcess.getProcessName()); eventProcess.setProcessTime(issueProcess.getProcessTime()); eventProcess.setPublicReply(issueProcess.getProgressDesc()); + eventProcess.setIssueId(issueAdvanceResDTO.getIssueId()); resultList.add(eventProcess); - }*/ + } } //最后拼上回复的!!!!!!!!!!!! //3.查询事件回复信息 From 176a24ef371a1d97029e64016ad7c288a436f414 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 12:18:26 +0800 Subject: [PATCH 084/621] =?UTF-8?q?/resi/hall/issue/votinglist=E8=AE=AE?= =?UTF-8?q?=E4=BA=8B=E5=8E=85=E8=A1=A8=E5=86=B3=E4=B8=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 528a7da03a..1a1bb6ea7a 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -437,14 +437,16 @@ public class IssueServiceImpl implements IssueService { vi.setLongitude(rr == null ? "" : rr.getLongitude()); vi.setLatitude(rr == null ? "" : rr.getLatitude()); // 赋值话题详情 - TopicInfoDTO topicInfoDTO=new TopicInfoDTO(); - topicInfoDTO.setTopicId(rr.getTopicId()); - topicInfoDTO.setTopicContent(rr.getTopicContent()); - topicInfoDTO.setTopicImgs(rr.getTopicImgs()); - topicInfoDTO.setTopicVoices(rr.getTopicVoices()); - topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); - topicInfoDTO.setReleaseTime(rr.getReleaseTime()); - vi.setTopicInfo(topicInfoDTO); + if(null!=rr){ + TopicInfoDTO topicInfoDTO=new TopicInfoDTO(); + topicInfoDTO.setTopicId(rr.getTopicId()); + topicInfoDTO.setTopicContent(rr.getTopicContent()); + topicInfoDTO.setTopicImgs(rr.getTopicImgs()); + topicInfoDTO.setTopicVoices(rr.getTopicVoices()); + topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); + topicInfoDTO.setReleaseTime(rr.getReleaseTime()); + vi.setTopicInfo(topicInfoDTO); + } }); } } From 5aea5407e8c6c8b40e5012df9cecb13414f81ffa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 12:54:59 +0800 Subject: [PATCH 085/621] batchSelectById --- .../src/main/java/com/epmet/controller/IcEventController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index c0a2924c84..bce6cc9f01 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -548,7 +548,7 @@ public class IcEventController { * @param icEventIds * @return */ - @PostMapping("gov/project/icEvent/batchSelectById") + @PostMapping("batchSelectById") public Result> batchSelectById(@RequestBody List icEventIds) { if (CollectionUtils.isEmpty(icEventIds)) { return new Result<>(); From 75d6b4d1fb3860c3ccdf2eb86a54062c9b8927a2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 13:36:58 +0800 Subject: [PATCH 086/621] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=B8=AD=EF=BC=9A/resi/hall/issue/processing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/commondto/IcEventComDTO.java | 38 +++++++++++ .../tools/dto/commondto/TopicInfoComDTO.java | 65 +++++++++++++++++++ .../com/epmet/dto/result/IssueProfileDTO.java | 2 +- .../epmet/dto/result/PendingResultDTO.java | 11 ++++ .../com/epmet/dto/result/HallIcEventDTO.java | 24 ------- .../dto/result/VotingIssueListResultDTO.java | 7 +- .../epmet/service/impl/IssueServiceImpl.java | 41 ++++++++++-- 7 files changed, 154 insertions(+), 34 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/IcEventComDTO.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/TopicInfoComDTO.java delete mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/IcEventComDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/IcEventComDTO.java new file mode 100644 index 0000000000..529bc6c34a --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/IcEventComDTO.java @@ -0,0 +1,38 @@ +package com.epmet.commons.tools.dto.commondto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/10/11 13:08 + */ +@Data +public class IcEventComDTO implements Serializable { + private static final long serialVersionUID = -5166489408303997740L; + /** + * 事件Id + */ + private String icEventId; + /** + * 事件内容 + */ + private String eventContent; + /** + * 处理中：processing；已办结：closed_case + */ + private String status; + + /** + * 0:已回复 1:已转项目 2:已转需求3:转议题 + */ + private String operationType; + + /** + * 项目、需求ID、议题id + */ + private String operationId; +} + diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/TopicInfoComDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/TopicInfoComDTO.java new file mode 100644 index 0000000000..65c001b97f --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/TopicInfoComDTO.java @@ -0,0 +1,65 @@ +package com.epmet.commons.tools.dto.commondto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/10/11 13:06 + */ +@Data +public class TopicInfoComDTO implements Serializable { + private static final long serialVersionUID = 4242861917113716511L; + /** + * 话题id + */ + private String topicId; + + /** + * 话题内容 + */ + private String topicContent; + + /** + * 图片列表 + */ + private List topicImgs; + + /** + * 话题语音-2022.10.10 + */ + private List topicVoices; + + /** + * 话题发表人（山东路168-尹女士） + */ + private String publishedUser; + + /** + * 话题发表时间 (时间戳 毫秒级) + */ + private Long publishedTime; + + + private String releaseTime; + + /** + * 小组类型(ordinary:楼院小组 branch:支部小组) + */ + private String groupType; + + /** + * 话题所属小组id + */ + private String groupId; + + /** + * 话题所属小组名称 + */ + private String groupName; + +} + diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProfileDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProfileDTO.java index 52e03407c7..ce7311130c 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProfileDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProfileDTO.java @@ -16,7 +16,7 @@ public class IssueProfileDTO { private String longitude; private String latitude; /** - * 来源类型 话题：resi_topic；直接立议题：issue； + * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event */ private String issueSourceType; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java index f4b76f8b96..a21e2f47d1 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java @@ -1,5 +1,7 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.dto.commondto.IcEventComDTO; +import com.epmet.commons.tools.dto.commondto.TopicInfoComDTO; import lombok.Data; import lombok.NoArgsConstructor; @@ -70,4 +72,13 @@ public class PendingResultDTO implements Serializable { * 发布议题的图片 */ private List issueImgs; + + /** + * 话题信息-2022.10.10 + */ + private TopicInfoComDTO topicInfo; + /** + * 事件信息-2022.10.10 + */ + private IcEventComDTO icEventInfo; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java deleted file mode 100644 index 37abb5cd03..0000000000 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description - * @Author yzm - * @Date 2022/10/10 14:47 - */ -@Data -public class HallIcEventDTO implements Serializable { - private static final long serialVersionUID = -6245586010939647194L; - /** - * 事件Id - */ - private String icEventId; - /** - * 事件内容 - */ - private String eventContent; -} - diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java index 4025307ca0..9d58e5134f 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.result; -import com.epmet.dto.TopicInfoDTO; +import com.epmet.commons.tools.dto.commondto.IcEventComDTO; +import com.epmet.commons.tools.dto.commondto.TopicInfoComDTO; import lombok.Data; import java.io.Serializable; @@ -73,9 +74,9 @@ public class VotingIssueListResultDTO implements Serializable { /** * 话题信息-2022.10.10 */ - private TopicInfoDTO topicInfo; + private TopicInfoComDTO topicInfo; /** * 事件信息-2022.10.10 */ - private HallIcEventDTO icEventInfo; + private IcEventComDTO icEventInfo; } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 1a1bb6ea7a..820c7b8a29 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -2,6 +2,8 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.commondto.IcEventComDTO; +import com.epmet.commons.tools.dto.commondto.TopicInfoComDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; @@ -438,7 +440,7 @@ public class IssueServiceImpl implements IssueService { vi.setLatitude(rr == null ? "" : rr.getLatitude()); // 赋值话题详情 if(null!=rr){ - TopicInfoDTO topicInfoDTO=new TopicInfoDTO(); + TopicInfoComDTO topicInfoDTO=new TopicInfoComDTO(); topicInfoDTO.setTopicId(rr.getTopicId()); topicInfoDTO.setTopicContent(rr.getTopicContent()); topicInfoDTO.setTopicImgs(rr.getTopicImgs()); @@ -459,10 +461,9 @@ public class IssueServiceImpl implements IssueService { votingIssueList.forEach(vi -> { IcEventDTO event = eventMap.get(vi.getSourceId()); if (null != event) { - HallIcEventDTO hallIcEventDTO = new HallIcEventDTO(); - hallIcEventDTO.setIcEventId(event.getId()); - hallIcEventDTO.setEventContent(event.getEventContent()); - vi.setIcEventInfo(hallIcEventDTO); + IcEventComDTO eventComDTO = ConvertUtils.sourceToTarget(event, IcEventComDTO.class); + eventComDTO.setIcEventId(event.getId()); + vi.setIcEventInfo(eventComDTO); } }); } @@ -555,7 +556,7 @@ public class IssueServiceImpl implements IssueService { Result> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds); if (issueRes.success() && !CollectionUtils.isEmpty(issueRes.getData())) { - // 3、如果存在议题来源于话题 + // 3.1、如果存在议题来源于话题 List topicIds = issueRes.getData().stream().filter(t -> t.getIssueSourceType().equals("resi_topic")).map(IssueProfileDTO::getSourceId).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(topicIds)) { // 3.1 查询话题详情 @@ -571,6 +572,23 @@ public class IssueServiceImpl implements IssueService { }); } } + //3.2 如果存在议题来源于事件 + List icEventIds = issueRes.getData().stream().filter(t -> t.getIssueSourceType().equals("ic_event")).map(IssueProfileDTO::getSourceId).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(icEventIds)) { + Result> eventInfoRes = govProjectOpenFeignClient.batchSelectById(icEventIds); + if (eventInfoRes.success() && !CollectionUtils.isEmpty(eventInfoRes.getData())) { + //key:议题id;value：事件信息 + Map eventMap = eventInfoRes.getData().stream().collect(Collectors.toMap(IcEventDTO::getOperationId, o -> o, (o1, o2) -> o1)); + resultList.forEach(vi -> { + IcEventDTO event = eventMap.get(vi.getIssueId()); + if (null != event) { + IcEventComDTO eventComDTO = ConvertUtils.sourceToTarget(event,IcEventComDTO.class); + eventComDTO.setIcEventId(event.getId()); + vi.setIcEventInfo(eventComDTO); + } + }); + } + } Map issueMap=issueRes.getData().stream().collect(Collectors.toMap(IssueProfileDTO::getIssueId, o -> o, (o1, o2) -> o1)); // 赋值话题信息、议题来源、议题图片 resultList.forEach(vi -> { @@ -581,6 +599,17 @@ public class IssueServiceImpl implements IssueService { vi.setLongitude(rr == null ? StrConstant.EPMETY_STR : rr.getLongitude()); vi.setLatitude(rr == null ? StrConstant.EPMETY_STR : rr.getLatitude()); vi.setTopicId(null == rr ? StrConstant.EPMETY_STR : rr.getTopicId()); + // 赋值话题详情 + if (null != rr) { + TopicInfoComDTO topicInfoDTO = new TopicInfoComDTO(); + topicInfoDTO.setTopicId(rr.getTopicId()); + topicInfoDTO.setTopicContent(rr.getTopicContent()); + topicInfoDTO.setTopicImgs(rr.getTopicImgs()); + topicInfoDTO.setTopicVoices(rr.getTopicVoices()); + topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); + topicInfoDTO.setReleaseTime(rr.getReleaseTime()); + vi.setTopicInfo(topicInfoDTO); + } IssueProfileDTO issue = issueMap.get(vi.getIssueId()); vi.setIssueSourceType(null != issue ? issue.getIssueSourceType() : StrConstant.EPMETY_STR); vi.setIssueImgs(null != issue ? issue.getIssueImgs() : new ArrayList<>()); From 6c8dbe4f8848cdd53ce4cc54563b6b317b7cfaee Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 13:47:10 +0800 Subject: [PATCH 087/621] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E5=B7=B2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B7=B2=E7=BB=93=E6=A1=88=EF=BC=9A/resi/hal?= =?UTF-8?q?l/issue/closedproject?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/ResolvedResultDTO.java | 11 +++++++ .../epmet/service/impl/IssueServiceImpl.java | 30 ++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java index 3c676185b9..88ad6068c7 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java @@ -1,5 +1,7 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.dto.commondto.IcEventComDTO; +import com.epmet.commons.tools.dto.commondto.TopicInfoComDTO; import lombok.Data; import java.io.Serializable; @@ -75,4 +77,13 @@ public class ResolvedResultDTO implements Serializable { * 发布议题的图片 */ private List issueImgs; + + /** + * 话题信息-2022.10.10 + */ + private TopicInfoComDTO topicInfo; + /** + * 事件信息-2022.10.10 + */ + private IcEventComDTO icEventInfo; } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 820c7b8a29..e5a8e0639e 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -651,7 +651,7 @@ public class IssueServiceImpl implements IssueService { Result> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds); if (issueRes.success() && !CollectionUtils.isEmpty(issueRes.getData())) { - // 3、如果存在议题来源于话题 + // 3.1、如果存在议题来源于话题 List topicIds = issueRes.getData().stream().filter(t -> t.getIssueSourceType().equals("resi_topic")).map(IssueProfileDTO::getSourceId).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(topicIds)) { // 3.1 查询话题详情 @@ -667,6 +667,23 @@ public class IssueServiceImpl implements IssueService { }); } } + //3.2 如果存在议题来源于事件 + List icEventIds = issueRes.getData().stream().filter(t -> t.getIssueSourceType().equals("ic_event")).map(IssueProfileDTO::getSourceId).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(icEventIds)) { + Result> eventInfoRes = govProjectOpenFeignClient.batchSelectById(icEventIds); + if (eventInfoRes.success() && !CollectionUtils.isEmpty(eventInfoRes.getData())) { + //key:议题id;value：事件信息 + Map eventMap = eventInfoRes.getData().stream().collect(Collectors.toMap(IcEventDTO::getOperationId, o -> o, (o1, o2) -> o1)); + resultList.forEach(vi -> { + IcEventDTO event = eventMap.get(vi.getIssueId()); + if (null != event) { + IcEventComDTO eventComDTO = ConvertUtils.sourceToTarget(event,IcEventComDTO.class); + eventComDTO.setIcEventId(event.getId()); + vi.setIcEventInfo(eventComDTO); + } + }); + } + } Map issueMap=issueRes.getData().stream().collect(Collectors.toMap(IssueProfileDTO::getIssueId, o -> o, (o1, o2) -> o1)); // 赋值话题信息、议题来源、议题图片 resultList.forEach(vi -> { @@ -677,6 +694,17 @@ public class IssueServiceImpl implements IssueService { vi.setLongitude(rr == null ? StrConstant.EPMETY_STR : rr.getLongitude()); vi.setLatitude(rr == null ? StrConstant.EPMETY_STR : rr.getLatitude()); vi.setTopicId(null == rr ? StrConstant.EPMETY_STR : rr.getTopicId()); + // 赋值话题详情 + if (null != rr) { + TopicInfoComDTO topicInfoDTO = new TopicInfoComDTO(); + topicInfoDTO.setTopicId(rr.getTopicId()); + topicInfoDTO.setTopicContent(rr.getTopicContent()); + topicInfoDTO.setTopicImgs(rr.getTopicImgs()); + topicInfoDTO.setTopicVoices(rr.getTopicVoices()); + topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); + topicInfoDTO.setReleaseTime(rr.getReleaseTime()); + vi.setTopicInfo(topicInfoDTO); + } IssueProfileDTO issue = issueMap.get(vi.getIssueId()); vi.setIssueSourceType(null != issue ? issue.getIssueSourceType() : StrConstant.EPMETY_STR); vi.setIssueImgs(null != issue ? issue.getIssueImgs() : new ArrayList<>()); From d3542a1d2d875db6e805756ee19241655dd349c5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Oct 2022 13:50:54 +0800 Subject: [PATCH 088/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/CollectDetailResultDTO.java | 3 +++ .../epmet/dto/result/OrgInfoResultDTO.java | 23 +++++++++++++++++++ .../impl/IcResiCollectServiceImpl.java | 11 +++++++++ 3 files changed, 37 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java index 8a71aa8ea9..2631a14625 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.dto.result.OrgInfoResultDTO; import lombok.Data; import java.io.Serializable; @@ -75,4 +76,6 @@ public class CollectDetailResultDTO implements Serializable { private List memberList; private String orgIdPath; + + private List orgIdPathList; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java new file mode 100644 index 0000000000..0905a073b7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/11 13:41 + * @DESC + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class OrgInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 7478605833438304330L; + + private String id; + private String name; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 3d2cfd552b..18c38f5407 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -225,6 +225,17 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl orgInfoList = new ArrayList<>(); + for (String orgId : split) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); + if (null == agencyInfo){ + throw new EpmetException("查询组织信息失败："+orgId); + } + OrgInfoResultDTO orgInfoResultDTO = new OrgInfoResultDTO(orgId,agencyInfo.getOrganizationName()); + orgInfoList.add(orgInfoResultDTO); + } + result.setOrgIdPathList(orgInfoList); //查询成员信息 List memberList = icResiMemberDao.selectListByCollectId(dto.getId()); result.setMemberList(memberList); From 265f2d30b0a2c6b75fe1f524b5e72ba2ae1aa1b7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 13:52:16 +0800 Subject: [PATCH 089/621] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E5=B7=B2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B7=B2=E5=85=B3=E9=97=AD=EF=BC=9A/resi/hal?= =?UTF-8?q?l/issue/closedlist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ClosedIssueListResultDTO.java | 11 +++++++ .../epmet/service/impl/IssueServiceImpl.java | 31 +++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java index 74483df1b1..06d8a2aee5 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java @@ -1,5 +1,7 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.dto.commondto.IcEventComDTO; +import com.epmet.commons.tools.dto.commondto.TopicInfoComDTO; import lombok.Data; import java.io.Serializable; @@ -65,4 +67,13 @@ public class ClosedIssueListResultDTO implements Serializable { * 发布议题的图片 */ private List issueImgs; + + /** + * 话题信息-2022.10.10 + */ + private TopicInfoComDTO topicInfo; + /** + * 事件信息-2022.10.10 + */ + private IcEventComDTO icEventInfo; } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index e5a8e0639e..7d010949fe 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -509,9 +509,7 @@ public class IssueServiceImpl implements IssueService { TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO(); form.setTopicIdList(topicIds); Result> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form); - if (!topicDetailsResult.success()) { - logger.error("调用resi-group批量查询详情失败"); - } else { + if (topicDetailsResult.success() && !CollectionUtils.isEmpty(topicDetailsResult.getData())) { List topicDetails = topicDetailsResult.getData(); HashMap rtm = convertTopicDetailList2Map(topicDetails); issueList.forEach(vi -> { @@ -521,8 +519,35 @@ public class IssueServiceImpl implements IssueService { vi.setTopicContent(rr == null ? "" :rr.getTopicContent()); vi.setLongitude(rr == null ? "" : rr.getLongitude()); vi.setLatitude(rr == null ? "" : rr.getLatitude()); + // 赋值话题详情 + if(null!=rr){ + TopicInfoComDTO topicInfoDTO=new TopicInfoComDTO(); + topicInfoDTO.setTopicId(rr.getTopicId()); + topicInfoDTO.setTopicContent(rr.getTopicContent()); + topicInfoDTO.setTopicImgs(rr.getTopicImgs()); + topicInfoDTO.setTopicVoices(rr.getTopicVoices()); + topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); + topicInfoDTO.setReleaseTime(rr.getReleaseTime()); + vi.setTopicInfo(topicInfoDTO); + } }); } + // 来源于事件的 + List icEventIds = issueList.stream().filter(t -> t.getSourceType().equals("ic_event")).map(i -> i.getSourceId()).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(icEventIds)) { + Result> eventInfoRes = govProjectOpenFeignClient.batchSelectById(icEventIds); + if (eventInfoRes.success() && !CollectionUtils.isEmpty(eventInfoRes.getData())) { + Map eventMap = eventInfoRes.getData().stream().collect(Collectors.toMap(IcEventDTO::getId, o -> o, (o1, o2) -> o1)); + issueList.forEach(vi -> { + IcEventDTO event = eventMap.get(vi.getSourceId()); + if (null != event) { + IcEventComDTO eventComDTO = ConvertUtils.sourceToTarget(event, IcEventComDTO.class); + eventComDTO.setIcEventId(event.getId()); + vi.setIcEventInfo(eventComDTO); + } + }); + } + } } return issueList; From 5c9b980081c14e9329e63dc8b1f8e11de6f8c1c3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Oct 2022 14:22:45 +0800 Subject: [PATCH 090/621] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/ProcessListResultDTO.java | 1 + .../src/main/resources/mapper/IssueProcessDao.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java index 394d617df8..731a1e5b57 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java @@ -37,5 +37,6 @@ public class ProcessListResultDTO implements Serializable { * 进展id（操作记录表id） */ private String processId; + private String type; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml index 2df1c162ba..60af2d5d12 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml @@ -109,6 +109,7 @@ UNIX_TIMESTAMP( created_time ) AS processTime, operation_explain AS progressDesc, org_name AS departmentName, + 'issue' AS type, id AS processId FROM issue_process @@ -125,6 +126,7 @@ UNIX_TIMESTAMP( created_time ) AS processTime, operation_explain AS progressDesc, org_name AS departmentName, + 'issue' AS type, id AS processId FROM issue_process From a36f48a4c43b1919a1defe1bfd194b9e2d3b5a0f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 14:27:35 +0800 Subject: [PATCH 091/621] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E5=8E=85-=E5=B7=B2?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=97=A0=E9=9C=80=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovIssueOpenFeignClient.java | 8 +++- .../epmet/service/impl/IssueServiceImpl.java | 45 +++++++++++++++---- .../epmet/dto/result/UnResolvedResultDTO.java | 11 +++++ .../epmet/controller/ProjectController.java | 2 +- .../com/epmet/service/ProjectService.java | 2 +- .../service/impl/ProjectServiceImpl.java | 1 + .../epmet/service/impl/IssueServiceImpl.java | 18 +++++++- 7 files changed, 74 insertions(+), 13 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index b2e939d9e9..58f010561f 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -34,7 +34,7 @@ import java.util.Map; * @date 2020/6/4 13:37 */ @FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallbackFactory = GovIssueOpenFeignClientFallBackFactory.class) -//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallbackFactory = GovIssueOpenFeignClientFallBackFactory.class,url = "localhost:8101") +// @FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallbackFactory = GovIssueOpenFeignClientFallBackFactory.class,url = "localhost:8101") public interface GovIssueOpenFeignClient { /** @@ -336,7 +336,11 @@ public interface GovIssueOpenFeignClient { @PostMapping(value = "/gov/issue/issueprojectcategorydict/getprojectcategory") Result> getProjectCategory(@RequestBody List list); - + /** + * 调用此方法建议分页！！！！ + * @param formDTO + * @return + */ @PostMapping("/gov/issue/issue/unresolvedlist") Result> getUnresolvedList(@RequestBody ShiftProjectListFromDTO formDTO); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 896a3b7a37..8f15ea37fb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.dto.commondto.IcEventComDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.AchievementTypeEnum; import com.epmet.commons.tools.enums.EventEnum; @@ -1659,28 +1660,56 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public List getUnResolvedList(ShiftProjectListFromDTO fromDTO) { List resultList = new ArrayList<>(); + List allList = new ArrayList<>(); + //1、该网格下已关闭且无需解决的议题 List issueList = baseDao.selectUnResolvedList(fromDTO.getGridId()); if (CollectionUtils.isNotEmpty(issueList)) { - resultList.addAll(issueList); + allList.addAll(issueList); } + //2、来源于议题的项目，结案无需解决的项目 List projectList = govProjectOpenFeignClient.getUnResolvedList(fromDTO).getData(); if (CollectionUtils.isNotEmpty(projectList)) { - resultList.addAll(projectList); + allList.addAll(projectList); } - if (CollectionUtils.isNotEmpty(resultList)) { - resultList = resultList.stream().sorted(Comparator.comparing(UnResolvedResultDTO::getClosedTime).reversed()).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(allList)) { + allList = allList.stream().sorted(Comparator.comparing(UnResolvedResultDTO::getClosedTime).reversed()).collect(Collectors.toList()); if (fromDTO.getIsPage()) { int fromIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize(); int toIndex = fromDTO.getPageNo() * fromDTO.getPageSize(); - if (fromIndex >= resultList.size()) { + if (fromIndex >= allList.size()) { return new ArrayList<>(); } - if (toIndex > resultList.size()) { - toIndex = resultList.size(); + if (toIndex > allList.size()) { + toIndex = allList.size(); } - resultList = resultList.subList(fromIndex, toIndex); + resultList = allList.subList(fromIndex, toIndex); } } + //重新查询一下所有议题的来源类型， 且来源于事件的议题，赋值icEventInfo + List issueIds=resultList.stream().map(i -> i.getIssueId()).collect(Collectors.toList()); + List issueEntityList=baseDao.selectBatchIds(issueIds); + if(CollectionUtils.isNotEmpty(issueEntityList)){ + Map eventMap=new HashMap<>(); + // 来源于事件的 + List icEventIds = issueEntityList.stream().filter(t -> t.getSourceType().equals("ic_event")).map(i -> i.getSourceId()).collect(Collectors.toList()); + if (!org.springframework.util.CollectionUtils.isEmpty(icEventIds)) { + Result> eventInfoRes = govProjectOpenFeignClient.batchSelectById(icEventIds); + if (eventInfoRes.success() && !org.springframework.util.CollectionUtils.isEmpty(eventInfoRes.getData())) { + eventMap = eventInfoRes.getData().stream().collect(Collectors.toMap(IcEventDTO::getId, o -> o, (o1, o2) -> o1)); + } + } + Map issueMap=issueEntityList.stream().collect(Collectors.toMap(IssueEntity::getId, o -> o, (o1, o2) -> o1)); + Map finalEventMap = eventMap; + resultList.forEach(vi -> { + vi.setIssueSourceType(null != issueMap.get(vi.getIssueId()) ? issueMap.get(vi.getIssueId()).getSourceType() : StrConstant.EPMETY_STR); + IcEventDTO event = finalEventMap.get(vi.getSourceId()); + if (null != event) { + IcEventComDTO eventComDTO = ConvertUtils.sourceToTarget(event, IcEventComDTO.class); + eventComDTO.setIcEventId(event.getId()); + vi.setIcEventInfo(eventComDTO); + } + }); + } return resultList; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java index cd3e689745..7d65a6a6b1 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java @@ -1,5 +1,7 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.dto.commondto.IcEventComDTO; +import com.epmet.commons.tools.dto.commondto.TopicInfoComDTO; import lombok.Data; import java.io.Serializable; @@ -75,4 +77,13 @@ public class UnResolvedResultDTO implements Serializable { */ private List issueImgs; private String projectId; + + /** + * 话题信息-2022.10.10 + */ + private TopicInfoComDTO topicInfo; + /** + * 事件信息-2022.10.10 + */ + private IcEventComDTO icEventInfo; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 02f813b232..6968e62398 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -279,7 +279,7 @@ public class ProjectController { } /** - * 无需解决项目列表 + * 无需解决项目列表 来源于议题，已结案，无需解决的项目 * @author zhaoqifeng * @date 2021/7/27 14:55 * @param formDTO diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 7dba649107..62c0040244 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -308,7 +308,7 @@ public interface ProjectService extends BaseService { List getResolvedListByGrid(ShiftProjectListFromDTO fromDTO); /** - * 无需解决项目列表 + * 无需解决项目列表 来源于议题，已结案，无需解决的项目 * @author zhaoqifeng * @date 2021/7/27 14:40 * @param fromDTO diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index ede20937fc..80aebed8a2 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2944,6 +2944,7 @@ public class ProjectServiceImpl extends BaseServiceImpl getUnResolvedListByGrid(ShiftProjectListFromDTO fromDTO) { + //来源于议题，已结案，无需解决的项目 return baseDao.selectUnResolvedListByGrid(fromDTO.getGridId()); } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 7d010949fe..1b46ac9e40 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -744,7 +744,12 @@ public class IssueServiceImpl implements IssueService { /** * 无需解决项目议题列表 - * + * 1、表决中：议题 + * 2、处理中：已转项目的议题，项目未结案的； + * 3、已处理： + * 3.1、已结案：议题已转项目，且项目结案选择已解决 + * 3.2、已关闭：议题关闭且选择的是已解决 + * 3.3、无需解决：议题关闭无需解决+议题已转项目无需解决 ❤ * @param formDTO * @return java.util.List * @author zhaoqifeng @@ -771,6 +776,17 @@ public class IssueServiceImpl implements IssueService { vi.setTopicContent(rr == null ? "" : rr.getTopicContent()); vi.setLongitude(rr == null ? "" : rr.getLongitude()); vi.setLatitude(rr == null ? "" : rr.getLatitude()); + // 赋值话题详情 + if(null!=rr){ + TopicInfoComDTO topicInfoDTO=new TopicInfoComDTO(); + topicInfoDTO.setTopicId(rr.getTopicId()); + topicInfoDTO.setTopicContent(rr.getTopicContent()); + topicInfoDTO.setTopicImgs(rr.getTopicImgs()); + topicInfoDTO.setTopicVoices(rr.getTopicVoices()); + topicInfoDTO.setPublishedUser(rr.getReleaseUserName()); + topicInfoDTO.setReleaseTime(rr.getReleaseTime()); + vi.setTopicInfo(topicInfoDTO); + } }); } return resultList; From 5bb5f51b7e19e0b53a3679a15a5d45273e85710a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 14:33:23 +0800 Subject: [PATCH 092/621] =?UTF-8?q?/gov/issue/manage/progress=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IssueProcessServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java index d4dc58fbaf..fe813fbe07 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java @@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; @@ -143,6 +145,9 @@ public class IssueProcessServiceImpl extends BaseServiceImpl processList(IssueIdFormDTO issueId) { List listResult = new ArrayList(); IssueDTO issueDTO = issueService.get(issueId.getIssueId()); + if(null==issueDTO){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"议题不存在","议题不存在"); + } String issueStatus = issueDTO.getIssueStatus(); if (issueStatus.equals(IssueConstant.ISSUE_CLOSED)){ //已关闭——处理进展 From 580c5cee01b685d907449707295153bb42cdf821 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 11 Oct 2022 14:47:34 +0800 Subject: [PATCH 093/621] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataSyncConfigController.java | 2 +- .../java/com/epmet/dao/DataSyncConfigDao.java | 19 ++-- .../java/com/epmet/enums/DataSyncEnum.java | 55 ++++++++++ .../epmet/service/DataSyncConfigService.java | 4 +- .../impl/DataSyncConfigServiceImpl.java | 103 +++++++++++++----- .../resources/mapper/DataSyncConfigDao.xml | 36 +++--- 6 files changed, 157 insertions(+), 62 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 950de6f573..2963823ce2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -108,7 +108,7 @@ public class DataSyncConfigController { @PostMapping("natInfoScanTask") public Result natInfoScanTask(@RequestBody NatInfoScanTaskFormDTO formDTO){ - dataSyncConfigService.natInfoScanTask(formDTO); + dataSyncConfigService.dataSyncForYanTaiTask(formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java index d3a2c600ef..6df7281e5b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java @@ -22,6 +22,7 @@ public interface DataSyncConfigDao extends BaseDao { /** * Desc: 【数据配置】配置开关 + * * @param formDTO * @author zxc * @date 2022/9/26 14:36 @@ -30,30 +31,32 @@ public interface DataSyncConfigDao extends BaseDao { /** * Desc: 【数据配置】列表 + * * @param customerId + * @param switchStatus * @author zxc * @date 2022/9/26 15:04 */ - List list(@Param("customerId")String customerId); + List list(@Param("customerId") String customerId, @Param("switchStatus") String switchStatus); - List scopeList(@Param("id")String id); + List scopeList(@Param("id") String id); /** * Desc: 删除范围 + * * @param dataSyncConfigId * @author zxc * @date 2022/9/26 15:46 */ - void delScope(@Param("dataSyncConfigId")String dataSyncConfigId); + void delScope(@Param("dataSyncConfigId") String dataSyncConfigId); /** * Desc: 根据范围查询居民证件号 - * @param list + * + * @param orgList * @author zxc * @date 2022/9/27 09:23 */ - List getIdCardsByScope(@Param("list") List list); + List getIdCardsByScope(@Param("orgList") List orgList, @Param("idCardList") List idCardList); - List getUserIdByIdCard(@Param("list") List list); - -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java new file mode 100644 index 0000000000..a3a66c4efc --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java @@ -0,0 +1,55 @@ +package com.epmet.enums; + +/** + * desc:数据同步配置枚举 对应data_sync_config中的DATA_CODE + * @author Administrator + */ + +public enum DataSyncEnum { + /** + * 环境变量枚举 + */ + HE_SUAN("hesuan", "核酸检测数据"), + CAN_JI("canji", "残疾数据"), + SI_WANG("siwang", "死亡数据"), + OTHER("qita","其他"), + + ; + + private final String code; + private final String name; + + + + DataSyncEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public static DataSyncEnum getEnum(String code) { + DataSyncEnum[] values = DataSyncEnum.values(); + for (DataSyncEnum value : values) { + if (value.getCode().equals(code)) { + return value; + } + } + return DataSyncEnum.OTHER; + } + + + public String getCode() { + return code; + } + + public String getName() { + return name; + } + + public static void main(String[] args) { + Integer pageNo = 1; + + for (int i = 0; i < 5; i++) { + System.out.println(pageNo++); + } + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index 1e0ad7162b..049fc774a0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -82,5 +82,5 @@ public interface DataSyncConfigService extends BaseService */ void scopeSave(ScopeSaveFormDTO formDTO); - void natInfoScanTask(NatInfoScanTaskFormDTO formDTO); -} \ No newline at end of file + void dataSyncForYanTaiTask(NatInfoScanTaskFormDTO formDTO); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index d4de7ebcbe..ed2490feed 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1,4 +1,5 @@ package com.epmet.service.impl; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; @@ -25,12 +26,14 @@ import com.epmet.entity.DataSyncConfigEntity; import com.epmet.entity.DataSyncScopeEntity; import com.epmet.entity.IcNatEntity; import com.epmet.entity.IcNatRelationEntity; +import com.epmet.enums.DataSyncEnum; import com.epmet.service.DataSyncConfigService; import com.epmet.service.DataSyncScopeService; import com.epmet.service.IcNatRelationService; import com.epmet.service.IcNatService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; @@ -50,6 +53,7 @@ import java.util.stream.Collectors; * @author generator generator@elink-cn.com * @since v1.0.0 2022-09-26 */ +@Slf4j @Service public class DataSyncConfigServiceImpl extends BaseServiceImpl implements DataSyncConfigService { @@ -119,10 +123,11 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl result = new PageData<>(new ArrayList<>(), NumConstant.ZERO_L); - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.list(tokenDto.getCustomerId())); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) + .doSelectPageInfo(() -> baseDao.list(tokenDto.getCustomerId(), null)); if (CollectionUtils.isNotEmpty(pageInfo.getList())){ result.setList(pageInfo.getList()); - result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + result.setTotal(Integer.parseInt(String.valueOf(pageInfo.getTotal()))); } return result; } @@ -171,40 +176,78 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl userIdByIdCard = baseDao.getUserIdByIdCard(formDTO.getIdCards()); - List collect = formDTO.getIdCards().stream().map(id -> { - NatUserInfoResultDTO e = new NatUserInfoResultDTO(); - e.setIdCard(id); - e.setUserId(""); - return e; - }).collect(Collectors.toList()); - collect.forEach(c -> userIdByIdCard.stream().filter(u -> u.getIdCard().equals(c.getIdCard())).forEach(u -> c.setUserId(u.getUserId()))); - hsjc(collect,formDTO.getCustomerId()); + public void dataSyncForYanTaiTask(NatInfoScanTaskFormDTO formDTO) { + List allConfigList = baseDao.list(formDTO.getCustomerId() ,"open"); + if (CollectionUtils.isEmpty(allConfigList)){ return; } - List allConfigList = baseDao.list(StringUtils.isNotBlank(formDTO.getCustomerId()) ? formDTO.getCustomerId() : null); - if (CollectionUtils.isEmpty(allConfigList)){ + + + //TODO 根据dataCode 调用不同的方法 抽取数据 + if (CollectionUtils.isNotEmpty(allConfigList)){ + log.warn("dataSyncForYanTaiTask don't have any resi data to pull data form YanTai interface"); return; } - List configList = allConfigList.stream().filter(l -> l.getDeptCode().equals("dsjj") && l.getSwitchStatus().equals("open")).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(configList)){ - configList.forEach(c -> { - if (CollectionUtils.isNotEmpty(c.getScopeList())){ - Integer no = NumConstant.ONE; - Integer size; - do { - PageInfo pageInfo = PageHelper.startPage(no, NumConstant.ONE_THOUSAND).doSelectPageInfo(() -> baseDao.getIdCardsByScope(c.getScopeList())); - size = pageInfo.getList().size(); - hsjc(pageInfo.getList(),c.getCustomerId()); - no++; - }while (size.compareTo(NumConstant.ONE_THOUSAND) == NumConstant.ZERO); - } - }); + for (DataSyncConfigDTO config : allConfigList) { + //没有配置 数据拉取范围 继续下次循环 + if (CollectionUtils.isEmpty(config.getScopeList())){ + continue; + } + + //如果传了身份证号 则按照身份证号查询 并同步记录， userId如果为空则是 手动录入的 此人没有录入居民库 但是也可以同步 + if (CollectionUtils.isNotEmpty(formDTO.getIdCards())){ + List userIdByIdCard = baseDao.getIdCardsByScope(config.getScopeList(),formDTO.getIdCards()); + List collect = formDTO.getIdCards().stream().map(id -> { + NatUserInfoResultDTO e = new NatUserInfoResultDTO(); + e.setIdCard(id); + e.setUserId(""); + return e; + }).collect(Collectors.toList()); + + collect.forEach(c -> userIdByIdCard.stream().filter(u -> u.getIdCard().equals(c.getIdCard())).forEach(u -> c.setUserId(u.getUserId()))); + executeSyncData(config, collect); + return; + } else { + //没传具体参数 则 按照 + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_THOUSAND; + PageInfo pageInfo = null; + do { + //根据 组织 分页获取 居民数据 + pageInfo = PageHelper.startPage(pageNo, pageSize, false) + .doSelectPageInfo(() -> baseDao.getIdCardsByScope(config.getScopeList(),formDTO.getIdCards())); + executeSyncData(config, pageInfo.getList()); + + pageNo++; + } while (pageInfo != null && pageInfo.getSize() == pageSize); + } + } } + /** + * desc：根据居民身份证号 从蓝图api接口 获取数据到本地 + * @param config + * @param resiList + */ + private void executeSyncData(DataSyncConfigDTO config, List resiList) { + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + switch (anEnum) { + case HE_SUAN: + hsjc(resiList, config.getCustomerId()); + break; + case CAN_JI: + //todo + break; + case SI_WANG: + //todo + break; + default: + log.warn("没有要处理的数据"); + } + } + + /** * Desc: 根据证件号 查询nat 存在 ? 不处理 : 新增 * @param idCards @@ -269,4 +312,4 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl - AND CUSTOMER_ID = #{customerId} - + + AND switch_status = #{switchStatus} + + + AND CUSTOMER_ID = #{customerId} + order by sort @@ -62,29 +65,20 @@ FROM ic_resi_user WHERE DEL_FLAG = '0' AND `STATUS` = '0' + + AND id_card in + + #{idCard} + + AND ( - + GRID_ID = #{l.orgId} - PIDS LIKE CONCAT('%',#{l.orgId},'%') + PIDS LIKE CONCAT(#{l.orgIdPath},'%') ) ORDER BY CREATED_TIME - - \ No newline at end of file + From 757f3cd0fe4a864524ea49541781912a528688ae Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Oct 2022 14:49:04 +0800 Subject: [PATCH 094/621] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/ProcessListResultDTOBak.java | 1 + .../src/main/java/com/epmet/service/impl/IcEventServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java index dc6c8787b9..d3e8b4ed84 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java @@ -34,5 +34,6 @@ public class ProcessListResultDTOBak { * 进展id（操作记录表id） */ private String processId; + private String type; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index c2d7aac1b3..73f5fc25c7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1287,6 +1287,7 @@ public class IcEventServiceImpl extends BaseServiceImpl Date: Tue, 11 Oct 2022 15:23:11 +0800 Subject: [PATCH 095/621] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E5=86=99=E4=BA=8B=E4=BB=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcUserDemandRecServiceImpl.java | 3 + .../com/epmet/dto/form/CloseIssueFormDTO.java | 6 + .../controller/IssueManageController.java | 3 +- .../epmet/service/impl/IssueServiceImpl.java | 113 +++++++++++------- ...e_source.sql => V0.0.20__issue_source.sql} | 0 .../dto/form/ColseProjectOrDemandFormDTO.java | 10 +- .../feign/GovProjectOpenFeignClient.java | 1 + .../epmet/controller/IcEventController.java | 1 + .../com/epmet/service/IcEventService.java | 1 + .../service/impl/IcEventServiceImpl.java | 33 ++++- .../service/impl/ProjectServiceImpl.java | 1 + .../migration/V0.0.27__icevent_to_issue.sql | 4 +- 12 files changed, 125 insertions(+), 51 deletions(-) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.19__issue_source.sql => V0.0.20__issue_source.sql} (100%) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 86ad54bec4..572a6f39fb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -563,6 +563,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl imp @Transactional(rollbackFor = Exception.class) public void closeIssue(CloseIssueFormDTO formDTO) { //公开回复内容审核 - if (StringUtils.isNotBlank(formDTO.getCloseReason())) { - TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); - TextTaskDTO taskDTO = new TextTaskDTO(); - taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); - taskDTO.setContent(formDTO.getCloseReason()); - textScanParamDTO.getTasks().add(taskDTO); - Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - if (!textSyncScanResult.success()){ - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } else { - if (!textSyncScanResult.getData().isAllPass()) { - throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); - } - } - } + checkCloseReason(formDTO.getCloseReason()); - Date date = new Date(); + Date nowTime = new Date(); //1:更新议题详情表数据 IssueEntity entity = baseDao.selectById(formDTO.getIssueId()); if (null == entity) { - throw new RenException(IssueConstant.SELECT_EXCEPTION); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),IssueConstant.SELECT_EXCEPTION,"议题不存在"); } if (IssueConstant.ISSUE_CLOSED.equals(entity.getIssueStatus())) { - throw new RenException(IssueConstant.OPERATION_EXCEPTION); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),IssueConstant.OPERATION_EXCEPTION,"议题不存在"); } entity.setIssueStatus(IssueConstant.ISSUE_CLOSED); entity.setCloseReason(formDTO.getCloseReason()); entity.setResolveType(formDTO.getResolveType()); - entity.setVotingDeadline(date); - entity.setClosedTime(date); + entity.setVotingDeadline(nowTime); + entity.setClosedTime(nowTime); if (baseDao.updateById(entity) < NumConstant.ONE) { throw new RenException(IssueConstant.UPPDATE_EXCEPTION); } //2:调用gov-org服务，查询组织网格名称 - AgencyGridResultDTO agencyGridResultDTO = new AgencyGridResultDTO(); + /*AgencyGridResultDTO agencyGridResultDTO = new AgencyGridResultDTO(); agencyGridResultDTO.setAgencyId(entity.getOrgId()); agencyGridResultDTO.setGridId(entity.getGridId()); Result resultDTO = govOrgFeignClient.getAgencyAndGrid(agencyGridResultDTO); if (!resultDTO.success() || null == resultDTO.getData()) { throw new RenException(IssueConstant.SELECT_GOV_ORG_EXCEPTION); } - agencyGridResultDTO = resultDTO.getData(); - + agencyGridResultDTO = resultDTO.getData();*/ + //上面代码注释，改用缓存 + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(entity.getGridId()); //3:议题进展记录表新增数据 IssueProcessEntity processEntity = new IssueProcessEntity(); processEntity.setIssueId(formDTO.getIssueId()); @@ -765,31 +752,27 @@ public class IssueServiceImpl extends BaseServiceImpl imp processEntity.setOrgType(IssueConstant.ISSUE_GRID); processEntity.setOrgId(entity.getGridId()); processEntity.setOperationExplain(formDTO.getCloseReason()); - processEntity.setOrgName(agencyGridResultDTO.getAgencyName() + "-" + agencyGridResultDTO.getGridName()); + // processEntity.setOrgName(agencyGridResultDTO.getAgencyName() + "-" + agencyGridResultDTO.getGridName()); + processEntity.setOrgName(gridInfoCache.getGridNamePath()); + processEntity.setCreatedTime(nowTime); + processEntity.setUpdatedTime(nowTime); + processEntity.setCustomerId(entity.getCustomerId()); issueProcessDao.insert(processEntity); //4:调用epmet-message服务，给居民端话题创建人和议题发起人发送消息 if (entity.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)){ //4.1:调用resi-group查询话题创建人数据(目前议题来源只有来自话题) - Result resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId()); - if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) { - throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION); - } - ResiTopicDTO topicDTO = resultTopicDTO.getData(); - //4.2:创建消息模板 - String messageContent = ""; - if (IssueConstant.ISSUE_RESOLVED.equals(formDTO.getResolveType())) { - messageContent = String.format(UserMessageConstant.ISSUE_RESOLVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); - } else if (IssueConstant.ISSUE_UNRESOLVED.equals(formDTO.getResolveType())) { - messageContent = String.format(UserMessageConstant.ISSUE_UNRESOLVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); - } - //4.3:调用服务，发送消息 - if (!saveUserMessageList(topicDTO, messageContent, entity).success()) { - throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION); - } - //4.4:2020.10.26 添加推送微信订阅消息功能 sun - if (!saveWxmpMessageList(topicDTO, messageContent, entity).success()) { - logger.error("议题关闭，推送微信订阅消息失败！"); + sendToTopicAndShiftIssueResiUser(entity.getSourceId(),formDTO.getResolveType(),entity,formDTO.getCloseReason()); + }else if(entity.getSourceType().equals("ic_event")){ + ColseProjectOrDemandFormDTO colseProjectOrDemandFormDTO=new ColseProjectOrDemandFormDTO(); + colseProjectOrDemandFormDTO.setCustomerId(entity.getCustomerId()); + colseProjectOrDemandFormDTO.setIcEventId(entity.getSourceId()); + colseProjectOrDemandFormDTO.setType("issue"); + colseProjectOrDemandFormDTO.setUserId(formDTO.getCurrentUserId()); + colseProjectOrDemandFormDTO.setCloseCaseTime(nowTime); + Result result = govProjectOpenFeignClient.closeProjectOrDemand(colseProjectOrDemandFormDTO); + if (!result.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"议题关闭异常，该议题来源于事件，回写事件信息失败","议题关闭异常:事件办结异常"); } } @@ -805,6 +788,50 @@ public class IssueServiceImpl extends BaseServiceImpl imp } } + /** + * 议题关闭时，填写的关闭理由，走内容审核 + * @param closeReason + */ + private void checkCloseReason(String closeReason) { + if (StringUtils.isNotBlank(closeReason)) { + TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + TextTaskDTO taskDTO = new TextTaskDTO(); + taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + taskDTO.setContent(closeReason); + textScanParamDTO.getTasks().add(taskDTO); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + } + } + } + } + + private void sendToTopicAndShiftIssueResiUser(String topicId,String resolveType,IssueEntity issueEntity,String closeReason) { + Result resultTopicDTO = resiGroupFeignClient.getTopicById(topicId); + if (resultTopicDTO.success() &&null != resultTopicDTO.getData()) { + ResiTopicDTO topicDTO = resultTopicDTO.getData(); + //4.2:创建消息模板 + String messageContent = ""; + if (IssueConstant.ISSUE_RESOLVED.equals(resolveType)) { + messageContent = String.format(UserMessageConstant.ISSUE_RESOLVED_MSG, topicDTO.getTopicContent(), closeReason); + } else if (IssueConstant.ISSUE_UNRESOLVED.equals(resolveType)) { + messageContent = String.format(UserMessageConstant.ISSUE_UNRESOLVED_MSG, topicDTO.getTopicContent(), closeReason); + } + //4.3:调用服务，发送消息 + if (!saveUserMessageList(topicDTO, messageContent, issueEntity).success()) { + throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION); + } + //4.4:2020.10.26 添加推送微信订阅消息功能 sun + if (!saveWxmpMessageList(topicDTO, messageContent, issueEntity).success()) { + logger.warn("议题关闭，推送微信订阅消息失败！"); + } + } + } + /** * @Description 关闭议题时给话题创建人和议题发起人发送消息 * @author sun diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__issue_source.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.20__issue_source.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__issue_source.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.20__issue_source.sql diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ColseProjectOrDemandFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ColseProjectOrDemandFormDTO.java index 19e7d38344..ac1812c5c7 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ColseProjectOrDemandFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ColseProjectOrDemandFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** @@ -13,7 +14,7 @@ public class ColseProjectOrDemandFormDTO implements Serializable { private static final long serialVersionUID = -590440160577071133L; //事件管理Id private String icEventId; - //类型 需求：demand 项目:project + //类型 需求：demand 项目:project 议题：issue private String type; //服务方【事件被转需求，需求在办结时的服务方名称】 private String serviceParty; @@ -22,4 +23,11 @@ public class ColseProjectOrDemandFormDTO implements Serializable { private String customerId; private String userId; + + /** + * 项目的结案时间 + * 需求的完成时间 + * 议题的关闭时间 + */ + private Date closeCaseTime; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index d4fd341b7f..8220889e9e 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -171,6 +171,7 @@ public interface GovProjectOpenFeignClient { /** * Desc: 需求完成/项目结案时 修改事件数据 + * 议题关闭时，如果议题来源于事件，也会调用此方法 * @author sun */ @PostMapping("gov/project/icEvent/closeprojectordemand") diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index bce6cc9f01..a139371cb2 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -364,6 +364,7 @@ public class IcEventController { /** * @Author sun * @Description 需求完成/项目结案时 修改事件数据 + * 议题关闭时，如果议题来源于事件，也会调用此方法 **/ @PostMapping("closeprojectordemand") public Result closeProjectOrDemand(@RequestBody ColseProjectOrDemandFormDTO formDTO) { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index 7421853c13..d785949909 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -172,6 +172,7 @@ public interface IcEventService extends BaseService { /** * @Author sun * @Description 需求完成/项目结案时 修改事件数据 + * 议题关闭时，如果议题来源于事件，也会调用此方法 **/ void closeProjectOrDemand(ColseProjectOrDemandFormDTO formDTO); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index c2d7aac1b3..72b4e5b033 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1300,20 +1300,21 @@ public class IcEventServiceImpl extends BaseServiceImpl%s", formDTO.getIcEventId())); + logger.warn(String.format("事件不存在或已办结不允许修改,事件Id->%s", formDTO.getIcEventId())); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件不存在或已办结不允许修改"); } //2.修改事件数据 entity.setStatus("closed_case"); - entity.setCloseCaseTime(new Date()); - entity.setLatestOperatedTime(new Date()); + entity.setCloseCaseTime(formDTO.getCloseCaseTime()); + entity.setLatestOperatedTime(formDTO.getCloseCaseTime()); entity.setDifficultPoint("0"); baseDao.updateById(entity); @@ -1325,7 +1326,31 @@ public class IcEventServiceImpl extends BaseServiceImpl已读；工作人员待处理=>处理中；转议题：shift_to_issue'; +alter TABLE ic_event_operation_log MODIFY COLUMN `ACTION_DESC` varchar(32) NOT NULL COMMENT '1、发布事件：publish；2、撤回事件：recall；n3、复：reply；n4、立项：shift_project；5、转需求: shift_demand；6、办结：close_case;7、需求办结：close_demand;8、选择是否已解决：choose_resolve;9、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；转议题：shift_to_issue；项目结案：project_closed；议题关闭：close_issue'; From acf79177a6aaf082c97ade870e79600710d9fffc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 16:05:26 +0800 Subject: [PATCH 096/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6-=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=9B=E4=BA=8B=E4=BB=B6-=E3=80=8B=E8=AE=AE=E9=A2=98-?= =?UTF-8?q?=E3=80=8B=E9=A1=B9=E7=9B=AE;=E8=BF=992=E7=A7=8D=E6=83=85?= =?UTF-8?q?=E5=86=B5=E9=83=BD=E8=A6=81=E5=9B=9E=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectServiceImpl.java | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index bbc37a04b5..b2e1c6f381 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -862,17 +862,42 @@ public class ProjectServiceImpl extends BaseServiceImpl issueIds =new ArrayList<>(); + issueIds.add(projectEntity.getOrigin()); + Result> issueRes=govIssueOpenFeignClient.getIssueProfile(issueIds); + if(issueRes.success()&&CollectionUtils.isNotEmpty(issueRes.getData())){ + if("ic_event".equals(issueRes.getData().get(NumConstant.ZERO).getIssueSourceType())){ + icEventFlag=true; + } + } + } + if ("ic_event".equals(projectEntity.getOrigin())||icEventFlag) { ColseProjectOrDemandFormDTO dto = new ColseProjectOrDemandFormDTO(); - dto.setCustomerId(fromDTO.getCustomerId()); - dto.setUserId(fromDTO.getUserId()); + dto.setCustomerId(projectEntity.getCustomerId()); + dto.setUserId(projectEntity.getUpdatedBy()); dto.setIcEventId(projectEntity.getOriginId()); dto.setType("project"); - dto.setCloseCaseTime(projectProcessEntity.getCreatedTime()); + dto.setCloseCaseTime(closeCaseTime); icEventService.closeProjectOrDemand(dto); } - //2022-5-19 sun end - } @Override From 638905600d526ef5637ebdbccedf9118446bb506 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Oct 2022 16:12:59 +0800 Subject: [PATCH 097/621] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IssueApplicationHistoryServiceImpl.java | 6 ++ .../group/form/ApplicationDetailFormDTO.java | 5 ++ .../service/impl/GroupIssueServiceImpl.java | 74 ++++++++----------- 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java index 7caa252331..ba8ce255f5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IssueApplicationHistoryDao; +import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.IssueApplicationHistoryDTO; import com.epmet.dto.form.ApplicationDetailWorkFormDTO; import com.epmet.dto.form.ApplicationHistoryWorkFormDTO; @@ -37,6 +38,7 @@ import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.IssueApplicationHistoryService; +import com.epmet.service.IssueApplicationService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,6 +64,8 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl page(Map params) { @@ -136,6 +140,8 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl result = resiGroupOpenFeignClient.applicationDetail(formDTO); if (!result.success()){ throw new RenException("工作端查询待审核||已驳回 申请详情失败......"); diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplicationDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplicationDetailFormDTO.java index 8dcccb0eae..2d84f8cb13 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplicationDetailFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplicationDetailFormDTO.java @@ -21,4 +21,9 @@ public class ApplicationDetailFormDTO implements Serializable { */ @NotBlank(message = "issueApplicationId不能为空",groups = {ApplicationDetail.class}) private String issueApplicationId; + + /** + * 话题ID是否为空 + */ + private Boolean topicIdIsNull; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java index fa5e644cf3..7d2b5fe87c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java @@ -73,53 +73,41 @@ public class GroupIssueServiceImpl implements GroupIssueService { List userIds = new ArrayList<>(); ApplicationDetailResultDTO data = result.getData(); userIds.add(data.getUserId()); - TopicInfoResultDTO topicInfoResultDTO = resiGroupDao.selectTopicInfo(data.getTopicId()); - userIds.add(topicInfoResultDTO.getTopicUserId()); - // 查询小组类别 - ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(topicInfoResultDTO.getGroupId()); - if (null == resiGroupEntity){ - throw new RenException("此小组信息不存在"); - } - List userInfos = resiTopicService.disPoseUserInfo(resiGroupEntity.getGroupType(), userIds); - if(CollectionUtils.isEmpty(userInfos)){ - throw new RenException("未查询到用户信息"); - } - userInfos.forEach(u -> { - if (u.getUserId().equals(data.getUserId())){ - data.setIssuePublisher(u.getReleaseUserName()); - data.setIssuePublisherMobile(u.getMobile()); + if (!applicationDetailFormDTO.getTopicIdIsNull()){ + TopicInfoResultDTO topicInfoResultDTO = resiGroupDao.selectTopicInfo(data.getTopicId()); + userIds.add(topicInfoResultDTO.getTopicUserId()); + // 查询小组类别 + ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(topicInfoResultDTO.getGroupId()); + if (null == resiGroupEntity){ + throw new RenException("此小组信息不存在"); } - if (u.getUserId().equals(topicInfoResultDTO.getTopicUserId())){ - topicInfoResultDTO.setPublishedUser(u.getReleaseUserName()); - topicInfoResultDTO.setTopicPublishMobile(u.getMobile()); + List userInfos = resiTopicService.disPoseUserInfo(resiGroupEntity.getGroupType(), userIds); + if(CollectionUtils.isEmpty(userInfos)){ + throw new RenException("未查询到用户信息"); } - }); - /*Result> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds); - if (!listResult.success()){ - throw new RenException("查询话题创建者，议题创建者失败......"); - } - listResult.getData().forEach(user -> { - if (user.getUserId().equals(data.getUserId())){ - data.setIssuePublisher(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender()))); - data.setIssuePublisherMobile(user.getMobile()); + userInfos.forEach(u -> { + if (u.getUserId().equals(data.getUserId())){ + data.setIssuePublisher(u.getReleaseUserName()); + data.setIssuePublisherMobile(u.getMobile()); + } + if (u.getUserId().equals(topicInfoResultDTO.getTopicUserId())){ + topicInfoResultDTO.setPublishedUser(u.getReleaseUserName()); + topicInfoResultDTO.setTopicPublishMobile(u.getMobile()); + } + }); + List gridIds = new ArrayList<>(); + gridIds.add(data.getGridId()); + Result> gridListByGridIds = govOrgOpenFeignClient.getGridListByGridIds(gridIds); + if (!gridListByGridIds.success()){ + throw new RenException("查询议题所属网格名称失败......"); } - if (user.getUserId().equals(topicInfoResultDTO.getTopicUserId())){ - topicInfoResultDTO.setPublishedUser(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender()))); - topicInfoResultDTO.setTopicPublishMobile(user.getMobile()); - } - });*/ - List gridIds = new ArrayList<>(); - gridIds.add(data.getGridId()); - Result> gridListByGridIds = govOrgOpenFeignClient.getGridListByGridIds(gridIds); - if (!gridListByGridIds.success()){ - throw new RenException("查询议题所属网格名称失败......"); + gridListByGridIds.getData().forEach(grid -> { + if (grid.getGridId().equals(data.getGridId())){ + data.setGridName(grid.getGridName()); + } + }); + data.setTopicInfo(topicInfoResultDTO); } - gridListByGridIds.getData().forEach(grid -> { - if (grid.getGridId().equals(data.getGridId())){ - data.setGridName(grid.getGridName()); - } - }); - data.setTopicInfo(topicInfoResultDTO); return ConvertUtils.sourceToTarget(data,ApplicationDetailCopyResultDTO.class); } From e36345ac2a3b96a83e726d60aedfbffa0aeff7bf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Oct 2022 16:21:16 +0800 Subject: [PATCH 098/621] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/VoteFormDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java index e13771455c..b3816f3a24 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java @@ -30,8 +30,9 @@ public class VoteFormDTO implements Serializable { /** * 当 sourceType = issue 时，是直接创建议题，无需加入小组即可表决 + * 默认为resi_topic */ - private String sourceType; + private String sourceType = "resi_topic"; } From 3aaede3e231a84dc8a5c31ffb1adcf844177b297 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 11 Oct 2022 16:28:36 +0800 Subject: [PATCH 099/621] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A/communityUs?= =?UTF-8?q?erHouseStats=20=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/HouseController.java | 6 +++--- .../src/main/java/com/epmet/service/HouseService.java | 2 +- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) 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 dd1d7c37af..79abda28a9 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 @@ -634,15 +634,15 @@ public class HouseController implements ResultDataResolver { * @return */ @PostMapping("communityUserHouseStats") - public Result> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) { + public Result> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) { String orgId = input.getOrgId(); String orgType = input.getOrgType(); Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); - List r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize); - return new Result>().ok(r); + PageData r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize); + return new Result>().ok(r); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 41ffd5709d..2973495dbf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -198,5 +198,5 @@ public interface HouseService { PageData houseStatisListDetail(HouseChartFormDTO formDTO); - List communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); + PageData communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index d5838a78a7..fa304c53c6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1394,15 +1394,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } @Override - public List communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { + public PageData communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { PageHelper.startPage(pageNo, pageSize); List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); + // 填充组织信息 Map communityMap = communityIds.stream().collect(Collectors.toMap(id -> id, id -> concatAgencyNamePath(id))); List communityUserHouseStats = houseUserChartList(communityIds, communityMap, "agency"); - return communityUserHouseStats; + + return new PageData(communityUserHouseStats, new PageInfo<>(communityIds).getTotal()); } public String concatAgencyNamePath(String agencyId) { From e7d2e5b03322f777102d5135bd374eed5af112fd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 16:42:52 +0800 Subject: [PATCH 100/621] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/controller/ResiTopicController.java | 2 +- .../modules/topic/service/ResiTopicService.java | 2 +- .../topic/service/impl/ResiTopicServiceImpl.java | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index 1695aaba09..fb2ef52238 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -67,7 +67,7 @@ public class ResiTopicController { @PostMapping("gettopicdetail") public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){ ValidatorUtils.validateEntity(topicDetailFormDTO); - return topicService.getTopicDetail(tokenDto,topicDetailFormDTO.getTopicId()); + return topicService.getTopicDetail(topicDetailFormDTO.getTopicId()); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index c6e8ea45db..10600d85bf 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -170,7 +170,7 @@ public interface ResiTopicService extends BaseService { * @Author wangc * @Date 2020.04.01 15:56 **/ - Result getTopicDetail(TokenDto tokenDto, String topicId); + Result getTopicDetail(String topicId); /** * @return List diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 2c1e2f57cf..6590ff1a60 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -36,6 +36,8 @@ import com.epmet.commons.tools.enums.EventEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; 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.bean.GridInfoCache; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -892,7 +894,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl getTopicDetail(TokenDto tokenDto, String topicId) { + public Result getTopicDetail(String topicId) { //1.获取话题基本信息 ResiTopicEntity topicDetail = baseDao.selectById(topicId); if(null == topicDetail || !StringUtils.equals(topicDetail.getId(),topicId)){ @@ -909,11 +911,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl gridInfoRes=govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO); - if(gridInfoRes.success()&&null!=gridInfoRes.getData()){ - resultDTO.setGridName(gridInfoRes.getData().getGridNamePath()); + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(resiGroupEntity.getGridId()); + if(null!=gridInfoCache){ + resultDTO.setGridName(gridInfoCache.getGridNamePath()); } } //2.查询话题附件 @@ -1327,7 +1327,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl getTopicDetailGov(String topicId) { - Result result = getTopicDetail(null,topicId); + Result result = getTopicDetail(topicId); if(result.success() && null != result.getData() && StringUtils.isNotBlank(result.getData().getTopicId())){ return new Result().ok(ConvertUtils.sourceToTarget(result.getData(),ResiTopicDetailResultDTO.class)); } @@ -1622,7 +1622,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topicDetailResult = - getTopicDetail(null,topicIdFormDTO.getTopicId()); + getTopicDetail(topicIdFormDTO.getTopicId()); if(topicDetailResult.success() && null != topicDetailResult.getData()){ ResiTopicShiftIssueInitResultDTO result = ConvertUtils.sourceToTarget(topicDetailResult.getData(),ResiTopicShiftIssueInitResultDTO.class); try { From 42ac13a88cfda8ec0099f72093b712c9fe0d1a10 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Oct 2022 16:51:04 +0800 Subject: [PATCH 101/621] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssueAuditController.java | 10 ++++ .../com/epmet/controller/IssueController.java | 11 ++++ .../epmet/excel/AllIssueListExportExcel.java | 42 +++++++++++++++ .../com/epmet/excel/AuditListExportExcel.java | 34 ++++++++++++ .../service/IssueApplicationService.java | 3 ++ .../java/com/epmet/service/IssueService.java | 3 ++ .../impl/IssueApplicationServiceImpl.java | 52 +++++++++++++++++-- .../epmet/service/impl/IssueServiceImpl.java | 45 ++++++++++++++-- 8 files changed, 193 insertions(+), 7 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AllIssueListExportExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AuditListExportExcel.java diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java index 87dfa6027c..1b3bf0f045 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java @@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; /** @@ -145,6 +147,14 @@ public class IssueAuditController { return new Result>().ok(issueApplicationService.auditList(formDTO)); } + @PostMapping("auditListExport") + public Result auditListExport(@RequestBody AuditListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + issueApplicationService.auditListExport(formDTO,response); + return new Result(); + } + /** * Desc: 补全议题审核表历史数据 * @param diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 834f8a0086..38d9fcafab 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -19,6 +19,8 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; /** @@ -382,6 +384,15 @@ public class IssueController { formDTO.setUserId(tokenDto.getUserId()); return new Result>().ok(issueService.allIssueList(formDTO)); } + + @PostMapping("allIssueListExport") + public Result allIssueListExport(@RequestBody AllIssueListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + issueService.allIssueListExport(formDTO,response); + return new Result(); + } + /** * 发布议题 * 事件转议题 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AllIssueListExportExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AllIssueListExportExcel.java new file mode 100644 index 0000000000..5a4a508506 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AllIssueListExportExcel.java @@ -0,0 +1,42 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Author zxc + * @DateTime 2022/10/11 16:30 + * @DESC + */ +@Data +public class AllIssueListExportExcel { + + @ExcelProperty(value = "所属网格") + @ColumnWidth(20) + private String gridName; + + @ExcelProperty(value = "议题标题") + @ColumnWidth(20) + private String issueTitle; + + @ExcelProperty(value = "议题建议") + @ColumnWidth(20) + private String suggestion; + + @ExcelProperty(value = "议题创建时间") + @ColumnWidth(20) + private String createdTime; + + @ExcelProperty(value = "支持数") + @ColumnWidth(20) + private Integer supportCount; + + @ExcelProperty(value = "反对数") + @ColumnWidth(20) + private Integer oppositionCount; + + @ExcelProperty(value = "议题状态") + @ColumnWidth(20) + private String issueStatusName; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AuditListExportExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AuditListExportExcel.java new file mode 100644 index 0000000000..f6aac9792c --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AuditListExportExcel.java @@ -0,0 +1,34 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Author zxc + * @DateTime 2022/10/11 16:45 + * @DESC + */ +@Data +public class AuditListExportExcel { + + @ExcelProperty(value = "所属网格") + @ColumnWidth(20) + private String gridName; + + @ExcelProperty(value = "议题标题") + @ColumnWidth(20) + private String issueTitle; + + @ExcelProperty(value = "议题建议") + @ColumnWidth(20) + private String suggestion; + + @ExcelProperty(value = "状态") + @ColumnWidth(20) + private String applyStatusName; + + @ExcelProperty(value = "提交审核时间") + @ColumnWidth(20) + private String applyTime; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java index 023bb20a0e..5b00541fb0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java @@ -34,6 +34,8 @@ import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO; import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO; import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -154,6 +156,7 @@ public interface IssueApplicationService extends BaseService notIssueToTopicIds(List topicIdList); PageData auditList(AuditListFormDTO formDTO); + void auditListExport(AuditListFormDTO formDTO, HttpServletResponse response) throws IOException; void initIssueApplicationHistoryData(); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 3fc5339009..6fb256e35e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -15,6 +15,8 @@ import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO; import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.github.pagehelper.Page; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; @@ -408,6 +410,7 @@ public interface IssueService extends BaseService { * @date 2022/10/9 16:58 */ PageData allIssueList(AllIssueListFormDTO formDTO); + void allIssueListExport(AllIssueListFormDTO formDTO, HttpServletResponse response) throws IOException; /** * 发布议题 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java index a37a1aad89..7332720abd 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java @@ -17,18 +17,27 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; 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.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.dao.IssueApplicationDao; import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.form.AuditListFormDTO; @@ -39,6 +48,8 @@ import com.epmet.dto.result.AuditListResultDTO; import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.dto.result.UserPubAuditingIssueResDTO; import com.epmet.entity.IssueApplicationEntity; +import com.epmet.excel.AllIssueListExportExcel; +import com.epmet.excel.AuditListExportExcel; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO; @@ -55,10 +66,10 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.*; /** * 话题转议题申请表 @@ -232,6 +243,39 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl list = null; + do { + PageData data = auditList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), AuditListExportExcel.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + @Override public void initIssueApplicationHistoryData() { Integer no = NumConstant.ONE; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index a3675369cb..26c9a93b6f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1,4 +1,7 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.client.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -28,9 +31,8 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; 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.utils.ScanContentUtils; +import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IssueConstant; import com.epmet.constant.ReadFlagConstant; @@ -46,6 +48,7 @@ import com.epmet.dto.form.IssueShiftedFromTopicFormDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; +import com.epmet.excel.AllIssueListExportExcel; import com.epmet.feign.*; import com.epmet.redis.GovIssueRedis; import com.epmet.redis.IssueVoteDetailRedis; @@ -76,6 +79,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -2071,6 +2077,39 @@ public class IssueServiceImpl extends BaseServiceImpl imp return result; } + @Override + public void allIssueListExport(AllIssueListFormDTO formDTO, HttpServletResponse response) throws IOException { + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "议题管理" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), AllIssueListExportExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + List list = null; + do { + PageData data = allIssueList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), AllIssueListExportExcel.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + logger.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + /** * 发布议题 * 事件转议题 From ce7477974eee194ed82143551fad0b7fbd5bf890 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 17:12:34 +0800 Subject: [PATCH 102/621] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E8=B0=83=E6=95=B4=EF=BC=88=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E5=B7=B2=E5=85=B3=E9=97=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IssueProcessServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java index fe813fbe07..d422e829da 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java @@ -152,6 +152,7 @@ public class IssueProcessServiceImpl extends BaseServiceImpl Date: Tue, 11 Oct 2022 17:23:46 +0800 Subject: [PATCH 103/621] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueProcessServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java index d422e829da..b53f885c0f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java @@ -189,11 +189,12 @@ public class IssueProcessServiceImpl extends BaseServiceImpl Date: Tue, 11 Oct 2022 17:31:38 +0800 Subject: [PATCH 104/621] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IssueAuditController.java | 3 +-- .../src/main/java/com/epmet/controller/IssueController.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java index 1b3bf0f045..25f4af86f9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java @@ -148,11 +148,10 @@ public class IssueAuditController { } @PostMapping("auditListExport") - public Result auditListExport(@RequestBody AuditListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException { + public void auditListExport(@RequestBody AuditListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); issueApplicationService.auditListExport(formDTO,response); - return new Result(); } /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 38d9fcafab..f9cc14f21b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -386,11 +386,10 @@ public class IssueController { } @PostMapping("allIssueListExport") - public Result allIssueListExport(@RequestBody AllIssueListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException { + public void allIssueListExport(@RequestBody AllIssueListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); issueService.allIssueListExport(formDTO,response); - return new Result(); } /** From 04cd2804f1a96f2d0f7643ab32fded41b86c5c2b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 17:40:01 +0800 Subject: [PATCH 105/621] =?UTF-8?q?/gov/issue/issue/allIssueList=E8=BF=94?= =?UTF-8?q?=E5=9B=9EsourceType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govissue/result/IssueListResultDTO.java | 6 +++++- .../mapper/govissue/IssueApplicationDao.xml | 14 ++++++++++++-- .../main/resources/mapper/govissue/IssueDao.xml | 6 ++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java index f1561c2a1b..32186f5212 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java @@ -108,7 +108,10 @@ public class IssueListResultDTO implements Serializable { @JsonIgnore private String applyStatus; - + /** + * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event + */ + private String sourceType; public IssueListResultDTO() { this.issueId = ""; this.issueTitle = ""; @@ -129,5 +132,6 @@ public class IssueListResultDTO implements Serializable { this.projectId = ""; this.issueClosedTime = 0L; this.issueApplicationId = ""; + this.sourceType=""; } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml index 08db0e9088..fdd1ff4c5f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml @@ -12,7 +12,12 @@ ia.TOPIC_ID, iah.REASON AS rejectedReason, ia.grid_id, - ia.apply_status + ia.apply_status, + ( + case when ia.TOPIC_ID is not null then 'resi_topic' + else '' + end + ) as sourceType FROM issue_application_history iah LEFT JOIN issue_application ia ON iah.ISSUE_APPLICATION_ID = ia.ID AND ia.APPLY_STATUS = 'rejected' WHERE ia.DEL_FLAG = 0 @@ -31,7 +36,12 @@ ISSUE_TITLE, UNIX_TIMESTAMP(CREATED_TIME) AS auditingTime, TOPIC_ID, - grid_id + grid_id, + ( + case when TOPIC_ID is not null then 'resi_topic' + else '' + end + ) as sourceType FROM issue_application WHERE DEL_FLAG = 0 AND ( diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml index 495473205c..82c3c09f32 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml @@ -12,7 +12,8 @@ ISSUE_TITLE AS issueTitle , UNIX_TIMESTAMP(CREATED_TIME) AS createTime, SUGGESTION, - grid_id + grid_id, + SOURCE_TYPE as sourceType FROM issue WHERE DEL_FLAG = '0' AND ISSUE_STATUS = #{issueStatus} @@ -30,7 +31,8 @@ SUGGESTION , UNIX_TIMESTAMP(SHIFTED_TIME) AS shiftProjectTime, grid_id, - issue_title + issue_title, + SOURCE_TYPE as sourceType FROM issue WHERE DEL_FLAG = '0' AND ISSUE_STATUS = 'shift_project' From 7be2a77aec4bd9f2b31401c96a2fadec12cf6cc9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 17:49:32 +0800 Subject: [PATCH 106/621] =?UTF-8?q?=E5=88=9A=E6=89=8D=E6=94=B9=E9=94=99?= =?UTF-8?q?=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/AllIssueListResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java index 7c01ab375a..843b1e7a8b 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java @@ -52,4 +52,9 @@ public class AllIssueListResultDTO implements Serializable { private String issueStatus; private String issueStatusName; private String issueId; + + /** + * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event + */ + private String sourceType; } From a06e2ee701ee4b8d8553a164cdfaf4e45cb3a080 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Oct 2022 17:58:46 +0800 Subject: [PATCH 107/621] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E8=BF=94=E5=9B=9Eorigin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/ProjectManageListResultDTO.java | 11 ++++++++++- .../src/main/resources/mapper/ProjectDao.xml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java index 7c9bb481e8..daf846a3a5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java @@ -75,7 +75,15 @@ public class ProjectManageListResultDTO implements Serializable { private Boolean processable; private Boolean returnable; - + /** + * 项目来源： + * 来源议题 issue + * 项目立项 agency + * 旧版事件上报 resi_event + * 工作人员上报(巡查) work_event + * 新版事件上报 ic_event + */ + private String origin; public ProjectManageListResultDTO() { this.gridName = ""; this.title = ""; @@ -86,5 +94,6 @@ public class ProjectManageListResultDTO implements Serializable { this.status = ""; this.departmentNameList = new ArrayList<>(); this.projectId = ""; + this.origin=""; } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index ba340a2464..b57ebeca72 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -612,6 +612,7 @@ p.CREATED_TIME AS shiftProjectTime, ps.IS_HANDLE, ps.CREATED_TIME AS updatedTime, + p.ORIGIN, t.* FROM (SELECT From 903820974e7b381445ea36303d8013ab2f74475b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 09:37:24 +0800 Subject: [PATCH 108/621] =?UTF-8?q?/gov/project/icEvent/detail=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E8=AF=A6=E6=83=85=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=B7=B2=E5=88=A0=E9=99=A4=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?9999=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BA=8B=E4=BB=B6=E5=B7=B2?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEventServiceImpl.java | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 25a794d695..fa54ca0bbd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1087,58 +1087,58 @@ public class IcEventServiceImpl extends BaseServiceImpl list = baseDao.icEventList(formDTO); - if (!CollectionUtils.isEmpty(list)) { - resultDTO = list.get(0); - //查询网格名称(组织-网格) - List gridIds = list.stream().map(IcEventListResultDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); - Result> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds); - List gridInfoList = gridInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>(); - Map gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName, (key1, key2) -> key2)); - - //事件管理字典表数据 - Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_EVENT_SOURCE_TYPE.getCode()); - Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); - - //封装数据 - if (gridInfoMap.containsKey(resultDTO.getGridId())) { - resultDTO.setGridName(gridInfoMap.get(resultDTO.getGridId())); - } - if (StringUtils.isNotBlank(resultDTO.getSourceType())) { - resultDTO.setSourceTypeName(statusMap.get(resultDTO.getSourceType())); - } - //每个事件对应的图片数据 - if(!CollectionUtils.isEmpty(resultDTO.getAttachmentList())){ - List imageList = new ArrayList<>(); - List voiceList = new ArrayList<>(); - resultDTO.getAttachmentList().forEach(file -> { - if ("image".equals(file.getType())) { - imageList.add(file.getUrl()); - } else if ("voice".equals(file.getType())) { - voiceList.add(file); - } - }); - resultDTO.setImageList(imageList); - resultDTO.setVoiceList(voiceList); - } + if(CollectionUtils.isEmpty(list)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"事件不存在","事件已删除"); + } + resultDTO = list.get(0); + //查询网格名称(组织-网格) + List gridIds = list.stream().map(IcEventListResultDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); + Result> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds); + List gridInfoList = gridInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>(); + Map gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName, (key1, key2) -> key2)); + + //事件管理字典表数据 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_EVENT_SOURCE_TYPE.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + + //封装数据 + if (gridInfoMap.containsKey(resultDTO.getGridId())) { + resultDTO.setGridName(gridInfoMap.get(resultDTO.getGridId())); + } + if (StringUtils.isNotBlank(resultDTO.getSourceType())) { + resultDTO.setSourceTypeName(statusMap.get(resultDTO.getSourceType())); + } + //每个事件对应的图片数据 + if(!CollectionUtils.isEmpty(resultDTO.getAttachmentList())){ + List imageList = new ArrayList<>(); + List voiceList = new ArrayList<>(); + resultDTO.getAttachmentList().forEach(file -> { + if ("image".equals(file.getType())) { + imageList.add(file.getUrl()); + } else if ("voice".equals(file.getType())) { + voiceList.add(file); + } + }); + resultDTO.setImageList(imageList); + resultDTO.setVoiceList(voiceList); + } - //分类信息 - if(StringUtils.isNotBlank(resultDTO.getCategoryId())){ - List categoryList = new ArrayList<>(); - categoryList.add(resultDTO.getCategoryId()); - CategoryTagResultDTO category = queryCategory(formDTO.getCustomerId(), categoryList); - for (IssueProjectCategoryDictDTO ca : category.getCategoryList()){ - if (ca.getId().equals(resultDTO.getCategoryId())) { - resultDTO.setParentCategoryId(ca.getPid()); - resultDTO.setCategoryId(ca.getId()); - resultDTO.setParentCategoryCode(ca.getParentCategoryCode()); - resultDTO.setCategoryCode(ca.getCategoryCode()); - resultDTO.setParentCategoryName(ca.getParentCategoryName()); - resultDTO.setCategoryName(ca.getCategoryName()); - } + //分类信息 + if(StringUtils.isNotBlank(resultDTO.getCategoryId())){ + List categoryList = new ArrayList<>(); + categoryList.add(resultDTO.getCategoryId()); + CategoryTagResultDTO category = queryCategory(formDTO.getCustomerId(), categoryList); + for (IssueProjectCategoryDictDTO ca : category.getCategoryList()){ + if (ca.getId().equals(resultDTO.getCategoryId())) { + resultDTO.setParentCategoryId(ca.getPid()); + resultDTO.setCategoryId(ca.getId()); + resultDTO.setParentCategoryCode(ca.getParentCategoryCode()); + resultDTO.setCategoryCode(ca.getCategoryCode()); + resultDTO.setParentCategoryName(ca.getParentCategoryName()); + resultDTO.setCategoryName(ca.getCategoryName()); } } } - return resultDTO; } From ffef482287a224061007a7dc49d533ddd37cf1c7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Oct 2022 10:05:54 +0800 Subject: [PATCH 109/621] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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/service/impl/IssueServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 26c9a93b6f..abfedfdb21 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -2066,13 +2066,14 @@ public class IssueServiceImpl extends BaseServiceImpl imp result.setTotal(allIssueListResultDTOS.size()); } if (CollectionUtils.isNotEmpty(result.getList())){ - result.getList().forEach(l -> { + for (AllIssueListResultDTO l : result.getList()) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId()); if(null == gridInfo){ - throw new EpmetException("查询网格信息失败："+l.getGridId()); + logger.warn("查询网格信息失败："+l.getGridId()); + continue; } l.setGridName(gridInfo.getGridNamePath()); - }); + } } return result; } From 390ec51fb5b0db537b0e518623024be0760f56e1 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 12 Oct 2022 10:34:24 +0800 Subject: [PATCH 110/621] =?UTF-8?q?=E3=80=90fix=E3=80=91=EF=BC=9A=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0customerId=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E5=AF=B9=E4=B8=8D=E4=BC=A0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/CustomerAgencyDao.java | 2 +- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 4 +++- .../src/main/resources/mapper/CustomerAgencyDao.xml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) 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 072a877e94..31b80d3918 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 @@ -397,6 +397,6 @@ public interface CustomerAgencyDao extends BaseDao { */ Integer getUsingCommunityStats(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); - List getCommunitysByOrgIdPath(@Param("orgId") String orgId, @Param("orgIdPath") String orgIdPath); + List getCommunitysByOrgIdPath(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgIdPath") String orgIdPath); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index fa304c53c6..f7582aa558 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1396,8 +1396,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Override public PageData communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + PageHelper.startPage(pageNo, pageSize); - List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); + List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(customerId, orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); // 填充组织信息 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 cf75164bfc..80f0037382 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 @@ -1032,7 +1032,8 @@ SELECT i.id as issueId, - i.source_id AS topicId, + ( + case when i.SOURCE_TYPE='resi_topic'then i.source_id + else '' + end + )as topicId, + i.source_id, i.issue_title AS issueTitle, i.issue_status AS issueStatus, i.suggestion AS issueSuggestion, diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index abddc4c099..3fba9bf715 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -472,7 +472,7 @@ public class IcEventServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 1b46ac9e40..0a3f0af97f 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -94,7 +94,7 @@ public class IssueServiceImpl implements IssueService { TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO(); topicInfoFormDTO.setTopicId(issueResult.getTopicId()); TopicInfoDTO topicInfoDTOResult = new TopicInfoDTO(); - if (!StringUtils.isBlank(issueResult.getTopicId())) { + if (!StringUtils.isBlank(issueResult.getTopicId())&&"resi_topic".equals(issueResult.getSourceType())) { topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData(); issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult); } From 19bbd97c6520d49d7197c831c3c7218b6737f552 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 13:05:00 +0800 Subject: [PATCH 118/621] =?UTF-8?q?/gov/issue/issuesharelink/createurl?= =?UTF-8?q?=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IssueShareLinkRecordServiceImpl.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java index 687ce57e47..2c02be5f3c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java @@ -9,10 +9,11 @@ import com.epmet.commons.tools.exception.RenException; 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.utils.SpringContextUtils; import com.epmet.constant.IssueShareConstant; import com.epmet.dao.IssueShareLinkRecordDao; import com.epmet.dao.IssueShareLinkVisitRecordDao; +import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueShareLinkRecordDTO; import com.epmet.dto.form.IssueCreateUrlFormDTO; import com.epmet.dto.form.IssueVisitFormDTO; @@ -20,9 +21,8 @@ import com.epmet.dto.result.IssueCreateUrlResultDTO; import com.epmet.dto.result.IssueVisitResultDTO; import com.epmet.entity.IssueShareLinkRecordEntity; import com.epmet.entity.IssueShareLinkVisitRecordEntity; -import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO; -import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; +import com.epmet.service.IssueService; import com.epmet.service.IssueShareLinkRecordService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -118,19 +118,24 @@ public class IssueShareLinkRecordServiceImpl extends BaseServiceImpl topicInfo = resiGroupOpenFeignClient.selectTopicBelongGroup(topicBelongGroupFormDTO); - if (!topicInfo.success()){ - throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_FAILURE); - } + IssueDTO issueEntity= SpringContextUtils.getBean(IssueService.class).get(formDTO.getIssueId()); + //并改成兼容，发现不需要查询话题的网格id， 索性注释了吧 + /*if("resi_topic".equals(issueEntity.getSourceType())){ + TopicBelongGroupFormDTO topicBelongGroupFormDTO = new TopicBelongGroupFormDTO(); + topicBelongGroupFormDTO.setTopicId(issueInfo.getTopicId()); + // 查询议题来源所属小组【话题所属小组】 + Result topicInfo = resiGroupOpenFeignClient.selectTopicBelongGroup(topicBelongGroupFormDTO); + if (!topicInfo.success()){ + throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_FAILURE); + } + if (StringUtils.isBlank(topicInfo.getData().getGridId())){ + throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_NULL); + } + }*/ IssueShareLinkRecordEntity entity = new IssueShareLinkRecordEntity(); entity.setCustomerId(issueInfo.getCustomerId()); - if (StringUtils.isBlank(topicInfo.getData().getGridId())){ - throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_NULL); - } - entity.setGridId(topicInfo.getData().getGridId()); + // entity.setGridId(topicInfo.getData().getGridId());//注释原因同上 + entity.setGridId(issueEntity.getGridId()); entity.setIssueId(formDTO.getIssueId()); entity.setShareUserId(tokenDto.getUserId()); entity.setInviteContent(null); From fddde233d68d7e686f3fae26c5452b430768e735 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 13:17:35 +0800 Subject: [PATCH 119/621] =?UTF-8?q?/resi/hall/issue/detail=E8=BF=98?= =?UTF-8?q?=E5=BE=97=E8=BF=94=E5=9B=9EtopicInfo=EF=BC=8C=E5=90=A6=E5=88=99?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8A=A0=E8=BD=BD=E4=B8=8D=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E8=AF=A6=E6=83=85=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 0a3f0af97f..6c61788c10 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -96,8 +96,8 @@ public class IssueServiceImpl implements IssueService { TopicInfoDTO topicInfoDTOResult = new TopicInfoDTO(); if (!StringUtils.isBlank(issueResult.getTopicId())&&"resi_topic".equals(issueResult.getSourceType())) { topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData(); - issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult); } + issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult); if (null != topicInfoDTOResult && "branch".equals(topicInfoDTOResult.getGroupType())) {//支部小组话题发起人显示真实姓名 List userIdList = new ArrayList<>(); From 053cde14fd4fb3106a0fd0b9acd4c446e30af1af Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 13:23:57 +0800 Subject: [PATCH 120/621] /resi/group/topic/topicattachmentlist --- .../epmet/modules/topic/controller/ResiTopicController.java | 2 +- .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index fb2ef52238..f1b5c1d79a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -419,7 +419,7 @@ public class ResiTopicController { **/ @PostMapping(value = "topicattachmentlist") public Result topicAttachmentList(@RequestBody TopicAttachmentFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, TopicAttachmentFormDTO.TopicForm.class); + // ValidatorUtils.validateEntity(formDTO, TopicAttachmentFormDTO.TopicForm.class);//暂时不校验了，service里判断 return new Result().ok(topicService.topicAttachmentList(formDTO)); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 65d7082753..ff564c7f01 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2439,6 +2439,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl list = resiTopicAttachmentDao.selectTopicAttachmentList(formDTO.getTopicId()); From 775a8ab4058cb0ec20668bf14332c31c1b93f9ed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 13:30:33 +0800 Subject: [PATCH 121/621] /gov/issue/issuecategory/categorytaglist --- .../com/epmet/dto/form/IssueCategoryTagListFormDTO.java | 3 ++- .../java/com/epmet/controller/IssueCategoryController.java | 3 ++- .../src/main/java/com/epmet/dao/IssueCategoryDao.java | 2 +- .../com/epmet/service/impl/IssueCategoryServiceImpl.java | 2 +- .../src/main/resources/mapper/IssueCategoryDao.xml | 7 ++++++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java index d9339a0e97..3c2caa5909 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java @@ -15,7 +15,8 @@ public class IssueCategoryTagListFormDTO implements Serializable { private static final long serialVersionUID = 2599592072265715951L; @NotBlank(message = "议题ID不能为空",groups = {ProjectCategoryTagListFormDTO.CategoryTag.class}) private String issueId; - + @NotBlank(message = "customerId不能为空",groups = {ProjectCategoryTagListFormDTO.CategoryTag.class}) + private String customerId; public interface CategoryTag{} } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java index 6f459a71ad..6df8e177c3 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java @@ -106,7 +106,8 @@ public class IssueCategoryController { * @Author sun **/ @PostMapping("categorytaglist") - public Result categoryTagList(@RequestBody IssueCategoryTagListFormDTO formDTO) { + public Result categoryTagList(@LoginUser TokenDto tokenDto,@RequestBody IssueCategoryTagListFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO, IssueCategoryTagListFormDTO.CategoryTag.class); return new Result().ok(issueCategoryService.categoryTagList(formDTO)); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java index 650e4ac227..42fb7ca9bf 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java @@ -42,7 +42,7 @@ public interface IssueCategoryDao extends BaseDao { * @Description 查询议题绑定的分类名称，按排序升序 * @Author sun **/ - List selectIssueCategoryList(@Param("issueId") String issueId); + List selectIssueCategoryList(@Param("customerId")String customerId,@Param("issueId") String issueId); /** * @param formDTO diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java index 6953874ade..2fda58fd28 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java @@ -128,7 +128,7 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl categoryList = baseDao.selectIssueCategoryList(formDTO.getIssueId()); + List categoryList = baseDao.selectIssueCategoryList(formDTO.getCustomerId(),formDTO.getIssueId()); if (categoryList.size() > NumConstant.ZERO) { resultDTO.setCategoryList(categoryList); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml index 078661e2a1..4a8deef951 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml @@ -16,7 +16,12 @@ a.sort AS "sort", CONCAT(b.category_name, '-', a.category_name) AS "category_name" FROM issue_project_category_dict a - INNER JOIN issue_project_category_dict b ON a.pid = b.id + INNER JOIN issue_project_category_dict b + ON (a.pid = b.id + and a.CUSTOMER_ID = #{customerId} + and b.CUSTOMER_ID = #{customerId} + and a.CUSTOMER_ID=b.CUSTOMER_ID + ) ) ip ON ic.category_id = ip.idd AND ic.customer_id = ip.customer_id WHERE From 7ad46b3a6e9593776669d47eb295c1e1fc03e9ea Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 13:37:56 +0800 Subject: [PATCH 122/621] selectDetail --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index ff564c7f01..c6b009199c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1533,8 +1533,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); From a75494313118488ece1ad912c3f15ea9a6584c3b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 13:46:26 +0800 Subject: [PATCH 123/621] =?UTF-8?q?/resi/group/topic/topicattachmentlist?= =?UTF-8?q?=E8=BF=94=E5=9B=9Enull=E4=B8=8D=E8=A1=8C=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=B8=8D=E5=87=BA=E6=9D=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index c6b009199c..024681d256 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2440,7 +2440,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Wed, 12 Oct 2022 14:19:34 +0800 Subject: [PATCH 124/621] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9Erea?= =?UTF-8?q?lName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/ResiDingAppLoginResDTO.java | 2 ++ .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java b/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java index 7a0517574a..6658ab5770 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java @@ -38,5 +38,7 @@ public class ResiDingAppLoginResDTO { * false:未注册 */ private Boolean regFlag; + + private String realName; } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index e1ab790e0f..c7c79bb575 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -1029,14 +1029,13 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol public ResiDingAppLoginResDTO resiLoginInternalDing(DingAppLoginMdFormDTO formDTO) { // 获取用户手机号 log.info("1、钉钉居民端应用登录入参:" + JSON.toJSONString(formDTO)); - ResiDingAppLoginResDTO resDTO = null; - resDTO = new ResiDingAppLoginResDTO(); + ResiDingAppLoginResDTO resDTO = new ResiDingAppLoginResDTO(); resDTO.setCustomerId(getCurrentCustomerId()); // 1、获取用户手机号 DingLoginResiFormDTO dingLoginResiFormDTO = getDingLoginResiFormDTOInternal(formDTO.getMiniAppId(), formDTO.getAuthCode()); dingLoginResiFormDTO.setCustomerId(resDTO.getCustomerId()); - + resDTO.setRealName(dingLoginResiFormDTO.getNick()); // 2、调用userfeign接口获取userId、注册网格相关信息 Result loginResiResDTOResult = epmetUserOpenFeignClient.dingResiLogin(dingLoginResiFormDTO); if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) { From 4d936ced62dc0b5d051dbe7cbe9281bfb78c3205 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Oct 2022 14:25:19 +0800 Subject: [PATCH 125/621] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=A1=A8=E5=86=B3=E4=B8=AD=E7=9A=84=E8=AE=AE=E9=A2=98=E8=A1=A8?= =?UTF-8?q?=E5=86=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AllIssueListResultDTO.java | 4 ++++ .../com/epmet/service/impl/IssueServiceImpl.java | 14 ++++++++++++++ .../src/main/resources/mapper/IssueDao.xml | 6 ++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java index 843b1e7a8b..0efcb2566a 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -57,4 +58,7 @@ public class AllIssueListResultDTO implements Serializable { * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event */ private String sourceType; + + private Date decidedTime; + private Date votingDeadline; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 312f76cab2..43ca008b2f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -83,10 +83,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; +import java.time.LocalDate; import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; +import static com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN; + /** * @Author zxc * @CreateTime 2020/5/11 9:46 @@ -2068,6 +2071,17 @@ public class IssueServiceImpl extends BaseServiceImpl imp } if (CollectionUtils.isNotEmpty(result.getList())){ for (AllIssueListResultDTO l : result.getList()) { + if (l.getIssueStatus().equals(ModuleConstants.ISSUE_STATUS_VOTING)){ + String endDate = null == l.getVotingDeadline() ? + DateUtils.format(new Date(),DATE_PATTERN) : + DateUtils.format(l.getVotingDeadline(),DATE_PATTERN); + String today = LocalDate.now().toString(); + if (today.equals(endDate)){ + PolyLineDTO polyLineDTO = issueVoteDetailDao.polyLineData(l.getIssueId(), endDate); + l.setSupportCount(l.getSupportCount() + polyLineDTO.getSupportIncrement()); + l.setOppositionCount(l.getOppositionCount() + polyLineDTO.getOppositionIncrement()); + } + } GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId()); if(null == gridInfo){ logger.warn("查询网格信息失败："+l.getGridId()); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index fb7e943e3a..8b572cfdb7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -894,8 +894,10 @@ i.ORG_ID, i.CREATED_TIME, i.suggestion, - vs.support_count, - vs.OPPOSITION_COUNT + ifnull(vs.support_count,0) AS supportCount, + ifnull(vs.OPPOSITION_COUNT,0) AS oppositionCount, + i.VOTING_DEADLINE, + i.DECIDED_TIME FROM issue i LEFT JOIN issue_vote_statistical vs ON vs.ISSUE_ID = i.ID AND vs.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0' From 44e3362f56dc4ba03e02187e54e9b3f1439d0805 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 14:40:36 +0800 Subject: [PATCH 126/621] =?UTF-8?q?return=E4=BA=86=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E6=89=93=E5=8D=B0error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 024681d256..e3ebc257d2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2484,13 +2484,13 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Wed, 12 Oct 2022 15:03:56 +0800 Subject: [PATCH 127/621] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88?= =?UTF-8?q?=EF=BC=8C=E6=9D=A5=E6=BA=90=E4=BA=8E=E4=BA=8B=E4=BB=B6-?= =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E9=A1=B9=E7=9B=AE=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E5=9B=9E=E5=86=99=E4=BA=8B=E4=BB=B6=EF=BC=8Cbugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/entity/ProjectEntity.java | 7 +++++- .../service/impl/ProjectServiceImpl.java | 23 +++++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java index b5199a8392..4d8163c9ae 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java @@ -48,7 +48,12 @@ public class ProjectEntity extends BaseEpmetEntity { private String gridId; /** - * 来源：议题issue 项目立项:agency + * 项目来源： + * 来源议题 issue + * 项目立项 agency + * 旧版事件上报 resi_event + * 工作人员上报(巡查) work_event + * 新版事件上报 ic_event */ private String origin; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 80d682cdff..6f58da119d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -879,22 +879,27 @@ public class ProjectServiceImpl extends BaseServiceImpl issueIds =new ArrayList<>(); + boolean icEventFlag = false; + String icEventId = ""; + if ("issue".equals(projectEntity.getOrigin())) { + List issueIds = new ArrayList<>(); issueIds.add(projectEntity.getOrigin()); - Result> issueRes=govIssueOpenFeignClient.getIssueProfile(issueIds); - if(issueRes.success()&&CollectionUtils.isNotEmpty(issueRes.getData())){ - if("ic_event".equals(issueRes.getData().get(NumConstant.ZERO).getIssueSourceType())){ - icEventFlag=true; + Result> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds); + if (issueRes.success() && CollectionUtils.isNotEmpty(issueRes.getData())) { + IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO); + if ("ic_event".equals(issueProfileDTO.getIssueSourceType())) { + icEventFlag = true; + icEventId = issueProfileDTO.getSourceId(); } } + } else if ("ic_event".equals(projectEntity.getOrigin())) { + icEventId = projectEntity.getOriginId(); } - if ("ic_event".equals(projectEntity.getOrigin())||icEventFlag) { + if ("ic_event".equals(projectEntity.getOrigin()) || icEventFlag) { ColseProjectOrDemandFormDTO dto = new ColseProjectOrDemandFormDTO(); dto.setCustomerId(projectEntity.getCustomerId()); dto.setUserId(projectEntity.getUpdatedBy()); - dto.setIcEventId(projectEntity.getOriginId()); + dto.setIcEventId(icEventId); dto.setType("project"); dto.setCloseCaseTime(closeCaseTime); icEventService.closeProjectOrDemand(dto); From b5e4a3a0757a239cf44887eb058fde0c35f81444 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 12 Oct 2022 15:07:16 +0800 Subject: [PATCH 128/621] - --- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 46c3a00d59..413bf6df2c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1417,11 +1417,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { return null; } - agencyNamePathList.add(0, agencyInfo.getOrganizationName()); String pidsStr = agencyInfo.getPids(); if (StringUtils.isBlank(pidsStr)) { // 没有pids，是顶级，直接返回 + agencyNamePathList.add(agencyInfo.getOrganizationName()); return String.join("-", agencyNamePathList); } @@ -1433,8 +1433,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } agencyNamePathList.add(pAgencyInfo.getOrganizationName()); } - // 反转列表 - Collections.reverse(agencyNamePathList); + // 最后把自己加上 + agencyNamePathList.add(agencyInfo.getOrganizationName()); return String.join("-", agencyNamePathList); } } From d35d033a48e043318d11546c518151dc083fe3c5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Oct 2022 15:21:38 +0800 Subject: [PATCH 129/621] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=AA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/CollectDetailResultDTO.java | 3 ++- .../{OrgInfoResultDTO.java => OrgInfoIdAndNameResultDTO.java} | 2 +- .../java/com/epmet/service/impl/IcResiCollectServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) rename epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/{OrgInfoResultDTO.java => OrgInfoIdAndNameResultDTO.java} (85%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java index 2631a14625..5a6d58d685 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.dto.result.OrgInfoIdAndNameResultDTO; import com.epmet.dto.result.OrgInfoResultDTO; import lombok.Data; @@ -77,5 +78,5 @@ public class CollectDetailResultDTO implements Serializable { private String orgIdPath; - private List orgIdPathList; + private List orgIdPathList; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java similarity index 85% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java index 0905a073b7..53223ed6ad 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java @@ -14,7 +14,7 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -public class OrgInfoResultDTO implements Serializable { +public class OrgInfoIdAndNameResultDTO implements Serializable { private static final long serialVersionUID = 7478605833438304330L; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 18c38f5407..c519210d7b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -226,13 +226,13 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl orgInfoList = new ArrayList<>(); + List orgInfoList = new ArrayList<>(); for (String orgId : split) { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); if (null == agencyInfo){ throw new EpmetException("查询组织信息失败："+orgId); } - OrgInfoResultDTO orgInfoResultDTO = new OrgInfoResultDTO(orgId,agencyInfo.getOrganizationName()); + OrgInfoIdAndNameResultDTO orgInfoResultDTO = new OrgInfoIdAndNameResultDTO(orgId,agencyInfo.getOrganizationName()); orgInfoList.add(orgInfoResultDTO); } result.setOrgIdPathList(orgInfoList); From 0e7301b5f2ecc1a9110802f444ee19f4ed1f8176 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 12 Oct 2022 15:55:50 +0800 Subject: [PATCH 130/621] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF-=E7=82=B9=E5=87=BB"?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=B9=B3=E5=8F=B0=E7=A4=BE=E5=8C=BA=E6=95=B0?= =?UTF-8?q?"=E5=BC=B9=E6=A1=86=EF=BC=8C=E5=8F=AA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=B9=B3=E5=8F=B0=E7=A4=BE=E5=8C=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E5=85=B6=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/HouseController.java | 4 +-- .../java/com/epmet/dao/CustomerAgencyDao.java | 4 +-- .../java/com/epmet/service/HouseService.java | 2 +- .../epmet/service/impl/AgencyServiceImpl.java | 6 ++-- .../epmet/service/impl/HouseServiceImpl.java | 5 +-- .../resources/mapper/CustomerAgencyDao.xml | 35 +++++++++---------- 6 files changed, 28 insertions(+), 28 deletions(-) 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 79abda28a9..26268f34c1 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 @@ -633,7 +633,7 @@ public class HouseController implements ResultDataResolver { * 针对社区的人房统计列表 * @return */ - @PostMapping("communityUserHouseStats") + @PostMapping("usingCommunityUserHouseStats") public Result> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) { String orgId = input.getOrgId(); @@ -641,7 +641,7 @@ public class HouseController implements ResultDataResolver { Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); - PageData r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize); + PageData r = houseService.usingCommunityUserHouseStats(orgId, orgType, pageNo, pageSize); return new Result>().ok(r); } 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 31b80d3918..cc68f3335b 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 @@ -389,13 +389,13 @@ public interface CustomerAgencyDao extends BaseDao { CustomerAgencyEntity getAgencyByUserId(@Param("userId") String userId, @Param("customerId") String customerId); /** - * 开通社区数统计 + * 开通社区列表 * @param agencyId 机关组织的id * @param agencyOrgIdPath agency的id路径path，包含自己 * @param endDate 截止日期，也即查询，截止改日期，有多少社区在使用 * @return */ - Integer getUsingCommunityStats(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); + List getUsingCommunityList(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); List getCommunitysByOrgIdPath(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgIdPath") String orgIdPath); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 2973495dbf..d1d1b87503 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -198,5 +198,5 @@ public interface HouseService { PageData houseStatisListDetail(HouseChartFormDTO formDTO); - PageData communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); + PageData usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); } 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 7896a7854f..d5b194f006 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 @@ -1145,9 +1145,9 @@ public class AgencyServiceImpl implements AgencyService { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); agencyOrgIdPath = getOrgIdPath(agencyInfo.getPids(), agencyInfo.getId()); - Integer currentUsingCommunityCount = customerAgencyDao.getUsingCommunityStats(orgId, agencyOrgIdPath, null); - Integer prefersUsingCommunityCount = customerAgencyDao.getUsingCommunityStats(orgId, agencyOrgIdPath, endTime); - return new UsingCommunityStatsResultDTO(currentUsingCommunityCount, currentUsingCommunityCount - prefersUsingCommunityCount); + List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(orgId, agencyOrgIdPath, null); + List preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(orgId, agencyOrgIdPath, endTime); + return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size()); } else if ("grid".equals(orgType)) { // 网格下不会有该数据，给个0 return new UsingCommunityStatsResultDTO(0, 0); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 413bf6df2c..b08f38ddda 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1394,12 +1394,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } @Override - public PageData communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { + public PageData usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { String customerId = EpmetRequestHolder.getLoginUserCustomerId(); PageHelper.startPage(pageNo, pageSize); - List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(customerId, orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); + List communityIds = customerAgencyDao.getUsingCommunityList(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType), null); + // List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(customerId, orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); // 填充组织信息 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 80f0037382..1075de7982 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 @@ -1011,24 +1011,6 @@ LIMIT 1 - - - + + + From 02b03545dc9aabcef0543e86a57e23a382b8131e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 16:03:42 +0800 Subject: [PATCH 131/621] =?UTF-8?q?api/resi/hall/issue/detail=E8=BF=94?= =?UTF-8?q?=E5=9B=9EsourceId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ProjectController.java | 5 +++++ .../com/epmet/service/ProjectService.java | 3 +++ .../service/impl/ProjectServiceImpl.java | 19 ++++++++++--------- .../dto/result/IssueDetailResultDTO.java | 2 ++ .../com/epmet/dto/result/IssueResultDTO.java | 2 ++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 6968e62398..4330ea21a7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -451,4 +451,9 @@ public class ProjectController { } } + @PostMapping("test-close/{projectId}") + public Result testClose(@LoginUser TokenDto tokenDto,@PathVariable("projectId")String projectId){ + projectService.modifyIcEvent(null,tokenDto.getUserId(),new Date(),projectId); + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 33a42bb28f..f588edc374 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -11,6 +11,7 @@ import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Date; import java.util.List; import java.util.Map; @@ -405,4 +406,6 @@ public interface ProjectService extends BaseService { * @return */ Integer deleteByOriginId(String originId, String origin); + + void modifyIcEvent(ProjectEntity projectEntity, String userId, Date closeCaseTime, String projectId); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 6f58da119d..82f79d586f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -864,7 +864,7 @@ public class ProjectServiceImpl extends BaseServiceImpl issueIds = new ArrayList<>(); - issueIds.add(projectEntity.getOrigin()); + issueIds.add(projectEntity1.getOrigin()); Result> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds); if (issueRes.success() && CollectionUtils.isNotEmpty(issueRes.getData())) { IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO); @@ -892,13 +893,13 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Wed, 12 Oct 2022 16:30:10 +0800 Subject: [PATCH 132/621] =?UTF-8?q?=E7=9C=BC=E7=9E=8E=E4=BA=86=E3=80=82ori?= =?UTF-8?q?ginId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ProjectController.java | 7 +++++++ .../java/com/epmet/service/impl/ProjectServiceImpl.java | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 4330ea21a7..101a735cfe 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -451,6 +451,13 @@ public class ProjectController { } } + /** + * 纯属为了测试.... + * 如果项目结案了，事件没有回写可以调用此方法 + * @param tokenDto + * @param projectId + * @return + */ @PostMapping("test-close/{projectId}") public Result testClose(@LoginUser TokenDto tokenDto,@PathVariable("projectId")String projectId){ projectService.modifyIcEvent(null,tokenDto.getUserId(),new Date(),projectId); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 82f79d586f..3b99956e6a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -879,12 +879,14 @@ public class ProjectServiceImpl extends BaseServiceImpl issueIds = new ArrayList<>(); - issueIds.add(projectEntity1.getOrigin()); + issueIds.add(projectEntity1.getOriginId()); Result> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds); if (issueRes.success() && CollectionUtils.isNotEmpty(issueRes.getData())) { IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO); From a727a1128265485ca64ddaa1b4d5bf0d932eecb0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 16:33:03 +0800 Subject: [PATCH 133/621] projectEntity --- .../com/epmet/service/impl/ProjectServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 3b99956e6a..d4065a4be0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -884,9 +884,9 @@ public class ProjectServiceImpl extends BaseServiceImpl issueIds = new ArrayList<>(); - issueIds.add(projectEntity1.getOriginId()); + issueIds.add(projectEntity.getOriginId()); Result> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds); if (issueRes.success() && CollectionUtils.isNotEmpty(issueRes.getData())) { IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO); @@ -895,12 +895,12 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Wed, 12 Oct 2022 17:22:52 +0800 Subject: [PATCH 134/621] - --- .../java/com/epmet/dao/CustomerAgencyDao.java | 2 +- .../com/epmet/service/impl/AgencyServiceImpl.java | 4 ++-- .../com/epmet/service/impl/HouseServiceImpl.java | 15 ++++++++++++++- .../main/resources/mapper/CustomerAgencyDao.xml | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) 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 cc68f3335b..fb1fc77855 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 @@ -395,7 +395,7 @@ public interface CustomerAgencyDao extends BaseDao { * @param endDate 截止日期，也即查询，截止改日期，有多少社区在使用 * @return */ - List getUsingCommunityList(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); + List getUsingCommunityList(@Param("customerId") String customerId, @Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); List getCommunitysByOrgIdPath(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgIdPath") String orgIdPath); } 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 d5b194f006..c15458dede 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 @@ -1145,8 +1145,8 @@ public class AgencyServiceImpl implements AgencyService { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); agencyOrgIdPath = getOrgIdPath(agencyInfo.getPids(), agencyInfo.getId()); - List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(orgId, agencyOrgIdPath, null); - List preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(orgId, agencyOrgIdPath, endTime); + List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, null); + List preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, endTime); return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size()); } else if ("grid".equals(orgType)) { // 网格下不会有该数据，给个0 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index b08f38ddda..31f8368adc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1398,8 +1398,21 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + if (StringUtils.isBlank(orgId)) { + // 没有传参数，使用当前登录人员所属的组织去查询 + String userId = EpmetRequestHolder.getLoginUserId(); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if (staffInfo == null) { + String errorMsg = String.format("查询当前工作人员信息失败。staffId:%s", userId); + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), errorMsg, errorMsg); + } + + orgId = staffInfo.getAgencyId(); + orgType = "agency"; + } + PageHelper.startPage(pageNo, pageSize); - List communityIds = customerAgencyDao.getUsingCommunityList(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType), null); + List communityIds = customerAgencyDao.getUsingCommunityList(customerId, orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType), null); // List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(customerId, orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); 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 1075de7982..d08d32a035 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 @@ -1029,6 +1029,7 @@ from customer_agency ca inner join customer_staff_agency csa on (ca.ID = csa.AGENCY_ID and csa.DEL_FLAG = 0) where ca.DEL_FLAG = 0 + and ca.CUSTOMER_ID=${customerId} and ca.LEVEL = 'community' and csa.CREATED_TIME #{endDate} From 085a42b5d5afc5e9de3f0964a85508944b2c24d0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Oct 2022 17:37:24 +0800 Subject: [PATCH 135/621] ai --- .../result/MyPubIssuesAuditingResultDTO.java | 2 + .../epmet/service/impl/IssueServiceImpl.java | 2 +- .../src/main/resources/mapper/IssueDao.xml | 1 + .../result/MyPubIssuesClosedResultDTO.java | 6 ++- .../MyPubIssuesShiftProjectResultDTO.java | 2 + .../person/service/impl/IssueServiceImpl.java | 40 ++++++++++++++----- 6 files changed, 41 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPubIssuesAuditingResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPubIssuesAuditingResultDTO.java index 4af11fb3f2..e666b9b9cb 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPubIssuesAuditingResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPubIssuesAuditingResultDTO.java @@ -50,4 +50,6 @@ public class MyPubIssuesAuditingResultDTO implements Serializable { @JsonIgnore private String topicId; + private String sourceType; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 43ca008b2f..22520d45be 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1456,7 +1456,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp throw new RenException("查询议题来源网格名称失败......"); } list.forEach(l -> gridNameList.getData().stream().filter(o -> l.getGridId().equals(o.getGridId())).forEach(o -> l.setTopicReleaseGridName(o.getGridName()))); - Result> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(list.stream().map(m -> m.getTopicId()).collect(Collectors.toList()))); + Result> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(list.stream().filter(l -> l.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)).map(m -> m.getTopicId()).collect(Collectors.toList()))); if (!groupNameList.success()){ throw new RenException("查询议题来源小组名称失败......"); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 8b572cfdb7..306a5c0204 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -514,6 +514,7 @@ i.SUGGESTION, i.ISSUE_TITLE, i.SOURCE_ID AS topicId, + i.SOURCE_TYPE AS sourceType, i.GRID_ID AS gridId, UNIX_TIMESTAMP(i.CREATED_TIME) AS shiftIssueTime FROM issue i diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPubIssuesClosedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPubIssuesClosedResultDTO.java index 46c2c9ff02..71378156e9 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPubIssuesClosedResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPubIssuesClosedResultDTO.java @@ -17,6 +17,8 @@ public class MyPubIssuesClosedResultDTO implements Serializable { * 议题id */ private String issueId; + private String sourceId; + private String sourceType; /** * 议题标题 @@ -36,11 +38,11 @@ public class MyPubIssuesClosedResultDTO implements Serializable { /** * 话题发表于哪个组 */ - private String topicReleaseGroupName; + private String topicReleaseGroupName = ""; /** * 话题发表于哪个网格 */ - private String topicReleaseGridName; + private String topicReleaseGridName = ""; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPubIssuesShiftProjectResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPubIssuesShiftProjectResultDTO.java index 8397d64b69..7931067f86 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPubIssuesShiftProjectResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPubIssuesShiftProjectResultDTO.java @@ -45,4 +45,6 @@ public class MyPubIssuesShiftProjectResultDTO implements Serializable { private String topicReleaseGroupName; private String issueId; + private String sourceId; + private String sourceType; } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java index f4fbf8f8ce..515c9a7b6b 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java @@ -188,11 +188,17 @@ public class IssueServiceImpl implements IssueService { } //查询话题来源小组名称 Result> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); + if (!CollectionUtils.isEmpty(topicIds)){ + groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); + } if (!groupNameList.success()){ logger.error("查询议题来源小组名称失败......"); } //查询项目基本信息 - Result> projectRes=govProjectOpenFeignClient.queryProjectInfoByIds(projectIds); + Result> projectRes = new Result<>(); + if (!CollectionUtils.isEmpty(projectIds)){ + projectRes = govProjectOpenFeignClient.queryProjectInfoByIds(projectIds); + } if(!projectRes.success()){ logger.error("查询项目信息失败......"); } @@ -201,14 +207,21 @@ public class IssueServiceImpl implements IssueService { MyPubIssuesShiftProjectResultDTO resultDTO=new MyPubIssuesShiftProjectResultDTO(); resultDTO.setIssueId(issueDTO.getId()); resultDTO.setProjectId(issueDTO.getProjectId()); - gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName())); - groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName())); + resultDTO.setSourceId(issueDTO.getSourceId()); + resultDTO.setSourceType(issueDTO.getSourceType()); + if (!CollectionUtils.isEmpty(gridNameList.getData())){ + gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName())); + } + if (!CollectionUtils.isEmpty(groupNameList.getData())){ + groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName())); + } resultDTO.setShiftProjectTime(issueDTO.getShiftedTimeStamp()); - - projectRes.getData().stream().filter(p->issueDTO.getProjectId().equals(p.getId())).forEach(projectDTO -> resultDTO.setProjectTitle(projectDTO.getTitle())); - //当前处理部门名称列表 - projectRes.getData().stream().filter(p->issueDTO.getProjectId().equals(p.getId())).forEach(projectDTO -> resultDTO.setDepartmentNameList(projectDTO.getCurrentDepartmentNameList())); + if (!CollectionUtils.isEmpty(projectRes.getData())){ + projectRes.getData().stream().filter(p->issueDTO.getProjectId().equals(p.getId())).forEach(projectDTO -> resultDTO.setProjectTitle(projectDTO.getTitle())); + //当前处理部门名称列表 + projectRes.getData().stream().filter(p->issueDTO.getProjectId().equals(p.getId())).forEach(projectDTO -> resultDTO.setDepartmentNameList(projectDTO.getCurrentDepartmentNameList())); + } list.add(resultDTO); } return list; @@ -244,6 +257,9 @@ public class IssueServiceImpl implements IssueService { } //查询话题来源小组名称 Result> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); + if (!CollectionUtils.isEmpty(topicIds)){ + groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds)); + } if (!groupNameList.success()){ logger.error("查询议题来源小组名称失败......"); } @@ -254,8 +270,14 @@ public class IssueServiceImpl implements IssueService { resultDTO.setIssueTitle(issueDTO.getIssueTitle()); resultDTO.setSuggestion(issueDTO.getSuggestion()); resultDTO.setClosedTime(issueDTO.getClosedTimeStamp()); - gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName())); - groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName())); + resultDTO.setSourceId(issueDTO.getSourceId()); + resultDTO.setSourceType(issueDTO.getSourceType()); + if (!CollectionUtils.isEmpty(gridNameList.getData())){ + gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName())); + } + if (!CollectionUtils.isEmpty(groupNameList.getData())){ + groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName())); + } resultDTOList.add(resultDTO); } return resultDTOList; From de4329adb8844d74405808bb1d660478eb195d97 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 12 Oct 2022 17:50:43 +0800 Subject: [PATCH 136/621] - --- .../src/main/resources/mapper/CustomerAgencyDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 d08d32a035..e81e8b0ad9 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 @@ -1024,18 +1024,18 @@ From 4a7dbcdb9ac9f7e59f499604521099d85f69fe44 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 12 Oct 2022 17:52:15 +0800 Subject: [PATCH 137/621] - --- .../src/main/resources/mapper/CustomerAgencyDao.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 e81e8b0ad9..d221f07b12 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 @@ -1023,8 +1023,9 @@ From 14e8a8751872965a9d6f2228c7e44b40dce1f7a9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 18:08:52 +0800 Subject: [PATCH 138/621] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=88=91?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E7=9A=84=E8=AE=AE=E9=A2=98=EF=BC=9A/resi/gro?= =?UTF-8?q?up/groupissue/applicationdetail=20=E5=AE=A1=E6=A0=B8=E4=B8=AD?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=B0=B1=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/GroupIssueServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java index 7d2b5fe87c..3ff103a039 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java @@ -73,7 +73,8 @@ public class GroupIssueServiceImpl implements GroupIssueService { List userIds = new ArrayList<>(); ApplicationDetailResultDTO data = result.getData(); userIds.add(data.getUserId()); - if (!applicationDetailFormDTO.getTopicIdIsNull()){ + //如果来源于话题 + if (StringUtils.isNotBlank(data.getTopicId())){ TopicInfoResultDTO topicInfoResultDTO = resiGroupDao.selectTopicInfo(data.getTopicId()); userIds.add(topicInfoResultDTO.getTopicUserId()); // 查询小组类别 From 7e6c0c6bb96ac3bd343cb76b506763c43bace683 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 12 Oct 2022 18:14:14 +0800 Subject: [PATCH 139/621] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20=E6=AD=BB=E4=BA=A1?= =?UTF-8?q?=E5=92=8C=E6=AE=8B=E7=96=BE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/result/YtDataSyncResDTO.java | 28 + .../commons/tools/utils/YtHsResUtils.java | 144 ++++- .../java/com/epmet/task/NatInfoScanTask.java | 6 +- .../com/epmet/dto/DataSyncRecordDeathDTO.java | 145 +++++ .../dto/DataSyncRecordDisabilityDTO.java | 145 +++++ .../com/epmet/dto/form/DataSyncTaskParam.java | 42 ++ .../dto/form/NatInfoScanTaskFormDTO.java | 21 - .../form/dataSync/QueryIcResiUserFormDTO.java | 40 ++ .../dto/result/NatUserInfoResultDTO.java | 11 + .../epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../EpmetUserOpenFeignClientFallback.java | 2 +- .../controller/DataSyncConfigController.java | 4 +- .../java/com/epmet/dao/DataSyncConfigDao.java | 5 +- .../com/epmet/dao/DataSyncRecordDeathDao.java | 16 + .../dao/DataSyncRecordDisabilityDao.java | 17 + .../entity/DataSyncRecordDeathEntity.java | 111 ++++ .../DataSyncRecordDisabilityEntity.java | 111 ++++ .../epmet/service/DataSyncConfigService.java | 4 +- .../service/DataSyncRecordDeathService.java | 78 +++ .../DataSyncRecordDisabilityService.java | 81 +++ .../impl/DataSyncConfigServiceImpl.java | 529 ++++++++++++++---- .../impl/DataSyncRecordDeathServiceImpl.java | 87 +++ .../DataSyncRecordDisabilityServiceImpl.java | 94 ++++ .../resources/mapper/DataSyncConfigDao.xml | 24 +- .../mapper/DataSyncRecordDeathDao.xml | 35 ++ .../mapper/DataSyncRecordDisabilityDao.xml | 95 ++++ 26 files changed, 1721 insertions(+), 156 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtDataSyncResDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java delete mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatInfoScanTaskFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/QueryIcResiUserFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDeathDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDeathEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtDataSyncResDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtDataSyncResDTO.java new file mode 100644 index 0000000000..aff500e51e --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtDataSyncResDTO.java @@ -0,0 +1,28 @@ +package com.epmet.commons.tools.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + + +/** + * @Description + * @Author yzm + * @Date 2022/9/26 17:04 + */ +@NoArgsConstructor +@Data +public class YtDataSyncResDTO { + private int code = 200; + private String msg = "请求成功"; + /** + * 响应数据 + */ + private String data; + private int total; + + public YtDataSyncResDTO(int code, String msg, String data) { + this.code = code; + this.msg = msg; + this.data = data; + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 0ea496de19..b41afbd23b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -1,6 +1,8 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import lombok.extern.slf4j.Slf4j; @@ -15,12 +17,15 @@ import java.util.Map; */ @Slf4j public class YtHsResUtils { - private static String URL = "http://10.2.2.60:8191/sjzt/server/hsjcxx"; + private static String SERVER_URL = "http://10.2.2.60:8191/sjzt/server/"; private static final String APP_KEY_VALUE = "DR4jF5Be7sCsqDmCamq2tmYCl"; private static final String APP_KEY = "appkey"; private static final String CARD_NO = "card_no"; + private static final String USER_NAME = "name"; private static final String ROW_NUM = "ROWNUM"; private static final String PAGE_SIZE = "PAGESIZE"; + private static final String START = "ROWNUM"; + private static final String LIMIT = "PAGESIZE"; /** * desc:图片同步扫描 * @@ -36,18 +41,151 @@ public class YtHsResUtils { param.put(ROW_NUM,rowNum); param.put(PAGE_SIZE,pageSize); log.info("hsjc api param:{}",param); - Result result = HttpClientManager.getInstance().sendGet(URL, param); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hsjcxx", param); log.info("hsjc api result:{}",JSON.toJSONString(result)); if (result.success()) { return JSON.parseObject(result.getData(), YtHsjcResDTO.class); } } catch (Exception e) { - e.printStackTrace(); log.warn(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); } YtHsjcResDTO resultResult = new YtHsjcResDTO(); resultResult.setData(new ArrayList<>()); return resultResult; } + /** + * desc:死亡数据同步 + * + * @return + */ + public static YtDataSyncResDTO siWang(String cardNo, String userName) { + try { +// 1)appkey秘钥 +// 2)name姓名 必填 +// 3)idcard身份证号 必填 +// 4)start开始默认0 +// 5)limit每页记录数 + Map param = new HashMap<>(); + param.put(APP_KEY,APP_KEY_VALUE); + param.put("id_card",cardNo); + param.put("name",userName); + param.put("start",0); + param.put("limit",1); + + log.info("siWang api param:{}",param); + + //todo 放开他 + //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"mzt_hhrysj1", param); + String mockData2 = "{\"code\":200,\"data\":\"{\\\"data\\\":[{\\\"AGE\\\":\\\"73\\\",\\\"CARD_TYPE\\\":\\\"9\\\",\\\"CREATE_ORGAN_NAME\\\":\\\"菏泽市巨野县殡仪馆\\\",\\\"CREMATION_TIME\\\":\\\"2014-04-17 14:46\\\",\\\"DEAD_ID\\\":\\\"SZ-371724-2012-1006560\\\",\\\"DEATH_DATE\\\":\\\"2014-04-17\\\",\\\"FAMILY_ADD\\\":\\\"菏泽市巨野县开发区马庄村\\\",\\\"FOLK\\\":\\\"01\\\",\\\"ID_CARD\\\":\\\"1\\\",\\\"NAME\\\":\\\"郭**\\\",\\\"NATION\\\":\\\"156\\\",\\\"POPULACE\\\":\\\"3381C3014B60439FE05319003C0A0897\\\",\\\"POPULACE_NAME\\\":\\\"菏泽市巨野县开发区马庄村\\\",\\\"RECORD_ID\\\":\\\"E-371724-2012-100000000000407849\\\",\\\"RN\\\":\\\"1\\\",\\\"SEX\\\":\\\"1\\\"}],\\\"fields\\\":[\\\"RN\\\",\\\"RECORD_ID\\\",\\\"DEAD_ID\\\",\\\"NAME\\\",\\\"SEX\\\",\\\"CARD_TYPE\\\",\\\"ID_CARD\\\",\\\"BIRTHDAY\\\",\\\"AGE\\\",\\\"NATION\\\",\\\"FOLK\\\",\\\"IF_LOCAL\\\",\\\"POPULACE\\\",\\\"FAMILY_ADD\\\",\\\"WORK_NAME\\\",\\\"DEATH_DATE\\\",\\\"CREMATION_TIME\\\",\\\"CREATE_ORGAN_NAME\\\",\\\"POPULACE_NAME\\\"],\\\"total\\\":\\\"4903\\\"}\",\"message\":\"\"}"; + String mockData = "{\"code\":200,\"data\":\"{\\\"data\\\":[],\\\"fields\\\":[\\\"RN\\\",\\\"RECORD_ID\\\",\\\"DEAD_ID\\\",\\\"NAME\\\",\\\"SEX\\\",\\\"CARD_TYPE\\\",\\\"ID_CARD\\\",\\\"BIRTHDAY\\\",\\\"AGE\\\",\\\"NATION\\\",\\\"FOLK\\\",\\\"IF_LOCAL\\\",\\\"POPULACE\\\",\\\"FAMILY_ADD\\\",\\\"WORK_NAME\\\",\\\"DEATH_DATE\\\",\\\"CREMATION_TIME\\\",\\\"CREATE_ORGAN_NAME\\\",\\\"POPULACE_NAME\\\"],\\\"total\\\":\\\"4903\\\"}\",\"message\":\"\"}"; + Result result = new Result().ok(mockData); + log.info("siWang api result:{}",JSON.toJSONString(result)); + String data = result.getData(); + JSONObject jsonObject = JSON.parseObject(data); + //他们的结果是成功的 + if (jsonObject!= null && "200".equals(jsonObject.getString("code"))){ + //第一层data + JSONObject realObject = JSON.parseObject(jsonObject.getString("data")); + if (realObject!= null&& realObject.getJSONArray("data") != null) { + //第二层 data + Object thirdData = realObject.getJSONArray("data").get(0); + YtDataSyncResDTO ytDataSyncResDTO = new YtDataSyncResDTO(200,"",thirdData.toString()); + return ytDataSyncResDTO; + }else { + log.warn("canji 调用蓝图接口成功但是蓝图的结果中 省平台失败"); + } + }else { + log.warn("canji 调用蓝图接口败"); + } + } catch (Exception e) { + log.warn(String.format("烟台siWang结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); + } + return new YtDataSyncResDTO(); + } + + /** + * desc:残疾数据同步 + * @remark：默认失败 因为一旦成功没有数据 会影响残疾人的数据 接口失败数据不做任何处理 + * @return + */ + public static YtDataSyncResDTO canji(String idCard, String userName) { + + YtDataSyncResDTO failResult = new YtDataSyncResDTO(); + failResult.setCode(500); + failResult.setMsg("默认错误"); + try { +// 1)appkey +// 2)name姓名 +// 3)citizenId身份证号 + Map param = new HashMap<>(); + param.put(APP_KEY,APP_KEY_VALUE); + param.put("citizenId",idCard); + param.put("name",userName); + + log.info("canji api param:{}",param); + + + //todo 上线放开她 + //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"sdcl_xxzx_czcjr1", param); + String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":{\\\"result\\\":true,\\\"errorcode\\\":0,\\\"msg\\\":\\\"获取成功\\\",\\\"data\\\":{\\\"isNewRecord\\\":\\\"true\\\",\\\"delFlag\\\":\\\"0\\\",\\\"pageNo\\\":\\\"0\\\",\\\"pageSize\\\":\\\"0\\\",\\\"name\\\":\\\"姓名\\\",\\\"genderName\\\":\\\"性别\\\",\\\"citizenId\\\":\\\"身份证号\\\",\\\"cardNum\\\":\\\"残疾证号\\\",\\\"idtKindName\\\":\\\"残疾类别\\\",\\\"idtLevelName\\\":\\\"残疾等级\\\",\\\"eduLevelName\\\":\\\"教育程度\\\",\\\"marriagerName\\\":\\\"婚姻状况\\\",\\\"guardian\\\":\\\"监护人\\\",\\\"guardianPhone\\\":\\\"监护人联系方式\\\",\\\"residentAdd\\\":\\\"户籍地址\\\",\\\"nowAdd\\\":\\\"现居住地\\\",\\\"phoneNo\\\":\\\"联系电话\\\"}},\\\"message\\\":\\\"\\\"}\",\"total\":0}"; + Result result = new Result().ok(mockData); + log.info("canji api result:{}",JSON.toJSONString(result)); + if (result.success()) { + /*返回示例 + { + "code":"200", + "msg":"请求成功", + "data":"{ + \"code\":200, + \"data\":{ + \\\"result\\\":true, + \\\"errorcode\\\":0, + \\\"msg\\\":\\\"获取成功\\\", + \\\"data\\\":{ + \\\"isNewRecord\\\":\\\"true\\\", + } + } + \"message\":\"\" + }", + "total":0 + } + */ + String data = result.getData(); + JSONObject jsonObject = JSON.parseObject(data); + //他们的结果是成功的 + if (jsonObject!= null && "200".equals(jsonObject.getString("code"))){ + //第一层data + JSONObject realObject = JSON.parseObject(jsonObject.getString("data")); + + if (realObject!= null && "200".equals(realObject.getString("code"))) { + //第二层 data + String thirdData = realObject.getString("data"); + YtDataSyncResDTO ytDataSyncResDTO = JSON.parseObject(thirdData, YtDataSyncResDTO.class); + return ytDataSyncResDTO; + }else { + log.warn("canji 调用蓝图接口成功但是蓝图的结果中 省平台失败"); + } + }else { + log.warn("canji 调用蓝图接口败"); + } + + } + } catch (Exception e) { + log.warn(String.format("烟台canji结果查询异常cardNo:%s,异常信息:%s", idCard, e.getMessage())); + } + return failResult; + } + + + public static void main(String[] args) { + YtDataSyncResDTO canji = canji("123", "123"); + System.out.println("残疾结果："+JSON.toJSON(canji)); + + + YtDataSyncResDTO siwang = siWang("1213", "!23"); + System.out.println("死亡结果："+JSON.toJSON(siwang)); + } + + } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java index d7334fabd6..f141cc818a 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java @@ -3,7 +3,7 @@ package com.epmet.task; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.NatInfoScanTaskFormDTO; +import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.feign.EpmetUserOpenFeignClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -26,9 +26,9 @@ public class NatInfoScanTask implements ITask { @Override public void run(String params) { - NatInfoScanTaskFormDTO formDTO = new NatInfoScanTaskFormDTO(); + DataSyncTaskParam formDTO = new DataSyncTaskParam(); if (StringUtils.isNotBlank(params)) { - formDTO = JSON.parseObject(params, NatInfoScanTaskFormDTO.class); + formDTO = JSON.parseObject(params, DataSyncTaskParam.class); } Result result = userOpenFeignClient.natInfoScanTask(formDTO); if (result.success()) { diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java new file mode 100644 index 0000000000..33ad3a8c5f --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java @@ -0,0 +1,145 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 数据同步记录-居民死亡信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-11 + */ +@Data +public class DataSyncRecordDeathDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids 含agencyId本身 + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 手机号 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 年龄(享年) + */ + private Integer age; + + /** + * 家庭住址 + */ + private String address; + + /** + * 死亡时间 + */ + private String deathDate; + + /** + * 火化时间 + */ + private String cremationTime; + + /** + * 民族 + */ + private String mz; + + /** + * 登记单位名称 + */ + private String organName; + + /** + * 国籍 + */ + private String nation; + + /** + * 第三方记录唯一标识 + */ + private String thirdRecordId; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + /** + * 处理结果 + */ + private String dealRedult; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java new file mode 100644 index 0000000000..678a770c1a --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java @@ -0,0 +1,145 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 数据同步记录-居民残疾信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-11 + */ +@Data +public class DataSyncRecordDisabilityDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids 含agencyId本身 + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 残疾证号 + */ + private String cardNum; + + /** + * 残疾等级(状况) + */ + private String cjzk; + + /** + * 残疾类别 + */ + private String cjlb; + + /** + * 文化程度 + */ + private String eduLevel; + + /** + * 婚姻状况 + */ + private String maritalStatus; + + /** + * 监护人 + */ + private String guardian; + + /** + * 监护人联系方式 + */ + private String guardianPhone; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + /** + * 残疾状态 0:非残疾；1:残疾 + */ + private Integer disabilityStatus; + + /** + * 处理结果 + */ + private String dealRedult; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java new file mode 100644 index 0000000000..163158f47e --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java @@ -0,0 +1,42 @@ +package com.epmet.dto.form; + +import com.epmet.dto.DataSyncScopeDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/9/26 17:04 + * @DESC + */ +@Data +public class DataSyncTaskParam implements Serializable { + + private static final long serialVersionUID = 3053943501957102943L; + + private String customerId; + + private List idCards; + + // ========================后台设置===== + /** + * 根据配置 设置次参数；数据查询范围 必填 + */ + private List orgList; + + /** + * 居民状态【0:正常;1:迁出;2:注销】 + */ + private String resiStatus; + /** + * 居民子状态 01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡 + */ + private String resiSubStatus; + + /** + * 类别字段 + */ + public String categoryColumn; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatInfoScanTaskFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatInfoScanTaskFormDTO.java deleted file mode 100644 index 6d642b2e90..0000000000 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatInfoScanTaskFormDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.epmet.dto.form; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Author zxc - * @DateTime 2022/9/26 17:04 - * @DESC - */ -@Data -public class NatInfoScanTaskFormDTO implements Serializable { - - private static final long serialVersionUID = 3053943501957102943L; - - private String customerId; - - private List idCards; -} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/QueryIcResiUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/QueryIcResiUserFormDTO.java new file mode 100644 index 0000000000..99a2d856d7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/QueryIcResiUserFormDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dto.form.dataSync; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.dto.DataSyncScopeDTO; +import lombok.Data; + +import java.util.List; + +/** + * desc:查询数据同步 所需要的居民信息参数 + * @author liujianjun + */ +@Data +public class QueryIcResiUserFormDTO extends PageFormDTO { + private static final long serialVersionUID = -3556723801307348545L; + /** + * 数据查询范围 必填 + */ + private List scopeList; + /** + * 必填 + */ + private String customerId; + + /** + * 身份证号集合 非必填 + */ + private List idCards; + + /** + * 居民状态【0:正常;1:迁出;2:注销】 + */ + private String resiStatus; + /** + * 居民子状态 01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡 + */ + private String resiSubStatus; + +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java index 10e611aa46..278f3ca537 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java @@ -14,11 +14,22 @@ public class NatUserInfoResultDTO implements Serializable { private static final long serialVersionUID = 8904940082452398136L; + private String customerId; + private String idCard; private String userId; private String agencyId; + private String gridId; + private String pids; + + private String name; + + /** + * 18大类 中 某一类的 是否值，用于比较 同步数据结果确定是否要插入到表中 + */ + private String categoryColumn; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index a2398b2d92..1a61d61a3c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -923,5 +923,5 @@ public interface EpmetUserOpenFeignClient { Result dingResiLogin(@RequestBody DingLoginResiFormDTO formDTO); @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask") - Result natInfoScanTask(@RequestBody NatInfoScanTaskFormDTO formDTO); + Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 4601ca1ef3..630e838db7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -713,7 +713,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result natInfoScanTask(NatInfoScanTaskFormDTO formDTO) { + public Result natInfoScanTask(DataSyncTaskParam formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "natInfoScanTask", formDTO); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 2963823ce2..2ea0a33db9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -13,7 +13,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.DataSyncConfigDTO; import com.epmet.dto.form.ConfigSwitchFormDTO; -import com.epmet.dto.form.NatInfoScanTaskFormDTO; +import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.dto.form.ScopeSaveFormDTO; import com.epmet.service.DataSyncConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -107,7 +107,7 @@ public class DataSyncConfigController { } @PostMapping("natInfoScanTask") - public Result natInfoScanTask(@RequestBody NatInfoScanTaskFormDTO formDTO){ + public Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ dataSyncConfigService.dataSyncForYanTaiTask(formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java index 6df7281e5b..2963617263 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java @@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.DataSyncConfigDTO; import com.epmet.dto.DataSyncScopeDTO; import com.epmet.dto.form.ConfigSwitchFormDTO; +import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.dto.result.NatUserInfoResultDTO; import com.epmet.entity.DataSyncConfigEntity; import org.apache.ibatis.annotations.Mapper; @@ -53,10 +54,10 @@ public interface DataSyncConfigDao extends BaseDao { /** * Desc: 根据范围查询居民证件号 * - * @param orgList + * @param formDTO * @author zxc * @date 2022/9/27 09:23 */ - List getIdCardsByScope(@Param("orgList") List orgList, @Param("idCardList") List idCardList); + List getIdCardsByScope(DataSyncTaskParam formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDeathDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDeathDao.java new file mode 100644 index 0000000000..6456d58053 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDeathDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.DataSyncRecordDeathEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 数据同步记录-居民死亡信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-11 + */ +@Mapper +public interface DataSyncRecordDeathDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java new file mode 100644 index 0000000000..caad1854be --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java @@ -0,0 +1,17 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.DataSyncRecordDisabilityEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 数据同步记录-居民残疾信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-11 + */ +@Mapper +public interface DataSyncRecordDisabilityDao extends BaseDao { + + //int upsertBatch(List list); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDeathEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDeathEntity.java new file mode 100644 index 0000000000..49d8749e9a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDeathEntity.java @@ -0,0 +1,111 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 数据同步记录-居民死亡信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("data_sync_record_death") +public class DataSyncRecordDeathEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids 含agencyId本身 + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 手机号 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 年龄(享年) + */ + private Integer age; + + /** + * 家庭住址 + */ + private String address; + + /** + * 死亡时间 + */ + private String deathDate; + + /** + * 火化时间 + */ + private String cremationTime; + + /** + * 民族 + */ + private String mz; + + /** + * 登记单位名称 + */ + private String organName; + + /** + * 国籍 + */ + private String nation; + + /** + * 第三方记录唯一标识 + */ + private String thirdRecordId; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + /** + * 处理结果 + */ + private String dealRedult; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java new file mode 100644 index 0000000000..4307bd8e25 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java @@ -0,0 +1,111 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 数据同步记录-居民残疾信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("data_sync_record_disability") +public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids 含agencyId本身 + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 残疾证号 + */ + private String cardNum; + + /** + * 残疾等级(状况) + */ + private String cjzk; + + /** + * 残疾类别 + */ + private String cjlb; + + /** + * 文化程度 + */ + private String eduLevel; + + /** + * 婚姻状况 + */ + private String maritalStatus; + + /** + * 监护人 + */ + private String guardian; + + /** + * 监护人联系方式 + */ + private String guardianPhone; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + /** + * 需要处理的残疾状态 0:非残疾；1:残疾 + */ + private Integer disabilityStatus; + + /** + * 处理结果 + */ + private String dealRedult; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index 049fc774a0..fe51881c46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -6,7 +6,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.DataSyncConfigDTO; import com.epmet.dto.form.ConfigSwitchFormDTO; -import com.epmet.dto.form.NatInfoScanTaskFormDTO; +import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.dto.form.ScopeSaveFormDTO; import com.epmet.entity.DataSyncConfigEntity; @@ -82,5 +82,5 @@ public interface DataSyncConfigService extends BaseService */ void scopeSave(ScopeSaveFormDTO formDTO); - void dataSyncForYanTaiTask(NatInfoScanTaskFormDTO formDTO); + void dataSyncForYanTaiTask(DataSyncTaskParam formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java new file mode 100644 index 0000000000..17a4efb3e0 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.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.DataSyncRecordDeathDTO; +import com.epmet.entity.DataSyncRecordDeathEntity; + +import java.util.List; +import java.util.Map; + +/** + * 数据同步记录-居民死亡信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-11 + */ +public interface DataSyncRecordDeathService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return DataSyncRecordDeathDTO + * @author generator + * @date 2022-10-11 + */ + DataSyncRecordDeathDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-11 + */ + void save(DataSyncRecordDeathDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-11 + */ + void update(DataSyncRecordDeathDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java new file mode 100644 index 0000000000..73408be3f2 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java @@ -0,0 +1,81 @@ +package com.epmet.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.DataSyncRecordDisabilityDTO; +import com.epmet.entity.DataSyncRecordDisabilityEntity; + +import java.util.List; +import java.util.Map; + +/** + * 数据同步记录-居民残疾信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-11 + */ +public interface DataSyncRecordDisabilityService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return DataSyncRecordDisabilityDTO + * @author generator + * @date 2022-10-11 + */ + DataSyncRecordDisabilityDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-11 + */ + void save(DataSyncRecordDisabilityDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-11 + */ + void update(DataSyncRecordDisabilityDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-11 + */ + void delete(String[] ids); + + DataSyncRecordDisabilityDTO selectOne(LambdaQueryWrapper queryWrapper); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index ed2490feed..26fe7c97c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1,11 +1,17 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; +import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -18,19 +24,14 @@ import com.epmet.commons.tools.utils.YtHsResUtils; import com.epmet.dao.DataSyncConfigDao; import com.epmet.dao.IcNatDao; import com.epmet.dto.DataSyncConfigDTO; +import com.epmet.dto.DataSyncRecordDisabilityDTO; import com.epmet.dto.form.ConfigSwitchFormDTO; -import com.epmet.dto.form.NatInfoScanTaskFormDTO; +import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.dto.form.ScopeSaveFormDTO; import com.epmet.dto.result.NatUserInfoResultDTO; -import com.epmet.entity.DataSyncConfigEntity; -import com.epmet.entity.DataSyncScopeEntity; -import com.epmet.entity.IcNatEntity; -import com.epmet.entity.IcNatRelationEntity; +import com.epmet.entity.*; import com.epmet.enums.DataSyncEnum; -import com.epmet.service.DataSyncConfigService; -import com.epmet.service.DataSyncScopeService; -import com.epmet.service.IcNatRelationService; -import com.epmet.service.IcNatService; +import com.epmet.service.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -65,9 +66,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -104,6 +109,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl result = new PageData<>(new ArrayList<>(), NumConstant.ZERO_L); PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) .doSelectPageInfo(() -> baseDao.list(tokenDto.getCustomerId(), null)); - if (CollectionUtils.isNotEmpty(pageInfo.getList())){ + if (CollectionUtils.isNotEmpty(pageInfo.getList())) { result.setList(pageInfo.getList()); result.setTotal(Integer.parseInt(String.valueOf(pageInfo.getTotal()))); } @@ -134,6 +141,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl { o.setCustomerId(formDTO.getCustomerId()); o.setDataSyncConfigId(formDTO.getDataSyncConfigId()); - if (o.getOrgType().equals("grid")){ + if (o.getOrgType().equals("grid")) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(o.getOrgId()); - if (null == gridInfo){ - throw new EpmetException("查询网格信息失败"+o.getOrgId()); + if (null == gridInfo) { + throw new EpmetException("查询网格信息失败" + o.getOrgId()); } o.setPid(gridInfo.getPid()); o.setOrgIdPath(gridInfo.getPids() + ":" + gridInfo.getId()); - }else { + } else { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(o.getOrgId()); - if (null == agencyInfo){ - throw new EpmetException("查询组织信息失败"+o.getOrgId()); + if (null == agencyInfo) { + throw new EpmetException("查询组织信息失败" + o.getOrgId()); } o.setPid(agencyInfo.getPid()); o.setOrgIdPath(agencyInfo.getPids().equals(NumConstant.EMPTY_STR) || agencyInfo.getPids().equals(NumConstant.ZERO_STR) ? agencyInfo.getId() : agencyInfo.getPids() + ":" + agencyInfo.getId()); @@ -171,145 +179,432 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl allConfigList = baseDao.list(formDTO.getCustomerId() ,"open"); - if (CollectionUtils.isEmpty(allConfigList)){ + public void dataSyncForYanTaiTask(DataSyncTaskParam formDTO) { + List allConfigList = baseDao.list(formDTO.getCustomerId(), "open"); + if (CollectionUtils.isEmpty(allConfigList)) { return; } //TODO 根据dataCode 调用不同的方法 抽取数据 - if (CollectionUtils.isNotEmpty(allConfigList)){ + if (CollectionUtils.isNotEmpty(allConfigList)) { log.warn("dataSyncForYanTaiTask don't have any resi data to pull data form YanTai interface"); return; } for (DataSyncConfigDTO config : allConfigList) { + //没有配置 数据拉取范围 继续下次循环 - if (CollectionUtils.isEmpty(config.getScopeList())){ + if (CollectionUtils.isEmpty(config.getScopeList())) { continue; } - //如果传了身份证号 则按照身份证号查询 并同步记录， userId如果为空则是 手动录入的 此人没有录入居民库 但是也可以同步 - if (CollectionUtils.isNotEmpty(formDTO.getIdCards())){ - List userIdByIdCard = baseDao.getIdCardsByScope(config.getScopeList(),formDTO.getIdCards()); - List collect = formDTO.getIdCards().stream().map(id -> { - NatUserInfoResultDTO e = new NatUserInfoResultDTO(); - e.setIdCard(id); - e.setUserId(""); - return e; - }).collect(Collectors.toList()); - - collect.forEach(c -> userIdByIdCard.stream().filter(u -> u.getIdCard().equals(c.getIdCard())).forEach(u -> c.setUserId(u.getUserId()))); - executeSyncData(config, collect); - return; - } else { - //没传具体参数 则 按照 - int pageNo = NumConstant.ONE; - int pageSize = NumConstant.ONE_THOUSAND; - PageInfo pageInfo = null; - do { - //根据 组织 分页获取 居民数据 - pageInfo = PageHelper.startPage(pageNo, pageSize, false) - .doSelectPageInfo(() -> baseDao.getIdCardsByScope(config.getScopeList(),formDTO.getIdCards())); - executeSyncData(config, pageInfo.getList()); - - pageNo++; - } while (pageInfo != null && pageInfo.getSize() == pageSize); + + //没传具体参数 则 按照 + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_THOUSAND; + List dbResiList = null; + //设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + + do { + switch (anEnum) { + case HE_SUAN: + dbResiList = getNatUserInfoFromDB(formDTO, anEnum, pageNo, pageSize); + if (CollectionUtils.isEmpty(dbResiList)) { + break; + } + hsjc(dbResiList, config.getCustomerId()); + break; + case CAN_JI: + formDTO.setCategoryColumn("IS_CJ"); + dbResiList = getNatUserInfoFromDB(formDTO, anEnum, pageNo, pageSize); + canJi(dbResiList); + break; + case SI_WANG: + formDTO.setResiSubStatus(IcResiUserSubStatusEnum.DIED.getSubStatus()); + dbResiList = getNatUserInfoFromDB(formDTO, anEnum, pageNo, pageSize); + siWang(dbResiList); + break; + default: + log.warn("没有要处理的数据"); + } + pageNo++; + } while (dbResiList != null && dbResiList.size() == pageSize); + } + + } + + @Transactional(rollbackFor = Exception.class) + public void siWang(List dbResiList) { + List list = new ArrayList<>(); + for (NatUserInfoResultDTO dbResi : dbResiList) { + YtDataSyncResDTO thirdResult = YtHsResUtils.siWang(dbResi.getIdCard(), dbResi.getName()); + if (200 != thirdResult.getCode()) { + log.warn("canJi 调用蓝图接口失败了 继续处理下一个人"); + continue; + } + /*{ + "AGE": "73", + "CARD_TYPE": "9", + "CREATE_ORGAN_NAME": "菏泽市巨野县殡仪馆", + "CREMATION_TIME": "2014-04-17 14:46", + "DEAD_ID": "SZ-371724-2012-1006560", + "DEATH_DATE": "2014-04-17", + "FAMILY_ADD": "菏泽市巨野县开发区马庄村", + "FOLK": "01", + "ID_CARD": "1", + "NAME": "郭**", + "NATION": "156", + "POPULACE": "3381C3014B60439FE05319003C0A0897", + "POPULACE_NAME": "菏泽市巨野县开发区马庄村", + "RECORD_ID": "E-371724-2012-100000000000407849", + "RN": "1", + "SEX": "1" + }*/ + String thirdResultData = thirdResult.getData(); + JSONObject thirdResultObject = JSON.parseObject(thirdResultData); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataSyncRecordDisabilityEntity::getIdCard, dbResi.getIdCard()); + //获取数据库里的记录 + DataSyncRecordDisabilityDTO dbDisablityEntity = dataSyncRecordDisabilityService.selectOne(queryWrapper); + + + DataSyncRecordDisabilityEntity entity = new DataSyncRecordDisabilityEntity(); + entity.setId(dbDisablityEntity.getId()); + //居民库里 是否是残疾 + String categoryColumn = dbResi.getCategoryColumn(); + + + JudgeDealStatus judgeDealStatus = null; + //居民是残疾 + if (NumConstant.ONE_STR.equals(categoryColumn)) { + // 第三方返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 + if (thirdResultObject != null) { + //todo 联调时看一下 为什么db == null 总是true + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); + if (judgeDealStatus.isStop()) { + continue; + } + } else { + //没有返回该人是残疾的数据 说明需要处理居民库的数据 + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); + } + } else if (NumConstant.ZERO_STR.equals(categoryColumn)) { + //居民不是残疾 + + // 第三方没有返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 + if (thirdResultObject == null) { + //todo 联调时看一下 为什么db == null 总是true + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); + if (judgeDealStatus.isStop()) { + continue; + } + + } else { + //蓝图返回该人是残疾的数据 说明需要处理居民库的数据 + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); + } } + entity.setCustomerId(dbResi.getCustomerId()); + entity.setAgencyId(dbResi.getAgencyId()); + entity.setPids(dbResi.getPids()); + entity.setGridId(dbResi.getGridId()); + entity.setName(dbResi.getName()); + entity.setIdCard(thirdResultObject.getString("citizenId")); + entity.setMobile(thirdResultObject.getString("phoneNo")); + entity.setIcResiUserId(dbResi.getUserId()); + entity.setCardNum(thirdResultObject.getString("cardNum")); + //todo 残疾等级 从字典获取 + entity.setCjzk(thirdResultObject.getString("idtLevelName")); + entity.setCjlb(thirdResultObject.getString("idtKindName")); + entity.setEduLevel(thirdResultObject.getString("eduLevelName")); + entity.setMaritalStatus(thirdResultObject.getString("marriagerName")); + entity.setGuardian(thirdResultObject.getString("guardian")); + entity.setGuardianPhone(thirdResultObject.getString("guardianPhone")); + entity.setDealStatus(NumConstant.ZERO); + entity.setDealRedult(StrConstant.EPMETY_STR); + if (judgeDealStatus.isNeedSetStatus) { + entity.setDealRedult(judgeDealStatus.dealResult); + entity.setDealStatus(judgeDealStatus.dealStatus); + } + list.add(entity); } + dataSyncRecordDisabilityService.saveOrUpdateBatch(list); } /** - * desc：根据居民身份证号 从蓝图api接口 获取数据到本地 - * @param config - * @param resiList + * desc：从数据库获取居民信息 + * + * @param formDTO + * @param anEnum + * @param pageNo + * @param pageSize + * @return */ - private void executeSyncData(DataSyncConfigDTO config, List resiList) { - DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); - switch (anEnum) { - case HE_SUAN: - hsjc(resiList, config.getCustomerId()); - break; - case CAN_JI: - //todo - break; - case SI_WANG: - //todo - break; - default: - log.warn("没有要处理的数据"); + private List getNatUserInfoFromDB(DataSyncTaskParam formDTO, DataSyncEnum anEnum, int pageNo, int pageSize) { + //根据 组织 分页获取 居民数据 + PageInfo pageInfo = PageHelper.startPage(pageNo, pageSize, false) + .doSelectPageInfo(() -> baseDao.getIdCardsByScope(formDTO)); + List dbResiList; + dbResiList = pageInfo.getList(); + //如果传了身份证号 则按照身份证号查询 并同步记录， userId如果为空则是 手动录入的 此人没有录入居民库 但是也可以同步 + if (CollectionUtils.isNotEmpty(formDTO.getIdCards()) && DataSyncEnum.HE_SUAN.equals(anEnum.getCode())) { + List collect = formDTO.getIdCards().stream().map(id -> { + NatUserInfoResultDTO e = new NatUserInfoResultDTO(); + e.setIdCard(id); + e.setUserId(""); + return e; + }).collect(Collectors.toList()); + + for (NatUserInfoResultDTO c : collect) { + dbResiList.stream().filter(u -> u.getIdCard().equals(c.getIdCard())).forEach(u -> c.setUserId(u.getUserId())); + } + dbResiList = collect; + } + return dbResiList; + } + + /*\"code\":300, + \"name\":\"姓名\", + \"genderName\":\"性别\", + \"citizenId\":\"身份证号\", + \"cardNum\":\"残疾证号\", + \"idtKindName\":\"残疾类别\", + \"idtLevelName\":\"残疾等级\", + \"eduLevelName\":\"教育程度\", + \"marriagerName\":\"婚姻状况\", + \"guardian\":\"监护人\", + \"guardianPhone\":\"监护人联系方式\", + \"residentAdd\":\"户籍地址\", + \"nowAdd\":'现居住地\", + \"phoneNo\":'联系电话\",*/ + @Transactional(rollbackFor = Exception.class) + public void canJi(List resiList) { + List list = new ArrayList<>(); + for (NatUserInfoResultDTO dbResi : resiList) { + YtDataSyncResDTO thirdResult = YtHsResUtils.canji(dbResi.getIdCard(), dbResi.getName()); + if (200 != thirdResult.getCode()) { + log.warn("canJi 调用蓝图接口失败了 继续处理下一个人"); + continue; + } + String thirdResultData = thirdResult.getData(); + JSONObject thirdResultObject = JSON.parseObject(thirdResultData); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataSyncRecordDisabilityEntity::getIdCard, dbResi.getIdCard()); + //获取数据库里的记录 + DataSyncRecordDisabilityDTO dbDisablityEntity = dataSyncRecordDisabilityService.selectOne(queryWrapper); + + + DataSyncRecordDisabilityEntity entity = new DataSyncRecordDisabilityEntity(); + entity.setId(dbDisablityEntity.getId()); + //居民库里 是否是残疾 + String categoryColumn = dbResi.getCategoryColumn(); + + + JudgeDealStatus judgeDealStatus = null; + Integer disabilityStatus = 0; + //居民是残疾 + if (NumConstant.ONE_STR.equals(categoryColumn)) { + // 第三方返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 + if (thirdResultObject != null) { + //todo 联调时看一下 为什么db == null 总是true + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); + if (judgeDealStatus.isStop()) { + continue; + } + disabilityStatus = 1; + } else { + //没有返回该人是残疾的数据 说明需要处理居民库的数据 + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); + disabilityStatus = 0; + } + } else if (NumConstant.ZERO_STR.equals(categoryColumn)) { + //居民不是残疾 + + // 第三方没有返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 + if (thirdResultObject == null) { + //todo 联调时看一下 为什么db == null 总是true + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); + if (judgeDealStatus.isStop()) { + continue; + } + disabilityStatus = 0; + } else { + //蓝图返回该人是残疾的数据 说明需要处理居民库的数据 + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); + disabilityStatus = 1; + } + } + + entity.setCustomerId(dbResi.getCustomerId()); + entity.setAgencyId(dbResi.getAgencyId()); + entity.setPids(dbResi.getPids()); + entity.setGridId(dbResi.getGridId()); + entity.setName(dbResi.getName()); + entity.setIdCard(thirdResultObject.getString("citizenId")); + entity.setMobile(thirdResultObject.getString("phoneNo")); + entity.setIcResiUserId(dbResi.getUserId()); + entity.setCardNum(thirdResultObject.getString("cardNum")); + + entity.setCjzk(thirdResultObject.getString("idtLevelName")); + entity.setCjlb(thirdResultObject.getString("idtKindName")); + + entity.setEduLevel(thirdResultObject.getString("eduLevelName")); + entity.setMaritalStatus(thirdResultObject.getString("marriagerName")); + entity.setGuardian(thirdResultObject.getString("guardian")); + entity.setGuardianPhone(thirdResultObject.getString("guardianPhone")); + entity.setDealStatus(NumConstant.ZERO); + entity.setDisabilityStatus(disabilityStatus); + entity.setDealRedult(StrConstant.EPMETY_STR); + if (judgeDealStatus.isNeedSetStatus) { + entity.setDealRedult(judgeDealStatus.getDealResult()); + entity.setDealStatus(judgeDealStatus.getDealStatus()); + } + list.add(entity); } + dataSyncRecordDisabilityService.saveOrUpdateBatch(list); } /** * Desc: 根据证件号 查询nat 存在 ? 不处理 : 新增 + * * @param idCards * @param customerId * @author zxc * @date 2022/9/27 11:08 */ - private void hsjc(List idCards,String customerId){ - if (CollectionUtils.isNotEmpty(idCards)){ - List entities = new ArrayList<>(); - idCards.forEach(idCard -> { - YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); - if (CollectionUtils.isNotEmpty(natInfoResult.getData())){ - natInfoResult.getData().forEach(natInfo -> { - IcNatEntity e = new IcNatEntity(); - e.setCustomerId(customerId); - e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); - e.setUserId(idCard.getUserId()); - e.setUserType("sync"); - e.setName(StringUtils.isNotBlank(natInfo.getName()) ? natInfo.getName() : ""); - e.setMobile(StringUtils.isNotBlank(natInfo.getTelephone()) ? natInfo.getTelephone() : ""); - e.setIdCard(StringUtils.isNotBlank(natInfo.getCard_no()) ? natInfo.getCard_no() : ""); - e.setNatTime(DateUtils.parseDate(natInfo.getTest_time(),DateUtils.DATE_TIME_PATTERN)); - e.setNatResult(natInfo.getSample_result_pcr()); - e.setNatAddress(natInfo.getSampling_org_pcr()); - e.setAgencyId(idCard.getAgencyId()); - e.setPids(idCard.getPids()); - e.setAttachmentType(""); - e.setAttachmentUrl(""); - entities.add(e); - }); + @Transactional(rollbackFor = Exception.class) + public void hsjc(List idCards, String customerId) { + List entities = new ArrayList<>(); + idCards.forEach(idCard -> { + YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); + if (CollectionUtils.isNotEmpty(natInfoResult.getData())) { + natInfoResult.getData().forEach(natInfo -> { + IcNatEntity e = new IcNatEntity(); + e.setCustomerId(customerId); + e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + e.setUserId(idCard.getUserId()); + e.setUserType("sync"); + e.setName(StringUtils.isNotBlank(natInfo.getName()) ? natInfo.getName() : ""); + e.setMobile(StringUtils.isNotBlank(natInfo.getTelephone()) ? natInfo.getTelephone() : ""); + e.setIdCard(StringUtils.isNotBlank(natInfo.getCard_no()) ? natInfo.getCard_no() : ""); + e.setNatTime(DateUtils.parseDate(natInfo.getTest_time(), DateUtils.DATE_TIME_PATTERN)); + e.setNatResult(natInfo.getSample_result_pcr()); + e.setNatAddress(natInfo.getSampling_org_pcr()); + e.setAgencyId(idCard.getAgencyId()); + e.setPids(idCard.getPids()); + e.setAttachmentType(""); + e.setAttachmentUrl(""); + entities.add(e); + }); + } + }); + if (CollectionUtils.isNotEmpty(entities)) { + List existNatInfos = icNatDao.getExistNatInfo(entities); + entities.forEach(e -> existNatInfos.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); + Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); + if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { + for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), 500)) { + icNatService.insertBatch(icNatEntities); + } + } + //组织关系表 + List relationEntities = new ArrayList<>(); + entities.forEach(ne -> { + // 不是居民的先不加关系表吧 + if (ne.getIsResiUser().equals(NumConstant.ONE_STR)) { + IcNatRelationEntity e = new IcNatRelationEntity(); + e.setCustomerId(customerId); + e.setAgencyId(ne.getAgencyId()); + e.setPids(ne.getPids()); + e.setIcNatId(ne.getId()); + e.setUserType("sync"); + relationEntities.add(e); } }); - if (CollectionUtils.isNotEmpty(entities)){ - List existNatInfos = icNatDao.getExistNatInfo(entities); - entities.forEach(e -> existNatInfos.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); - Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); - if (CollectionUtils.isNotEmpty(groupByStatus.get(false))){ - for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), 500)) { - icNatService.insertBatch(icNatEntities); - } + if (CollectionUtils.isNotEmpty(relationEntities)) { + for (List icNatRelationEntities : ListUtils.partition(relationEntities, 500)) { + icNatRelationService.insertBatch(icNatRelationEntities); } - //组织关系表 - List relationEntities = new ArrayList<>(); - entities.forEach(ne -> { - // 不是居民的先不加关系表吧 - if (ne.getIsResiUser().equals(NumConstant.ONE_STR)){ - IcNatRelationEntity e = new IcNatRelationEntity(); - e.setCustomerId(customerId); - e.setAgencyId(ne.getAgencyId()); - e.setPids(ne.getPids()); - e.setIcNatId(ne.getId()); - e.setUserType("sync"); - relationEntities.add(e); - } - }); - if (CollectionUtils.isNotEmpty(relationEntities)){ - for (List icNatRelationEntities : ListUtils.partition(relationEntities, 500)) { - icNatRelationService.insertBatch(icNatRelationEntities); - } + } + } + + } + + private class JudgeDealStatus { + private boolean myResult; + private DataSyncRecordDisabilityDTO dbDisablityEntity; + private Integer dealStatus; + private String dealResult; + private boolean isNeedSetStatus; + + public JudgeDealStatus(DataSyncRecordDisabilityDTO dbDisablityEntity) { + this.dbDisablityEntity = dbDisablityEntity; + } + + boolean isStop() { + return myResult; + } + + public Integer getDealStatus() { + return dealStatus; + } + + public String getDealResult() { + return dealResult; + } + + public boolean isNeedSetStatus() { + return isNeedSetStatus; + } + + public JudgeDealStatus invoke() { + //对比记录里 也没有信息 则不用处理 + if (dbDisablityEntity == null || StringUtils.isBlank(dbDisablityEntity.getId())) { + myResult = true; + return this; + } else { + //对比记录里 有数据 且是已处理状态 则继续下一个居民 + if (dbDisablityEntity.getDealStatus().equals(NumConstant.ONE)) { + myResult = true; + return this; + } else { + //如果是其他处理状态 则改为已处理即可 + dealStatus = 1; + dealResult = "系统比对数据一致，自动处理"; + isNeedSetStatus = true; } } + myResult = false; + return this; + } + + /** + * desc:蓝图返回该人是残疾的数据 说明需要处理居民库的数据 + * + * @return + */ + public JudgeDealStatus notSame() { + + if (dbDisablityEntity != null && StringUtils.isNotBlank(dbDisablityEntity.getId()) + && dbDisablityEntity.getDealStatus().equals(NumConstant.ONE)) { + dealStatus = 0; + dealResult = ""; + isNeedSetStatus = true; + } + myResult = false; + return this; } } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java new file mode 100644 index 0000000000..81a8c39961 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.DataSyncRecordDeathDao; +import com.epmet.dto.DataSyncRecordDeathDTO; +import com.epmet.entity.DataSyncRecordDeathEntity; +import com.epmet.redis.DataSyncRecordDeathRedis; +import com.epmet.service.DataSyncRecordDeathService; +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-10-11 + */ +@Service +public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl implements DataSyncRecordDeathService { + + @Autowired + private DataSyncRecordDeathRedis dataSyncRecordDeathRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, DataSyncRecordDeathDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, DataSyncRecordDeathDTO.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 DataSyncRecordDeathDTO get(String id) { + DataSyncRecordDeathEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, DataSyncRecordDeathDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(DataSyncRecordDeathDTO dto) { + DataSyncRecordDeathEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordDeathEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(DataSyncRecordDeathDTO dto) { + DataSyncRecordDeathEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordDeathEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java new file mode 100644 index 0000000000..8556999dc2 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -0,0 +1,94 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.DataSyncRecordDisabilityDao; +import com.epmet.dto.DataSyncRecordDisabilityDTO; +import com.epmet.entity.DataSyncRecordDisabilityEntity; +import com.epmet.redis.DataSyncRecordDisabilityRedis; +import com.epmet.service.DataSyncRecordDisabilityService; +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-10-11 + */ +@Service +public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl implements DataSyncRecordDisabilityService { + + @Autowired + private DataSyncRecordDisabilityRedis dataSyncRecordDisabilityRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, DataSyncRecordDisabilityDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, DataSyncRecordDisabilityDTO.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 DataSyncRecordDisabilityDTO get(String id) { + DataSyncRecordDisabilityEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(DataSyncRecordDisabilityDTO dto) { + DataSyncRecordDisabilityEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordDisabilityEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(DataSyncRecordDisabilityDTO dto) { + DataSyncRecordDisabilityEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordDisabilityEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public DataSyncRecordDisabilityDTO selectOne(LambdaQueryWrapper queryWrapper) { + DataSyncRecordDisabilityEntity entity = baseDao.selectOne(queryWrapper); + return ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml index 4f61e271d3..bae3918241 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml @@ -52,22 +52,38 @@ + SELECT + d.id, + d.`NAME`, + d.ID_CARD, + d.DEATH_DATE, + d.AGE, + d.ADDRESS, + d.IC_RESI_USER_ID, + d.GRID_ID, + d.AGENCY_ID + FROM + data_sync_record_death d + WHERE + d.DEL_FLAG = '0' + AND d.CUSTOMER_ID = #{customerId} + + AND d.PIDS LIKE concat( '%', #{agencyId}, '%' ) + + + AND d.ID_CARD LIKE concat('%',#{idCard},'%') + + + AND d.`NAME` LIKE concat('%',#{name},'%') + + ORDER BY + d.CREATED_TIME DESC + From 384c4195e7668d2703acfea2c5402706a5ad469e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Oct 2022 14:47:16 +0800 Subject: [PATCH 148/621] =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/DataSyncRecordDeathController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java index 5281c4036a..c7fdd676c7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -32,6 +33,7 @@ public class DataSyncRecordDeathController { * @param formDTO * @return */ + @MaskResponse(fieldNames = {"idCard" }, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD }) @RequestMapping("page") public Result> page(@LoginUser TokenDto tokenDto, @RequestParam DataSyncRecordDeathPageFormDTO formDTO){ formDTO.setStaffId(tokenDto.getUserId()); From c30b36b7bbe7ee0dced1b22bf02062a6e3a7e015 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Oct 2022 14:51:44 +0800 Subject: [PATCH 149/621] daochu --- .../DataSyncRecordDeathController.java | 47 +++++++++++++++++++ .../impl/DataSyncRecordDeathServiceImpl.java | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java index c7fdd676c7..20ebd81810 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java @@ -1,17 +1,28 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.dto.DataSyncRecordDeathDTO; import com.epmet.dto.form.dataSync.DataSyncRecordDeathPageFormDTO; import com.epmet.service.DataSyncRecordDeathService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; @@ -21,6 +32,7 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2022-10-11 */ +@Slf4j @RestController @RequestMapping("dataSyncRecordDeath") public class DataSyncRecordDeathController { @@ -68,5 +80,40 @@ public class DataSyncRecordDeathController { return new Result(); } + /** + * pc:数据比对-死亡人员数据-导出 + * @param tokenDto + * @param formDTO + * @param response + */ + @NoRepeatSubmit + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody DataSyncRecordDeathPageFormDTO formDTO, HttpServletResponse response) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setIsPage(false); + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + int pageNo = formDTO.getPageNo(); + try { + String today = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_MMDD); + String fileName = "数据比对-死亡人员数据".concat(today); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), DataSyncRecordDeathDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + do { + data = dataSyncRecordDeathService.page(formDTO); + formDTO.setPageNo(++pageNo); + excelWriter.write(data.getList(), writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + } catch (Exception e) { + log.error("export exception", e); + } finally { + // 千万别忘记finish 会帮忙关闭流 + if (excelWriter != null) { + excelWriter.finish(); + } + } + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java index 2aecfec3c4..1246b82d47 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java @@ -43,7 +43,7 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl page(DataSyncRecordDeathPageFormDTO formDTO) { CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); formDTO.setAgencyId(null != staffInfoCacheResult ? staffInfoCacheResult.getAgencyId() : null); - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()); List records = baseDao.pageSelect(formDTO.getCustomerId(),formDTO.getIdCard(), formDTO.getName(), formDTO.getAgencyId()); PageInfo pi = new PageInfo<>(records); return new PageData<>(records, pi.getTotal()); From b09b4ad987f4fe974a41734f3a6fff56120f7f72 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Oct 2022 14:56:33 +0800 Subject: [PATCH 150/621] DataSyncRecordDeathDTO --- .../com/epmet/dto/DataSyncRecordDeathDTO.java | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java index 780fdc1824..eeed519be6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java @@ -1,5 +1,8 @@ package com.epmet.dto; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import java.io.Serializable; @@ -17,126 +20,158 @@ public class DataSyncRecordDeathDTO implements Serializable { private static final long serialVersionUID = 1L; + @ColumnWidth(50) + @ExcelProperty("所属网格") + private String gridName; /** * 主键 */ + @ExcelIgnore private String id; /** * 客户Id */ + @ExcelIgnore private String customerId; /** * 组织Id */ + @ExcelIgnore private String agencyId; /** * 组织的pids 含agencyId本身 */ + @ExcelIgnore private String pids; /** * 网格ID */ + @ExcelIgnore private String gridId; /** * 姓名 */ + @ColumnWidth(15) + @ExcelProperty("姓名") private String name; /** * 身份证 */ + @ColumnWidth(20) + @ExcelProperty("证件号") private String idCard; /** * 居民Id，ic_resi_user.id */ + @ExcelIgnore private String icResiUserId; /** * 年龄(享年) */ + @ColumnWidth(10) + @ExcelProperty("年龄") private String age; /** * 家庭住址 */ + @ColumnWidth(40) + @ExcelProperty("家庭住址") private String address; /** * 死亡时间 */ + @ColumnWidth(20) + @ExcelProperty("死亡日期") private String deathDate; /** * 火化时间 */ + @ColumnWidth(20) + @ExcelProperty("火化时间") private String cremationTime; /** * 民族 */ + @ExcelIgnore private String mz; /** * 登记单位名称 */ + @ColumnWidth(40) + @ExcelProperty("登记单位名称") private String organName; /** * 国籍 */ + @ExcelIgnore private String nation; /** * 第三方记录唯一标识 */ + @ExcelIgnore private String thirdRecordId; /** * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 */ + @ExcelIgnore private Integer dealStatus; /** * 处理结果 */ + @ExcelIgnore private String dealResult; /** * 删除标识：0.未删除 1.已删除 */ + @ExcelIgnore private Integer delFlag; /** * 乐观锁 */ + @ExcelIgnore private Integer revision; /** * 创建人 */ + @ExcelIgnore private String createdBy; /** * 创建时间 */ + @ExcelIgnore private Date createdTime; /** * 更新人 */ + @ExcelIgnore private String updatedBy; /** * 更新时间 */ + @ExcelIgnore private Date updatedTime; - private String gridName; - } From 5f68112c5e9d8294f3077638696f703592fa621b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 13 Oct 2022 15:56:39 +0800 Subject: [PATCH 151/621] =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/DataSyncRecordDisabilityDTO.java | 1 + .../DataSyncRecordDisabilityFormDTO.java | 24 ++++++ .../DataSyncRecordDisabilityController.java | 24 +++++- .../dao/DataSyncRecordDisabilityDao.java | 6 ++ .../excel/DataSyncRecordDisabilityExcel.java | 59 ++++++++++++++ .../DataSyncRecordDisabilityService.java | 7 ++ .../DataSyncRecordDisabilityServiceImpl.java | 80 ++++++++++++++++++- .../mapper/DataSyncRecordDisabilityDao.xml | 24 +++++- 8 files changed, 218 insertions(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordDisabilityFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordDisabilityExcel.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java index 8c99d8f95b..c24009c73a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java @@ -101,6 +101,7 @@ public class DataSyncRecordDisabilityDTO implements Serializable { * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 */ private Integer dealStatus; + private String dealStatusName; /** * 残疾状态 0:非残疾；1:残疾 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordDisabilityFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordDisabilityFormDTO.java new file mode 100644 index 0000000000..0de7c52e15 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordDisabilityFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.form.dataSync; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/13 14:47 + * @DESC + */ +@Data +public class DataSyncRecordDisabilityFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = -20061989190666183L; + + private String name; + private String idCard; + private String mobile; + private String customerId; + private String userId; + private String agencyId; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java index c8a3bed494..07ac090a24 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java @@ -1,7 +1,9 @@ package com.epmet.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.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,10 +11,13 @@ 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.dto.DataSyncRecordDisabilityDTO; +import com.epmet.dto.form.dataSync.DataSyncRecordDisabilityFormDTO; import com.epmet.service.DataSyncRecordDisabilityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.Map; @@ -29,9 +34,11 @@ public class DataSyncRecordDisabilityController { @Autowired private DataSyncRecordDisabilityService dataSyncRecordDisabilityService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = dataSyncRecordDisabilityService.page(params); + @PostMapping("page") + public Result> page(@LoginUser TokenDto tokenDto,@RequestBody DataSyncRecordDisabilityFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + PageData page = dataSyncRecordDisabilityService.list(formDTO); return new Result>().ok(page); } @@ -67,5 +74,16 @@ public class DataSyncRecordDisabilityController { return new Result(); } + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody DataSyncRecordDisabilityFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + dataSyncRecordDisabilityService.export(formDTO,response); + } + + @PostMapping("batchUpdate") + public Result batchUpdate(){ + return new Result(); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java index caad1854be..8f7d1f4713 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.DataSyncRecordDisabilityDTO; +import com.epmet.dto.form.dataSync.DataSyncRecordDisabilityFormDTO; import com.epmet.entity.DataSyncRecordDisabilityEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 数据同步记录-居民残疾信息 * @@ -14,4 +18,6 @@ import org.apache.ibatis.annotations.Mapper; public interface DataSyncRecordDisabilityDao extends BaseDao { //int upsertBatch(List list); + + List list(DataSyncRecordDisabilityFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordDisabilityExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordDisabilityExcel.java new file mode 100644 index 0000000000..e7a52a2b40 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordDisabilityExcel.java @@ -0,0 +1,59 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Author zxc + * @DateTime 2022/10/13 15:29 + * @DESC + */ +@Data +public class DataSyncRecordDisabilityExcel { + + @ExcelProperty(value = "姓名") + @ColumnWidth(20) + private String name; + + @ExcelProperty(value = "证件号") + @ColumnWidth(20) + private String idCard; + + @ExcelProperty(value = "手机") + @ColumnWidth(20) + private String mobile; + + @ExcelProperty(value = "性别") + @ColumnWidth(20) + private String gender; + + @ExcelProperty(value = "民族") + @ColumnWidth(20) + private String mz; + + @ExcelProperty(value = "家庭住址") + @ColumnWidth(20) + private String address; + + @ExcelProperty(value = "残疾类别") + @ColumnWidth(20) + private String cjlb; + + @ExcelProperty(value = "残疾等级") + @ColumnWidth(20) + private String cjzk; + + @ExcelProperty(value = "监护人") + @ColumnWidth(20) + private String guardian; + + @ExcelProperty(value = "状态") + @ColumnWidth(20) + private String dealStatusName; + + @ExcelProperty(value = "失败原因") + @ColumnWidth(20) + private String dealResult; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java index 73408be3f2..99ea18d578 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.DataSyncRecordDisabilityDTO; +import com.epmet.dto.form.dataSync.DataSyncRecordDisabilityFormDTO; import com.epmet.entity.DataSyncRecordDisabilityEntity; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -78,4 +81,8 @@ public interface DataSyncRecordDisabilityService extends BaseService queryWrapper); + + PageData list(DataSyncRecordDisabilityFormDTO formDTO); + + void export(DataSyncRecordDisabilityFormDTO formDTO, HttpServletResponse response) throws IOException; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index f8e093e6f1..e28e34e301 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -1,23 +1,43 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.dao.DataSyncRecordDisabilityDao; import com.epmet.dto.DataSyncRecordDisabilityDTO; +import com.epmet.dto.form.dataSync.DataSyncRecordDisabilityFormDTO; import com.epmet.entity.DataSyncRecordDisabilityEntity; +import com.epmet.excel.DataSyncRecordDisabilityExcel; import com.epmet.service.DataSyncRecordDisabilityService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.*; /** * 数据同步记录-居民残疾信息 @@ -26,6 +46,7 @@ import java.util.Map; * @since v1.0.0 2022-10-11 */ @Service +@Slf4j public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl implements DataSyncRecordDisabilityService { @Override @@ -86,4 +107,57 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl list(DataSyncRecordDisabilityFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员失败："+formDTO.getUserId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + PageData result = new PageData<>(new ArrayList<>(), NumConstant.ZERO_L); + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.list(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + List list = baseDao.list(formDTO); + result.setList(list); + result.setTotal(list.size()); + } + return result; + } + + @Override + public void export(DataSyncRecordDisabilityFormDTO formDTO, HttpServletResponse response) throws IOException { + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "残疾" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), DataSyncRecordDisabilityExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + List list = null; + do { + PageData data = list(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), DataSyncRecordDisabilityExcel.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml index a08fdfc710..0326e8b1f5 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml @@ -32,7 +32,29 @@ - + + + From 11eebc55c87a23c65517044e06765a4a20680272 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 13 Oct 2022 16:06:35 +0800 Subject: [PATCH 152/621] detail --- .../dto/DataSyncRecordDisabilityDTO.java | 3 + .../epmet/dto/form/dataSync/ResiInfoDTO.java | 81 +++++++++++++++++++ .../DataSyncRecordDisabilityController.java | 2 +- .../DataSyncRecordDisabilityServiceImpl.java | 13 ++- 4 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java index c24009c73a..d1a35d8d77 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto; +import com.epmet.dto.form.dataSync.ResiInfoDTO; import lombok.Data; import java.io.Serializable; @@ -143,4 +144,6 @@ public class DataSyncRecordDisabilityDTO implements Serializable { */ private Date updatedTime; + private ResiInfoDTO resiInfo; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java new file mode 100644 index 0000000000..b42e47618d --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java @@ -0,0 +1,81 @@ +package com.epmet.dto.form.dataSync; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/13 15:58 + * @DESC + */ +@Data +public class ResiInfoDTO implements Serializable { + + private static final long serialVersionUID = -3320460795150912451L; + + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + + /** + * 残疾证号 + */ + private String cardNum; + + /** + * 残疾等级(状况) + */ + private String cjzk; + + /** + * 残疾类别 + */ + private String cjlb; + + /** + * 民族 + */ + private String mz; + + /** + * 家庭住址 + */ + private String address; + + /** + * 性别 + */ + private String gender; + + /** + * 监护人 + */ + private String guardian; + + public ResiInfoDTO() { + this.name = ""; + this.idCard = ""; + this.mobile = ""; + this.cardNum = ""; + this.cjzk = ""; + this.cjlb = ""; + this.mz = ""; + this.address = ""; + this.gender = ""; + this.guardian = ""; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java index 07ac090a24..4685545676 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java @@ -42,7 +42,7 @@ public class DataSyncRecordDisabilityController { return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @PostMapping("detail/{id}") public Result get(@PathVariable("id") String id){ DataSyncRecordDisabilityDTO data = dataSyncRecordDisabilityService.get(id); return new Result().ok(data); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index e28e34e301..a08f6c9502 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -22,15 +22,19 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.dao.DataSyncRecordDisabilityDao; import com.epmet.dto.DataSyncRecordDisabilityDTO; +import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.form.dataSync.DataSyncRecordDisabilityFormDTO; +import com.epmet.dto.form.dataSync.ResiInfoDTO; import com.epmet.entity.DataSyncRecordDisabilityEntity; import com.epmet.excel.DataSyncRecordDisabilityExcel; import com.epmet.service.DataSyncRecordDisabilityService; +import com.epmet.service.IcResiUserService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -49,6 +53,9 @@ import java.util.*; @Slf4j public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl implements DataSyncRecordDisabilityService { + @Autowired + private IcResiUserService icResiUserService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -77,7 +84,11 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl Date: Thu, 13 Oct 2022 16:47:02 +0800 Subject: [PATCH 153/621] =?UTF-8?q?=E3=80=90=E6=AD=BB=E4=BA=A1=E3=80=91?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChangeDeathController.java | 6 +++ .../DataSyncRecordDeathController.java | 18 +++++++ .../service/DataSyncRecordDeathService.java | 8 +++ .../service/impl/ChangeDeathServiceImpl.java | 25 +++++++-- .../impl/DataSyncRecordDeathServiceImpl.java | 53 +++++++++++++++++++ .../impl/IcUserTransferRecordServiceImpl.java | 42 +++++++++------ 6 files changed, 132 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java index c3a1e0ec6f..963d2369d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java @@ -50,6 +50,12 @@ public class ChangeDeathController { return new Result().ok(data); } + /** + * 死亡管理-新增死亡人员 + * @param tokenDto + * @param dto + * @return + */ @NoRepeatSubmit @PostMapping("save") public Result save(@LoginUser TokenDto tokenDto, @RequestBody ChangeDeathDTO dto){ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java index 20ebd81810..d29cf564be 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java @@ -116,4 +116,22 @@ public class DataSyncRecordDeathController { } } } + + /** + * 批量更新 + * 新增死亡记录 + * + * @param tokenDto + * @param ids + * @return + */ + @NoRepeatSubmit + @PostMapping("batchupdate") + public Result batchUpdate(@LoginUser TokenDto tokenDto, @RequestBody List ids) { + if (CollectionUtils.isEmpty(ids)) { + return new Result(); + } + dataSyncRecordDeathService.batchUpdate(tokenDto.getUserId(), tokenDto.getCustomerId(), ids); + return new Result(); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java index 43c330af9f..de5e8ef59f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java @@ -59,4 +59,12 @@ public interface DataSyncRecordDeathService extends BaseService ids); DataSyncRecordDeathDTO selectOne(LambdaQueryWrapper queryWrapper); + + /** + * + * @param userId 当前操作人 + * @param customerId 当前客户 + * @param ids 要操作的记录id + */ + void batchUpdate(String userId, String customerId, List ids); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java index 96085b2a3b..04690ad68a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.service.ChangeDeathService; import com.epmet.service.ChangeWelfareService; import com.epmet.service.IcResiUserService; import com.epmet.service.IcUserTransferRecordService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +43,7 @@ import java.util.*; * @author generator generator@elink-cn.com * @since v1.0.0 2022-05-05 */ +@Slf4j @Service public class ChangeDeathServiceImpl extends BaseServiceImpl implements ChangeDeathService { @@ -106,6 +108,12 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl params = new HashMap<>(4); params.put("idCard", dto.getIdCard()); if (!list(params).isEmpty()) { - return new Result().error("该人员已经迁入死亡人口"); + // return new Result().error("该人员已经迁入死亡人口"); + log.warn(String.format("该人员已经迁入死亡人口,idCard:%s",result.getIdCard())); + return new Result(); } - + // 插入死亡名单表 dto.setJoinDate(DateUtils.format(new Date())); ChangeDeathEntity entity = ConvertUtils.sourceToTarget(dto, ChangeDeathEntity.class); entity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); insert(entity); + // 如果勾选了享受福利 if (dto.getWelfareFlag() != null && dto.getWelfareFlag()) { ChangeWelfareDTO formDto = new ChangeWelfareDTO(); formDto.setUserId(dto.getUserId()); @@ -148,6 +163,8 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl ids) { + // 要做的事：居民表修改状态为注销、子状态为死亡、加入死亡人员名单、记录变更主表、变更明细表（如果当前死亡的这个人属于十八类中的是，-1操作） + // 上面要做的事，其实就是新增死亡人员名单，调整下ChangeDeathServiceImpl.save，直接调用吧， + for (String id : ids) { + DataSyncRecordDeathEntity entity = baseDao.selectById(id); + if (NumConstant.ONE == entity.getDealStatus() || StringUtils.isBlank(entity.getIcResiUserId())) { + // 已处理的跳过 + continue; + } + try { + ChangeDeathDTO changeDeathDTO = new ChangeDeathDTO(); + changeDeathDTO.setStaffId(userId); + changeDeathDTO.setUserId(entity.getIcResiUserId()); + changeDeathDTO.setGridId(entity.getGridId()); + changeDeathDTO.setName(entity.getName()); + changeDeathDTO.setIdCard(entity.getIdCard()); + // 手机号没有值 + changeDeathDTO.setMobile(StrConstant.EPMETY_STR); + changeDeathDTO.setDeathDate(DateUtils.stringToDate(entity.getDeathDate(), "yyyy-MM-dd")); + changeDeathDTO.setJoinReason("来源于数据比对-死亡人员数据"); + SpringContextUtils.getBean(ChangeDeathServiceImpl.class).save(changeDeathDTO); + entity.setDealStatus(NumConstant.ONE); + } catch (EpmetException epmetException) { + + entity.setDealStatus(NumConstant.TWO); + entity.setDealResult("系统内部异常:" + epmetException.getMsg()); + + epmetException.printStackTrace(); + } catch (Exception e) { + + entity.setDealStatus(NumConstant.TWO); + entity.setDealResult("未知错误:" + e.getMessage()); + + e.printStackTrace(); + } finally { + baseDao.updateById(entity); + } + } + } + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index d07fe051eb..e2013336f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -179,10 +179,19 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl result2 = getNewHouseInfo(formDTO); CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); From 26a23ceb314781b0037f6ab591e16b9ea14b2144 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Oct 2022 16:51:52 +0800 Subject: [PATCH 154/621] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/YtHsResUtils.java | 107 +++-- .../dto/DataSyncRecordDisabilityDTO.java | 24 +- .../DataSyncRecordDisabilityEntity.java | 24 +- .../impl/DataSyncConfigServiceImpl.java | 412 ++++++++++-------- .../resources/mapper/DataSyncConfigDao.xml | 2 + .../mapper/DataSyncRecordDisabilityDao.xml | 6 +- .../service/DataSyncConfigServiceTest.java | 22 + 7 files changed, 356 insertions(+), 241 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/test/java/com/epmet/service/DataSyncConfigServiceTest.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index b41afbd23b..6ed4887e13 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -26,6 +26,7 @@ public class YtHsResUtils { private static final String PAGE_SIZE = "PAGESIZE"; private static final String START = "ROWNUM"; private static final String LIMIT = "PAGESIZE"; + /** * desc:图片同步扫描 * @@ -35,24 +36,28 @@ public class YtHsResUtils { try { //String param = String.format("&card_no=%s&ROWNUM=%s&PAGESIZE=%s", cardNo, rowNum, pageSize); //String apiUrl = url.concat(param); - Map param = new HashMap<>(); - param.put(APP_KEY,APP_KEY_VALUE); - param.put(CARD_NO,cardNo); - param.put(ROW_NUM,rowNum); - param.put(PAGE_SIZE,pageSize); - log.info("hsjc api param:{}",param); - Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hsjcxx", param); - log.info("hsjc api result:{}",JSON.toJSONString(result)); + Map param = new HashMap<>(); + param.put(APP_KEY, APP_KEY_VALUE); + param.put(CARD_NO, cardNo); + param.put(ROW_NUM, rowNum); + param.put(PAGE_SIZE, pageSize); + log.info("hsjc api param:{}", param); + //todo 核酸检测 mock数据 放开她 + //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hsjcxx", param); + String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-20 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}"; + Result result = new Result().ok(mockData); + log.info("hsjc api result:{}", JSON.toJSONString(result)); if (result.success()) { return JSON.parseObject(result.getData(), YtHsjcResDTO.class); } } catch (Exception e) { - log.warn(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); + log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); } YtHsjcResDTO resultResult = new YtHsjcResDTO(); resultResult.setData(new ArrayList<>()); return resultResult; } + /** * desc:死亡数据同步 * @@ -65,48 +70,55 @@ public class YtHsResUtils { // 3)idcard身份证号 必填 // 4)start开始默认0 // 5)limit每页记录数 - Map param = new HashMap<>(); - param.put(APP_KEY,APP_KEY_VALUE); - param.put("id_card",cardNo); - param.put("name",userName); - param.put("start",0); - param.put("limit",1); + Map param = new HashMap<>(); + param.put(APP_KEY, APP_KEY_VALUE); + param.put("id_card", cardNo); + param.put("name", userName); + param.put("start", 0); + param.put("limit", 1); - log.info("siWang api param:{}",param); + log.info("siWang api param:{}", param); //todo 放开他 //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"mzt_hhrysj1", param); String mockData2 = "{\"code\":200,\"data\":\"{\\\"data\\\":[{\\\"AGE\\\":\\\"73\\\",\\\"CARD_TYPE\\\":\\\"9\\\",\\\"CREATE_ORGAN_NAME\\\":\\\"菏泽市巨野县殡仪馆\\\",\\\"CREMATION_TIME\\\":\\\"2014-04-17 14:46\\\",\\\"DEAD_ID\\\":\\\"SZ-371724-2012-1006560\\\",\\\"DEATH_DATE\\\":\\\"2014-04-17\\\",\\\"FAMILY_ADD\\\":\\\"菏泽市巨野县开发区马庄村\\\",\\\"FOLK\\\":\\\"01\\\",\\\"ID_CARD\\\":\\\"1\\\",\\\"NAME\\\":\\\"郭**\\\",\\\"NATION\\\":\\\"156\\\",\\\"POPULACE\\\":\\\"3381C3014B60439FE05319003C0A0897\\\",\\\"POPULACE_NAME\\\":\\\"菏泽市巨野县开发区马庄村\\\",\\\"RECORD_ID\\\":\\\"E-371724-2012-100000000000407849\\\",\\\"RN\\\":\\\"1\\\",\\\"SEX\\\":\\\"1\\\"}],\\\"fields\\\":[\\\"RN\\\",\\\"RECORD_ID\\\",\\\"DEAD_ID\\\",\\\"NAME\\\",\\\"SEX\\\",\\\"CARD_TYPE\\\",\\\"ID_CARD\\\",\\\"BIRTHDAY\\\",\\\"AGE\\\",\\\"NATION\\\",\\\"FOLK\\\",\\\"IF_LOCAL\\\",\\\"POPULACE\\\",\\\"FAMILY_ADD\\\",\\\"WORK_NAME\\\",\\\"DEATH_DATE\\\",\\\"CREMATION_TIME\\\",\\\"CREATE_ORGAN_NAME\\\",\\\"POPULACE_NAME\\\"],\\\"total\\\":\\\"4903\\\"}\",\"message\":\"\"}"; - String mockData = "{\"code\":200,\"data\":\"{\\\"data\\\":[],\\\"fields\\\":[\\\"RN\\\",\\\"RECORD_ID\\\",\\\"DEAD_ID\\\",\\\"NAME\\\",\\\"SEX\\\",\\\"CARD_TYPE\\\",\\\"ID_CARD\\\",\\\"BIRTHDAY\\\",\\\"AGE\\\",\\\"NATION\\\",\\\"FOLK\\\",\\\"IF_LOCAL\\\",\\\"POPULACE\\\",\\\"FAMILY_ADD\\\",\\\"WORK_NAME\\\",\\\"DEATH_DATE\\\",\\\"CREMATION_TIME\\\",\\\"CREATE_ORGAN_NAME\\\",\\\"POPULACE_NAME\\\"],\\\"total\\\":\\\"4903\\\"}\",\"message\":\"\"}"; + String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"data\\\\\\\":[{\\\\\\\"AGE\\\\\\\":\\\\\\\"82\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\":\\\\\\\"1933-02-23\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\":\\\\\\\"莱州市殡仪馆\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\":\\\\\\\"2016-01-03 13:01\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600555c2849\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\":\\\\\\\"2016-01-02\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\":\\\\\\\"山东省莱州市光州西路420号\\\\\\\",\\\\\\\"FOLK\\\\\\\":\\\\\\\"01\\\\\\\",\\\\\\\"ID_CARD\\\\\\\":\\\\\\\"370625193302231929\\\\\\\",\\\\\\\"NAME\\\\\\\":\\\\\\\"陈秀芬\\\\\\\",\\\\\\\"NATION\\\\\\\":\\\\\\\"156\\\\\\\",\\\\\\\"POPULACE\\\\\\\":\\\\\\\"3381C300B4B9439FE05319003C0A0897\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\":\\\\\\\"烟台市莱州市文昌路街道\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600694e2877\\\\\\\",\\\\\\\"RN\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"SEX\\\\\\\":\\\\\\\"2\\\\\\\"}],\\\\\\\"fields\\\\\\\":[\\\\\\\"RN\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\",\\\\\\\"NAME\\\\\\\",\\\\\\\"SEX\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\",\\\\\\\"ID_CARD\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\",\\\\\\\"AGE\\\\\\\",\\\\\\\"NATION\\\\\\\",\\\\\\\"FOLK\\\\\\\",\\\\\\\"IF_LOCAL\\\\\\\",\\\\\\\"POPULACE\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\",\\\\\\\"WORK_NAME\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\"],\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\"}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; Result result = new Result().ok(mockData); - log.info("siWang api result:{}",JSON.toJSONString(result)); + log.info("siWang api result:{}", JSON.toJSONString(result)); String data = result.getData(); JSONObject jsonObject = JSON.parseObject(data); //他们的结果是成功的 - if (jsonObject!= null && "200".equals(jsonObject.getString("code"))){ - //第一层data - JSONObject realObject = JSON.parseObject(jsonObject.getString("data")); - if (realObject!= null&& realObject.getJSONArray("data") != null) { - //第二层 data - Object thirdData = realObject.getJSONArray("data").get(0); - YtDataSyncResDTO ytDataSyncResDTO = new YtDataSyncResDTO(200,"",thirdData.toString()); - return ytDataSyncResDTO; - }else { - log.warn("canji 调用蓝图接口成功但是蓝图的结果中 省平台失败"); + if (jsonObject != null && "200".equals(jsonObject.getString("code"))) { + //第一层 + JSONObject firstData = JSON.parseObject(jsonObject.getString("data")); + + //第二层 data + if (firstData != null && "200".equals(firstData.getString("code"))) { + //第一层 + JSONObject secondData = JSON.parseObject(firstData.getString("data")); + Object thirdData = ""; + if (secondData != null && secondData.getJSONArray("data") != null) { + //第二层 data + thirdData = secondData.getJSONArray("data").get(0); + } + return new YtDataSyncResDTO(200, "", thirdData.toString()); + } else { + log.warn("siWang 调用蓝图接口成功但是蓝图的结果中 省平台失败"); } - }else { - log.warn("canji 调用蓝图接口败"); + } else { + log.warn("siWang 调用蓝图接口败"); } } catch (Exception e) { - log.warn(String.format("烟台siWang结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); + log.error(String.format("烟台siWang结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); } return new YtDataSyncResDTO(); } /** * desc:残疾数据同步 - * @remark：默认失败 因为一旦成功没有数据 会影响残疾人的数据 接口失败数据不做任何处理 + * * @return + * @remark：默认失败 因为一旦成功没有数据 会影响残疾人的数据 接口失败数据不做任何处理 */ public static YtDataSyncResDTO canji(String idCard, String userName) { @@ -117,19 +129,19 @@ public class YtHsResUtils { // 1)appkey // 2)name姓名 // 3)citizenId身份证号 - Map param = new HashMap<>(); - param.put(APP_KEY,APP_KEY_VALUE); - param.put("citizenId",idCard); - param.put("name",userName); + Map param = new HashMap<>(); + param.put(APP_KEY, APP_KEY_VALUE); + param.put("citizenId", idCard); + param.put("name", userName); - log.info("canji api param:{}",param); + log.info("canji api param:{}", param); //todo 上线放开她 //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"sdcl_xxzx_czcjr1", param); - String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":{\\\"result\\\":true,\\\"errorcode\\\":0,\\\"msg\\\":\\\"获取成功\\\",\\\"data\\\":{\\\"isNewRecord\\\":\\\"true\\\",\\\"delFlag\\\":\\\"0\\\",\\\"pageNo\\\":\\\"0\\\",\\\"pageSize\\\":\\\"0\\\",\\\"name\\\":\\\"姓名\\\",\\\"genderName\\\":\\\"性别\\\",\\\"citizenId\\\":\\\"身份证号\\\",\\\"cardNum\\\":\\\"残疾证号\\\",\\\"idtKindName\\\":\\\"残疾类别\\\",\\\"idtLevelName\\\":\\\"残疾等级\\\",\\\"eduLevelName\\\":\\\"教育程度\\\",\\\"marriagerName\\\":\\\"婚姻状况\\\",\\\"guardian\\\":\\\"监护人\\\",\\\"guardianPhone\\\":\\\"监护人联系方式\\\",\\\"residentAdd\\\":\\\"户籍地址\\\",\\\"nowAdd\\\":\\\"现居住地\\\",\\\"phoneNo\\\":\\\"联系电话\\\"}},\\\"message\\\":\\\"\\\"}\",\"total\":0}"; + String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"result\\\\\\\":true,\\\\\\\"errorcode\\\\\\\":0,\\\\\\\"msg\\\\\\\":\\\\\\\"获取成功\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"isNewRecord\\\\\\\":true,\\\\\\\"delFlag\\\\\\\":\\\\\\\"0\\\\\\\",\\\\\\\"pageNo\\\\\\\":0,\\\\\\\"pageSize\\\\\\\":0,\\\\\\\"name\\\\\\\":\\\\\\\"数据同步测试用户\\\\\\\",\\\\\\\"genderName\\\\\\\":\\\\\\\"男\\\\\\\",\\\\\\\"citizenId\\\\\\\":\\\\\\\"370682198002072719\\\\\\\",\\\\\\\"cardNum\\\\\\\":\\\\\\\"370283199912010302\\\\\\\",\\\\\\\"idtKindName\\\\\\\":\\\\\\\"精神\\\\\\\",\\\\\\\"idtLevelName\\\\\\\":\\\\\\\"二级\\\\\\\",\\\\\\\"eduLevelName\\\\\\\":\\\\\\\"小学\\\\\\\",\\\\\\\"marriagerName\\\\\\\":\\\\\\\"未婚\\\\\\\",\\\\\\\"guardian\\\\\\\":\\\\\\\"盖希仁\\\\\\\",\\\\\\\"guardianPhone\\\\\\\":\\\\\\\"13854516627\\\\\\\",\\\\\\\"guardianRName\\\\\\\":\\\\\\\"兄/弟/姐/妹\\\\\\\",\\\\\\\"raceName\\\\\\\":\\\\\\\"汉族\\\\\\\",\\\\\\\"certDate\\\\\\\":1620779842000,\\\\\\\"residentAdd\\\\\\\":\\\\\\\"姜疃镇凤头村248号附1号\\\\\\\",\\\\\\\"nowAdd\\\\\\\":\\\\\\\"山东省烟台市莱阳市姜疃镇凤头村委会\\\\\\\",\\\\\\\"phoneNo\\\\\\\":\\\\\\\"13854516627\\\\\\\"}}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; Result result = new Result().ok(mockData); - log.info("canji api result:{}",JSON.toJSONString(result)); + log.info("canji api result:{}", JSON.toJSONString(result)); if (result.success()) { /*返回示例 { @@ -153,25 +165,24 @@ public class YtHsResUtils { String data = result.getData(); JSONObject jsonObject = JSON.parseObject(data); //他们的结果是成功的 - if (jsonObject!= null && "200".equals(jsonObject.getString("code"))){ + if (jsonObject != null && "200".equals(jsonObject.getString("code"))) { //第一层data JSONObject realObject = JSON.parseObject(jsonObject.getString("data")); - if (realObject!= null && "200".equals(realObject.getString("code"))) { + if (realObject != null && "200".equals(realObject.getString("code"))) { //第二层 data String thirdData = realObject.getString("data"); - YtDataSyncResDTO ytDataSyncResDTO = JSON.parseObject(thirdData, YtDataSyncResDTO.class); - return ytDataSyncResDTO; - }else { + return JSON.parseObject(thirdData, YtDataSyncResDTO.class); + } else { log.warn("canji 调用蓝图接口成功但是蓝图的结果中 省平台失败"); } - }else { + } else { log.warn("canji 调用蓝图接口败"); } } } catch (Exception e) { - log.warn(String.format("烟台canji结果查询异常cardNo:%s,异常信息:%s", idCard, e.getMessage())); + log.error(String.format("烟台canji结果查询异常cardNo:%s,异常信息:%s", idCard, e.getMessage())); } return failResult; } @@ -179,11 +190,11 @@ public class YtHsResUtils { public static void main(String[] args) { YtDataSyncResDTO canji = canji("123", "123"); - System.out.println("残疾结果："+JSON.toJSON(canji)); + System.out.println("残疾结果：" + JSON.toJSON(canji)); YtDataSyncResDTO siwang = siWang("1213", "!23"); - System.out.println("死亡结果："+JSON.toJSON(siwang)); + System.out.println("死亡结果：" + JSON.toJSON(siwang)); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java index d1a35d8d77..748a039549 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java @@ -84,9 +84,29 @@ public class DataSyncRecordDisabilityDTO implements Serializable { private String eduLevel; /** - * 婚姻状况 + * 婚姻状况 中文 */ - private String maritalStatus; + private String maritalStatusName; + + /** + * 民族 中文 + */ + private String mzCn; + + /** + * 性别1男2女 + */ + private Integer gender; + + /** + * 户籍地址 + */ + private String residentAdd; + + /** + * 现居住地址 + */ + private String nowAdd; /** * 监护人 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java index 50dc64edbe..810b153665 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java @@ -79,9 +79,29 @@ public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity { private String eduLevel; /** - * 婚姻状况 + * 婚姻状况 中文 */ - private String maritalStatus; + private String maritalStatusName; + + /** + * 民族 中文 + */ + private String mzCn; + + /** + * 性别1男2女 + */ + private Integer gender; + + /** + * 户籍地址 + */ + private String residentAdd; + + /** + * 现居住地址 + */ + private String nowAdd; /** * 监护人 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index d70289b0fb..8515089201 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; +import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -40,10 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -182,7 +180,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList = null; //设置查询数据范围 formDTO.setOrgList(config.getScopeList()); @@ -206,7 +206,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList) { - List list = new ArrayList<>(); - for (NatUserInfoResultDTO dbResi : dbResiList) { - YtDataSyncResDTO thirdResult = YtHsResUtils.siWang(dbResi.getIdCard(), dbResi.getName()); - if (200 != thirdResult.getCode()) { - log.warn("canJi 调用蓝图接口失败了 继续处理下一个人"); - continue; - } + try { + List list = new ArrayList<>(); + for (NatUserInfoResultDTO dbResi : dbResiList) { + YtDataSyncResDTO thirdResult = YtHsResUtils.siWang(dbResi.getIdCard(), dbResi.getName()); + if (200 != thirdResult.getCode()) { + log.warn("canJi 调用蓝图接口失败了 继续处理下一个人"); + continue; + } - String thirdResultData = thirdResult.getData(); - JSONObject thirdResultObject = JSON.parseObject(thirdResultData); + String thirdResultData = thirdResult.getData(); + JSONObject thirdResultObject = JSON.parseObject(thirdResultData); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(DataSyncRecordDeathEntity::getIdCard, dbResi.getIdCard()); - //获取数据库里的记录 - DataSyncRecordDeathDTO dbDeathEntity = dataSyncRecordDeathService.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataSyncRecordDeathEntity::getIdCard, dbResi.getIdCard()); + //获取数据库里的记录 + DataSyncRecordDeathDTO dbDeathEntity = dataSyncRecordDeathService.selectOne(queryWrapper); - JudgeDealStatus judgeDealStatus= new JudgeDealStatus(thirdResultObject,dbDeathEntity).invokeDeath(); - if (judgeDealStatus.isStop()) { - continue; - } + JudgeDealStatus judgeDealStatus = new JudgeDealStatus(thirdResultObject, dbDeathEntity).invokeDeath(); + if (judgeDealStatus.isStop()) { + continue; + } + + DataSyncRecordDeathEntity entity = new DataSyncRecordDeathEntity(); + if (dbDeathEntity != null && StringUtils.isNotBlank(dbDeathEntity.getId())) { + entity.setId(dbDeathEntity.getId()); + } + entity.setCustomerId(dbResi.getCustomerId()); + entity.setAgencyId(dbResi.getAgencyId()); + entity.setPids(dbResi.getPids()); + entity.setGridId(dbResi.getGridId()); + entity.setName(dbResi.getName()); + entity.setIdCard(dbResi.getIdCard()); + entity.setIcResiUserId(dbResi.getUserId()); + //死亡未获取到数据 + if (thirdResultObject != null) { + entity.setAge(thirdResultObject.getString("AGE")); + entity.setAddress(thirdResultObject.getString("FAMILY_ADD")); + entity.setDeathDate(thirdResultObject.getString("DEATH_DATE")); + entity.setCremationTime(thirdResultObject.getString("CREMATION_TIME")); + entity.setMz(thirdResultObject.getString("FAMILY_ADD")); + entity.setOrganName(thirdResultObject.getString("CREATE_ORGAN_NAME")); + entity.setNation(thirdResultObject.getString("NATION")); + entity.setThirdRecordId(thirdResultObject.getString("RECORD_ID")); + } - DataSyncRecordDeathEntity entity = new DataSyncRecordDeathEntity(); - entity.setId(dbDeathEntity.getId()); - entity.setCustomerId(dbResi.getCustomerId()); - entity.setAgencyId(dbResi.getAgencyId()); - entity.setPids(dbResi.getPids()); - entity.setGridId(dbResi.getGridId()); - entity.setName(dbResi.getName()); - entity.setIdCard(dbResi.getIdCard()); - entity.setIcResiUserId(dbResi.getUserId()); - - entity.setAge(thirdResultObject.getString("AGE")); - entity.setAddress(thirdResultObject.getString("FAMILY_ADD")); - entity.setDeathDate(thirdResultObject.getString("DEATH_DATE")); - entity.setCremationTime(thirdResultObject.getString("CREMATION_TIME")); - entity.setMz(thirdResultObject.getString("FAMILY_ADD")); - entity.setOrganName(thirdResultObject.getString("CREATE_ORGAN_NAME")); - entity.setNation(thirdResultObject.getString("NATION")); - entity.setThirdRecordId(thirdResultObject.getString("RECORD_ID")); - entity.setDealStatus(NumConstant.ZERO); - entity.setDealResult(StrConstant.EPMETY_STR); - if (judgeDealStatus.isNeedSetStatus) { - entity.setDealResult(judgeDealStatus.dealResult); - entity.setDealStatus(judgeDealStatus.dealStatus); + entity.setDealStatus(NumConstant.ZERO); + entity.setDealResult(StrConstant.EPMETY_STR); + if (judgeDealStatus.isNeedSetStatus) { + entity.setDealResult(judgeDealStatus.dealResult); + entity.setDealStatus(judgeDealStatus.dealStatus); + } + entity.setUpdatedTime(new Date()); + list.add(entity); } - list.add(entity); - } - if (list.size()==NumConstant.ZERO){ - return; + if (list.size() == NumConstant.ZERO) { + return; + } + dataSyncRecordDeathService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED); + } catch (Exception e) { + log.error("siwang exception", e); } - dataSyncRecordDeathService.saveOrUpdateBatch(list,NumConstant.TWO_HUNDRED); } /** @@ -295,13 +305,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl getNatUserInfoFromDb(DataSyncTaskParam formDTO, DataSyncEnum anEnum, int pageNo, int pageSize) { + private List getNatUserInfoFromDb(DataSyncTaskParam formDTO, int pageNo, int pageSize) { //根据 组织 分页获取 居民数据 PageInfo pageInfo = PageHelper.startPage(pageNo, pageSize, false) .doSelectPageInfo(() -> baseDao.getIdCardsByScope(formDTO)); List dbResiList; dbResiList = pageInfo.getList(); - //如果传了身份证号 则按照身份证号查询 并同步记录， userId如果为空则是 手动录入的 此人没有录入居民库 但是也可以同步 + /* //如果传了身份证号 则按照身份证号查询 并同步记录， userId如果为空则是 手动录入的 此人没有录入居民库 但是也可以同步 if (CollectionUtils.isNotEmpty(formDTO.getIdCards()) && DataSyncEnum.HE_SUAN.getCode().equals(anEnum.getCode())) { List collect = formDTO.getIdCards().stream().map(id -> { NatUserInfoResultDTO e = new NatUserInfoResultDTO(); @@ -314,95 +324,112 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl u.getIdCard().equals(c.getIdCard())).forEach(u -> c.setUserId(u.getUserId())); } dbResiList = collect; - } + }*/ return dbResiList; } private void canJi(List resiList) { - List list = new ArrayList<>(); - for (NatUserInfoResultDTO dbResi : resiList) { - YtDataSyncResDTO thirdResult = YtHsResUtils.canji(dbResi.getIdCard(), dbResi.getName()); - if (200 != thirdResult.getCode()) { - log.warn("canJi 调用蓝图接口失败了 继续处理下一个人"); - continue; - } - String thirdResultData = thirdResult.getData(); - JSONObject thirdResultObject = JSON.parseObject(thirdResultData); - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(DataSyncRecordDisabilityEntity::getIdCard, dbResi.getIdCard()); - //获取数据库里的记录 - DataSyncRecordDisabilityDTO dbDisablityEntity = dataSyncRecordDisabilityService.selectOne(queryWrapper); - + try { + List list = new ArrayList<>(); + for (NatUserInfoResultDTO dbResi : resiList) { + YtDataSyncResDTO thirdResult = YtHsResUtils.canji(dbResi.getIdCard(), dbResi.getName()); + if (200 != thirdResult.getCode()) { + log.warn("canJi 调用蓝图接口失败了 继续处理下一个人"); + continue; + } + String thirdResultData = thirdResult.getData(); + JSONObject thirdResultObject = JSON.parseObject(thirdResultData); - DataSyncRecordDisabilityEntity entity = new DataSyncRecordDisabilityEntity(); - entity.setId(dbDisablityEntity.getId()); - //居民库里 是否是残疾 - String categoryColumn = dbResi.getCategoryColumn(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataSyncRecordDisabilityEntity::getIdCard, dbResi.getIdCard()); + //获取数据库里的记录 + DataSyncRecordDisabilityDTO dbDisablityEntity = dataSyncRecordDisabilityService.selectOne(queryWrapper); - JudgeDealStatus judgeDealStatus = null; - int disabilityStatus = 0; - //居民是残疾 - if (NumConstant.ONE_STR.equals(categoryColumn)) { - // 第三方返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 - if (thirdResultObject != null) { - //todo 联调时看一下 为什么db == null 总是true - judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); - if (judgeDealStatus.isStop()) { - continue; + DataSyncRecordDisabilityEntity entity = new DataSyncRecordDisabilityEntity(); + if (dbDisablityEntity != null && StringUtils.isNotBlank(dbDisablityEntity.getId())) { + entity.setId(dbDisablityEntity.getId()); + } + //居民库里 是否是残疾 + String categoryColumn = dbResi.getCategoryColumn(); + + + JudgeDealStatus judgeDealStatus = null; + int disabilityStatus = 0; + //居民是残疾 + if (NumConstant.ONE_STR.equals(categoryColumn)) { + // 第三方返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 + if (thirdResultObject != null) { + //todo 联调时看一下 为什么db == null 总是true + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); + if (judgeDealStatus.isStop()) { + continue; + } + disabilityStatus = 1; + } else { + //没有返回该人是残疾的数据 说明需要处理居民库的数据 + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); + disabilityStatus = 0; } - disabilityStatus = 1; } else { - //没有返回该人是残疾的数据 说明需要处理居民库的数据 - judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); - disabilityStatus = 0; + //居民不是残疾 + + // 第三方没有返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 + if (thirdResultObject == null) { + //todo 联调时看一下 为什么db == null 总是true + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); + if (judgeDealStatus.isStop()) { + continue; + } + disabilityStatus = 0; + } else { + //蓝图返回该人是残疾的数据 说明需要处理居民库的数据 + judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); + disabilityStatus = 1; + } } - } else { - //居民不是残疾 - - // 第三方没有返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 - if (thirdResultObject == null) { - //todo 联调时看一下 为什么db == null 总是true - judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); - if (judgeDealStatus.isStop()) { - continue; + + entity.setCustomerId(dbResi.getCustomerId()); + entity.setAgencyId(dbResi.getAgencyId()); + entity.setPids(dbResi.getPids()); + entity.setGridId(dbResi.getGridId()); + entity.setName(dbResi.getName()); + entity.setIdCard(dbResi.getIdCard()); + entity.setIcResiUserId(dbResi.getUserId()); + if (thirdResultObject != null){ + entity.setMobile(thirdResultObject.getString("phoneNo")); + entity.setCardNum(thirdResultObject.getString("cardNum")); + entity.setCjzk(thirdResultObject.getString("idtLevelName")); + entity.setCjlb(thirdResultObject.getString("idtKindName")); + entity.setEduLevel(thirdResultObject.getString("eduLevelName")); + entity.setMaritalStatusName(thirdResultObject.getString("marriagerName")); + entity.setGuardian(thirdResultObject.getString("guardian")); + entity.setGuardianPhone(thirdResultObject.getString("guardianPhone")); + entity.setMzCn(thirdResultObject.getString("raceName")); + String genderName = thirdResultObject.getString("genderName"); + if (GenderEnum.MAN.getName().equals(genderName)){ + entity.setGender(NumConstant.ONE); + }else { + entity.setGender(NumConstant.TWO); } - disabilityStatus = 0; - } else { - //蓝图返回该人是残疾的数据 说明需要处理居民库的数据 - judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); - disabilityStatus = 1; + entity.setResidentAdd(thirdResultObject.getString("residentAdd")); + entity.setNowAdd(thirdResultObject.getString("nowAdd")); } - } - entity.setCustomerId(dbResi.getCustomerId()); - entity.setAgencyId(dbResi.getAgencyId()); - entity.setPids(dbResi.getPids()); - entity.setGridId(dbResi.getGridId()); - entity.setName(dbResi.getName()); - entity.setIdCard(thirdResultObject.getString("citizenId")); - entity.setMobile(thirdResultObject.getString("phoneNo")); - entity.setIcResiUserId(dbResi.getUserId()); - entity.setCardNum(thirdResultObject.getString("cardNum")); - - entity.setCjzk(thirdResultObject.getString("idtLevelName")); - entity.setCjlb(thirdResultObject.getString("idtKindName")); - - entity.setEduLevel(thirdResultObject.getString("eduLevelName")); - entity.setMaritalStatus(thirdResultObject.getString("marriagerName")); - entity.setGuardian(thirdResultObject.getString("guardian")); - entity.setGuardianPhone(thirdResultObject.getString("guardianPhone")); - entity.setDealStatus(NumConstant.ZERO); - entity.setDisabilityStatus(disabilityStatus); - entity.setDealResult(StrConstant.EPMETY_STR); - if (judgeDealStatus.isNeedSetStatus) { - entity.setDealResult(judgeDealStatus.getDealResult()); - entity.setDealStatus(judgeDealStatus.getDealStatus()); + entity.setDealStatus(NumConstant.ZERO); + entity.setDisabilityStatus(disabilityStatus); + entity.setDealResult(StrConstant.EPMETY_STR); + if (judgeDealStatus.isNeedSetStatus) { + entity.setDealResult(judgeDealStatus.getDealResult()); + entity.setDealStatus(judgeDealStatus.getDealStatus()); + } + entity.setUpdatedTime(new Date()); + list.add(entity); } - list.add(entity); + dataSyncRecordDisabilityService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED); + } catch (Exception e) { + log.error("canJi exception", e); } - dataSyncRecordDisabilityService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED); } @@ -414,59 +441,68 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl idCards, String customerId) { - List entities = new ArrayList<>(); - idCards.forEach(idCard -> { - YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); - if (CollectionUtils.isNotEmpty(natInfoResult.getData())) { - natInfoResult.getData().forEach(natInfo -> { - IcNatEntity e = new IcNatEntity(); - e.setCustomerId(customerId); - e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); - e.setUserId(idCard.getUserId()); - e.setUserType("sync"); - e.setName(StringUtils.isNotBlank(natInfo.getName()) ? natInfo.getName() : ""); - e.setMobile(StringUtils.isNotBlank(natInfo.getTelephone()) ? natInfo.getTelephone() : ""); - e.setIdCard(StringUtils.isNotBlank(natInfo.getCard_no()) ? natInfo.getCard_no() : ""); - e.setNatTime(DateUtils.parseDate(natInfo.getTest_time(), DateUtils.DATE_TIME_PATTERN)); - e.setNatResult(natInfo.getSample_result_pcr()); - e.setNatAddress(natInfo.getSampling_org_pcr()); - e.setAgencyId(idCard.getAgencyId()); - e.setPids(idCard.getPids()); - e.setAttachmentType(""); - e.setAttachmentUrl(""); - entities.add(e); - }); - } - }); - if (CollectionUtils.isNotEmpty(entities)) { - List existNatInfos = icNatDao.getExistNatInfo(entities); - entities.forEach(e -> existNatInfos.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); - Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); - if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { - for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), 500)) { - icNatService.insertBatch(icNatEntities); - } - } - //组织关系表 - List relationEntities = new ArrayList<>(); - entities.forEach(ne -> { - // 不是居民的先不加关系表吧 - if (ne.getIsResiUser().equals(NumConstant.ONE_STR)) { - IcNatRelationEntity e = new IcNatRelationEntity(); - e.setCustomerId(customerId); - e.setAgencyId(ne.getAgencyId()); - e.setPids(ne.getPids()); - e.setIcNatId(ne.getId()); - e.setUserType("sync"); - relationEntities.add(e); + @Transactional(rollbackFor = Exception.class) + public void hsjc(List idCards, String customerId) { + try { + List entities = new ArrayList<>(); + idCards.forEach(idCard -> { + YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); + if (CollectionUtils.isNotEmpty(natInfoResult.getData())) { + natInfoResult.getData().forEach(natInfo -> { + IcNatEntity e = new IcNatEntity(); + e.setCustomerId(customerId); + e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + e.setUserId(idCard.getUserId()); + e.setUserType("sync"); + e.setName(StringUtils.isNotBlank(natInfo.getName()) ? natInfo.getName() : ""); + e.setMobile(StringUtils.isNotBlank(natInfo.getTelephone()) ? natInfo.getTelephone() : ""); + e.setIdCard(StringUtils.isNotBlank(natInfo.getCard_no()) ? natInfo.getCard_no() : ""); + e.setNatTime(DateUtils.parseDate(natInfo.getTest_time(), DateUtils.DATE_TIME_PATTERN)); + String resultPcr = natInfo.getSample_result_pcr(); + //检测结果 转换 我们 0:阴性 1:阳性, 他们 ：1:阳性,2:阴性 + e.setNatResult(NumConstant.ZERO_STR); + if (NumConstant.ONE_STR.equals(resultPcr)){ + e.setNatResult(NumConstant.ONE_STR); + } + e.setNatAddress(natInfo.getSampling_org_pcr()); + e.setAgencyId(idCard.getAgencyId()); + e.setPids(idCard.getPids()); + e.setAttachmentType(""); + e.setAttachmentUrl(""); + entities.add(e); + }); } }); - if (CollectionUtils.isNotEmpty(relationEntities)) { - for (List icNatRelationEntities : ListUtils.partition(relationEntities, 500)) { - icNatRelationService.insertBatch(icNatRelationEntities); + if (CollectionUtils.isNotEmpty(entities)) { + List existNatInfos = icNatDao.getExistNatInfo(entities); + entities.forEach(e -> existNatInfos.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); + Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); + if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { + for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), NumConstant.FIVE_HUNDRED)) { + icNatService.insertBatch(icNatEntities); + //组织关系表 + List relationEntities = new ArrayList<>(); + icNatEntities.forEach(ne -> { + // 不是居民的先不加关系表吧 + if (ne.getIsResiUser().equals(NumConstant.ONE_STR)) { + IcNatRelationEntity e = new IcNatRelationEntity(); + e.setCustomerId(customerId); + e.setAgencyId(ne.getAgencyId()); + e.setPids(ne.getPids()); + e.setIcNatId(ne.getId()); + e.setUserType("sync"); + relationEntities.add(e); + } + }); + if (CollectionUtils.isNotEmpty(relationEntities)) { + icNatRelationService.insertBatch(relationEntities); + } + } } + } + } catch (Exception e) { + log.error("hsjc exception", e); } } @@ -488,7 +524,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl ${categoryColumn} AS categoryColumn, diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml index 0326e8b1f5..8947f3a5e1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml @@ -17,7 +17,11 @@ - + + + + + diff --git a/epmet-user/epmet-user-server/src/test/java/com/epmet/service/DataSyncConfigServiceTest.java b/epmet-user/epmet-user-server/src/test/java/com/epmet/service/DataSyncConfigServiceTest.java new file mode 100644 index 0000000000..a60c27d432 --- /dev/null +++ b/epmet-user/epmet-user-server/src/test/java/com/epmet/service/DataSyncConfigServiceTest.java @@ -0,0 +1,22 @@ +package com.epmet.service; + +import com.epmet.dto.form.DataSyncTaskParam; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +public class DataSyncConfigServiceTest { + @Autowired + private DataSyncConfigService dataSyncConfigService; + + @Test + public void dataSyncForYanTaiTask() { + DataSyncTaskParam param = new DataSyncTaskParam(); + dataSyncConfigService.dataSyncForYanTaiTask(param); + + } +} From 8796e5816d0072f795aaf39a1d8f3d168d68597e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Oct 2022 16:54:41 +0800 Subject: [PATCH 155/621] =?UTF-8?q?=E3=80=90=E6=AD=BB=E4=BA=A1=E3=80=91?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java index 6feb825d30..d51b6b2fb6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java @@ -142,7 +142,7 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl Date: Thu, 13 Oct 2022 16:56:40 +0800 Subject: [PATCH 156/621] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java | 4 ++-- .../java/com/epmet/entity/DataSyncRecordDisabilityEntity.java | 4 ++-- .../com/epmet/service/impl/DataSyncConfigServiceImpl.java | 4 ++-- .../src/main/resources/mapper/DataSyncRecordDisabilityDao.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java index 748a039549..66762c7617 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java @@ -71,12 +71,12 @@ public class DataSyncRecordDisabilityDTO implements Serializable { /** * 残疾等级(状况) */ - private String cjzk; + private String cjzkCn; /** * 残疾类别 */ - private String cjlb; + private String cjlbCn; /** * 文化程度 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java index 810b153665..3ea26e8050 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java @@ -66,12 +66,12 @@ public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity { /** * 残疾等级(状况) */ - private String cjzk; + private String cjzkCn; /** * 残疾类别 */ - private String cjlb; + private String cjlbCn; /** * 文化程度 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 8515089201..991884787a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -399,8 +399,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl - - + + From 4f8015ff473a0cbd406eab6399a6f29a47c11281 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 13 Oct 2022 16:58:46 +0800 Subject: [PATCH 157/621] /gov/issue/issue/unresolvedlist --- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 8be5461c75..63efe318c7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1724,7 +1724,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp } //重新查询一下所有议题的来源类型， 且来源于事件的议题，赋值icEventInfo List issueIds=resultList.stream().map(i -> i.getIssueId()).collect(Collectors.toList()); - List issueEntityList=baseDao.selectBatchIds(issueIds); + List issueEntityList = CollectionUtils.isEmpty(issueIds) ? new ArrayList<>() : baseDao.selectBatchIds(issueIds); if(CollectionUtils.isNotEmpty(issueEntityList)){ Map eventMap=new HashMap<>(); // 来源于事件的 From 904fdcb04796d4caed18be0ab40120b2a71ab51d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Oct 2022 17:32:04 +0800 Subject: [PATCH 158/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E9=87=87=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/result/YtHscyResDTO.java | 80 +++++++++++++++++++ .../commons/tools/utils/YtHsResUtils.java | 33 +++++++- 2 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java new file mode 100644 index 0000000000..dd74313196 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java @@ -0,0 +1,80 @@ +package com.epmet.commons.tools.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +/** + * @Description 核算采样结果 + * @Author yzm + * @Date 2022/9/26 17:04 + */ +@NoArgsConstructor +@Data +public class YtHscyResDTO { + private int code = 200; + private String msg = "请求成功"; + /** + * 响应数据 + */ + private List data; + private int total; + + @Data + class YtHscyResDetail { + private String id; + private String name; + private String card_type; + private String card_no; + private String create_by; + /** + * 采样时间 + */ + private String create_time; + private String sys_org_code; + private String sample_tube; + private String package_id; + private String city; + private String uuid; + private String county; + private String depart_ids; + private Object depart_name; + /** + * 采样点名称 + */ + private String realname; + private String upload_time; + private Object sd_id; + private Object sd_batch; + private Object sd_operation; + private Object sd_time; + private String inserttime; + } + + /*{ + "id":"1570924677539635484", + "name":"杨XX",//姓名 + "card_type":"1",//证件类型 + "card_no":"37************0813",//证件号码 + "create_by":"370613594",//采样点账号 + "create_time":"2022-09-17 07:15:22",//采样时间 + "sys_org_code":"370613",//部门代码 + "sample_tube":"GCJ-0825-0441",//采样管号 + "package_id":"bcj00208083952",//采样包号 + "city":"烟台市",//城市 + "uuid":"6225684525062602095",// + "county":"莱山区",//区县 + "depart_ids":"未填写",//街道 + "depart_name":null,//部门名称 + "realname":"采样点327",//采样点名称 + "upload_time":"2022-09-17 07:56:45",//自增时间戳 + "sd_id":null, + "sd_batch":null, + "sd_operation":null, + "sd_time":null, + "inserttime":"2022-09-17 09:36:20"//省大数据局返还烟台入库时间 + }*/ + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 6ed4887e13..cb28cf5419 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -3,6 +3,7 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; +import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import lombok.extern.slf4j.Slf4j; @@ -28,7 +29,36 @@ public class YtHsResUtils { private static final String LIMIT = "PAGESIZE"; /** - * desc:图片同步扫描 + * desc:核酸采样查询 + * + * @return + */ + public static YtHscyResDTO hscy(String cardNo, Integer rowNum, Integer pageSize) { + try { + Map param = new HashMap<>(); + param.put(APP_KEY, APP_KEY_VALUE); + param.put(CARD_NO, cardNo); + param.put(ROW_NUM, rowNum); + param.put(PAGE_SIZE, pageSize); + log.info("hscy api param:{}", param); + //todo 核酸检测 mock数据 放开她 + //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hscyxxcx", param); + String mockData = "{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-17 07:15:22\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}"; + Result result = new Result().ok(mockData); + log.info("hscy api result:{}", JSON.toJSONString(result)); + if (result.success()) { + return JSON.parseObject(result.getData(), YtHscyResDTO.class); + } + } catch (Exception e) { + log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); + } + YtHscyResDTO resultResult = new YtHscyResDTO(); + resultResult.setData(new ArrayList<>()); + return resultResult; + } + + /** + * desc:核酸结果查询 * * @return */ @@ -81,7 +111,6 @@ public class YtHsResUtils { //todo 放开他 //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"mzt_hhrysj1", param); - String mockData2 = "{\"code\":200,\"data\":\"{\\\"data\\\":[{\\\"AGE\\\":\\\"73\\\",\\\"CARD_TYPE\\\":\\\"9\\\",\\\"CREATE_ORGAN_NAME\\\":\\\"菏泽市巨野县殡仪馆\\\",\\\"CREMATION_TIME\\\":\\\"2014-04-17 14:46\\\",\\\"DEAD_ID\\\":\\\"SZ-371724-2012-1006560\\\",\\\"DEATH_DATE\\\":\\\"2014-04-17\\\",\\\"FAMILY_ADD\\\":\\\"菏泽市巨野县开发区马庄村\\\",\\\"FOLK\\\":\\\"01\\\",\\\"ID_CARD\\\":\\\"1\\\",\\\"NAME\\\":\\\"郭**\\\",\\\"NATION\\\":\\\"156\\\",\\\"POPULACE\\\":\\\"3381C3014B60439FE05319003C0A0897\\\",\\\"POPULACE_NAME\\\":\\\"菏泽市巨野县开发区马庄村\\\",\\\"RECORD_ID\\\":\\\"E-371724-2012-100000000000407849\\\",\\\"RN\\\":\\\"1\\\",\\\"SEX\\\":\\\"1\\\"}],\\\"fields\\\":[\\\"RN\\\",\\\"RECORD_ID\\\",\\\"DEAD_ID\\\",\\\"NAME\\\",\\\"SEX\\\",\\\"CARD_TYPE\\\",\\\"ID_CARD\\\",\\\"BIRTHDAY\\\",\\\"AGE\\\",\\\"NATION\\\",\\\"FOLK\\\",\\\"IF_LOCAL\\\",\\\"POPULACE\\\",\\\"FAMILY_ADD\\\",\\\"WORK_NAME\\\",\\\"DEATH_DATE\\\",\\\"CREMATION_TIME\\\",\\\"CREATE_ORGAN_NAME\\\",\\\"POPULACE_NAME\\\"],\\\"total\\\":\\\"4903\\\"}\",\"message\":\"\"}"; String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"data\\\\\\\":[{\\\\\\\"AGE\\\\\\\":\\\\\\\"82\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\":\\\\\\\"1933-02-23\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\":\\\\\\\"莱州市殡仪馆\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\":\\\\\\\"2016-01-03 13:01\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600555c2849\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\":\\\\\\\"2016-01-02\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\":\\\\\\\"山东省莱州市光州西路420号\\\\\\\",\\\\\\\"FOLK\\\\\\\":\\\\\\\"01\\\\\\\",\\\\\\\"ID_CARD\\\\\\\":\\\\\\\"370625193302231929\\\\\\\",\\\\\\\"NAME\\\\\\\":\\\\\\\"陈秀芬\\\\\\\",\\\\\\\"NATION\\\\\\\":\\\\\\\"156\\\\\\\",\\\\\\\"POPULACE\\\\\\\":\\\\\\\"3381C300B4B9439FE05319003C0A0897\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\":\\\\\\\"烟台市莱州市文昌路街道\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600694e2877\\\\\\\",\\\\\\\"RN\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"SEX\\\\\\\":\\\\\\\"2\\\\\\\"}],\\\\\\\"fields\\\\\\\":[\\\\\\\"RN\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\",\\\\\\\"NAME\\\\\\\",\\\\\\\"SEX\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\",\\\\\\\"ID_CARD\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\",\\\\\\\"AGE\\\\\\\",\\\\\\\"NATION\\\\\\\",\\\\\\\"FOLK\\\\\\\",\\\\\\\"IF_LOCAL\\\\\\\",\\\\\\\"POPULACE\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\",\\\\\\\"WORK_NAME\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\"],\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\"}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; Result result = new Result().ok(mockData); log.info("siWang api result:{}", JSON.toJSONString(result)); From cb315f9d289ee5ff8650f684c5a3ef9714bdfdb2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 14 Oct 2022 08:52:33 +0800 Subject: [PATCH 159/621] =?UTF-8?q?=E6=9A=82=E6=8F=90=E4=B8=80=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/DataSyncRecordDisabilityDTO.java | 1 + .../DataSyncRecordDisabilityController.java | 18 +++++- .../dao/DataSyncRecordDisabilityDao.java | 2 + .../DataSyncRecordDisabilityEntity.java | 7 +++ .../excel/DataSyncRecordDisabilityExcel.java | 8 +-- .../DataSyncRecordDisabilityService.java | 21 +++++++ .../DataSyncRecordDisabilityServiceImpl.java | 58 +++++++++++++++++++ .../mapper/DataSyncRecordDisabilityDao.xml | 55 ++++++++++++++++++ 8 files changed, 164 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java index 66762c7617..517a6bf26d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java @@ -107,6 +107,7 @@ public class DataSyncRecordDisabilityDTO implements Serializable { * 现居住地址 */ private String nowAdd; + private String address; /** * 监护人 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java index 4685545676..b9e8cd3c15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java @@ -74,6 +74,14 @@ public class DataSyncRecordDisabilityController { return new Result(); } + /** + * Desc: 导出 + * @param tokenDto + * @param formDTO + * @param response + * @author zxc + * @date 2022/10/13 16:17 + */ @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody DataSyncRecordDisabilityFormDTO formDTO, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -81,9 +89,15 @@ public class DataSyncRecordDisabilityController { dataSyncRecordDisabilityService.export(formDTO,response); } + /** + * Desc: 批量更新 + * @param ids + * @author zxc + * @date 2022/10/13 16:18 + */ @PostMapping("batchUpdate") - public Result batchUpdate(){ - + public Result batchUpdate(@RequestBody String[] ids,@LoginUser TokenDto tokenDto){ + dataSyncRecordDisabilityService.batchUpdate(ids,tokenDto.getCustomerId()); return new Result(); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java index 8f7d1f4713..c920bf67b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDisabilityDao.java @@ -20,4 +20,6 @@ public interface DataSyncRecordDisabilityDao extends BaseDao list); List list(DataSyncRecordDisabilityFormDTO formDTO); + + void batchUpdateResiDisability(List entities); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java index 3ea26e8050..b09103c8d7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java @@ -1,5 +1,6 @@ package com.epmet.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; @@ -68,11 +69,17 @@ public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity { */ private String cjzkCn; + @TableField(exist = false) + private String cjzk; + /** * 残疾类别 */ private String cjlbCn; + @TableField(exist = false) + private String cjlb; + /** * 文化程度 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordDisabilityExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordDisabilityExcel.java index e7a52a2b40..9b4d338451 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordDisabilityExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordDisabilityExcel.java @@ -26,11 +26,11 @@ public class DataSyncRecordDisabilityExcel { @ExcelProperty(value = "性别") @ColumnWidth(20) - private String gender; + private Integer gender; @ExcelProperty(value = "民族") @ColumnWidth(20) - private String mz; + private String mzCn; @ExcelProperty(value = "家庭住址") @ColumnWidth(20) @@ -38,11 +38,11 @@ public class DataSyncRecordDisabilityExcel { @ExcelProperty(value = "残疾类别") @ColumnWidth(20) - private String cjlb; + private String cjlbCn; @ExcelProperty(value = "残疾等级") @ColumnWidth(20) - private String cjzk; + private String cjzkCn; @ExcelProperty(value = "监护人") @ColumnWidth(20) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java index 99ea18d578..3c1d294b05 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDisabilityService.java @@ -82,7 +82,28 @@ public interface DataSyncRecordDisabilityService extends BaseService queryWrapper); + /** + * Desc: 列表 + * @param formDTO + * @author zxc + * @date 2022/10/13 16:17 + */ PageData list(DataSyncRecordDisabilityFormDTO formDTO); + /** + * Desc: 导出 + * @param formDTO + * @param response + * @author zxc + * @date 2022/10/13 16:17 + */ void export(DataSyncRecordDisabilityFormDTO formDTO, HttpServletResponse response) throws IOException; + + /** + * Desc: 批量更新 + * @param ids + * @author zxc + * @date 2022/10/13 16:18 + */ + void batchUpdate(String[] ids,String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index a08f6c9502..939c4d37b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -23,10 +23,14 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.dao.DataSyncRecordDisabilityDao; import com.epmet.dto.DataSyncRecordDisabilityDTO; import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.form.CustomerFormQueryDTO; +import com.epmet.dto.form.IcFormOptionsQueryFormDTO; import com.epmet.dto.form.dataSync.DataSyncRecordDisabilityFormDTO; import com.epmet.dto.form.dataSync.ResiInfoDTO; +import com.epmet.dto.result.FormItemResult; import com.epmet.entity.DataSyncRecordDisabilityEntity; import com.epmet.excel.DataSyncRecordDisabilityExcel; +import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.service.DataSyncRecordDisabilityService; import com.epmet.service.IcResiUserService; import com.github.pagehelper.PageHelper; @@ -55,6 +59,8 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl page(Map params) { @@ -171,4 +177,56 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl all = Arrays.asList(ids); + List entities = baseDao.selectBatchIds(all); + IcFormOptionsQueryFormDTO formDTO = new IcFormOptionsQueryFormDTO(); + formDTO.setCustomerId(customerId); + formDTO.setFormCode("resi_base_info"); + formDTO.setColumnName("CJZK"); + Result> cjzkOptionsMap = operCustomizeOpenFeignClient.getOptionsMap(formDTO); + if (!cjzkOptionsMap.success()){ + throw new EpmetException("operCustomizeOpenFeignClient.getOptionsMap执行失败"); + } + formDTO.setColumnName("CJLB"); + Result> cjlbOptionsMap = operCustomizeOpenFeignClient.getOptionsMap(formDTO); + if (!cjlbOptionsMap.success()){ + throw new EpmetException("operCustomizeOpenFeignClient.getOptionsMap执行失败"); + } + Map cjlbMap = cjlbOptionsMap.getData(); + Map cjzkMap = cjzkOptionsMap.getData(); + entities.forEach(e -> { + cjlbMap.forEach((k,v) ->{ + if (e.getCjlbCn().equals(v)){ + e.setCjlb(k); + } + }); + cjzkMap.forEach((k,v) -> { + if (e.getCjzkCn().equals(v)){ + e.setCjzk(k); + } + }); + }); + // 变更记录 + + } + + @Transactional(rollbackFor = Exception.class) + public void disposeDisabilitybatchUpdate(List entities){ + baseDao.batchUpdateResiDisability(entities); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml index e545808db8..c9ecd32591 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml @@ -36,12 +36,67 @@ + + UPDATE ic_resi_user + + + + + when id = #{item.icResiUserId} then #{item.disabilityStatus} + + + + + + + + when id = #{item.icResiUserId} then #{item.cjzh} + + + when id = #{item.icResiUserId} then '' + + + + + + + + + when id = #{item.icResiUserId} then #{item.cjzk} + + + when id = #{item.icResiUserId} then '' + + + + + + + + + when id = #{item.icResiUserId} then #{item.cjlb} + + + when id = #{item.icResiUserId} then '' + + + + + UPDATED_TIME = NOW() + WHERE + + id = #{item.icResiUserId} + + + + From 9f48bc819724d073725a2451617a2030c24666ab Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 14 Oct 2022 14:24:22 +0800 Subject: [PATCH 167/621] =?UTF-8?q?/gov/project/icEvent/myreport-detail?= =?UTF-8?q?=E4=B8=8D=E9=99=90=E5=88=B6userId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcEventController.java | 2 +- .../java/com/epmet/service/impl/IcEventServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index a139371cb2..c7bd63814f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -413,7 +413,7 @@ public class IcEventController { @PostMapping("myreport-detail") public Result myReportDetail(@LoginUser TokenDto tokenDto, @RequestBody MyReportIcEvFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); - formDTO.setUserId(tokenDto.getUserId()); + // formDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, MyReportIcEvFormDTO.DetailGroup.class); return new Result().ok(icEventService.myReportDetail(formDTO)); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 3fba9bf715..b37344a620 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1682,7 +1682,13 @@ public class IcEventServiceImpl extends BaseServiceImpl + // AND ie.REPORT_USER_ID = #{userId} + // List list=baseDao.selectMyReport(formDTO); + if(CollectionUtils.isEmpty(list)){ + return null; + } if (!CollectionUtils.isEmpty(list)) { //封装数据 for (MyReportIcEvResDTO dto : list) { From 3684e024e198a32926ea9056d70547010f79093d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 14 Oct 2022 14:26:28 +0800 Subject: [PATCH 168/621] emm --- .../dto/DataSyncRecordDisabilityDTO.java | 1 + .../epmet/dto/form/dataSync/ResiInfoDTO.java | 2 ++ .../DataSyncRecordDisabilityEntity.java | 3 +++ .../DataSyncRecordDisabilityServiceImpl.java | 24 +++++++++++++++++++ 4 files changed, 30 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java index 517a6bf26d..d6768e09da 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java @@ -97,6 +97,7 @@ public class DataSyncRecordDisabilityDTO implements Serializable { * 性别1男2女 */ private Integer gender; + private String genderCn; /** * 户籍地址 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java index b42e47618d..f9a8295e53 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java @@ -40,6 +40,7 @@ public class ResiInfoDTO implements Serializable { * 残疾等级(状况) */ private String cjzk; + private String cjzkCn; /** * 残疾类别 @@ -60,6 +61,7 @@ public class ResiInfoDTO implements Serializable { * 性别 */ private String gender; + private String genderCn; /** * 监护人 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java index 5d2987cdb3..81f8fd7a06 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java @@ -100,6 +100,9 @@ public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity { */ private Integer gender; + @TableField(exist = false) + private Integer genderCn; + /** * 户籍地址 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index 4fed49f5de..400e00f000 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -97,12 +97,36 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl Date: Fri, 14 Oct 2022 14:43:06 +0800 Subject: [PATCH 169/621] emm --- .../src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql new file mode 100644 index 0000000000..4c58646746 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql @@ -0,0 +1,3 @@ +alter table ic_nat add COLUMN `SAMPLE_TIME` datetime COMMENT '采样时间'after ID_CARD; + +ALTER TABLE ic_nat MODIFY COLUMN NAT_TIME datetime COMMENT '检测时间，精确到分钟'; \ No newline at end of file From 9ccd523888b784f99f73811c339ec3221566bc8c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 14 Oct 2022 15:59:29 +0800 Subject: [PATCH 170/621] =?UTF-8?q?/gov/voice/article/topArticle:pc?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=BD=AE=E9=A1=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E5=B0=81=E9=9D=A2=E4=B8=BA=E7=A9=BA=EF=BC=8C=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/TopArticleFormDTO.java | 5 +++++ .../com/epmet/controller/ArticleController.java | 2 +- .../java/com/epmet/service/ArticleService.java | 2 +- .../epmet/service/impl/ArticleServiceImpl.java | 15 ++++++++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TopArticleFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TopArticleFormDTO.java index 030fc58bd5..f97e610192 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TopArticleFormDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/TopArticleFormDTO.java @@ -22,5 +22,10 @@ public class TopArticleFormDTO { */ @NotBlank(message = "type不能为空,置顶:top,取消置顶:cancel_top") private String type; + + /** + * 封面图片 + */ + private String imgUrl; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index bcbaf69fde..7ab6795c57 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -432,7 +432,7 @@ public class ArticleController { @PostMapping("topArticle") public Result topArticle(@RequestBody TopArticleFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); - articleService.topArticle(formDTO.getArticleId(),formDTO.getType()); + articleService.topArticle(formDTO.getArticleId(),formDTO.getType(),formDTO.getImgUrl()); return new Result(); } /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index 4a9269c42c..8f0914bfe4 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -256,5 +256,5 @@ public interface ArticleService extends BaseService { PublishedListResultDTO detailV2(ArticleListFormDTO formDTO); - void topArticle(String articleId, String type); + void topArticle(String articleId, String type,String imgUrl); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index daf88968d0..4e94222164 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -1780,7 +1780,7 @@ public class ArticleServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper(); + queryWrapper.eq(ArticleCoverEntity::getArticleId,articleEntity); + if (articleCoverDao.selectCount(queryWrapper) == 0) { + ArticleCoverEntity articleCoverEntity=new ArticleCoverEntity(); + articleCoverEntity.setCustomerId(articleEntity.getCustomerId()); + articleCoverEntity.setArticleId(articleId); + articleCoverEntity.setImgUrl(imgUrl); + articleCoverEntity.setAuditStatus("pass"); + articleCoverDao.insert(articleCoverEntity); + } + } } else if ("cancel_top".equals(type)) { articleEntity.setIsTop(NumConstant.ZERO); } From 858daf7b12bf1890ddf412c289c2bf34cb2565e9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 14 Oct 2022 16:26:27 +0800 Subject: [PATCH 171/621] user --- .../tools/exception/EpmetErrorCode.java | 4 +++ .../src/main/java/com/epmet/dto/IcNatDTO.java | 6 +++++ .../com/epmet/dto/form/AddIcNatFormDTO.java | 7 ++++- .../com/epmet/dto/form/MyNatListFormDTO.java | 6 +++++ .../epmet/dto/result/NatListResultDTO.java | 5 ++++ .../DataSyncRecordDisabilityController.java | 2 ++ .../src/main/java/com/epmet/dao/IcNatDao.java | 4 ++- .../java/com/epmet/entity/IcNatEntity.java | 5 ++++ .../excel/data/IcNatImportExcelData.java | 7 +++-- .../handler/IcNatExcelImportListener.java | 14 +++++++++- .../epmet/service/impl/IcNatServiceImpl.java | 25 +++++++++++++++--- .../db/migration/V0.0.76__alter_ic_nat.sql | 6 ++++- .../src/main/resources/excel/ic_nat.xlsx | Bin 9220 -> 9203 bytes .../src/main/resources/mapper/IcNatDao.xml | 22 ++++++++++++++- 14 files changed, 103 insertions(+), 10 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 64688c8990..ec9ee8c209 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -263,6 +263,10 @@ public enum EpmetErrorCode { UNIT_EXIST_HOUSES_ERROR(8928,"单元下存在房屋，不可修改单元数"), IC_VACCINE(8929,"已存在相同记录，请去修改原有记录"), NOT_MATCH_IC_USER_ERROR(8930,"请联系社区工作人员"), + NAT_TIME_IS_NULL_ERROR(8931,"检测时间不能为空"), + NAT_RESULT_IS_NULL_ERROR(8932,"检测结果不能为空"), + SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), + SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java index dbd32f4463..66c9828dfd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java @@ -67,6 +67,12 @@ public class IcNatDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date natTime; + /** + * 采样时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date sampleTime; + /** * 检测结果(0:阴性 1:阳性) */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java index 258f28c66b..1d7ba24673 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java @@ -61,9 +61,14 @@ public class AddIcNatFormDTO implements Serializable { /** * 检测时间 */ - @NotNull(message = "检测时间不能为空", groups = Nat.class) +// @NotNull(message = "检测时间不能为空", groups = Nat.class) @JsonFormat(pattern="yyyy-MM-dd HH:mm") private Date natTime; + +// @NotNull(message = "采样时间不能为空", groups = Nat.class) + @JsonFormat(pattern="yyyy-MM-dd HH:mm") + private Date sampleTime; + /** * 检测结果 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyNatListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyNatListFormDTO.java index 0272a30799..88f8359222 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyNatListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyNatListFormDTO.java @@ -51,6 +51,12 @@ public class MyNatListFormDTO extends PageFormDTO { */ private String endTime; + /** + * 采样开始/结束时间yyyy-MM-dd HH:mm + */ + private String sampleStartTime; + private String sampleEndTime; + /** * 核酸记录Id */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java index cbeb66e482..43f9582b8c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java @@ -71,6 +71,11 @@ public class NatListResultDTO implements Serializable { @ExcelProperty(value = "检测时间",order = 4) private Date natTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @ColumnWidth(25) + @ExcelProperty(value = "采样时间",order = 4) + private Date sampleTime; + /** * 检测结果 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java index 55a2fe580a..d890ff812c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -35,6 +36,7 @@ public class DataSyncRecordDisabilityController { private DataSyncRecordDisabilityService dataSyncRecordDisabilityService; @PostMapping("page") + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result> page(@LoginUser TokenDto tokenDto,@RequestBody DataSyncRecordDisabilityFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java index 3507473187..b2419b09f5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java @@ -49,7 +49,9 @@ public interface IcNatDao extends BaseDao { * @Author sun * @Description 按条件查询业务数据 **/ - IcNatDTO getNatDTO(@Param("customerId") String customerId, @Param("icNatId") String icNatId, @Param("idCard") String idCard, @Param("natTime") String natTime, @Param("natResult") String natResult); + IcNatDTO getNatDTO(@Param("customerId") String customerId, @Param("icNatId") String icNatId, + @Param("idCard") String idCard, @Param("natTime") String natTime, + @Param("natResult") String natResult, @Param("sampleTime") String sampleTime); /** * desc:根据客户id 更新是否居民状态 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java index 50a9eed8e7..7cbe8cdd66 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java @@ -64,6 +64,11 @@ public class IcNatEntity extends BaseEpmetEntity { */ private Date natTime; + /** + * 采样时间 + */ + private Date sampleTime; + /** * 检测结果(0:阴性 1:阳性) */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java index 052b0cb1eb..ae0cb210d7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java @@ -29,14 +29,17 @@ public class IcNatImportExcelData { @Length(max = 18, message = "身份证号长度不正确，应小于18位") private String idCard; - @NotNull(message = "检测时间为必填项") +// @NotNull(message = "检测时间为必填项") @ExcelProperty("检测时间") private Date natTime; + @ExcelProperty("采样时间") + private Date sampleTime; + @ExcelProperty("检测地点") private String natAddress; - @NotBlank(message = "检测结果为必填项") +// @NotBlank(message = "检测结果为必填项") @ExcelProperty("检测结果") private String natResultZh; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java index 1f09a5142f..59f5eaab7b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java @@ -2,6 +2,8 @@ package com.epmet.excel.handler; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.ConvertUtils; @@ -66,6 +68,16 @@ public class IcNatExcelImportListener implements ReadListener imp //@Autowired //private UserService userService; + public void disposeIsNull(AddIcNatFormDTO formDTO){ + /** + * 根据产品要求 不同情况提示不同错误 + * 1.采样时间为空，检测时间和结果有一个为空就报错 + * 2.采样时间不为空，检测时间和结果可以为空【如果不为空 检测时间和结果都不为空】 + */ + if ((null == formDTO.getSampleTime() && null == formDTO.getNatTime() || org.apache.commons.lang3.StringUtils.isBlank(formDTO.getNatResult()))){ + throw new EpmetException(EpmetErrorCode.SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR.getCode()); + } + if(null != formDTO.getSampleTime() && org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getNatResult()) && null == formDTO.getNatTime()){ + throw new EpmetException(EpmetErrorCode.NAT_TIME_IS_NULL_ERROR.getCode()); + } + if (null != formDTO.getSampleTime() && org.apache.commons.lang3.StringUtils.isBlank(formDTO.getNatResult()) && null != formDTO.getNatTime()){ + throw new EpmetException(EpmetErrorCode.NAT_RESULT_IS_NULL_ERROR.getCode()); + } + } + /** * @Author sun * @Description 核酸检测-上报核酸记录 @@ -95,8 +112,9 @@ public class IcNatServiceImpl extends BaseServiceImpl imp @Override @Transactional(rollbackFor = Exception.class) public void add(AddIcNatFormDTO formDTO) { + disposeIsNull(formDTO); //0.先根据身份证号和检查时间以及检测结果校验数据是否存在 - IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), null, formDTO.getIdCard(), DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE), null); + IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), null, formDTO.getIdCard(), null != formDTO.getNatTime() ? DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE) : null, null, null != formDTO.getSampleTime() ? DateUtils.format(formDTO.getSampleTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE) : null); //按身份证号核酸时间存在记录的 核酸结果相同的提示已存在相同记录核酸结果不同的提示已存在去修改【业务要求的】 if (null != icNatDTO && icNatDTO.getNatResult().equals(formDTO.getNatResult())) { throw new RenException(EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getCode(), EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getMsg()); @@ -216,8 +234,9 @@ public class IcNatServiceImpl extends BaseServiceImpl imp @Override @Transactional(rollbackFor = Exception.class) public void edit(AddIcNatFormDTO formDTO) { + disposeIsNull(formDTO); //0.先根据身份证号和检测时间以及检测结果校验除当前数据是否还存在相同数据 - IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), formDTO.getIcNatId(), formDTO.getIdCard(), DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE), formDTO.getNatResult()); + IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), formDTO.getIcNatId(), formDTO.getIdCard(), null != formDTO.getNatTime() ? DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE) : null, formDTO.getNatResult(), null != formDTO.getSampleTime() ? DateUtils.format(formDTO.getSampleTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE) : null); if (null != icNatDTO) { throw new RenException(EpmetErrorCode.IC_NAT.getCode(), EpmetErrorCode.IC_NAT.getMsg()); } @@ -464,7 +483,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp errorRow.setName(e.getName()); errorRow.setMobile(e.getMobile()); errorRow.setIdCard(e.getIdCard()); - errorRow.setErrorInfo("未知系统错误"); + errorRow.setErrorInfo(exception.getMessage()); listener.getErrorRows().add(errorRow); } }); diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql index 4c58646746..136596160f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.76__alter_ic_nat.sql @@ -1,3 +1,7 @@ alter table ic_nat add COLUMN `SAMPLE_TIME` datetime COMMENT '采样时间'after ID_CARD; -ALTER TABLE ic_nat MODIFY COLUMN NAT_TIME datetime COMMENT '检测时间，精确到分钟'; \ No newline at end of file +ALTER TABLE ic_nat MODIFY COLUMN NAT_TIME datetime COMMENT '检测时间，精确到分钟'; + +UPDATE ic_nat +SET SAMPLE_TIME = NAT_TIME, + UPDATED_TIME = NOW(); \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx index d9038bfdc4faa94007e45287efb4b4b9e34a099b..31cc19219bf74629dbeba6c13449990ad7f8208e 100644 GIT binary patch delta 5155 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 X(0_F~U?AWaw1{IC60Bv$e~|wH2aby? delta 5168 zcmZ8l2T&7AyG>|;Kg%A{KGo6VL(x0AfJY z{S_5lyiMIT<_eD!scIA{N*n%%%c$bhQIjs#!q3F+3>2BN0enU7hR*swUQ(|j>z(BH z+3niWL>7bHPxFXGNw*6}2;;c$B8KODO>#)j{1tPB2ypdHZlD59Aj9%fMN7M*$Yfks zkN_(&co!Ua5H=*{e+7HEogePU*;@7S_mi5Z?iaS+BaBK&fxLUgD0k7EcQW938Mc;- z!GfzZ!*(wE@?5wbQY+MscehuZqFIY{ znQ4SgnDhBQ4sRXrX7!u*1=kioROm?jNLgNs>&^ali|7C)iKlVjkqr zjf>@z;@GP_<`GO*iz)KwN(w~R)D0%dxSkp0(~m@a(~EBTj-}zmbwFUk2kafvX$yblLHlir|4K-xP=>l>O ze_uZ}m9o_`EZRpk$oQruZn6-j_O_&HWO{7Id53=&ODqB1?XixetTe9 z-yn^9BZ&7bfPULAT1$A(@71;H@Ax}?3{}@UGp^;T^Bs^xF7I!addee^^H zS@m(5$FR=jo?pA%Ly`*K)Q8SfySKI!>%lDU=2y)2yuV305680Gmn$C6t5RGlD1@bOd3nazmq#~w ziaMw4@#m}Rq9XTxO_()PxQdV2Xd-nz-h7MU9gCs00+B0?o5R1v@hFn#+Huh+N<5h5 z7*+)5XO$`+NWUu9c=w2SOo$g=$C17d5<4cE@~h9!MKNU8=*j7-hAM@2kR4tJqdpIV^C z*-N$CH=lpgP6!*Yzwc8l=}o-h5RB6eva7jx>@G4UIQ8hEK(+WPE1AkKH9aUxr-Q7B z{3_u|u$RuaWzqH#IljP)J*XYSMfc!QPP;O)75U-@qED3>D1}&&^6T7kA?kQY#9R?= zEhhS9i~6KH03_<-Bvv2GA|zgRbl*8W^~4*3q~L!izqsqDczihlLJXP^hn`WfPQac$ zfgRvrBF_LXXAHY0p?@si%;=Cu6dB{Fkktcw z8&Z+W&w*AlpH!y`k-R2rMwg@tr|7f|y)@XW1uYwrSo2`P2j_##_StI`8Sky_4l`=r zJyV}zkpy1^mFCJt)=fPJ1;=;2@%-Ud`%;?hape874ahsKWaL4TR zb*cityC<1eXfp>HvbIi!nIQfpkEhE{mW;fYsfhEZ`r;{|nWsyo%cHh{b-k_B6ZyuQ zE#{l!`J6W`OTVQ~I6_x0>uc1+XwjEah)a0<&FMFi<_?FSZCxfCZB8;K0#9&vI*TgO z5IeD+I<0oib<;X-b+>YGfuJY*K8xN8j_r2221&sIJ_XwlB#e)R=a+aRwoxp^s(Jn| z;4RroUftADh!B7|BF*nFtoh;-qc|hv_0<;s#dz2t2i~QH`WWn#|MUzK8nAS}hDhp9 zPtv%ACttPBYjxJ`Zcpr*2)vcO7(Yin$EFHLvA};6+mt&wJ(Ra=#S5G(3BsDRSs3k7 zAELMgX&ShZ)S0D#@v&s%k*GQddj6qBhcOo;^;7E&c=*5xVuV*nozmc|_b)^2% zzq|7qf` zR%miz?FUWCR7tqUX?Dmp!Qhbf1r4*nIypN6et|?RiSd^?caL=o zuAhjzIgaz6cBU^&y3%L`KgAUWMtDG9tdx2?`EA7kBrkF32@sA5SR%eMc4=MNW9athi z;+sJa9vDlEiyv4b4623f3&7~lw+S*ocICoZB}@pQpF)Ps1UsU_Qw8~UjJx6j7|OYM zVKR#_VEZ|dE3WR;^uM1*w&XDKKLi!9MVX7c5FM zTUh)1o!9I0O3j}+<`Z|!%Bvsb5$+(-!+wLDNGD>GyiYJ$SFtzG)$j?sNQ7`v&-w&Q zePRm0hKLZMd)elYB71gJEQwI5{348PTnE+FK|mGjzNQX})A0B()vWp|jw7JQ%V`2i z#p*xu0w9a0dh)tI3E!I}w(%+%a&M>mr&ig<9^?WC@Xuva_L_CNZGv#H)giY+rsMZh zS!I{zyXutp%-z^nj}yXV|Js*tGc>wy%(FQ!B%h#_QyB%;s9!j2?Qj7d3xb#scB*W$e`34#bu9N!*+oh)}~qU#A0@U&coDAUAj5K^iz)Q9yT~hf-If zUJj&AG9?Fjs-frgypUU^B|OEOr)JJOZM-3`K7I~|;M_*(b*VZNAh`i8fIc4esM=(2 z@(_y*bK?P&v2IEvr)92baf$XJ4 z1nj2W*Hl9TD4P{+GVCykh~U#*P9rxmS+FIl%NGQIz6fUx=&a6F;3dzT@;Kr#canw6 z-q|tFCZn|J=iwknl9eh(G{GMTaF!1U)uYsoCA|lY)^_G_VN{8YHiJ#vBsr}HSv7+_ zu)b7>9@}NGbY_kEoHhwbbQS+3PrO8|U-b}ODKQ6qNxCXflbWY8$HC1x`Xiya7OUOiB{YOGtX?cPJaI9+|RYDYj26Q3>z=T||e zh9wA{Fjg%k@IMOwP9F;&_#B9eD&^{?r4G|N5ZG?qKi`{8BpHrCr)V>Z58s=}ARORc zB9|Y5=4?L|q>CDK;MsZWytXW{B_FQ-5%#X4y$Pa=Nh8 zBacHGWrM54kCujd2czkT)Z-iz4dH!8H!l<$j~0!^=ec602W(BV;oE0}rUxxUcczui zoaN82aBD_$8IC$#mRY2-2G3!+QsmSd#G5wZ7_QCUFkBCzLS#%H0eki zU;IW%S>eXZdxMJmx}Oh8g9pc@yp`{zRv|!g%s)!7hbuFPlWwE7gd9-9Od9diR+HHH zVoCj*!efcNsv))_b%(K*M2L0gcvXu3oBhSmn`5Q5A?zDva8DLM0qpMAEYhBy9p-cL z>$vCZzTvIU{!S;h|Ji*Fka$6g>Odm3kQ007B(|%)ikFll!j${l+j#?yTlm#11ss`> zE^%d&EG~_G4Fziv2`-vwZ@1roCFxQJw@7}z2M;>VkQ`dvmsvl4XzpLo_X*an%EVb( zffAm?SECSR3NSUtlhbCb&W&LFU@($i%5UCh4srcxK&E(y(2$eXi$&JGphI!e9LOZ6 z6Rlx2;Mw4=O6B&-#np;oyh8L)#{~Iygs!ZmuOwG!kI2C`0!X^u_=(~zsVC|7;IMQi zRLzB>W(my@^w?_rL?td^%p*Ri)9?UZKxuOu-Zl+XS}|%}UpT@0q4{U0UDsCHVQW#2 zY=O0lMeSF+^x?eL^85GYuA#wSr6*mB%70|S<=1P2UbqF9yGzyA)$a!N^E*l{qNAb8 zF9LoW*Z&MVso1XzeYWWr`CGcBd(E%eb2j64xjCqc{pOg>*V}J8@wa%gBb*>sFyfpT69uMC9NKRfTwT z1C%0^RCIc!6Ajc5wDYxU3?^3*U^B9O-w||dQ^^nBlr{szXbU>&<;pO&c|##;aGkmQ zsN)gN%b+zeU8M|~Yrlf3(EhDw_-PnAZrQFbhz3-fJ`sL#E(QuHL9wF z1nMU*`x)sX6en8Rr^^VEF6(W8xX?Pz7O}-yE_KVRU5b9bheyk&$n)t(8UA2yHe6J{ zWoYomI<9%eF|pEC^O>s(g6UV3Cv}MUTEJBG-3lU@?)h#S+2od0w$Rkr0)3q&msZZY zGw-Q%9N&J=x`V>q>b$`FPUdrDhsU=5wY`;2g&Zomx1(zsY!gYZea)t54WGFNi&v8O zVa1S-Q{RNPSsZY`rCIMb@a01ae_D7NivQnKt~D*b!8kGtAe%i`9Um*ih*Xhg66~;3 z2gIj}@CdNove!>AYTrM>u5O&Zo49b6yzHWUi{&xklM}7!(uJS$gtREz&Ev(!SoPOp zExKg1EFPsXl;P0bAACSs1k$O)g==Y+^qP^czQ!Cmmzp-)2f`RnERTVWaS#V_`MZZ# z@)FjTj7+J^NM+WFinkrwe2*igEM1KK6#wWAFzY+`%YcV!AMOCns@$1o2` z;3N_+E4qE200nDq+RQSW0`jY0) z`gZ^UoPXv`j3ZP9LQn9I05jGH;?V*yP-14x02GXe&xV AND b.nat_time #{endTime} + + AND b.sample_time = ]]> #{sampleStartTime} + + + AND b.sample_time #{sampleEndTime} + AND b.is_resi_user = #{isResiUser} @@ -83,6 +90,7 @@ mobile mobile, id_card idCard, nat_time natTime, + sample_time sampleTime, nat_result natResult, nat_address natAddress FROM @@ -105,6 +113,12 @@ AND nat_time #{endTime} + + AND sample_time = ]]> #{sampleStartTime} + + + AND sample_time #{sampleEndTime} + ORDER BY nat_time DESC, id ASC @@ -117,6 +131,7 @@ mobile, id_card, nat_time, + sample_time, nat_result, nat_address FROM @@ -125,7 +140,12 @@ del_flag = '0' AND customer_id = #{customerId} AND id_card = #{idCard} - AND DATE_FORMAT(nat_time, '%Y-%m-%d %h:%i') = DATE_FORMAT(#{natTime}, '%Y-%m-%d %h:%i') + + AND DATE_FORMAT(nat_time, '%Y-%m-%d %h:%i') = DATE_FORMAT(#{natTime}, '%Y-%m-%d %h:%i') + + + AND DATE_FORMAT(sample_time, '%Y-%m-%d %h:%i') = DATE_FORMAT(#{sampleTime}, '%Y-%m-%d %h:%i') + AND nat_result = #{natResult} From 211bd576fe09570807491c65b176cb0d2771ad6b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 14 Oct 2022 17:09:11 +0800 Subject: [PATCH 172/621] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8C=BA?= =?UTF-8?q?=E7=BA=A7areaCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AreaCodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index b0f519a3ac..418b3dc251 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -833,7 +833,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl Date: Fri, 14 Oct 2022 17:35:15 +0800 Subject: [PATCH 173/621] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/DataSyncTaskParam.java | 12 +++ .../impl/DataSyncConfigServiceImpl.java | 102 ++++++++++-------- .../resources/mapper/DataSyncConfigDao.xml | 23 ++-- 3 files changed, 84 insertions(+), 53 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java index 563bfc1500..00134f6c45 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.dto.DataSyncScopeDTO; import lombok.Data; @@ -35,4 +36,15 @@ public class DataSyncTaskParam implements Serializable { * 类别字段 */ public String categoryColumn; + + /** + * 是否同步 1：是；0：否； + */ + private String isSync = NumConstant.ZERO_STR; + + /** + * 核酸检测信息列表 点击同步时使用此字段 不使用数据配置的范围 + */ + private String agencyId = null; + private String dataCode; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 991884787a..fc872eb582 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -8,11 +8,13 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; +import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.exception.EpmetException; 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.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; @@ -178,58 +180,66 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList = null; - //设置查询数据范围 - formDTO.setOrgList(config.getScopeList()); - DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); - - do { - switch (anEnum) { - case HE_SUAN: - //查询正常状态的居民 - dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); - if (CollectionUtils.isEmpty(dbResiList)) { - break; - } - hsjc(dbResiList, config.getCustomerId()); - break; - case CAN_JI: - //查询正常状态的居民 并回显 残疾状态 - formDTO.setCategoryColumn("IS_CJ"); - dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); - canJi(dbResiList); - break; - case SI_WANG: - //查询正常状态的居民 - dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); - siWang(dbResiList); - break; - default: - log.warn("没有要处理的数据"); + if (StringUtils.isNotBlank(formDTO.getDataCode())){ + allConfigList.forEach(c -> { + if (c.getDataCode().equals(formDTO.getDataCode())){ + disAllData(c,formDTO); + return; } - pageNo++; - } while (false);//todo fangkaita(dbResiList != null && dbResiList.size() == pageSize); + }); + }else { + for (DataSyncConfigDTO config : allConfigList) { + //没有配置 数据拉取范围 继续下次循环 + if (CollectionUtils.isEmpty(config.getScopeList())) { + continue; + } + disAllData(config,formDTO); + } } + } + private void disAllData(DataSyncConfigDTO config,DataSyncTaskParam formDTO){ + //没传具体参数 则 按照 + int pageNo = NumConstant.ONE; + int pageSize = 1;//todo fangkaita NumConstant.ONE_THOUSAND; + //ToDo 去掉 + formDTO.setIdCards(Collections.singletonList("370283199912010302")); + List dbResiList = null; + //设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + + do { + switch (anEnum) { + case HE_SUAN: + //查询正常状态的居民 + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + if (CollectionUtils.isEmpty(dbResiList)) { + break; + } + hsjc(dbResiList, config.getCustomerId()); + break; + case CAN_JI: + //查询正常状态的居民 并回显 残疾状态 + formDTO.setCategoryColumn("IS_CJ"); + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + canJi(dbResiList); + break; + case SI_WANG: + //查询正常状态的居民 + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + siWang(dbResiList); + break; + default: + log.warn("没有要处理的数据"); + } + pageNo++; + } while (false);//todo fangkaita(dbResiList != null && dbResiList.size() == pageSize); } private void siWang(List dbResiList) { @@ -446,8 +456,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl entities = new ArrayList<>(); idCards.forEach(idCard -> { + YtHscyResDTO sampleResult = YtHsResUtils.hscy(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); - if (CollectionUtils.isNotEmpty(natInfoResult.getData())) { + if ((CollectionUtils.isEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData())) || (CollectionUtils.isNotEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData()))) { natInfoResult.getData().forEach(natInfo -> { IcNatEntity e = new IcNatEntity(); e.setCustomerId(customerId); @@ -458,6 +469,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl - AND ( - - - GRID_ID = #{l.orgId} - PIDS LIKE CONCAT(#{l.orgIdPath},'%') - - - ) + + + AND ( + + + GRID_ID = #{l.orgId} + PIDS LIKE CONCAT(#{l.orgIdPath},'%') + + + ) + + + AND PIDS LIKE CONCAT(#{agencyId},'%') + + ORDER BY CREATED_TIME From ca56697eeb54d0b39d80709138c7ff37d9df5fe7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 14 Oct 2022 17:48:46 +0800 Subject: [PATCH 174/621] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/result/YtHscyResDTO.java | 2 +- .../impl/DataSyncConfigServiceImpl.java | 34 ++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java index dd74313196..5e404f75d9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java @@ -23,7 +23,7 @@ public class YtHscyResDTO { private int total; @Data - class YtHscyResDetail { + public static class YtHscyResDetail { private String id; private String name; private String card_type; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index fc872eb582..469465901e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -458,7 +458,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl { YtHscyResDTO sampleResult = YtHsResUtils.hscy(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); - if ((CollectionUtils.isEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData())) || (CollectionUtils.isNotEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData()))) { + Boolean aBoolean = CollectionUtils.isEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData()); + Boolean bBoolean = CollectionUtils.isNotEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData()); + /** + * 1.采样结果 和 检测结果 都不为空，以检测结果为准 + * 2.采样结果为空，检测结果不为空 + */ + if (aBoolean || bBoolean) { natInfoResult.getData().forEach(natInfo -> { IcNatEntity e = new IcNatEntity(); e.setCustomerId(customerId); @@ -484,6 +490,32 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl { + IcNatEntity e = new IcNatEntity(); + e.setCustomerId(customerId); + e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + e.setUserId(idCard.getUserId()); + e.setUserType("sync"); + e.setName(StringUtils.isNotBlank(sampleInfo.getName()) ? sampleInfo.getName() : ""); + e.setMobile(StringUtils.isNotBlank(sampleInfo.getTelephone()) ? sampleInfo.getTelephone() : ""); + e.setIdCard(StringUtils.isNotBlank(sampleInfo.getCard_no()) ? sampleInfo.getCard_no() : ""); + e.setNatTime(DateUtils.parseDate(sampleInfo.getTest_time(), DateUtils.DATE_TIME_PATTERN)); + e.setSampleTime(DateUtils.parseDate(sampleInfo.getSample_time(), DateUtils.DATE_TIME_PATTERN)); + String resultPcr = sampleInfo.getSample_result_pcr(); + //检测结果 转换 我们 0:阴性 1:阳性, 他们 ：1:阳性,2:阴性 + e.setNatResult(NumConstant.ZERO_STR); + if (NumConstant.ONE_STR.equals(resultPcr)){ + e.setNatResult(NumConstant.ONE_STR); + } + e.setNatAddress(sampleInfo.getSampling_org_pcr()); + e.setAgencyId(idCard.getAgencyId()); + e.setPids(idCard.getPids()); + e.setAttachmentType(""); + e.setAttachmentUrl(""); + entities.add(e); + });*/ + } }); if (CollectionUtils.isNotEmpty(entities)) { List existNatInfos = icNatDao.getExistNatInfo(entities); From f72c8c075e91187da9c61e9f7e2fc437f74cf45d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 16 Oct 2022 20:38:07 +0800 Subject: [PATCH 175/621] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=A4=B1=E8=B4=A5=E4=B8=8D=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index de8806a781..31aa88b033 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -175,7 +175,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { try { entity.setHouseQrcodeUrl(createHouseQrcodeUrl(icHouseDTO.getId(),null)); } catch (Exception e) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"二维码生成失败","二维码生成失败"); + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("二维码生成失败:"+errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"二维码生成失败:","二维码生成失败"); } icHouseDao.updateById(entity); } From a4f94291750124c65d4ea7c4b8b6d32a31a2c50f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 09:47:17 +0800 Subject: [PATCH 176/621] =?UTF-8?q?test=20=E8=8F=9C=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/GovMenuServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index a3b63e096b..b9ee352c28 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -234,7 +234,9 @@ public class GovMenuServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 09:56:14 +0800 Subject: [PATCH 177/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataSyncConfigServiceImpl.java | 79 ++++++++++--------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 469465901e..d165bfaa51 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -222,7 +222,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl idCards, String customerId) { + public void hsjc(List idCards, String customerId, String isSync) { try { List entities = new ArrayList<>(); idCards.forEach(idCard -> { - YtHscyResDTO sampleResult = YtHsResUtils.hscy(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); +// YtHscyResDTO sampleResult = YtHsResUtils.hscy(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); - Boolean aBoolean = CollectionUtils.isEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData()); - Boolean bBoolean = CollectionUtils.isNotEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData()); + /*Boolean aBoolean = CollectionUtils.isEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData()); + Boolean bBoolean = CollectionUtils.isNotEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData());*/ /** * 1.采样结果 和 检测结果 都不为空，以检测结果为准 * 2.采样结果为空，检测结果不为空 */ - if (aBoolean || bBoolean) { +// if (aBoolean || bBoolean) { + if (CollectionUtils.isNotEmpty(natInfoResult.getData())) { natInfoResult.getData().forEach(natInfo -> { IcNatEntity e = new IcNatEntity(); e.setCustomerId(customerId); e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); e.setUserId(idCard.getUserId()); - e.setUserType("sync"); + e.setUserType(isSync.equals(NumConstant.ONE_STR) ? "manualSync" : "sync"); e.setName(StringUtils.isNotBlank(natInfo.getName()) ? natInfo.getName() : ""); e.setMobile(StringUtils.isNotBlank(natInfo.getTelephone()) ? natInfo.getTelephone() : ""); e.setIdCard(StringUtils.isNotBlank(natInfo.getCard_no()) ? natInfo.getCard_no() : ""); @@ -479,7 +481,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl { + /*if (CollectionUtils.isNotEmpty(sampleResult.getData()) && CollectionUtils.isEmpty(natInfoResult.getData())){ + sampleResult.getData().forEach(sampleInfo -> { IcNatEntity e = new IcNatEntity(); e.setCustomerId(customerId); e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); e.setUserId(idCard.getUserId()); - e.setUserType("sync"); + e.setUserType(isSync.equals(NumConstant.ONE_STR) ? "manualSync" : "sync"); e.setName(StringUtils.isNotBlank(sampleInfo.getName()) ? sampleInfo.getName() : ""); - e.setMobile(StringUtils.isNotBlank(sampleInfo.getTelephone()) ? sampleInfo.getTelephone() : ""); + e.setMobile(StringUtils.isNotBlank(sampleInfo.get()) ? sampleInfo.getTelephone() : ""); e.setIdCard(StringUtils.isNotBlank(sampleInfo.getCard_no()) ? sampleInfo.getCard_no() : ""); e.setNatTime(DateUtils.parseDate(sampleInfo.getTest_time(), DateUtils.DATE_TIME_PATTERN)); e.setSampleTime(DateUtils.parseDate(sampleInfo.getSample_time(), DateUtils.DATE_TIME_PATTERN)); @@ -514,37 +516,38 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl existNatInfos = icNatDao.getExistNatInfo(entities); - entities.forEach(e -> existNatInfos.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); - Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); - if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { - for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), NumConstant.FIVE_HUNDRED)) { - icNatService.insertBatch(icNatEntities); - //组织关系表 - List relationEntities = new ArrayList<>(); - icNatEntities.forEach(ne -> { - // 不是居民的先不加关系表吧 - if (ne.getIsResiUser().equals(NumConstant.ONE_STR)) { - IcNatRelationEntity e = new IcNatRelationEntity(); - e.setCustomerId(customerId); - e.setAgencyId(ne.getAgencyId()); - e.setPids(ne.getPids()); - e.setIcNatId(ne.getId()); - e.setUserType("sync"); - relationEntities.add(e); + });*/ + if (CollectionUtils.isNotEmpty(entities)) { + List existNatInfos = icNatDao.getExistNatInfo(entities); + entities.forEach(e -> existNatInfos.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); + Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); + if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { + for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), NumConstant.FIVE_HUNDRED)) { + icNatService.insertBatch(icNatEntities); + //组织关系表 + List relationEntities = new ArrayList<>(); + icNatEntities.forEach(ne -> { + // 不是居民的先不加关系表吧 + if (ne.getIsResiUser().equals(NumConstant.ONE_STR)) { + IcNatRelationEntity e = new IcNatRelationEntity(); + e.setCustomerId(customerId); + e.setAgencyId(ne.getAgencyId()); + e.setPids(ne.getPids()); + e.setIcNatId(ne.getId()); + e.setUserType("sync"); + relationEntities.add(e); + } + }); + if (CollectionUtils.isNotEmpty(relationEntities)) { + icNatRelationService.insertBatch(relationEntities); } - }); - if (CollectionUtils.isNotEmpty(relationEntities)) { - icNatRelationService.insertBatch(relationEntities); } } - } - } + } + }); } catch (Exception e) { log.error("hsjc exception", e); } From d14dda0e4f5cf658dd3ad9622b6f4e78bd3e3729 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 10:05:07 +0800 Subject: [PATCH 178/621] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/GovMenuServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index b9ee352c28..a413c9dfdc 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -234,8 +234,6 @@ public class GovMenuServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 10:08:23 +0800 Subject: [PATCH 179/621] emm --- .../com/epmet/dto/form/dataSync/ResiInfoDTO.java | 1 + .../impl/DataSyncRecordDisabilityServiceImpl.java | 14 ++++++++++++++ .../com/epmet/service/impl/IcNatServiceImpl.java | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java index f9a8295e53..1f148219b5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java @@ -46,6 +46,7 @@ public class ResiInfoDTO implements Serializable { * 残疾类别 */ private String cjlb; + private String cjlbCn; /** * 民族 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index 400e00f000..3b564f19e7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -102,6 +102,7 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl> cjlbOptionsMap = operCustomizeOpenFeignClient.getOptionsMap(formDTO); + if (!cjlbOptionsMap.success()){ + throw new EpmetException("operCustomizeOpenFeignClient.getOptionsMap执行失败"); + } + Map data = cjlbOptionsMap.getData(); + return data.get(cjlb); + } + @Override @Transactional(rollbackFor = Exception.class) public void save(DataSyncRecordDisabilityDTO dto) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 08c6fa1079..3a9282b9bb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -94,7 +94,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp * 1.采样时间为空，检测时间和结果有一个为空就报错 * 2.采样时间不为空，检测时间和结果可以为空【如果不为空 检测时间和结果都不为空】 */ - if ((null == formDTO.getSampleTime() && null == formDTO.getNatTime() || org.apache.commons.lang3.StringUtils.isBlank(formDTO.getNatResult()))){ + if ((null == formDTO.getSampleTime() && (null == formDTO.getNatTime() || org.apache.commons.lang3.StringUtils.isBlank(formDTO.getNatResult())))){ throw new EpmetException(EpmetErrorCode.SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR.getCode()); } if(null != formDTO.getSampleTime() && org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getNatResult()) && null == formDTO.getNatTime()){ From 962aca62ea0a65c3ae15205b2b6a24ddf5b20163 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 17 Oct 2022 10:31:43 +0800 Subject: [PATCH 180/621] emm --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index d165bfaa51..2517791025 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -218,11 +218,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 10:38:24 +0800 Subject: [PATCH 181/621] =?UTF-8?q?gov/access/menu/nav=20=E4=B8=8D?= =?UTF-8?q?=E9=99=90=E5=88=B6type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/GovMenuServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index a3b63e096b..62f344b3a2 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -234,7 +234,9 @@ public class GovMenuServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 11:05:15 +0800 Subject: [PATCH 182/621] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E6=88=BF=E4=B8=BB=E5=A7=93=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E7=94=B5=E8=AF=9D=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.24__alter_log_operation.sql | 2 ++ .../tools/redis/common/bean/HouseInfoCache.java | 15 +++++++++++++++ .../java/com/epmet/dto/result/HouseInfoDTO.java | 16 ++++++++++++++++ .../src/main/resources/mapper/IcHouseDao.xml | 5 ++++- 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql new file mode 100644 index 0000000000..cba42020bb --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql @@ -0,0 +1,2 @@ + +ALTER TABLE log_operation MODIFY COLUMN CATEGORY varchar(64) not null COMMENT '操作类型大类。例如login和logout都属于login大类。项目立项，项目流转，项目结案都属于项目大类；data_tm:数据脱敏；'; diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java index 1fe656fef6..d3df049dab 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java @@ -107,4 +107,19 @@ public class HouseInfoCache implements Serializable { * 二维码地址 */ private String houseQrcodeUrl; + + /** + * 房主姓名 + */ + private String ownerName; + + /** + * 房主电话 + */ + private String ownerPhone; + + /** + * 房主身份证 + */ + private String ownerIdCard; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java index fffaae071c..f6be2d8f83 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java @@ -108,4 +108,20 @@ public class HouseInfoDTO implements Serializable { * 二维码地址 */ private String houseQrcodeUrl; + + + /** + * 房主姓名 + */ + private String ownerName; + + /** + * 房主电话 + */ + private String ownerPhone; + + /** + * 房主身份证 + */ + private String ownerIdCard; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index ed9bc5acd9..6e417b0aed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -276,7 +276,10 @@ gr.GRID_NAME, ih.HOUSE_CODE, ih.CODING, - ih.HOUSE_QRCODE_URL + ih.HOUSE_QRCODE_URL, + ih.owner_name, + ih.owner_phone, + ih.owner_id_card FROM ic_house ih left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id AND n.DEL_FLAG = '0') left JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id AND ib.DEL_FLAG = '0') From a38e542e46ede7180e52a91002474e7c4eb57e6b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:31:20 +0800 Subject: [PATCH 183/621] =?UTF-8?q?navDigitalCommunity=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GovMenuServiceImpl.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index 62f344b3a2..3f7dfdcbc4 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -242,7 +242,14 @@ public class GovMenuServiceImpl extends BaseServiceImpl navDigitalCommunity(TokenDto tokenDto, String tableName) { tableName = getTableName(tableName); - List menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName); + List menuList=new ArrayList<>(); + if("gov_menu".equals(tableName)){ + // 管理平台菜单返回所有的 + menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(),null, HttpContextUtils.getLanguage(),tableName); + }else{ + //数据分析还是沿用原来的 + menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName); + } Result isRootManager = epmetUserOpenFeignClient.getIsRootManager(tokenDto.getUserId()); if (!isRootManager.success()){ throw new EpmetException("getIsRootManager method is failure"); @@ -251,6 +258,11 @@ public class GovMenuServiceImpl extends BaseServiceImpl govMenuDTOS = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); return TreeUtils.buildTree(govMenuDTOS); } + /*for(GovMenuEntity m:menuList){ + if("ic_resi_add".equals(m.getPermissions())){ + logger.info("1、菜单返回了新增居民"); + } + }*/ disposeGovMenu(menuList,tokenDto.getUserId()); Map> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus)); List dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class); @@ -286,11 +298,17 @@ public class GovMenuServiceImpl extends BaseServiceImpl(); return; } + // logger.info("==roleIdList="+ JSON.toJSONString(roleIdList)); List menuIdsList = govRoleMenuDao.getMenuIdsList(roleIdList); if (CollectionUtils.isEmpty(menuIdsList)){ menuList = new ArrayList<>(); return; } + /*for(String mid:menuIdsList){ + if("1581827798717898754".equals(mid)){ + logger.info("2、角色也有此菜单"); + } + }*/ for (String id : menuIdsList) { for (GovMenuEntity m : menuList) { if (m.getId().equals(id)){ From ae27530890ac11c80689643e3b9b1ab30a2481de Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:47:32 +0800 Subject: [PATCH 184/621] =?UTF-8?q?/epmetuser/icresiuser/searchbycategory?= =?UTF-8?q?=E4=B8=8E=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E5=AF=86=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcResiUserController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index c70bf78c83..caf4682cea 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -421,6 +421,7 @@ public class IcResiUserController implements ResultDataResolver { * @author yinzuomei * @date 2021/10/28 10:29 上午 */ + @MaskResponse(fieldNames = {"NAME", "MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result queryIcResiDetail(@LoginUser TokenDto tokenDto, @RequestBody IcResiDetailFormDTO pageFormDTO) { //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); @@ -783,6 +784,7 @@ public class IcResiUserController implements ResultDataResolver { * @param tokenDto * @return 根据分类搜索 */ + @MaskResponse(fieldNames = {"name", "mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("searchbycategory") public Result> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) { formDTO.setCustomerId(tokenDto.getCustomerId()); From 47deba8e8e79fe8d7094b13b8b3400f873fe8186 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:55:08 +0800 Subject: [PATCH 185/621] =?UTF-8?q?/epmetuser/icresiuser/persondata?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=A7=93=E5=90=8D=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/IcResiUserController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index caf4682cea..2300695f0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -755,6 +755,7 @@ public class IcResiUserController implements ResultDataResolver { * @author zxc * @date 2021/11/3 9:21 上午 */ + @MaskResponse(fieldNames = {"name", "mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) @PostMapping("persondata") public Result personData(@LoginUser TokenDto tokenDto, @RequestBody PersonDataFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From b053903342486b986731768270b91a83720a37ba Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:57:21 +0800 Subject: [PATCH 186/621] =?UTF-8?q?/resi/partymember/icPartyMember/partyme?= =?UTF-8?q?mberagelist=E5=A7=93=E5=90=8D=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/controller/IcPartyMemberController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index fbddc60fb1..228cdedd84 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -30,7 +30,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; -import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; @@ -253,7 +252,7 @@ public class IcPartyMemberController implements ResultDataResolver { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymemberagelist") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ IcPartyOrgEntity org = setOrgId(tokenDto); From b44ad2c870fa7a1b15649317e2a61f76aff33011 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 12:58:18 +0800 Subject: [PATCH 187/621] =?UTF-8?q?/resi/partymember/icPartyMember/partyme?= =?UTF-8?q?mbereducationlist=E5=A7=93=E5=90=8D=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/controller/IcPartyMemberController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 228cdedd84..702a6fe72e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -272,7 +272,7 @@ public class IcPartyMemberController implements ResultDataResolver { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymembereducationlist") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ IcPartyOrgEntity org = setOrgId(tokenDto); From c1b6434e5dd10d4ed2eb74a9b229ae26bcd16269 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 13:11:47 +0800 Subject: [PATCH 188/621] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=A7=EF=BC=8C=E8=BF=94=E5=8F=82=E5=8A=A0?= =?UTF-8?q?=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcResiUserController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 2300695f0e..36959c6b80 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -898,7 +898,7 @@ public class IcResiUserController implements ResultDataResolver { * @Date 2021/12/10 17:54 */ @PostMapping("partymemberagelist") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@RequestBody PartyMemberListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(icResiUserService.getPartyMemberAgeList(formDTO)); @@ -977,7 +977,7 @@ public class IcResiUserController implements ResultDataResolver { * @Date 2021/12/10 17:58 */ @PostMapping("partymembereducationlist") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@RequestBody PartyMemberListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(icResiUserService.getPartyMemberEducationList(formDTO)); @@ -1045,6 +1045,7 @@ public class IcResiUserController implements ResultDataResolver { * @param resiUserId * @return */ + @MaskResponse(fieldNames = {"icUserName","mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("resi-brief/{resi-user-id}") public Result getResiBrief(@PathVariable("resi-user-id") String resiUserId, @LoginUser TokenDto loginUser) { String customerId = loginUser.getCustomerId(); From 145463571e9a974e597309d545d4b519aa83b1e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 13:31:50 +0800 Subject: [PATCH 189/621] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7+=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/controller/IcPartyMemberController.java | 4 ++-- .../java/com/epmet/controller/IcResiUserController.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 702a6fe72e..a27833eb76 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -252,7 +252,7 @@ public class IcPartyMemberController implements ResultDataResolver { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymemberagelist") - @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ IcPartyOrgEntity org = setOrgId(tokenDto); @@ -272,7 +272,7 @@ public class IcPartyMemberController implements ResultDataResolver { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("partymembereducationlist") - @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ IcPartyOrgEntity org = setOrgId(tokenDto); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 36959c6b80..70c7fd0640 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -421,7 +421,7 @@ public class IcResiUserController implements ResultDataResolver { * @author yinzuomei * @date 2021/10/28 10:29 上午 */ - @MaskResponse(fieldNames = {"NAME", "MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result queryIcResiDetail(@LoginUser TokenDto tokenDto, @RequestBody IcResiDetailFormDTO pageFormDTO) { //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); @@ -755,7 +755,7 @@ public class IcResiUserController implements ResultDataResolver { * @author zxc * @date 2021/11/3 9:21 上午 */ - @MaskResponse(fieldNames = {"name", "mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE}) + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) @PostMapping("persondata") public Result personData(@LoginUser TokenDto tokenDto, @RequestBody PersonDataFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -785,7 +785,7 @@ public class IcResiUserController implements ResultDataResolver { * @param tokenDto * @return 根据分类搜索 */ - @MaskResponse(fieldNames = {"name", "mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("searchbycategory") public Result> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -1045,7 +1045,7 @@ public class IcResiUserController implements ResultDataResolver { * @param resiUserId * @return */ - @MaskResponse(fieldNames = {"icUserName","mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("resi-brief/{resi-user-id}") public Result getResiBrief(@PathVariable("resi-user-id") String resiUserId, @LoginUser TokenDto loginUser) { String customerId = loginUser.getCustomerId(); From ac5da6a224eab7f6c51451008cf3fd37a8d97ad8 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 17 Oct 2022 14:00:10 +0800 Subject: [PATCH 190/621] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9AMaskProcesso?= =?UTF-8?q?r=E5=AF=B9=E8=BF=94=E5=8F=82=E4=B8=AD=E6=9C=89List=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E5=81=9A=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/processor/MaskProcessor.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index a3169a2ec6..a7b42dd438 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -83,6 +83,9 @@ public class MaskProcessor { String maskResult = maskString((String) value, fieldsMaskType.get(index)); entry.setValue(maskResult); } + } else if (value instanceof List) { + // 列表 + ((List)value).forEach(e -> mask(e)); } } } @@ -155,10 +158,12 @@ public class MaskProcessor { // 2个字以上的，首位字母明文，中间* // 中文不能用\\w，要用[\u4e00-\u9fa5] if (length == 2) { - return originString.replaceAll("^([\\u4e00-\\u9fa5]).*$", "$1*"); +// return originString.replaceAll("^([\\u4e00-\\u9fa5]).*$", "$1*"); + return originString.substring(0).concat("*"); } else { String maskStr = StrUtil.repeat("*", length - 2); - return originString.replaceAll("^([\\u4e00-\\u9fa5]).*([\\u4e00-\\u9fa5])$", "$1" + maskStr + "$2"); +// return originString.replaceAll("^([\\u4e00-\\u9fa5]).*([\\u4e00-\\u9fa5])$", "$1" + maskStr + "$2"); + return originString.charAt(0) + maskStr + originString.charAt(originString.length() - 1); } } From ba8128c3a203b02b21d523695ae4756c85fabc5a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 14:31:35 +0800 Subject: [PATCH 191/621] =?UTF-8?q?/epmetuser/icresiuser/icuserstatislist?= =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=A6=82=E8=A7=88-=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=8B=E6=9C=BA=E5=8F=B7=E3=80=81=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/GovMenuController.java | 1 + .../src/main/resources/mapper/GovMenuDao.xml | 13 ++++++++++--- .../com/epmet/controller/IcResiUserController.java | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java index cc94cd91f0..ef763f4a43 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -106,6 +106,7 @@ public class GovMenuController { /** * 导航 + * +数字社区-系统管理-角色管理配置角色权限，也会调用此接口 * @param tokenDto token * @return List */ diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml index 6bc815e44d..7a005b3c02 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml @@ -47,9 +47,16 @@ select t1.*, lang.field_value name from gov_menu t1 - INNER join gov_language lang on lang.table_name=#{tableName} and lang.field_name='name' and lang.table_id=t1.id and lang.language=#{language} - RIGHT JOIN gov_customer_menu m ON t1.id = m.TABLE_ID - where t1.del_flag = 0 AND m.del_flag = 0 + INNER join gov_language lang + on (lang.table_name=#{tableName} + and lang.field_name='name' + and lang.table_id=t1.id + and lang.language=#{language} + ) + RIGHT JOIN gov_customer_menu m + ON t1.id = m.TABLE_ID + where t1.del_flag = 0 + AND m.del_flag = 0 and t1.type = #{type} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 70c7fd0640..0b2e9ee3f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1420,6 +1420,7 @@ public class IcResiUserController implements ResultDataResolver { * @Author sun * @Description 【人房概览】居民统计数点击查询列表 **/ + @MaskResponse(fieldNames = {"mobile", "idCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("icuserstatislist") public Result> icUserStatisList(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From b7825ec18d219543aac73ef4e76caa17075c34d3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 14:35:49 +0800 Subject: [PATCH 192/621] =?UTF-8?q?/gov/project/icEvent/detail=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96-=E6=8C=87=E6=8C=A5=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85showIdCard?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcEventListResultDTO.java | 4 ++++ .../src/main/java/com/epmet/controller/IcEventController.java | 2 ++ .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 1 + 3 files changed, 7 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index beac1277a0..f120219c36 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -73,6 +73,10 @@ public class IcEventListResultDTO implements Serializable { * 身份证号 */ private String idCard; + /** + * 加密的 + */ + private String showIdCard; /** * 上报渠道[字典表] */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 5105ca27bf..3435cf59c6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; @@ -274,6 +275,7 @@ public class IcEventController { * @Author sun * @Description 事件管理-详情 **/ + @MaskResponse(fieldNames = {"showIdCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index dda3a90647..038b3fdf94 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1050,6 +1050,7 @@ public class IcEventServiceImpl extends BaseServiceImpl list = baseDao.icEventList(formDTO); if (!CollectionUtils.isEmpty(list)) { resultDTO = list.get(0); + resultDTO.setShowIdCard(resultDTO.getIdCard()); //查询网格名称(组织-网格) List gridIds = list.stream().map(IcEventListResultDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); Result> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds); From 86be8ca3b20955e4dcecff6336e29ac510e9573c Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 17 Oct 2022 14:48:26 +0800 Subject: [PATCH 193/621] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=AF=94-?= =?UTF-8?q?=E6=AE=8B=E7=96=BE=E5=92=8C=E6=AD=BB=E4=BA=A1=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.77__data_compare_d_c.sql | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c.sql new file mode 100644 index 0000000000..ed2d9a1de1 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c.sql @@ -0,0 +1,66 @@ +CREATE TABLE `data_sync_record_death` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) DEFAULT '' COMMENT '组织Id', + `PIDS` varchar(255) DEFAULT '' COMMENT '组织的pids 含agencyId本身', + `GRID_ID` varchar(64) DEFAULT '' COMMENT '网格ID', + `NAME` varchar(16) NOT NULL COMMENT '姓名', + `ID_CARD` varchar(24) NOT NULL COMMENT '身份证', + `IC_RESI_USER_ID` varchar(64) DEFAULT NULL COMMENT '居民Id，ic_resi_user.id', + `AGE` varchar(8) DEFAULT NULL COMMENT '年龄(享年)', + `ADDRESS` varchar(128) DEFAULT NULL COMMENT '家庭住址', + `DEATH_DATE` varchar(32) DEFAULT '' COMMENT '死亡时间', + `CREMATION_TIME` varchar(32) DEFAULT '' COMMENT '火化时间', + `MZ` varchar(32) DEFAULT '' COMMENT '民族', + `ORGAN_NAME` varchar(16) DEFAULT '' COMMENT '登记单位名称', + `NATION` varchar(32) DEFAULT '' COMMENT '国籍', + `THIRD_RECORD_ID` varchar(64) DEFAULT '' COMMENT '第三方记录唯一标识', + `DEAL_STATUS` smallint(1) NOT NULL DEFAULT '0' COMMENT '处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败', + `DEAL_RESULT` varchar(128) DEFAULT '' COMMENT '处理结果', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE, + KEY `idx_u_id` (`IC_RESI_USER_ID`) USING BTREE COMMENT '居民Id' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='数据同步记录-居民死亡信息'; + +CREATE TABLE `data_sync_record_disability` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) DEFAULT '' COMMENT '组织Id', + `PIDS` varchar(255) DEFAULT '' COMMENT '组织的pids 含agencyId本身', + `GRID_ID` varchar(64) DEFAULT '' COMMENT '网格ID', + `NAME` varchar(16) NOT NULL COMMENT '姓名', + `ID_CARD` varchar(24) NOT NULL COMMENT '身份证', + `MOBILE` varchar(24) DEFAULT NULL COMMENT '电话', + `IC_RESI_USER_ID` varchar(64) DEFAULT NULL COMMENT '居民Id，ic_resi_user.id', + `CARD_NUM` varchar(32) DEFAULT NULL COMMENT '残疾证号', + `CJZK_CN` varchar(32) DEFAULT NULL COMMENT '残疾等级(状况)', + `CJLB_CN` varchar(32) DEFAULT NULL COMMENT '残疾类别', + `EDU_LEVEL` varchar(32) DEFAULT '' COMMENT '文化程度', + `MARITAL_STATUS_NAME` varchar(32) DEFAULT '' COMMENT '婚姻状况', + `MZ_CN` varchar(32) DEFAULT '' COMMENT '民族中文', + `GENDER` char(2) DEFAULT NULL COMMENT '性别 1男2女', + `RESIDENT_ADD` varchar(128) DEFAULT NULL COMMENT '户籍地址', + `NOW_ADD` varchar(128) DEFAULT NULL COMMENT '现居住地址', + `GUARDIAN` varchar(32) DEFAULT '' COMMENT '监护人', + `GUARDIAN_PHONE` varchar(32) DEFAULT '' COMMENT '监护人联系方式', + `DEAL_STATUS` smallint(1) NOT NULL DEFAULT '0' COMMENT '处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败', + `DISABILITY_STATUS` smallint(1) NOT NULL DEFAULT '0' COMMENT '需要处理的残疾状态 0:非残疾；1:残疾', + `DEAL_RESULT` varchar(128) DEFAULT '' COMMENT '处理结果', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE, + KEY `idx_u_id` (`IC_RESI_USER_ID`) USING BTREE COMMENT '居民Id' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='数据同步记录-居民残疾信息'; + + +UPDATE `epmet_user`.`data_sync_config` SET `DATA_CODE` = 'siwang' ,`UPDATED_TIME` = now() WHERE `ID` = '7'; +UPDATE `epmet_user`.`data_sync_config` SET `DATA_CODE` = 'canji' ,`UPDATED_TIME` = now() WHERE `ID` = '9'; From 6631564950739955162c2054eb757b7ea4803420 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 17 Oct 2022 14:59:46 +0800 Subject: [PATCH 194/621] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=9A=90=E8=97=8F?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E9=9C=80=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcEventListResultDTO.java | 4 ---- .../src/main/java/com/epmet/controller/IcEventController.java | 1 - .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 1 - 3 files changed, 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index f120219c36..beac1277a0 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -73,10 +73,6 @@ public class IcEventListResultDTO implements Serializable { * 身份证号 */ private String idCard; - /** - * 加密的 - */ - private String showIdCard; /** * 上报渠道[字典表] */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 3435cf59c6..3eb4d8eefa 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -275,7 +275,6 @@ public class IcEventController { * @Author sun * @Description 事件管理-详情 **/ - @MaskResponse(fieldNames = {"showIdCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 038b3fdf94..dda3a90647 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1050,7 +1050,6 @@ public class IcEventServiceImpl extends BaseServiceImpl list = baseDao.icEventList(formDTO); if (!CollectionUtils.isEmpty(list)) { resultDTO = list.get(0); - resultDTO.setShowIdCard(resultDTO.getIdCard()); //查询网格名称(组织-网格) List gridIds = list.stream().map(IcEventListResultDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); Result> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds); From fcdd2efc601d2d3180b69f7bfe94922ad4061704 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 17 Oct 2022 15:00:56 +0800 Subject: [PATCH 195/621] =?UTF-8?q?=E6=98=8E=E6=96=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/RocketMQConsumerRegister.java | 2 + .../CheckAndExportOperationLogListener.java | 120 ++++++++++++++++++ .../constants/ConsomerGroupConstants.java | 5 + .../rocketmq/constants/TopicConstants.java | 5 + .../commons/rocketmq/messages/CheckMQMsg.java | 28 ++++ .../epmet/constant/NeighborhoodConstant.java | 2 + .../epmet/dto/form/DetailByTypeFormDTO.java | 25 ++++ .../dto/result/DetailByTypeResultDTO.java | 20 +++ .../epmet/controller/IcHouseController.java | 17 ++- .../com/epmet/service/IcHouseService.java | 15 ++- .../service/impl/IcHouseServiceImpl.java | 60 ++++++++- 11 files changed, 290 insertions(+), 9 deletions(-) create mode 100644 epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java create mode 100644 epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DetailByTypeResultDTO.java diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java index 93a2f8e5f0..7f15960037 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java @@ -5,6 +5,7 @@ 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.listener.AuthOperationLogListener; +import com.epmet.mq.listener.listener.CheckAndExportOperationLogListener; import com.epmet.mq.listener.listener.PointOperationLogListener; import com.epmet.mq.listener.listener.ProjectOperationLogListener; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; @@ -19,6 +20,7 @@ public class RocketMQConsumerRegister extends MQAbstractRegister { register(consumerProperties, ConsomerGroupConstants.AUTH_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.AUTH, "*", new AuthOperationLogListener()); register(consumerProperties, ConsomerGroupConstants.PROJECT_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT_CHANGED, "*", new ProjectOperationLogListener()); register(consumerProperties, ConsomerGroupConstants.POINT_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.POINT, "*", new PointOperationLogListener()); + register(consumerProperties, ConsomerGroupConstants.CHECK_OR_EXPORT_GROUP, MessageModel.CLUSTERING, TopicConstants.CHECK_OR_EXPORT, "*", new CheckAndExportOperationLogListener()); // ...其他监听器类似 } diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java new file mode 100644 index 0000000000..1d86c65b8d --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java @@ -0,0 +1,120 @@ +package com.epmet.mq.listener.listener; + +import com.alibaba.fastjson.JSON; +import com.epmet.auth.constants.AuthOperationEnum; +import com.epmet.commons.rocketmq.constants.MQUserPropertys; +import com.epmet.commons.rocketmq.messages.CheckMQMsg; +import com.epmet.commons.rocketmq.messages.LoginMQMsg; +import com.epmet.commons.tools.distributedlock.DistributedLock; +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.SpringContextUtils; +import com.epmet.entity.LogOperationEntity; +import com.epmet.mq.listener.bean.log.LogOperationHelper; +import com.epmet.mq.listener.bean.log.OperatorInfo; +import com.epmet.service.LogOperationService; +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.redisson.api.RLock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** + * @author zxc + * @Description 查询明文或者导出操作日志监听器 + */ +public class CheckAndExportOperationLogListener 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; + } + + 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); + CheckMQMsg msgObj = JSON.parseObject(msg, CheckMQMsg.class); + + //获取操作人信息 + OperatorInfo operatorInfo = LogOperationHelper.getInstance().getOperatorInfo(msgObj.getUserId()); + LogOperationEntity logEntity = new LogOperationEntity(); + logEntity.setCategory(messageExt.getTopic()); + logEntity.setType(tags); + logEntity.setTypeDisplay(AuthOperationEnum.getDisplay(tags)); + logEntity.setIp(msgObj.getIp()); + logEntity.setFromApp(msgObj.getFromApp()); + logEntity.setFromClient(msgObj.getFromClient()); + logEntity.setTargetId(""); + logEntity.setCustomerId(operatorInfo.getCustomerId()); + logEntity.setOperatorId(msgObj.getUserId()); + logEntity.setOperatorName(operatorInfo.getName()); + logEntity.setOperatorMobile(operatorInfo.getMobile()); + logEntity.setOperatingTime(msgObj.getOperateTime()); + logEntity.setContent(msgObj.getContent()); + + DistributedLock distributedLock = null; + RLock lock = null; + try { + distributedLock = SpringContextUtils.getBean(DistributedLock.class); + lock = distributedLock.getLock(String.format("lock:auth_operation_log:%s:%s", logEntity.getType(), logEntity.getOperatorId()), + 30L, 30L, TimeUnit.SECONDS); + SpringContextUtils.getBean(LogOperationService.class).log(logEntity); + } catch (RenException e) { + // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 + logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + } catch (Exception e) { + // 不是我们自己抛出的异常，可以让MQ重试 + logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + throw e; + } finally { + distributedLock.unLock(lock); + } + + if (StringUtils.isNotBlank(pendingMsgLabel)) { + try { + removePendingMqMsgCache(pendingMsgLabel); + } catch (Exception e) { + logger.error("【查询明文或者导出操作日志监听器】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + + /** + * @description + * + * @param pendingMsgLabel + * @return + * @author wxz + * @date 2021.10.14 16:32:32 + */ + private void removePendingMqMsgCache(String pendingMsgLabel) { + String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel); + redisUtils.delete(key); + //logger.info("【登录操作事件监听器】删除pendingMsgLabel成功:{}", pendingMsgLabel); + } +} 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 6bc618a01b..c4f43a03b2 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 @@ -108,4 +108,9 @@ public interface ConsomerGroupConstants { * 党建积分操作消费组 */ String PARTY_BUILDING_GROUP = "party_building_group"; + + /** + * 查看或者导出 日志记录 消费组 + */ + String CHECK_OR_EXPORT_GROUP = "check_or_export_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 23bfd628a4..2624971db2 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 @@ -91,4 +91,9 @@ public interface TopicConstants { String IC_MESSAGE = "ic_message"; String PARTY_BUILDING = "party_building"; + + /** + * 查看或者导出 日志记录 + */ + String CHECK_OR_EXPORT = "check_or_export"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java new file mode 100644 index 0000000000..0a9f02b692 --- /dev/null +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java @@ -0,0 +1,28 @@ +package com.epmet.commons.rocketmq.messages; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CheckMQMsg { + + /** + * 谁登录 + */ + private String userId; + + private String content; + + /** + * 操作时间 + */ + private Date operateTime; + + private String ip; + + private String fromApp; + + private String fromClient; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java index 49a21f262e..fe92bcd3c2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java @@ -12,4 +12,6 @@ public interface NeighborhoodConstant { String BUILDING = "building"; String HOUSE = "house"; + String IC_RESI_USER = "icResiUser"; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java new file mode 100644 index 0000000000..45fc98f517 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/17 13:42 + * @DESC + */ +@Data +public class DetailByTypeFormDTO implements Serializable { + + private static final long serialVersionUID = 8190270734257503603L; + + public interface DetailByTypeForm{} + + @NotBlank(message = "type不能为空",groups = DetailByTypeForm.class) + private String type; + + @NotBlank(message = "id不能为空",groups = DetailByTypeForm.class) + private String id; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DetailByTypeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DetailByTypeResultDTO.java new file mode 100644 index 0000000000..3992215890 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DetailByTypeResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/17 13:41 + * @DESC + */ +@Data +public class DetailByTypeResultDTO implements Serializable { + + private static final long serialVersionUID = -8067849365791132347L; + + private String idCard; + + private String mobile; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 6d828df25a..6e867c47de 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -26,12 +26,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; +import com.epmet.dto.form.DetailByTypeFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.VaccinePrarmeterListFormDTO; -import com.epmet.dto.result.HouseAgencyInfoResultDTO; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.HouseListResultDTO; -import com.epmet.dto.result.HousesNameResultDTO; +import com.epmet.dto.result.*; import com.epmet.service.IcHouseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -154,6 +152,17 @@ public class IcHouseController { ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); return icHouseService.checkHomeInfo(formDTO); + } + /** + * Desc: 数据明文查询 + * @param formDTO + * @author zxc + * @date 2022/10/17 13:45 + */ + @PostMapping("detailByType") + public Result detailByType(@RequestBody DetailByTypeFormDTO formDTO,@LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, DetailByTypeFormDTO.DetailByTypeForm.class); + return new Result().ok(icHouseService.detailByType(formDTO,tokenDto)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 77a5bdd4ad..0b2e40f86d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -7,11 +7,9 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; +import com.epmet.dto.form.DetailByTypeFormDTO; import com.epmet.dto.form.HouseFormDTO; -import com.epmet.dto.result.HouseAgencyInfoResultDTO; -import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.HouseListResultDTO; -import com.epmet.dto.result.HousesNameResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.IcHouseEntity; import java.util.List; @@ -139,4 +137,13 @@ public interface IcHouseService extends BaseService { * @return */ Result checkHomeInfo(CheckHouseInfoFormDTO formDTO); + + /** + * Desc: 数据明文查询 + * @param formDTO + * @author zxc + * @date 2022/10/17 13:45 + */ + DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 0f69fc8816..364b859376 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -3,6 +3,9 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.rocketmq.constants.TopicConstants; +import com.epmet.commons.rocketmq.messages.CheckMQMsg; +import com.epmet.commons.rocketmq.messages.LoginMQMsg; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; @@ -10,10 +13,14 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; +import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.NeighborhoodConstant; import com.epmet.dao.IcBuildingDao; import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dao.IcHouseDao; @@ -23,7 +30,9 @@ import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; +import com.epmet.dto.form.DetailByTypeFormDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.form.SystemMsgFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcBuildingEntity; import com.epmet.entity.IcBuildingUnitEntity; @@ -32,6 +41,7 @@ import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseRentFlagEnums; import com.epmet.enums.HouseTypeEnums; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.redis.IcHouseRedis; @@ -39,10 +49,14 @@ import com.epmet.service.IcHouseService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; 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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -69,7 +83,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl().ok(checkHomeInfoResultInfo); } + + /** + * Desc: 数据明文查询 + * @param formDTO + * @author zxc + * @date 2022/10/17 13:45 + */ + @Override + public DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto) { + DetailByTypeResultDTO result = new DetailByTypeResultDTO(); + String customerId = tokenDto.getCustomerId(); + String userId = tokenDto.getUserId(); + CheckMQMsg msg = new CheckMQMsg(); + if (formDTO.getType().equals(NeighborhoodConstant.HOUSE)){ + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId()); + if (null == houseInfo){ + throw new EpmetException("查询房屋信息失败："+formDTO.getId()); + } + result.setMobile(houseInfo.getOwnerPhone()); + result.setIdCard(houseInfo.getOwnerIdCard()); + msg.setContent("查看房屋信息明文"); + }else if (formDTO.getType().equals(NeighborhoodConstant.IC_RESI_USER)){ + ResiUserInfoCache userBaseInfo = CustomerResiUserRedis.getUserBaseInfo(formDTO.getId()); + if (null == userBaseInfo){ + throw new EpmetException("查询icResiUser失败："+formDTO.getId()); + } + result.setIdCard(userBaseInfo.getIdNum()); + result.setMobile(userBaseInfo.getMobile()); + msg.setContent("查看居民信息明文"); + } + // 发送mq消息 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + msg.setOperateTime(new Date()); + msg.setUserId(userId); + msg.setFromApp(tokenDto.getApp()); + msg.setIp(IpUtils.getIpAddr(request)); + msg.setFromClient(tokenDto.getClient()); + SystemMsgFormDTO form = new SystemMsgFormDTO(); + form.setMessageType(TopicConstants.CHECK_OR_EXPORT); + form.setContent(msg); + epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); + return result; + } } From 0caac7b142f70f2e523a4a56d526051eaa3bfce3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 17 Oct 2022 15:20:03 +0800 Subject: [PATCH 196/621] message --- .../src/main/java/com/epmet/constant/SystemMessageType.java | 6 ++++++ .../com/epmet/service/impl/SystemMessageServiceImpl.java | 3 +++ 2 files changed, 9 insertions(+) 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 9920eb019a..e0d8c80b35 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 @@ -175,6 +175,12 @@ public interface SystemMessageType { */ String PARTY_MEETING_MESSAGE = "party_meeting_message"; + + /** + * 查看或者导出 日志记录 + */ + String CHECK_OR_EXPORT = "check_or_export"; + String ZBWYH = "参加支部委员会"; String ZBDYDH = "参加支部党员大会"; String DXZH = "参加党小组会"; 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 3eea1f03d8..ad742b155b 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 @@ -248,6 +248,9 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.WMFWHD: topic=TopicConstants.PARTY_BUILDING; break; + case SystemMessageType.CHECK_OR_EXPORT: + topic = TopicConstants.CHECK_OR_EXPORT; + break; default: logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType); } From 78e81a9f56a2e2f7962be11343c533eaaf3f2201 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 17 Oct 2022 15:36:43 +0800 Subject: [PATCH 197/621] message --- .../listener/CheckAndExportOperationLogListener.java | 6 +++--- .../com/epmet/commons/rocketmq/messages/CheckMQMsg.java | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java index 1d86c65b8d..b11751f3eb 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java @@ -63,9 +63,9 @@ public class CheckAndExportOperationLogListener implements MessageListenerConcur //获取操作人信息 OperatorInfo operatorInfo = LogOperationHelper.getInstance().getOperatorInfo(msgObj.getUserId()); LogOperationEntity logEntity = new LogOperationEntity(); - logEntity.setCategory(messageExt.getTopic()); - logEntity.setType(tags); - logEntity.setTypeDisplay(AuthOperationEnum.getDisplay(tags)); + logEntity.setCategory("data_tm"); + logEntity.setType(msgObj.getType()); + logEntity.setTypeDisplay(msgObj.getTypeDisplay()); logEntity.setIp(msgObj.getIp()); logEntity.setFromApp(msgObj.getFromApp()); logEntity.setFromClient(msgObj.getFromClient()); diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java index 0a9f02b692..462133adfe 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java @@ -14,6 +14,9 @@ public class CheckMQMsg { private String content; + private String typeDisplay; + private String type; + /** * 操作时间 */ From 99e2f02be9244397e471437f16b30897822690b7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 17 Oct 2022 15:54:47 +0800 Subject: [PATCH 198/621] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AAicresiuser?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/feign/CommonUserFeignClient.java | 4 + .../CommonUserFeignClientFallback.java | 6 + .../epmet/commons/tools/redis/RedisKeys.java | 4 + .../redis/common/CustomerResiUserRedis.java | 27 + .../common/bean/IcResiUserInfoCache.java | 539 ++++++++++++++++++ .../service/impl/IcHouseServiceImpl.java | 9 +- .../controller/IcResiUserController.java | 6 + .../com/epmet/service/IcResiUserService.java | 3 + .../service/impl/IcResiUserServiceImpl.java | 11 +- 9 files changed, 601 insertions(+), 8 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/IcResiUserInfoCache.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java index 0f8f937a8a..8e67c1939b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.commons.tools.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.feign.fallback.CommonUserFeignClientFallBackFactory; +import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.Result; import org.springframework.cloud.openfeign.FeignClient; @@ -17,4 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping; public interface CommonUserFeignClient { @PostMapping("/epmetuser/userbaseinfo/getUserInfo/{userId}") Result getUserInfo(@PathVariable("userId") String userId); + + @PostMapping("/epmetuser/icresiuser/getIcResiUserInfo/{userId}") + Result getIcResiUserInfo(@PathVariable("userId") String userId); } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java index 8cd5660484..77f212943c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java @@ -2,6 +2,7 @@ package com.epmet.commons.tools.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.feign.CommonUserFeignClient; +import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; @@ -20,4 +21,9 @@ public class CommonUserFeignClientFallback implements CommonUserFeignClient { public Result getUserInfo(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserInfo", userId); } + + @Override + public Result getIcResiUserInfo(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcResiUserInfo", userId); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index c09f13f2f4..49ab921e0f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -393,6 +393,10 @@ public class RedisKeys { return rootPrefix.concat("resi:user:").concat(userId); } + public static String getIcResiUserKey(String userId) { + return rootPrefix.concat("resi:icResiUser:").concat(userId); + } + /** * @param userId * @return epmet:badge:user:[customerId]:[userId] diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java index 5b34fcdee7..39e1995d9b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java @@ -1,10 +1,12 @@ package com.epmet.commons.tools.redis.common; import cn.hutool.core.bean.BeanUtil; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.CommonUserFeignClient; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -70,6 +72,31 @@ public class CustomerResiUserRedis { return resultData; } + public static IcResiUserInfoCache getIcResiUserInfo(String icResiUserId){ + if (StringUtils.isBlank(icResiUserId)){ + log.warn("getIcResiUserInfo param is blank,userId:{}",icResiUserId); + return null; + } + String key = RedisKeys.getIcResiUserKey(icResiUserId); + Map map = customerResiUserRedis.redisUtils.hGetAll(key); + if (!CollectionUtils.isEmpty(map)) { + return ConvertUtils.mapToEntity(map, IcResiUserInfoCache.class); + } + Result result = customerResiUserRedis.commonUserFeignClient.getIcResiUserInfo(icResiUserId); + if (result == null || !result.success()) { + throw new EpmetException("获取居民信息失败"); + } + IcResiUserInfoCache data = result.getData(); + if (null == data) { + log.warn("居民信息为空,userId:{}", icResiUserId); + return null; + } + + Map cacheMap = BeanUtil.beanToMap(data, false, true); + customerResiUserRedis.redisUtils.hMSet(key, cacheMap); + return data; + } + @Nullable private static ResiUserInfoCache reloadStaffCache(String userId, String key) { Result result = customerResiUserRedis.commonUserFeignClient.getUserInfo(userId); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/IcResiUserInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/IcResiUserInfoCache.java new file mode 100644 index 0000000000..6749272790 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/IcResiUserInfoCache.java @@ -0,0 +1,539 @@ +package com.epmet.commons.tools.redis.common.bean; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2022/10/17 15:40 + * @DESC + */ +@Data +public class IcResiUserInfoCache implements Serializable { + + private static final long serialVersionUID = -3644143706074015380L; + + + /** + * 主键 + */ + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * + */ + private String agencyId; + + /** + * + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 所属小区ID + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元id + */ + private String unitId; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 是否本地户籍 + */ + private String isBdhj; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 备注 + */ + private String remarks; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系人电话 + */ + private String contactsMobile; + + /** + * 九小场所url + */ + private String ninePlace; + + /** + * 是否党员 + */ + private String isParty; + + /** + * 是否低保户 + */ + private String isDbh; + + /** + * 是否保障房 + */ + private String isEnsureHouse; + + /** + * 是否失业 + */ + private String isUnemployed; + + /** + * 是否育龄妇女 + */ + private String isYlfn; + + /** + * 是否退役军人 + */ + private String isVeterans; + + /** + * 是否统战人员 + */ + private String isUnitedFront; + + /** + * 是否信访人员 + */ + private String isXfry; + + /** + * 是否志愿者 + */ + private String isVolunteer; + + /** + * 是否老年人 + */ + private String isOldPeople; + + /** + * 是否空巢 + */ + private String isKc; + + /** + * 是否失独 + */ + private String isSd; + + /** + * 是否失能 + */ + private String isSn; + + /** + * 是否失智 + */ + private String isSz; + + /** + * 是否残疾 + */ + private String isCj; + + /** + * 是否大病 + */ + private String isDb; + + /** + * 是否慢病 + */ + private String isMb; + + /** + * 是否特殊人群 + */ + private String isSpecial; + + /** + * 是否租户【是:1 否:0】 + */ + private String isTenant; + + /** + * 是否是流动人口【是:1 否:0】 + */ + private String isFloating; + + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; + + /** + * 文化程度【字典表】 + */ + private String culture; + + /** + * 文化程度备注 + */ + private String cultureRemakes; + + /** + * 特长【字典表】 + */ + private String specialSkill; + + /** + * 兴趣爱好 + */ + private String hobby; + + /** + * 兴趣爱好备注 + */ + private String hobbyRemakes; + + /** + * 宗教信仰 + */ + private String faith; + + /** + * 宗教信仰备注 + */ + private String faithRemakes; + + /** + * 残疾类别【字典表】 + */ + private String cjlb; + + /** + * 残疾登记(状况)【字典表】 + */ + private String cjzk; + + /** + * 残疾证号 + */ + private String cjzh; + + /** + * 残疾说明 + */ + private String cjsm; + + /** + * 有无监护人【yes no】 + */ + private String ynJdr; + + /** + * 有无技能特长【yes no】 + */ + private String ynJntc; + + /** + * 有无劳动能力 + */ + private String ynLdnl; + + /** + * 有无非义务教育阶段助学【yes no】 + */ + private String ynFywjyjdzx; + + /** + * 所患大病 + */ + private String shdb; + + /** + * 患大病时间 + */ + private String dbsj; + + /** + * 所患慢性病 + */ + private String shmxb; + + /** + * 患慢性病时间 + */ + private String mxbsj; + + /** + * 是否参保 + */ + private String isCb; + + /** + * 自付金额 + */ + private String zfje; + + /** + * 救助金额 + */ + private String jzje; + + /** + * 救助时间[yyyy-MM-dd] + */ + private String jzsj; + + /** + * 享受救助明细序号 + */ + private String jzmxxh; + + /** + * 健康信息备注 + */ + private String healthRemakes; + + /** + * 工作单位 + */ + private String gzdw; + + /** + * 职业 + */ + private String zy; + + /** + * 离退休时间 + */ + private String ltxsj; + + /** + * 工作信息备注 + */ + private String workRemake; + + /** + * 退休金额 + */ + private String txje; + + /** + * 月收入 + */ + private String ysr; + + /** + * 是否经济低保 + */ + private String isJjdb; + + /** + * 籍贯 + */ + private String jg; + + /** + * 户籍所在地 + */ + private String hjszd; + + /** + * 现居住地 + */ + private String xjzd; + + /** + * 人户情况 + */ + private String rhzk; + + /** + * 居住信息备注 + */ + private String jzxxRemakes; + + /** + * 民族【字典表】 + */ + private String mz; + + /** + * 与户主关系【字典表】 + */ + private String yhzgx; + + /** + * 居住情况【字典表】 + */ + private String jzqk; + + /** + * 婚姻状况【字典表】 + */ + private String hyzk; + + /** + * 配偶情况【字典表】 + */ + private String poqk; + + /** + * 有无赡养人 + */ + private String ynSyr; + + /** + * 与赡养人关系【字典表】 + */ + private String ysyrgx; + + /** + * 赡养人电话 + */ + private String syrMobile; + + /** + * 家庭信息备注 + */ + private String jtxxRemakes; + + /** + * 用户状态【0:正常;1:迁出;2:注销】 + */ + private String status; + + /** + * 用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡 + */ + private String subStatus; + + + /** + * 删除标识 0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 预留字段1 + */ + private String field1; + + /** + * 预留字段2 + */ + private String field2; + + /** + * 预留字段3 + */ + private String field3; + + /** + * 预留字段4 + */ + private String field4; + + /** + * 预留字段5 + */ + private String field5; + + /** + * 预留字段6 + */ + private String field6; + + /** + * 预留字段7 + */ + private String field7; + + /** + * 预留字段8 + */ + private String field8; + + /** + * 预留字段9 + */ + private String field9; + + /** + * 预留字段10 + */ + private String field10; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 364b859376..7ad72ca217 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -15,6 +15,7 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; +import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -437,12 +438,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl getIcResiUserInfo(@PathVariable("userId") String userId){ + return new Result().ok(icResiUserService.getIcResiUserInfo(userId)); + } + } 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 87dcd4cba3..e3e0f75e1f 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 @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcResiUserDTO; @@ -518,4 +519,6 @@ public interface IcResiUserService extends BaseService { * @Date 2022/9/8 15:45 */ void updateYlfn(); + + IcResiUserInfoCache getIcResiUserInfo(String userId); } 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 ec9bf3043c..e602218bee 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 @@ -44,10 +44,7 @@ import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; -import com.epmet.commons.tools.redis.common.bean.GridInfoCache; -import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; -import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.redis.common.bean.*; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.constant.IcPlatformConstant; @@ -3540,4 +3537,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 15:58:29 +0800 Subject: [PATCH 199/621] emm --- .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 7ad72ca217..83d12ff7ab 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -437,6 +437,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 16:05:26 +0800 Subject: [PATCH 200/621] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcHouseDTO.java | 9 +++++++++ .../java/com/epmet/controller/IcHouseController.java | 4 ++-- .../java/com/epmet/service/impl/IcHouseServiceImpl.java | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java index e026d7cbdc..cdbf65c799 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java @@ -161,4 +161,13 @@ public class IcHouseDTO implements Serializable { * 房屋可编辑编码 */ private String coding; + + /** + * 加密后的联系方式 + */ + private String showOwnerPhone; + /** + * 加密后的房主身份证 + */ + private String showOwnerIdCard; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 6e867c47de..00a9076821 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -18,17 +18,16 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcHouseDTO; -import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.DetailByTypeFormDTO; import com.epmet.dto.form.HouseFormDTO; -import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.dto.result.*; import com.epmet.service.IcHouseService; import org.springframework.beans.factory.annotation.Autowired; @@ -51,6 +50,7 @@ public class IcHouseController { @Autowired private IcHouseService icHouseService; + @MaskResponse(fieldNames = { "showOwnerPhone", "showOwnerIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @GetMapping("{id}") public Result get(@PathVariable("id") String id) { IcHouseDTO data = icHouseService.get(id); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 7ad72ca217..6a222b9500 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.rocketmq.messages.CheckMQMsg; -import com.epmet.commons.rocketmq.messages.LoginMQMsg; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; @@ -16,7 +15,6 @@ import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; -import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.IpUtils; @@ -94,6 +92,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 16:33:44 +0800 Subject: [PATCH 201/621] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/LogOperationListFormDTO.java | 20 +++++++++++ .../dto/region/LogOperationResultDTO.java | 5 +++ .../controller/LogOperationController.java | 17 +++++++++ .../java/com/epmet/dao/LogOperationDao.java | 12 ++++++- .../epmet/service/LogOperationService.java | 17 +++++++++ .../service/impl/LogOperationServiceImpl.java | 24 +++++++++++++ .../main/resources/mapper/LogOperationDao.xml | 35 ++++++++++++++++++- 7 files changed, 128 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java index 3fe203b482..a4fc503431 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java @@ -10,4 +10,24 @@ public class LogOperationListFormDTO { private Integer pageNo = 1; private Integer pageSize = 10; + /** + * 姓名 + */ + private String operatorName; + /** + * 手机号 + */ + private String operatorMobile; + /** + * yyyyMMdd + */ + private String startTime; + /** + * yyyyMMdd + */ + private String endTime; + /** + * 默认传data_tm + */ + private String category; } diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java index b08c9fc295..b794dcbd26 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java @@ -1,7 +1,10 @@ package com.epmet.dto.region; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + /** * */ @@ -45,4 +48,6 @@ public class LogOperationResultDTO { */ private Long operatingTime; + @JsonFormat(pattern="yyyy-MM-dd HH:mm") + private Date operateTime; } diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java index 089ad29639..2da04fe5d6 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java @@ -2,6 +2,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.enums.RequirePermissionEnum; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -45,4 +46,20 @@ public class LogOperationController { return new Result>().ok(resultList); } + /** + * 数字社区-操作记录 + * @param formDTO + * @return + */ + @PostMapping("page") + public Result> page(@RequestBody LogOperationListFormDTO formDTO){ + return new Result>().ok(logOperationService.page(loginUserUtil.getLoginUserCustomerId(), + formDTO.getStartTime(), + formDTO.getEndTime(), + formDTO.getOperatorName(), + formDTO.getOperatorMobile(), + formDTO.getPageNo(), + formDTO.getPageSize(), + formDTO.getCategory())); + } } diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java index a63a5aa8e4..59650e60ae 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.entity.LogOperationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 操作日指标 @@ -29,5 +33,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface LogOperationDao extends BaseDao { - + + List pageList(@Param("customerId") String customerId, + @Param("startTime")String startTime, + @Param("endTime")String endTime, + @Param("operatorName")String operatorName, + @Param("operatorMobile")String operatorMobile, + @Param("category")String category); } \ No newline at end of file diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java index 67b3736395..ad7bc8acb6 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java @@ -1,5 +1,6 @@ package com.epmet.service; +import com.epmet.commons.tools.page.PageData; import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.entity.LogOperationEntity; @@ -25,4 +26,20 @@ public interface LogOperationService { * @date 2021.06.07 21:56 */ List listOperationLogs(String condition, String customerId, Integer pageNo, Integer pageSize); + + /** + * 数字社区-操作记录 + * @param loginUserCustomerId + * @param startTime + * @param endTime + * @param operatorName + * @param operatorMobile + * @return + */ + PageData page(String loginUserCustomerId, + String startTime, + String endTime, + String operatorName, + String operatorMobile, + Integer pageNo, Integer pageSize,String category); } diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java index 1cbf7e32d2..f9837728e7 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.LogOperationDao; import com.epmet.dto.CustomerStaffDTO; @@ -15,6 +16,8 @@ import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.entity.LogOperationEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.LogOperationService; +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; @@ -174,7 +177,28 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR ldto.setCustomerId(l.getCustomerId()); ldto.setOperatorMobile(staffMap.get(l.getOperatorId()).getMobile()); ldto.setOperatorName(staffMap.get(l.getOperatorId()).getRealName()); + ldto.setOperateTime(l.getOperatingTime()); return ldto; }).collect(Collectors.toList()); } + + /** + * 数字社区-操作记录 + * + * @param customerId + * @param startTime + * @param endTime + * @param operatorName + * @param operatorMobile + * @return + */ + @Override + public PageData page(String customerId, String startTime, String endTime, String operatorName, String operatorMobile, + Integer pageNo, Integer pageSize,String category) { + // 列表/导出查询 + PageHelper.startPage(pageNo, pageSize); + List list = logOperationDao.pageList(customerId, startTime, endTime, operatorName, operatorMobile,category); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml index 5f34d339ad..b65219788c 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml +++ b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml @@ -26,5 +26,38 @@ - + \ No newline at end of file From dc37e827abae339040c5df812d7c47f9c5424c22 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 17 Oct 2022 16:41:36 +0800 Subject: [PATCH 202/621] message --- .../com/epmet/controller/HouseController.java | 52 +++++++++++++++---- .../service/impl/IcHouseServiceImpl.java | 8 +-- .../impl/IcResiUserExportServiceImpl.java | 32 +++++++++--- 3 files changed, 70 insertions(+), 22 deletions(-) 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 35b3bc0e6f..0e2f57f7d9 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 @@ -25,6 +25,8 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; +import com.epmet.commons.rocketmq.constants.TopicConstants; +import com.epmet.commons.rocketmq.messages.CheckMQMsg; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.annotation.ReportRequest; @@ -40,10 +42,7 @@ import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.HouseQRcodeUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillRowMergeStrategy; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -54,6 +53,7 @@ import com.epmet.dto.result.*; import com.epmet.entity.CustomerOrgParameterEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.HouseService; import com.epmet.util.ExcelPoiUtils; @@ -66,18 +66,18 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; import javax.imageio.ImageIO; import javax.imageio.stream.ImageOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.*; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.concurrent.TimeUnit; @@ -105,6 +105,8 @@ public class HouseController implements ResultDataResolver { @Autowired private IcHouseDao icHouseDao; + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @ReportRequest @PostMapping("houselist") @@ -265,7 +267,7 @@ public class HouseController implements ResultDataResolver { * @throws Exception */ @RequestMapping("exporthouseinfo") - public void exporthouseinfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { + public void exporthouseinfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response,@LoginUser TokenDto tokenDto) throws Exception { ValidatorUtils.validateEntity(formDTO); if (StringUtils.isNotBlank(formDTO.getId())){ formDTO.setSelectType("id"); @@ -274,7 +276,21 @@ public class HouseController implements ResultDataResolver { } formDTO.setIsPage(false); houseService.exportBuildinginfo(formDTO, response); - + // 新增操作日志 + CheckMQMsg msg = new CheckMQMsg(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + msg.setOperateTime(new Date()); + msg.setContent("导出房屋数据"); + msg.setType("exportHouse"); + msg.setTypeDisplay("导出房屋数据"); + msg.setUserId(tokenDto.getUserId()); + msg.setFromApp(tokenDto.getApp()); + msg.setIp(IpUtils.getIpAddr(request)); + msg.setFromClient(tokenDto.getClient()); + SystemMsgFormDTO form = new SystemMsgFormDTO(); + form.setMessageType(TopicConstants.CHECK_OR_EXPORT); + form.setContent(msg); + epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); } @PostMapping("queryListHouseInfo") @@ -452,6 +468,22 @@ public class HouseController implements ResultDataResolver { //获取导出配置 haveSearchCache.invalidateAll(); + + // 发送操作日志 + CheckMQMsg msg = new CheckMQMsg(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + msg.setOperateTime(new Date()); + msg.setContent("导出一户一档数据"); + msg.setType("exportYHYD"); + msg.setTypeDisplay("导出一户一档数据"); + msg.setUserId(tokenDto.getUserId()); + msg.setFromApp(tokenDto.getApp()); + msg.setIp(IpUtils.getIpAddr(request)); + msg.setFromClient(tokenDto.getClient()); + SystemMsgFormDTO form = new SystemMsgFormDTO(); + form.setMessageType(TopicConstants.CHECK_OR_EXPORT); + form.setContent(msg); + epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); } catch (EpmetException e) { response.reset(); response.setCharacterEncoding("UTF-8"); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 15d9d849f6..81693e4230 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -436,9 +436,9 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Mon, 17 Oct 2022 17:18:56 +0800 Subject: [PATCH 203/621] showOwnerIdCard --- .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 81693e4230..a44882b549 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -92,7 +92,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Tue, 18 Oct 2022 09:03:31 +0800 Subject: [PATCH 204/621] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=BA=BA=E5=91=98=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yantai/DataSyncUserAndOrgController.java | 42 ++++ .../yantai/DataSyncUserAndOrgService.java | 10 + .../yantai/DataSyncUserAndOrgServiceImpl.java | 30 +++ .../controller/yantai/SM4UtilsForYanTai.java | 199 ++++++++++++++++++ .../main/java/com/epmet/utils/YantaiApi.java | 96 +++++++++ 5 files changed, 377 insertions(+) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/SM4UtilsForYanTai.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/YantaiApi.java diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java new file mode 100644 index 0000000000..9df9a6d5c5 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java @@ -0,0 +1,42 @@ +package com.epmet.controller.yantai; + +import com.epmet.commons.tools.utils.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * desc: 从各个平台-同步用户和组织数据到本地 用于生成本系统账号 + * + * @author LiuJanJun + * @date 2022/10/17 3:41 下午 + */ +@RestController +@RequestMapping("dataSync") +public class DataSyncUserAndOrgController { + + @Autowired + private DataSyncUserAndOrgService dataSyncUserAndOrgService; + + /** + * desc:从统一认证中心 拉取用户信息 + * @return + */ + @PostMapping("yantai/sync/user") + public Result templateList(String orgId) { + Boolean flag = dataSyncUserAndOrgService.yanTaiSyncUser(orgId); + return new Result().ok(flag); + } + + /** + * desc:从统一认证中心 拉取组织信息 + * @return + */ + @PostMapping("yantai/sync/org") + public Result getExtJson(String orgId) { + Boolean extJson = dataSyncUserAndOrgService.yanTaiSyncOrg(orgId); + return new Result().ok(extJson); + } + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java new file mode 100644 index 0000000000..2a7e1bbabc --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java @@ -0,0 +1,10 @@ +package com.epmet.controller.yantai; + +/** + * @author liujianjun + */ +public interface DataSyncUserAndOrgService { + Boolean yanTaiSyncUser(String organizationId); + + Boolean yanTaiSyncOrg(String organizationId); +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java new file mode 100644 index 0000000000..bfc87e0ff4 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -0,0 +1,30 @@ +package com.epmet.controller.yantai; + +import com.epmet.utils.OrgData; +import com.epmet.utils.UserData; +import com.epmet.utils.YantaiApi; + +import java.util.List; + +/** + * desc:烟台 从认证中心同步组织和用户信息 到本地 + * + * @author: LiuJanJun + * @date: 2022/10/17 3:42 下午 + * @version: 1.0 + */ +public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService { + @Override + public Boolean yanTaiSyncUser(String organizationId) { + List data = YantaiApi.getChildOuInfoByGuid(organizationId); + //todo 更新或插入数据 + return false; + } + + @Override + public Boolean yanTaiSyncOrg(String organizationId) { + List data = YantaiApi.getUserByOuGuid(organizationId); + + return false; + } +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/SM4UtilsForYanTai.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/SM4UtilsForYanTai.java new file mode 100644 index 0000000000..35d90d20ca --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/SM4UtilsForYanTai.java @@ -0,0 +1,199 @@ +package com.epmet.controller.yantai; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.commons.codec.binary.Base64; +import org.bouncycastle.jce.provider.BouncyCastleProvider; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.security.InvalidKeyException; +import java.security.Security; + +/** + * 烟台的认证中心-国密sm4加解密 + */ +public class SM4UtilsForYanTai { + private static String SM4_KEY = "yaweisoftware@xy"; + //编码格式 + private static final Charset encryptCharset = StandardCharsets.UTF_8; + + public enum Algorithm { + SM4("SM4","SM4","国密四,key长16byte"); + private String keyAlgorithm; + private String transformation; + private String description;//描述 + Algorithm(String keyAlgorithm, String transformation, String description) { + this.keyAlgorithm = keyAlgorithm; + this.transformation = transformation; + this.description = description; + } + public String getKeyAlgorithm() { + return this.keyAlgorithm; + } + public String getTransformation() { + return this.transformation; + } + public String getDescription() { + return this.description; + } + } + + private static final String PROVIDER_NAME = "BC"; + static { + Security.addProvider(new BouncyCastleProvider()); + } + + /** + * 自定字符串产生密钥 + * @param algorithm 加解密算法 + * @param keyStr 密钥字符串 + * @param charset 编码字符集 + * @return 密钥 + */ + public static SecretKey genKeyByStr(Algorithm algorithm, String keyStr, Charset charset) { + return readKeyFromBytes(algorithm, keyStr.getBytes(charset)); + } + + /** + * 根据指定字节数组产生密钥 + * @param algorithm 加解密算法 + * @param keyBytes 密钥字节数组 + * @return 密钥 + */ + public static SecretKey readKeyFromBytes(Algorithm algorithm, byte[] keyBytes) { + return new SecretKeySpec(keyBytes, algorithm.getKeyAlgorithm()); + } + + /****************************加密*********************************/ + /** + * 加密字符串，并进行base64编码 + * @param algorithm 加解密算法 + * @param key 密钥 + * @param data 明文 + * @param charset 编码字符集 + * @return 密文 + * @throws InvalidKeyException 密钥错误 + */ + public static String encryptBase64(Algorithm algorithm, SecretKey key, String data, Charset charset) throws InvalidKeyException { + return Base64.encodeBase64String(encrypt(algorithm, key, data.getBytes(charset))); + } + + /** + * 加密字节数组 + * @param algorithm 加解密算法 + * @param key 密钥 + * @param data 明文 + * @return 密文 + * @throws InvalidKeyException 密钥错误 + */ + public static byte[] encrypt(Algorithm algorithm, SecretKey key, byte[] data) throws InvalidKeyException { + try { + return cipherDoFinal(algorithm, Cipher.ENCRYPT_MODE, key, data); + } catch (BadPaddingException e) { + throw new RuntimeException(e);//明文没有具体格式要求，不会出错。所以这个异常不需要外部捕获。 + } + } + + /** + * 加解密字节数组 + * @param algorithm 加解密算法 + * @param opmode 操作：1加密，2解密 + * @param key 密钥 + * @param data 数据 + * @throws InvalidKeyException 密钥错误 + * @throws BadPaddingException 解密密文错误(加密模式没有) + */ + private static byte[] cipherDoFinal(Algorithm algorithm, int opmode, SecretKey key, byte[] data) throws InvalidKeyException, BadPaddingException { + Cipher cipher; + try { + cipher = Cipher.getInstance(algorithm.getTransformation(), PROVIDER_NAME); + } catch (Exception e) { + //NoSuchAlgorithmException：加密算法名是本工具类提供的，如果错了业务没有办法处理。所以这个异常不需要外部捕获。 + //NoSuchProviderException：Provider是本工具类提供的，如果错了业务没有办法处理。所以这个异常不需要外部捕获。 + //NoSuchPaddingException：没有特定的填充机制，与环境有关，业务没有办法处理。所以这个异常不需要外部捕获。 + throw new RuntimeException(e); + } + cipher.init(opmode, key); + try { + return cipher.doFinal(data); + } catch (IllegalBlockSizeException e) { + throw new RuntimeException(e);//业务不需要将数据分块(好像由底层处理了)，如果错了业务没有办法处理。所以这个异常不需要外部捕获。 + } + } + + /****************************解密*********************************/ + /** + * 对字符串先进行base64解码，再解密 + * @param algorithm 加解密算法 + * @param key 密钥 + * @param data 密文 + * @param charset 编码字符集 + * @return 明文 + * @throws InvalidKeyException 密钥错误 + * @throws BadPaddingException 密文错误 + */ + public static String decryptBase64(Algorithm algorithm, SecretKey key, String data, Charset charset) + throws InvalidKeyException, BadPaddingException { + return new String(decrypt(algorithm, key, Base64.decodeBase64(data)), charset); + } + + /** + * 解密字节数组 + * @param algorithm 加解密算法 + * @param key 密钥 + * @param data 密文 + * @return 明文 + * @throws InvalidKeyException 密钥错误 + * @throws BadPaddingException 密文错误 + */ + public static byte[] decrypt(Algorithm algorithm, SecretKey key, byte[] data) throws InvalidKeyException, BadPaddingException { + return cipherDoFinal(algorithm, Cipher.DECRYPT_MODE, key, data); + } + + public static String Encrypt(String data) throws InvalidKeyException { + SecretKey key = genKeyByStr(Algorithm.SM4, SM4_KEY, encryptCharset); + return encryptBase64(Algorithm.SM4, key, data, encryptCharset); + } + public static String Decrypt(String data) throws BadPaddingException, InvalidKeyException { + SecretKey key = genKeyByStr(Algorithm.SM4, SM4_KEY, encryptCharset); + return decryptBase64(Algorithm.SM4, key, data, encryptCharset); + } + //加密 + public static String dealEncryptData(Object data) throws JsonProcessingException, InvalidKeyException { + ObjectMapper objectMapper = new ObjectMapper(); + String dataString = ""; + try { + if(data instanceof String){ + dataString = (String) data; + }else { + dataString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(data); + } + String dataEncrypt = Encrypt(dataString); + return dataEncrypt; + }catch (Exception e){ + return dataString; + } + } + //解密 + public static String dealDecryptData(Object data) throws JsonProcessingException, BadPaddingException, InvalidKeyException { + String dataString = ""; + try { + ObjectMapper objectMapper = new ObjectMapper(); + if (data instanceof String) { + dataString = (String) data; + } else { + dataString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(data); + } + String dataDecrypt = Decrypt(dataString); + return dataDecrypt; + }catch (Exception e){ + return dataString; + } + } +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/YantaiApi.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/YantaiApi.java new file mode 100644 index 0000000000..e788f605c1 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/YantaiApi.java @@ -0,0 +1,96 @@ +package com.epmet.utils; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.controller.yantai.SM4UtilsForYanTai; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2022/10/17 3:57 下午 + * @version: 1.0 + */ +@Slf4j +public class YantaiApi { + private static final String SSO_SERVER = "http://localhost:8080/"; + + /** + * desc:根据组织id获取下级组织 + * + * @param organizationId + * @return + */ + public static List getChildOuInfoByGuid(String organizationId) { + try { + if (StringUtils.isBlank(organizationId)){ + throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + } + //加密 + String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); + //pwd = URLEncoder.encode(pwd, "UTF-8"); + System.out.println("加密组织Id = " + organizationIdEn); + String url = "ouinfo/getChildOuInfoByGuid?organizationId=" + organizationIdEn; + + Map headerMap = new HashMap<>(); + Map paramMap = new HashMap<>(); + log.info("getChildOuInfoByGuid request param: url:{},header:{}", url, headerMap); + Result result = HttpClientManager.getInstance().sendGet(url, paramMap, headerMap); + log.info("getChildOuInfoByGuid request result:{}", result); + JSONObject jsonObject = JSONObject.parseObject(result.getData()); + //解密 + String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); + List orgData = JSON.parseArray(data, OrgData.class); + log.info("getChildOuInfoByGuid request real result:{}", JSON.toJSONString(orgData)); + return orgData; + } catch (Exception e) { + log.error("getChildOuInfoByGuid exception", e); + } + return new ArrayList<>(); + } + + /** + * desc:根据组织id获取下级组织 + * + * @param organizationId + * @return + */ + public static List getUserByOuGuid(String organizationId) { + try { + if (StringUtils.isBlank(organizationId)){ + throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + } + //加密 + String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); + //pwd = URLEncoder.encode(pwd, "UTF-8"); + System.out.println("加密组织Id = " + organizationIdEn); + String url = "ouinfo/getUserByOuGuid?organizationId=" + organizationIdEn; + + Map headerMap = new HashMap<>(); + Map paramMap = new HashMap<>(); + log.info("getUserByOuGuid request param: url:{},header:{}", url, headerMap); + Result result = HttpClientManager.getInstance().sendGet(url, paramMap, headerMap); + log.info("getUserByOuGuid request result:{}", result); + JSONObject jsonObject = JSONObject.parseObject(result.getData()); + //解密 + String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); + List userData = JSON.parseArray(data, UserData.class); + log.info("getUserByOuGuid request real result:{}", JSON.toJSONString(userData)); + return userData; + } catch (Exception e) { + log.error("getUserByOuGuid exception", e); + } + return new ArrayList<>(); + } +} From 24b8116bfdfb074de21e09ab46da0aaa16681891 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 10:19:04 +0800 Subject: [PATCH 205/621] =?UTF-8?q?=E5=97=AF=20=E6=A0=B8=E9=85=B8=E6=A3=80?= =?UTF-8?q?=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/YtHsResUtils.java | 30 +++- .../src/main/java/com/epmet/dao/IcNatDao.java | 2 + .../java/com/epmet/service/IcNatService.java | 2 + .../impl/DataSyncConfigServiceImpl.java | 142 ++++++++++-------- .../epmet/service/impl/IcNatServiceImpl.java | 8 + .../src/main/resources/mapper/IcNatDao.xml | 34 ++++- 6 files changed, 152 insertions(+), 66 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index cb28cf5419..3f72228656 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -43,7 +43,33 @@ public class YtHsResUtils { log.info("hscy api param:{}", param); //todo 核酸检测 mock数据 放开她 //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hscyxxcx", param); - String mockData = "{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-17 07:15:22\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}"; + String mockData = "{\n" + + " \"code\":0,\n" + + " \"msg\":\"success\",\n" + + " \"data\":[{\n" + + " \"id\": \"1570924677539635484\",\n" + + " \"name\": \"杨XX\",\n" + + " \"card_type\": \"1\",\n" + + " \"card_no\": \"370283199912010302\",\n" + + " \"create_by\": \"370613594\",\n" + + " \"create_time\": \"2022-09-17 07:15:22\",\n" + + " \"sys_org_code\": \"370613\",\n" + + " \"sample_tube\": \"GCJ-0825-0441\",\n" + + " \"package_id\": \"bcj00208083952\",\n" + + " \"city\": \"烟台市\",\n" + + " \"uuid\": \"6225684525062602095\",\n" + + " \"county\": \"莱山区\",\n" + + " \"depart_ids\": \"未填写\",\n" + + " \"depart_name\": null,\n" + + " \"realname\": \"采样点327\",\n" + + " \"upload_time\": \"2022-09-17 07:56:45\",\n" + + " \"sd_id\": null,\n" + + " \"sd_batch\": null,\n" + + " \"sd_operation\": null,\n" + + " \"sd_time\": null,\n" + + " \"inserttime\": \"2022-09-17 09:36:20\"\n" + + "}]\n" + + "}"; Result result = new Result().ok(mockData); log.info("hscy api result:{}", JSON.toJSONString(result)); if (result.success()) { @@ -74,7 +100,7 @@ public class YtHsResUtils { log.info("hsjc api param:{}", param); //todo 核酸检测 mock数据 放开她 //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hsjcxx", param); - String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-20 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}"; + String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-17 07:15:22\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}"; Result result = new Result().ok(mockData); log.info("hsjc api result:{}", JSON.toJSONString(result)); if (result.success()) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java index b2419b09f5..f21ec91eb3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java @@ -64,4 +64,6 @@ public interface IcNatDao extends BaseDao { List getExistNatInfo(@Param("list") List entities); + void updateBatchNat(@Param("list")List entities); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java index ea75c911e4..430a66424a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java @@ -92,4 +92,6 @@ public interface IcNatService extends BaseService { * @return */ Integer updateIsResiFlag(String customerId, String icResiUserId); + + void updateBatchNat(List entities); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 2517791025..90ddad6372 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -454,100 +454,64 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl idCards, String customerId, String isSync) { try { - List entities = new ArrayList<>(); idCards.forEach(idCard -> { -// YtHscyResDTO sampleResult = YtHsResUtils.hscy(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); - YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); - /*Boolean aBoolean = CollectionUtils.isEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData()); - Boolean bBoolean = CollectionUtils.isNotEmpty(sampleResult.getData()) && CollectionUtils.isNotEmpty(natInfoResult.getData());*/ - /** - * 1.采样结果 和 检测结果 都不为空，以检测结果为准 - * 2.采样结果为空，检测结果不为空 - */ -// if (aBoolean || bBoolean) { - if (CollectionUtils.isNotEmpty(natInfoResult.getData())) { - natInfoResult.getData().forEach(natInfo -> { + YtHscyResDTO sampleResult = YtHsResUtils.hscy(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); + if (CollectionUtils.isNotEmpty(sampleResult.getData())){ + List entities = new ArrayList<>(); + sampleResult.getData().forEach(sampleInfo -> { IcNatEntity e = new IcNatEntity(); e.setCustomerId(customerId); e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); e.setUserId(idCard.getUserId()); + e.setMobile(""); e.setUserType(isSync.equals(NumConstant.ONE_STR) ? "manualSync" : "sync"); - e.setName(StringUtils.isNotBlank(natInfo.getName()) ? natInfo.getName() : ""); - e.setMobile(StringUtils.isNotBlank(natInfo.getTelephone()) ? natInfo.getTelephone() : ""); - e.setIdCard(StringUtils.isNotBlank(natInfo.getCard_no()) ? natInfo.getCard_no() : ""); - e.setNatTime(DateUtils.parseDate(natInfo.getTest_time(), DateUtils.DATE_TIME_PATTERN)); - e.setSampleTime(DateUtils.parseDate(natInfo.getSample_time(), DateUtils.DATE_TIME_PATTERN)); - String resultPcr = natInfo.getSample_result_pcr(); - //检测结果 转换 我们 0:阴性 1:阳性, 他们 ：1:阳性,2:阴性 - e.setNatResult(NumConstant.ZERO_STR); - if (NumConstant.ONE_STR.equals(resultPcr)) { - e.setNatResult(NumConstant.ONE_STR); - } - e.setNatAddress(natInfo.getSampling_org_pcr()); + e.setName(StringUtils.isNotBlank(sampleInfo.getName()) ? sampleInfo.getName() : ""); + e.setIdCard(StringUtils.isNotBlank(sampleInfo.getCard_no()) ? sampleInfo.getCard_no() : ""); + e.setSampleTime(DateUtils.parseDate(sampleInfo.getCreate_time(), DateUtils.DATE_TIME_PATTERN)); e.setAgencyId(idCard.getAgencyId()); e.setPids(idCard.getPids()); e.setAttachmentType(""); e.setAttachmentUrl(""); entities.add(e); }); + if (CollectionUtils.isNotEmpty(entities)){ + List existSampleInfo = icNatDao.getExistNatInfo(entities); + sampleAndNat(existSampleInfo,entities,NumConstant.ONE_STR,customerId,isSync); + } } - /*if (CollectionUtils.isNotEmpty(sampleResult.getData()) && CollectionUtils.isEmpty(natInfoResult.getData())){ - sampleResult.getData().forEach(sampleInfo -> { + YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE); + if (CollectionUtils.isNotEmpty(natInfoResult.getData())) { + List entities = new ArrayList<>(); + natInfoResult.getData().forEach(natInfo -> { IcNatEntity e = new IcNatEntity(); e.setCustomerId(customerId); e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); e.setUserId(idCard.getUserId()); e.setUserType(isSync.equals(NumConstant.ONE_STR) ? "manualSync" : "sync"); - e.setName(StringUtils.isNotBlank(sampleInfo.getName()) ? sampleInfo.getName() : ""); - e.setMobile(StringUtils.isNotBlank(sampleInfo.get()) ? sampleInfo.getTelephone() : ""); - e.setIdCard(StringUtils.isNotBlank(sampleInfo.getCard_no()) ? sampleInfo.getCard_no() : ""); - e.setNatTime(DateUtils.parseDate(sampleInfo.getTest_time(), DateUtils.DATE_TIME_PATTERN)); - e.setSampleTime(DateUtils.parseDate(sampleInfo.getSample_time(), DateUtils.DATE_TIME_PATTERN)); - String resultPcr = sampleInfo.getSample_result_pcr(); + e.setName(StringUtils.isNotBlank(natInfo.getName()) ? natInfo.getName() : ""); + e.setMobile(StringUtils.isNotBlank(natInfo.getTelephone()) ? natInfo.getTelephone() : ""); + e.setIdCard(StringUtils.isNotBlank(natInfo.getCard_no()) ? natInfo.getCard_no() : ""); + e.setNatTime(DateUtils.parseDate(natInfo.getTest_time(), DateUtils.DATE_TIME_PATTERN)); + e.setSampleTime(DateUtils.parseDate(natInfo.getSample_time(), DateUtils.DATE_TIME_PATTERN)); + String resultPcr = natInfo.getSample_result_pcr(); //检测结果 转换 我们 0:阴性 1:阳性, 他们 ：1:阳性,2:阴性 e.setNatResult(NumConstant.ZERO_STR); - if (NumConstant.ONE_STR.equals(resultPcr)){ + if (NumConstant.ONE_STR.equals(resultPcr)) { e.setNatResult(NumConstant.ONE_STR); } - e.setNatAddress(sampleInfo.getSampling_org_pcr()); + e.setNatAddress(natInfo.getSampling_org_pcr()); e.setAgencyId(idCard.getAgencyId()); e.setPids(idCard.getPids()); e.setAttachmentType(""); e.setAttachmentUrl(""); entities.add(e); }); - } - });*/ - if (CollectionUtils.isNotEmpty(entities)) { - List existNatInfos = icNatDao.getExistNatInfo(entities); - entities.forEach(e -> existNatInfos.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); - Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); - if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { - for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), NumConstant.FIVE_HUNDRED)) { - icNatService.insertBatch(icNatEntities); - //组织关系表 - List relationEntities = new ArrayList<>(); - icNatEntities.forEach(ne -> { - // 不是居民的先不加关系表吧 - if (ne.getIsResiUser().equals(NumConstant.ONE_STR)) { - IcNatRelationEntity e = new IcNatRelationEntity(); - e.setCustomerId(customerId); - e.setAgencyId(ne.getAgencyId()); - e.setPids(ne.getPids()); - e.setIcNatId(ne.getId()); - e.setUserType("sync"); - relationEntities.add(e); - } - }); - if (CollectionUtils.isNotEmpty(relationEntities)) { - icNatRelationService.insertBatch(relationEntities); - } - } + if (CollectionUtils.isNotEmpty(entities)) { + List existNatInfos = icNatDao.getExistNatInfo(entities); + sampleAndNat(existNatInfos,entities,NumConstant.TWO_STR,customerId,isSync); } - } }); } catch (Exception e) { @@ -556,6 +520,58 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl existInfo, List entities, String type, String customerId, String isSync){ + /** + * 采样结果不为空 + * 数据库采样时间+idCard+userId 存在的 不做操作 + * 数据库采样时间+idCard+userId 不存在的 新增 + * + * 检测结果不为空 + * 数据库采样时间+idCard+userId 存在的 做更新 + * 数据库采样时间+idCard+userId 不存在的 新增 + */ + entities.forEach(e -> existInfo.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); + Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); + if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { + for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), NumConstant.FIVE_HUNDRED)) { + // 主表新增 + icNatService.insertBatch(icNatEntities); + // 组织关系表 + List relationEntities = new ArrayList<>(); + icNatEntities.forEach(ne -> { + if (ne.getIsResiUser().equals(NumConstant.ONE_STR)) { + IcNatRelationEntity e = new IcNatRelationEntity(); + e.setCustomerId(customerId); + e.setAgencyId(ne.getAgencyId()); + e.setPids(ne.getPids()); + e.setIcNatId(ne.getId()); + e.setUserType(isSync.equals(NumConstant.ONE_STR) ? "manualSync" : "sync"); + relationEntities.add(e); + } + }); + if (CollectionUtils.isNotEmpty(relationEntities)) { + icNatRelationService.insertBatch(relationEntities); + } + } + } + if (NumConstant.TWO_STR.equals(type)){ + if (CollectionUtils.isNotEmpty(groupByStatus.get(true))){ + for (List icNatEntities : ListUtils.partition(groupByStatus.get(true), NumConstant.ONE_HUNDRED)) { + icNatService.updateBatchNat(icNatEntities); + } + } + } + } + private class JudgeDealStatus { private boolean isNext; private DataSyncRecordDisabilityDTO dbDisablityEntity; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 3a9282b9bb..fcc03adf39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -464,6 +464,14 @@ public class IcNatServiceImpl extends BaseServiceImpl imp return baseDao.updateIsResiFlag(customerId,icResiUserId); } + @Override + @Transactional(rollbackFor = Exception.class) + public void updateBatchNat(List entities) { + if (CollectionUtils.isNotEmpty(entities)){ + baseDao.updateBatchNat(entities); + } + } + /** * 批量持久化 * @param entities diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index 0295d92f3f..ea4f9a8bc6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -164,7 +164,7 @@ WHERE del_flag = '0' AND USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} - AND UNIX_TIMESTAMP(NAT_TIME) = UNIX_TIMESTAMP(#{l.natTime}) + AND UNIX_TIMESTAMP(SAMPLE_TIME) = UNIX_TIMESTAMP(#{l.sampleTime}) @@ -189,4 +189,36 @@ m.ID_CARD = t.ID_CARD AND m.DEL_FLAG = '0' + + UPDATE ic_nat + + + + when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natTime} + + + + + when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natAddress} + + + + + when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natResult} + + + + + when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.mobile} + + + UPDATED_TIME = NOW() + + WHERE DEL_FLAG = '0' + + AND USER_ID = #{l.userId} + AND ID_CARD = #{l.idCard} + + + From b55b324fc480d1e9eae4f3920e0918e4e584ce50 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 10:49:10 +0800 Subject: [PATCH 206/621] =?UTF-8?q?=E5=85=88=E6=8A=8A=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=8B=BF=E5=88=B0controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcResiUserController.java | 18 ++++++++++++++++++ .../impl/IcResiUserExportServiceImpl.java | 14 -------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 5b78b84775..701968bcf0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -22,6 +22,8 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillWrapper; import com.alibaba.fastjson.JSON; +import com.epmet.commons.rocketmq.constants.TopicConstants; +import com.epmet.commons.rocketmq.messages.CheckMQMsg; import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; @@ -85,6 +87,8 @@ import org.jetbrains.annotations.NotNull; import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; @@ -558,6 +562,20 @@ public class IcResiUserController implements ResultDataResolver { } else { icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, response,false); } + CheckMQMsg msg = new CheckMQMsg(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + msg.setOperateTime(new Date()); + msg.setContent("导出居民数据"); + msg.setType("exportIcResiUser"); + msg.setTypeDisplay("导出居民数据"); + msg.setUserId(tokenDto.getUserId()); + msg.setFromApp(tokenDto.getApp()); + msg.setIp(IpUtils.getIpAddr(request)); + msg.setFromClient(tokenDto.getClient()); + SystemMsgFormDTO form = new SystemMsgFormDTO(); + form.setMessageType(TopicConstants.CHECK_OR_EXPORT); + form.setContent(msg); + epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); } catch (EpmetException e) { response.reset(); response.setCharacterEncoding("UTF-8"); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index e5d691a8c0..ec754bb2b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -204,20 +204,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { excelWriter.write(resultData, writeSheet); } } while (!searchForm.getIsPage() && mapListPage.getResult().size() == searchForm.getPageSize()); - CheckMQMsg msg = new CheckMQMsg(); - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - msg.setOperateTime(new Date()); - msg.setContent("导出居民数据"); - msg.setType("exportIcResiUser"); - msg.setTypeDisplay("导出居民数据"); - msg.setUserId(tokenDto.getUserId()); - msg.setFromApp(tokenDto.getApp()); - msg.setIp(IpUtils.getIpAddr(request)); - msg.setFromClient(tokenDto.getClient()); - SystemMsgFormDTO form = new SystemMsgFormDTO(); - form.setMessageType(TopicConstants.CHECK_OR_EXPORT); - form.setContent(msg); - epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); } catch (IOException e) { log.error("exportIcResiUser exception", e); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMessage(), "导出失败"); From 7661f838bc9307ec989187e92b4f20eba0f9319a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 12:38:58 +0800 Subject: [PATCH 207/621] =?UTF-8?q?/third/dataSync/page-user=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E8=AE=A4=E8=AF=81=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/yantai/YtUserPageFormDTO.java | 36 ++++++ .../dto/result/yantai/YtUserPageResDTO.java | 54 +++++++++ .../yantai/DataSyncUserAndOrgController.java | 16 +++ .../yantai/DataSyncUserAndOrgService.java | 12 ++ .../yantai/DataSyncUserAndOrgServiceImpl.java | 27 +++++ .../epmet/dao/yantai/DataSyncOrgDataDao.java | 16 +++ .../epmet/dao/yantai/DataSyncUserDataDao.java | 25 +++++ .../entity/yantai/DataSyncOrgDataEntity.java | 106 ++++++++++++++++++ .../entity/yantai/DataSyncUserDataEntity.java | 91 +++++++++++++++ .../mapper/yantai/DataSyncOrgDataDao.xml | 34 ++++++ .../mapper/yantai/DataSyncUserDataDao.xml | 76 +++++++++++++ 11 files changed, 493 insertions(+) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/yantai/YtUserPageFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncOrgDataEntity.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncUserDataEntity.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/yantai/YtUserPageFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/yantai/YtUserPageFormDTO.java new file mode 100644 index 0000000000..6a3ddda553 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/yantai/YtUserPageFormDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.form.yantai; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description 运营端，统一认证 列表查询入参 + * @Author yzm + * @Date 2022/10/18 11:12 + */ +@Data +public class YtUserPageFormDTO extends PageFormDTO { + /** + * 0本机 + * 1本级及下级 + */ + private String type; + /** + * 组织id + * data_sync_org_data.ORGANIZATION_ID + */ + private String orgId; + /** + * 姓名 + */ + private String name; + /** + * 手机号 + */ + private String mobile; + /** + * 0未创建、已创建 + */ + private String status; +} + diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java new file mode 100644 index 0000000000..1600fa6052 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java @@ -0,0 +1,54 @@ +package com.epmet.dto.result.yantai; + +import lombok.Data; + +/** + * @Description 运营端，统一认证 列表返参 + * @Author yzm + * @Date 2022/10/18 11:53 + */ +@Data +public class YtUserPageResDTO { + /** + * 统一用户编码 + */ + private String userGuid; + /** + * data_sync_org_data.组织机构ID; + */ + private String organizationId; + /** + * XXX-XXX + */ + private String orgName; + /** + * 用户姓名 + */ + private String userName; + + /** + * 电话号码 + */ + private String telephoneNumber; + + /** + * 性别:0未知1男2女 + */ + private String gender; + + /** + * 0未创建、已创建 + */ + private String status; + + /** + * customer_staff.userId + */ + private String staffId; + + /** + * 备注；目前为空 + */ + private String remark; +} + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java index 9df9a6d5c5..9ebbbfa8d3 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java @@ -1,8 +1,12 @@ package com.epmet.controller.yantai; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.yantai.YtUserPageFormDTO; +import com.epmet.dto.result.yantai.YtUserPageResDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,4 +43,16 @@ public class DataSyncUserAndOrgController { return new Result().ok(extJson); } + + /** + * 运营端，统一认证 列表查询 + * + * @param formDTO + * @return + */ + @PostMapping("page-user") + public Result> pageUser(@RequestBody YtUserPageFormDTO formDTO) { + return new Result>().ok(dataSyncUserAndOrgService.pageUser(formDTO)); + } + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java index 2a7e1bbabc..42b002eb07 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java @@ -1,5 +1,9 @@ package com.epmet.controller.yantai; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.form.yantai.YtUserPageFormDTO; +import com.epmet.dto.result.yantai.YtUserPageResDTO; + /** * @author liujianjun */ @@ -7,4 +11,12 @@ public interface DataSyncUserAndOrgService { Boolean yanTaiSyncUser(String organizationId); Boolean yanTaiSyncOrg(String organizationId); + + /** + * 运营端-统一认证 + * 用户列表 + * @param formDTO + * @return + */ + PageData pageUser(YtUserPageFormDTO formDTO); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index bfc87e0ff4..60eb24a678 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -1,8 +1,15 @@ package com.epmet.controller.yantai; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dao.yantai.DataSyncUserDataDao; +import com.epmet.dto.form.yantai.YtUserPageFormDTO; +import com.epmet.dto.result.yantai.YtUserPageResDTO; import com.epmet.utils.OrgData; import com.epmet.utils.UserData; import com.epmet.utils.YantaiApi; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -14,6 +21,10 @@ import java.util.List; * @version: 1.0 */ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService { + @Autowired + private DataSyncUserDataDao dataSyncUserDataDao; + + @Override public Boolean yanTaiSyncUser(String organizationId) { List data = YantaiApi.getChildOuInfoByGuid(organizationId); @@ -27,4 +38,20 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService return false; } + + + /** + * 运营端-统一认证 + * 用户列表 + * + * @param formDTO + * @return + */ + @Override + public PageData pageUser(YtUserPageFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = dataSyncUserDataDao.pageUser(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java new file mode 100644 index 0000000000..9e5ad6b28b --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao.yantai; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.yantai.DataSyncOrgDataEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-18 + */ +@Mapper +public interface DataSyncOrgDataDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java new file mode 100644 index 0000000000..aa3caaf4d9 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java @@ -0,0 +1,25 @@ +package com.epmet.dao.yantai; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.yantai.YtUserPageFormDTO; +import com.epmet.dto.result.yantai.YtUserPageResDTO; +import com.epmet.entity.yantai.DataSyncUserDataEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-18 + */ +@Mapper +public interface DataSyncUserDataDao extends BaseDao { + /** + * 运营端，统一认证 列表查询 + * @param formDTO + * @return + */ + List pageUser(YtUserPageFormDTO formDTO); +} \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncOrgDataEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncOrgDataEntity.java new file mode 100644 index 0000000000..95a12a46c4 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncOrgDataEntity.java @@ -0,0 +1,106 @@ +package com.epmet.entity.yantai; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("data_sync_org_data") +public class DataSyncOrgDataEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 联系人姓名 + */ + private String contact; + + /** + * 联系电话号码 + */ + private String contacttelephoneNumber; + + /** + * 详细地址 + */ + private String detailAddress; + + /** + * 组织机构第一名称 + */ + private String firstnameofOrganization; + + /** + * 组织机构全称 + */ + private String nameofOrganization; + + /** + * 排序号码 + */ + private String orderNumber; + + /** + * 组织机构简称 + */ + private String organizatioNabbreviation; + + /** + * 组织机构ID + */ + private String organizationId; + + /** + * 组织机构级别 + */ + private String organizationLevel; + + /** + * 组织机构路径 + */ + private String organizationPath; + + /** + * 组织机构类型 + */ + private String organizationType; + + /** + * 注册类型 + */ + private String registrationType; + + /** + * 统一社会信用代码 + */ + private String unifiedsocialcreditId; + + /** + * 客户id;烟台id + */ + private String customerId; + + /** + * 上级组织机构id:ORGANIZATION_ID + */ + private String pid; + + /** + * 上级组织机构名称：ORGANIZATIO_NABBREVIATION + */ + private String parentOrgName; + + /** + * 所有上级组织。不包含本身！ + */ + private String pids; + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncUserDataEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncUserDataEntity.java new file mode 100644 index 0000000000..e0fa956f32 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncUserDataEntity.java @@ -0,0 +1,91 @@ +package com.epmet.entity.yantai; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("data_sync_user_data") +public class DataSyncUserDataEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 性别:0未知1男2女 + */ + private String gender; + + /** + * 手机号码 + */ + private String mobileTelephoneNumber; + + /** + * 排序号码 + */ + private String orderNumber; + + /** + * 职务 + */ + private String position; + + /** + * 职级 + */ + private String positionLevel; + + /** + * 电话号码 + */ + private String telephoneNumber; + + /** + * 统一用户编码 + */ + private String userGuid; + + /** + * 用户姓名 + */ + private String userName; + + /** + * 人员路径 + */ + private String userPath; + + /** + * data_sync_org_data.组织机构ID; + */ + private String organizationId; + + /** + * 客户id + */ + private String customerId; + + /** + * 0未创建、已创建 + */ + private String status; + + /** + * customer_staff.userId + */ + private String staffId; + + /** + * 备注；目前为空 + */ + private String remark; + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml new file mode 100644 index 0000000000..0c6f3288ef --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml new file mode 100644 index 0000000000..204f27314c --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 85c7dc882e2178f1e596c851af8c205942832c9d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 18 Oct 2022 12:41:18 +0800 Subject: [PATCH 208/621] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=BA=BA=E5=91=98=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/utils/OrgData.java | 79 +++++++++++++++++++ .../main/java/com/epmet/utils/UserData.java | 50 ++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/OrgData.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/UserData.java diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/OrgData.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/OrgData.java new file mode 100644 index 0000000000..f82b6fdef5 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/OrgData.java @@ -0,0 +1,79 @@ + +package com.epmet.utils; + +import lombok.Data; + +import java.io.Serializable; + +/** + * desc:组织机构数据 实体类 + * @author liujianjun + */ +@Data +public class OrgData implements Serializable { + + /** + * 联系人姓名 + */ + private String contact; + /** + * 联系电话号码 + */ + private String contactTelephoneNumber; + + /** + * 详细地址 + */ + private String detailAddress; + + /** + * 组织机构第一名称 + */ + private String firstNameOfOrganization; + + /** + * 组织机构全称 + */ + private String nameOfOrganization; + + /** + * 排序号码 + */ + private String orderNumber; + + /** + * 组织机构简称 + */ + private String organizatioNabbreviation; + + /** + * 组织机构ID + */ + private String organizationId; + + /** + * 组织机构级别 + */ + private String organizationLevel; + + /** + * 组织机构路径 + */ + private String organizationPath; + + /** + * 组织机构类型 + */ + private String organizationType; + /** + * 注册类型 + */ + private String registrationType; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditId; + + + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/UserData.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/UserData.java new file mode 100644 index 0000000000..99d78d63d7 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/UserData.java @@ -0,0 +1,50 @@ + +package com.epmet.utils; + +import lombok.Data; + +import java.io.Serializable; + +/** + * desc:认证中心-用户信息 + * @author liujianjun + */ +@Data +public class UserData implements Serializable { + + /** + * 性别：todo 不知道是什么值 + */ + private String gender; + /** + * 手机号码 + */ + private String mobileTelephoneNumber; + private String orderNumber; + /** + * 职务 + */ + private String position; + /** + * 职级 + */ + private String positionLevel; + /** + * 电话号码 + */ + private String telephoneNumber; + /** + * 用户编码/id + */ + private String userGuid; + /** + * 用户姓名 + */ + private String userName; + /** + * 人员路径 + */ + private String userPath; + + +} From eb891e052e66a0c537012ed007f26e1c7aef42b3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 12:53:57 +0800 Subject: [PATCH 209/621] =?UTF-8?q?/org/staffdetailv2=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E7=A4=BE=E5=8C=BA=E8=A7=92=E8=89=B2=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govorg/form/StaffDetailV2FormDTO.java | 4 ++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java index 4a63e5c8ee..2a320915e8 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java @@ -42,5 +42,9 @@ public class StaffDetailV2FormDTO implements Serializable { private String orgType = ""; //职责名称列表 private List roles; + /** + * 数字社区里的角色名称 + */ + private List szsqRoles; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index f93c66675b..6820ef9f8c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.constant.BadgeConstant; import com.epmet.constant.OrgInfoConstant; import com.epmet.dataaggre.constant.DataSourceConstant; @@ -42,7 +43,10 @@ import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.opercustomize.CustomerFootBarService; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; +import com.epmet.dto.form.GetStaffExistRoleFormDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.dto.result.StaffRoleResultDTO; +import com.epmet.feign.GovAccessFeignClient; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -98,6 +102,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { private IcPointVaccinesInoculationDao pointVaccinesInoculationDao; @Resource private IcPointNucleicMonitoringDao pointNucleicMonitoringDao; + @Autowired + private GovAccessFeignClient govAccessFeignClient; /** * @Description 根据UserIds查询 @@ -724,7 +730,15 @@ public class EpmetUserServiceImpl implements EpmetUserService { result.setName(dto.getRealName()); result.setGender(dto.getGender().toString()); result.setRoles(list); - + // 获取数字社区里的新角色 + GetStaffExistRoleFormDTO getStaffExistRoleFormDTO = new GetStaffExistRoleFormDTO(); + getStaffExistRoleFormDTO.setStaffId(staffId); + getStaffExistRoleFormDTO.setCustomerId(dto.getCustomerId()); + Result> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO); + if (staffExistRole.success()&&CollectionUtils.isNotEmpty(staffExistRole.getData())){ + List szsqRoles=staffExistRole.getData().stream().map(m -> m.getRoleName()).distinct().collect(Collectors.toList()); + result.setSzsqRoles(szsqRoles); + } return result; } From 24ba608e289a73d18a25225f595a1d1b7fa3f3cb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 13:18:46 +0800 Subject: [PATCH 210/621] =?UTF-8?q?/gov/org/staff/addstaffv2=E8=BF=94?= =?UTF-8?q?=E5=9B=9EstaffId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/StaffController.java | 3 ++- .../src/main/java/com/epmet/service/StaffService.java | 3 ++- .../java/com/epmet/service/impl/StaffServiceImpl.java | 9 +++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 939f740fc1..4f2c228243 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -196,11 +196,12 @@ public class StaffController { /** * 【通讯录】人员添加v2 + * 返回staffId * @author sun */ @PostMapping("addstaffv2") @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_CREATE) - public Result addStaffV2(@LoginUser TokenDto tokenDto, @RequestBody AddStaffV2FromDTO fromDTO){ + public Result addStaffV2(@LoginUser TokenDto tokenDto, @RequestBody AddStaffV2FromDTO fromDTO){ ValidatorUtils.validateEntity(fromDTO, AddStaffV2FromDTO.AddStaff.class); fromDTO.setCustomerId(tokenDto.getCustomerId()); fromDTO.setApp(tokenDto.getApp()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java index fc2f954b02..9d9929a9ae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java @@ -134,9 +134,10 @@ public interface StaffService { /** * 【通讯录】人员添加v2 + * 返回staffId * @author sun */ - Result addStaffV2(AddStaffV2FromDTO fromDTO); + Result addStaffV2(AddStaffV2FromDTO fromDTO); /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 6950cbcc3c..9dc4670192 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -537,7 +537,7 @@ public class StaffServiceImpl implements StaffService { */ @Override @Transactional(rollbackFor = Exception.class) - public Result addStaffV2(AddStaffV2FromDTO fromDTO) { + public Result addStaffV2(AddStaffV2FromDTO fromDTO) { //1.根据新增人员类型判断查询机关信息 OrgResultDTO orgDTO = customerAgencyDao.selectAgencyDetail(fromDTO.getOrgId(), fromDTO.getOrgType()); if (null == orgDTO) { @@ -612,8 +612,13 @@ public class StaffServiceImpl implements StaffService { throw new EpmetException("save data to gov-role-user failure"); } } + //如果是烟台的需要更新 根据手机号+姓名 更新data_sync_user_data置为已创建、记录staffId + // todo - return new Result(); + //2022.10.18加个返参，借用下StaffDetailResultDTO不再新建dto了 + StaffDetailResultDTO resultDTO=new StaffDetailResultDTO(); + resultDTO.setStaffId(result.getData().getUserId()); + return new Result().ok(resultDTO); } From ae2008d288d3a08a230b1179808d02d48391ce63 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 13:36:47 +0800 Subject: [PATCH 211/621] vote --- .../com/epmet/dto/form/IssueIdFormDTO.java | 2 +- .../com/epmet/dto/result/VoteResultDTO.java | 2 +- .../epmet/service/impl/IssueServiceImpl.java | 36 ++++++++++--------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java index ce1b760bb3..58d12671de 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java @@ -19,7 +19,7 @@ public class IssueIdFormDTO implements Serializable { /** * 当 sourceType = issue 时，是直接创建议题，无需加入小组即可表决 */ - private String sourceType; + private String sourceType = "resi_topic"; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java index 7f81035bf1..dfa73fe47e 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java @@ -31,7 +31,7 @@ public class VoteResultDTO implements Serializable { /** * 是否加入小组 已加入：true，未加入：false */ - private Boolean voteAuthorization; + private Boolean voteAuthorization = false; /** * 支持：support 反对：oppose diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 6c61788c10..2eddf62d6a 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -22,6 +22,7 @@ import com.epmet.resi.group.dto.topic.form.TopicDetailBatchFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.IssueService; +import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -217,25 +218,26 @@ public class IssueServiceImpl implements IssueService { GridIdFormDTO gridIdFormDTO = new GridIdFormDTO(); gridIdFormDTO.setGridId(gridId.getGridId()); gridIdFormDTO.setUserId(tokenDto.getUserId()); - Result checkJoinTeam = resiGroupFeignClient.checkjointeam(gridIdFormDTO); - if (!checkJoinTeam.success()){ - throw new RenException("查询校验用户是否加入小组失败"); - } - CheckJoinTeamResultDTO check = checkJoinTeam.getData(); - //未加入小组 - if (check.getVoteAuthorization()==false){ - voteResultDTOResult.setVoteFlag(false); - voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization()); - voteResultDTOResult.setOppositionCount(NumConstant.ZERO); - voteResultDTOResult.setSupportCount(NumConstant.ZERO); - }else { - Result voteResult = govIssueFeignClient.voteCount(issueId); - if (!voteResult.success()){ - throw new RenException("查询表决中议题详情——支持、反对数失败"); + if (issueId.getSourceType().equals("resi_topic")){ + Result checkJoinTeam = resiGroupFeignClient.checkjointeam(gridIdFormDTO); + if (!checkJoinTeam.success()){ + throw new RenException("查询校验用户是否加入小组失败"); + } + CheckJoinTeamResultDTO check = checkJoinTeam.getData(); + //未加入小组 + if (check.getVoteAuthorization()==false){ + voteResultDTOResult.setVoteFlag(false); + voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization()); + voteResultDTOResult.setOppositionCount(NumConstant.ZERO); + voteResultDTOResult.setSupportCount(NumConstant.ZERO); } - voteResultDTOResult = voteResult.getData(); - voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization()); + return voteResultDTOResult; + } + Result voteResult = govIssueFeignClient.voteCount(issueId); + if (!voteResult.success()){ + throw new RenException("查询表决中议题详情——支持、反对数失败"); } + voteResultDTOResult = voteResult.getData(); return voteResultDTOResult; } From 8c70b4c74685b7a1121626e550d1a9666bdb0743 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 13:51:17 +0800 Subject: [PATCH 212/621] =?UTF-8?q?/gov/org/customeragency/agencylist?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=BF=90=E8=90=A5=E7=AB=AF=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/GetAgencyListFormDTO.java | 8 ++++++++ .../com/epmet/controller/CustomerAgencyController.java | 9 +++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java index 95c371ad83..64dd258641 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java @@ -1,7 +1,9 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -14,6 +16,12 @@ public class GetAgencyListFormDTO implements Serializable { private static final long serialVersionUID = -5846836779036328298L; + /** + * 这个接口在运营端统一认证，新增用户事也调用了 + */ + public interface OperAddUserShowGroup extends CustomerClientShowGroup { + } + @NotBlank(message = "运营端调用此接口必须传客户id",groups =OperAddUserShowGroup.class ) private String customerId; 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 c1aba9bb3c..6a8c433250 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 @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -348,8 +349,12 @@ public class CustomerAgencyController { */ @PostMapping("agencylist") public Result getAgencyList(@LoginUser TokenDto tokenDTO,@RequestBody GetAgencyListFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getCustomerId())){ - formDTO.setCustomerId(tokenDTO.getCustomerId()); + if(AppClientConstant.APP_OPER.equals(tokenDTO.getApp())){ + ValidatorUtils.validateEntity(formDTO.getCustomerId(),GetAgencyListFormDTO.OperAddUserShowGroup.class); + }else{ + if (StringUtils.isBlank(formDTO.getCustomerId())){ + formDTO.setCustomerId(tokenDTO.getCustomerId()); + } } return new Result().ok(customerAgencyService.getAgencyList(formDTO)); } From d8a05f9f1253e04de68782b7df51e5c2397a8945 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 14:14:10 +0800 Subject: [PATCH 213/621] =?UTF-8?q?/gov/org/staff/addstaffv2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E7=94=A8/third/dataSync/update-staff=E6=9B=B4=E6=96=B0staffId?= =?UTF-8?q?=EF=BC=8Cstatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetThirdOpenFeignClient.java | 4 ++++ .../EpmetThirdOpenFeignClientFallback.java | 5 +++++ .../yantai/DataSyncUserAndOrgController.java | 15 ++++++++++++++ .../yantai/DataSyncUserAndOrgService.java | 9 +++++++++ .../yantai/DataSyncUserAndOrgServiceImpl.java | 13 ++++++++++++ .../epmet/dao/yantai/DataSyncUserDataDao.java | 7 +++++++ .../mapper/yantai/DataSyncUserDataDao.xml | 13 ++++++++++++ .../com/epmet/dto/form/AddStaffV2FromDTO.java | 2 ++ .../com/epmet/controller/StaffController.java | 1 + .../epmet/service/impl/StaffServiceImpl.java | 20 +++++++++++++------ 10 files changed, 83 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java index f0fef19e58..0638d340be 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.BlockChainCreateProjectFormDTO; import com.epmet.dto.form.BlockChainProcessProjectFormDTO; import com.epmet.dto.form.ProjectApplyAssistFormDTO; +import com.epmet.dto.form.yantai.YtSyncStaffIdFormDTO; import com.epmet.dto.result.ProjectAssistResult; import com.epmet.dto.result.UploadFileResultDTO; import com.epmet.feign.fallback.EpmetThirdOpenFeignClientFallbackFactory; @@ -75,6 +76,9 @@ public interface EpmetThirdOpenFeignClient { @PostMapping("/third/blockchain/project/process") Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input); + @PostMapping("/third/dataSync/update-staff") + Result dataSyncUpdateStaff(@RequestBody YtSyncStaffIdFormDTO ytSyncStaffIdFormDTO); + class MultipartSupportConfig { @Autowired diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java index ebf63b3e49..ec7901a7a1 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.BlockChainCreateProjectFormDTO; import com.epmet.dto.form.BlockChainProcessProjectFormDTO; import com.epmet.dto.form.ProjectApplyAssistFormDTO; +import com.epmet.dto.form.yantai.YtSyncStaffIdFormDTO; import com.epmet.dto.result.ProjectAssistResult; import com.epmet.dto.result.UploadFileResultDTO; import com.epmet.feign.EpmetThirdOpenFeignClient; @@ -57,4 +58,8 @@ public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignCli return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "processProject", input); } + @Override + public Result dataSyncUpdateStaff(YtSyncStaffIdFormDTO ytSyncStaffIdFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "updateStaff", ytSyncStaffIdFormDTO); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java index 9ebbbfa8d3..e0122911d1 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java @@ -2,6 +2,9 @@ package com.epmet.controller.yantai; import com.epmet.commons.tools.page.PageData; 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.dto.form.yantai.YtSyncStaffIdFormDTO; import com.epmet.dto.form.yantai.YtUserPageFormDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -55,4 +58,16 @@ public class DataSyncUserAndOrgController { return new Result>().ok(dataSyncUserAndOrgService.pageUser(formDTO)); } + /** + * 工作端新增完用户后，需要调用此接口，更新data_sync_user_data + * + * @param formDTO + * @return + */ + @PostMapping("update-staff") + public Result updateStaff(@RequestBody YtSyncStaffIdFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + dataSyncUserAndOrgService.updateStaff(formDTO.getCustomerId(),formDTO.getOperUserId(),formDTO.getStaffId(),formDTO.getName(),formDTO.getMobile()); + return new Result(); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java index 42b002eb07..320bc29919 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java @@ -19,4 +19,13 @@ public interface DataSyncUserAndOrgService { * @return */ PageData pageUser(YtUserPageFormDTO formDTO); + + /** + * 工作端新增完用户后，需要调用此接口，更新data_sync_user_data + * @param customerId + * @param staffId + * @param name + * @param mobile + */ + int updateStaff(String customerId,String operUserId, String staffId, String name, String mobile); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 60eb24a678..9de208d165 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -54,4 +54,17 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } + + /** + * 工作端新增完用户后，需要调用此接口，更新data_sync_user_data + * + * @param customerId + * @param staffId + * @param name + * @param mobile + */ + @Override + public int updateStaff(String customerId, String operUserId,String staffId, String name, String mobile) { + return dataSyncUserDataDao.updateStaff(customerId,operUserId,staffId,name,mobile); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java index aa3caaf4d9..170bbb82c1 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java @@ -5,6 +5,7 @@ import com.epmet.dto.form.yantai.YtUserPageFormDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; import com.epmet.entity.yantai.DataSyncUserDataEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,4 +23,10 @@ public interface DataSyncUserDataDao extends BaseDao { * @return */ List pageUser(YtUserPageFormDTO formDTO); + + int updateStaff(@Param("customerId") String customerId, + @Param("operUserId")String operUserId, + @Param("staffId")String staffId, + @Param("name")String name, + @Param("mobile")String mobile); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml index 204f27314c..dbb8b3c455 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml @@ -73,4 +73,17 @@ order by o.ORDER_NUMBER asc,u.ORDER_NUMBER asc + + + UPDATE data_sync_user_data + SET UPDATED_BY = #{operUserId}, + UPDATED_TIME = NOW(), + `STATUS` = '1', + STAFF_ID = #{staffId}, + CUSTOMER_ID = #{customerId} + WHERE + MOBILE_TELEPHONE_NUMBER = #{mobile} + AND USER_NAME = #{name} + AND del_flag = '0' + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java index 705ddfaadb..ecdfba89f9 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java @@ -73,4 +73,6 @@ public class AddStaffV2FromDTO implements Serializable { private String client; private List newRoles; + + private String currentStaffId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 4f2c228243..892f92087b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -206,6 +206,7 @@ public class StaffController { fromDTO.setCustomerId(tokenDto.getCustomerId()); fromDTO.setApp(tokenDto.getApp()); fromDTO.setClient(tokenDto.getClient()); + fromDTO.setCurrentStaffId(tokenDto.getUserId()); return staffService.addStaffV2(fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 9dc4670192..9269f249ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -17,6 +17,7 @@ import com.epmet.dao.CustomerStaffAgencyDao; import com.epmet.dao.StaffOrgRelationDao; import com.epmet.dto.*; import com.epmet.dto.form.*; +import com.epmet.dto.form.yantai.YtSyncStaffIdFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.feign.*; @@ -46,8 +47,6 @@ public class StaffServiceImpl implements StaffService { @Autowired private EpmetUserFeignClient epmetUserFeignClient; @Autowired - private OperCrmFeignClient operCrmFeignClient; - @Autowired private CustomerAgencyService customerAgencyService; @Autowired private CustomerStaffAgencyService customerStaffAgencyService; @@ -76,11 +75,11 @@ public class StaffServiceImpl implements StaffService { @Autowired private StaffOrgRelationService staffOrgRelationService; @Resource - private CustomerStaffRedis customerStaffRedis; - @Resource private StaffOrgRelationDao staffOrgRelationDao; @Autowired private GovAccessFeignClient govAccessFeignClient; + @Autowired + private EpmetThirdOpenFeignClient epmetThirdOpenFeignClient; @Override public Result getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) { @@ -613,8 +612,17 @@ public class StaffServiceImpl implements StaffService { } } //如果是烟台的需要更新 根据手机号+姓名 更新data_sync_user_data置为已创建、记录staffId - // todo - + // 开发环境默认：45687aa479955f9d06204d415238f7cc + // 测试环境：0c41b272ee9ee95ac6f184ad548a30eb + // 烟台： 1535072605621841922 + if ("1535072605621841922".equals(fromDTO.getCustomerId()) + || "45687aa479955f9d06204d415238f7cc".equals(fromDTO.getCustomerId()) + || "0c41b272ee9ee95ac6f184ad548a30eb".equals(fromDTO.getCustomerId())) { + YtSyncStaffIdFormDTO ytSyncStaffIdFormDTO = ConvertUtils.sourceToTarget(fromDTO,YtSyncStaffIdFormDTO.class); + ytSyncStaffIdFormDTO.setStaffId(result.getData().getUserId()); + ytSyncStaffIdFormDTO.setOperUserId(fromDTO.getCurrentStaffId()); + epmetThirdOpenFeignClient.dataSyncUpdateStaff(ytSyncStaffIdFormDTO); + } //2022.10.18加个返参，借用下StaffDetailResultDTO不再新建dto了 StaffDetailResultDTO resultDTO=new StaffDetailResultDTO(); resultDTO.setStaffId(result.getData().getUserId()); From 7a30d453b406728c8e72f2b5c75965c4f6518120 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 14:15:14 +0800 Subject: [PATCH 214/621] =?UTF-8?q?/gov/org/staff/addstaffv2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E7=94=A8/third/dataSync/update-staff=E6=9B=B4=E6=96=B0staffId?= =?UTF-8?q?=EF=BC=8Cstatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/yantai/YtSyncStaffIdFormDTO.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/yantai/YtSyncStaffIdFormDTO.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/yantai/YtSyncStaffIdFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/yantai/YtSyncStaffIdFormDTO.java new file mode 100644 index 0000000000..522f2926ee --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/yantai/YtSyncStaffIdFormDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.form.yantai; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description 工作端新增完用户后，需要调用此接口，更新data_sync_user_data + * @Author yzm + * @Date 2022/10/18 13:54 + */ +@Data +public class YtSyncStaffIdFormDTO { + /** + * 客户ID + */ + @NotBlank(message = "customerId不能为空",groups = AddGroup.class) + private String customerId; + /** + * 人员ID + */ + @NotBlank(message = "staffId不能为空",groups = AddGroup.class) + private String staffId; + + @NotBlank(message = "name不能为空",groups = AddGroup.class) + private String name; + + @NotBlank(message = "mobile不能为空",groups = AddGroup.class) + private String mobile; + + @NotBlank(message = "当前操作人id不能为空",groups = AddGroup.class) + private String operUserId; + +} + From cc82f45c88b415756cd0ff4f3012009587ee9c50 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 14:16:14 +0800 Subject: [PATCH 215/621] =?UTF-8?q?updateStaff=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/yantai/DataSyncUserDataDao.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java index 170bbb82c1..f1bc42e2e8 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java @@ -24,6 +24,15 @@ public interface DataSyncUserDataDao extends BaseDao { */ List pageUser(YtUserPageFormDTO formDTO); + /** + * 更新data_sync_user_data 为已创建、记录staffId + * @param customerId + * @param operUserId + * @param staffId + * @param name + * @param mobile + * @return + */ int updateStaff(@Param("customerId") String customerId, @Param("operUserId")String operUserId, @Param("staffId")String staffId, From dfcf11438097181415801c44ba10eee7cba6cc71 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 14:19:18 +0800 Subject: [PATCH 216/621] vote --- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2eddf62d6a..f13aff5a82 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -231,7 +231,6 @@ public class IssueServiceImpl implements IssueService { voteResultDTOResult.setOppositionCount(NumConstant.ZERO); voteResultDTOResult.setSupportCount(NumConstant.ZERO); } - return voteResultDTOResult; } Result voteResult = govIssueFeignClient.voteCount(issueId); if (!voteResult.success()){ From 09160e9a8a5519c0ff79ea4b701c4c4a52949d00 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 14:25:04 +0800 Subject: [PATCH 217/621] vote --- .../src/main/java/com/epmet/dto/result/VoteResultDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java index dfa73fe47e..33207f51f8 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java @@ -31,7 +31,7 @@ public class VoteResultDTO implements Serializable { /** * 是否加入小组 已加入：true，未加入：false */ - private Boolean voteAuthorization = false; + private Boolean voteAuthorization = true; /** * 支持：support 反对：oppose From 481c9dcdd66e52c1e238ba57c56ea33d1dd2b4c6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 14:42:40 +0800 Subject: [PATCH 218/621] =?UTF-8?q?/third/dataSync/ytorglist=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/yantai/DataSyncOrgDataDTO.java | 23 +++++++++++++++++++ .../yantai/DataSyncUserAndOrgController.java | 14 +++++++++++ .../yantai/DataSyncUserAndOrgService.java | 10 ++++++++ .../yantai/DataSyncUserAndOrgServiceImpl.java | 17 +++++++++++++- .../epmet/dao/yantai/DataSyncOrgDataDao.java | 11 ++++++++- .../entity/yantai/DataSyncOrgDataEntity.java | 2 +- .../mapper/yantai/DataSyncOrgDataDao.xml | 17 +++++++++++++- 7 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/DataSyncOrgDataDTO.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/DataSyncOrgDataDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/DataSyncOrgDataDTO.java new file mode 100644 index 0000000000..1a3b19a855 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/DataSyncOrgDataDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result.yantai; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/10/18 14:21 + */ +@Data +public class DataSyncOrgDataDTO implements Serializable { + private static final long serialVersionUID = -3011177998045994250L; + private String orgId; + private String orgName; + private String pid; + /** + * true代表有下级 + */ + private Boolean haveChild; +} + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java index e0122911d1..888e18ea3c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.dto.form.yantai.YtSyncStaffIdFormDTO; import com.epmet.dto.form.yantai.YtUserPageFormDTO; +import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * desc: 从各个平台-同步用户和组织数据到本地 用于生成本系统账号 * @@ -70,4 +73,15 @@ public class DataSyncUserAndOrgController { dataSyncUserAndOrgService.updateStaff(formDTO.getCustomerId(),formDTO.getOperUserId(),formDTO.getStaffId(),formDTO.getName(),formDTO.getMobile()); return new Result(); } + + /** + * 运营端，统一认证 列表查询条件 那颗树 调用此接口 + * @param formDTO + * @return + */ + @PostMapping("ytorglist") + public Result> ytOrgList(@RequestBody YtUserPageFormDTO formDTO){ + List list=dataSyncUserAndOrgService.ytOrgList(formDTO.getOrgId()); + return new Result>().ok(list); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java index 320bc29919..eedd580077 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgService.java @@ -2,8 +2,11 @@ package com.epmet.controller.yantai; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.form.yantai.YtUserPageFormDTO; +import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; +import java.util.List; + /** * @author liujianjun */ @@ -28,4 +31,11 @@ public interface DataSyncUserAndOrgService { * @param mobile */ int updateStaff(String customerId,String operUserId, String staffId, String name, String mobile); + + /** + * 根据组织id查询下级组织 + * @param pid + * @return + */ + List ytOrgList(String pid); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 9de208d165..51e99171ea 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -1,8 +1,10 @@ package com.epmet.controller.yantai; import com.epmet.commons.tools.page.PageData; +import com.epmet.dao.yantai.DataSyncOrgDataDao; import com.epmet.dao.yantai.DataSyncUserDataDao; import com.epmet.dto.form.yantai.YtUserPageFormDTO; +import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; import com.epmet.utils.OrgData; import com.epmet.utils.UserData; @@ -23,7 +25,8 @@ import java.util.List; public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService { @Autowired private DataSyncUserDataDao dataSyncUserDataDao; - + @Autowired + private DataSyncOrgDataDao dataSyncOrgDataDao; @Override public Boolean yanTaiSyncUser(String organizationId) { @@ -67,4 +70,16 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService public int updateStaff(String customerId, String operUserId,String staffId, String name, String mobile) { return dataSyncUserDataDao.updateStaff(customerId,operUserId,staffId,name,mobile); } + + /** + * 根据组织id查询下级组织 + * + * @param pid + * @return + */ + @Override + public List ytOrgList(String pid) { + List list=dataSyncOrgDataDao.queryList(pid); + return list; + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java index 9e5ad6b28b..edad699db9 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java @@ -1,8 +1,12 @@ package com.epmet.dao.yantai; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.entity.yantai.DataSyncOrgDataEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @@ -12,5 +16,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface DataSyncOrgDataDao extends BaseDao { - + /** + * 根据pid查询下一级组织列表 + * @param pid + * @return + */ + List queryList(@Param("pid") String pid); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncOrgDataEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncOrgDataEntity.java index 95a12a46c4..5c46e0b939 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncOrgDataEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/yantai/DataSyncOrgDataEntity.java @@ -89,7 +89,7 @@ public class DataSyncOrgDataEntity extends BaseEpmetEntity { private String customerId; /** - * 上级组织机构id:ORGANIZATION_ID + * 上级组织机构id:ORGANIZATION_ID; 根级组织赋值0 */ private String pid; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml index 0c6f3288ef..6f81c501f3 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml @@ -30,5 +30,20 @@ - + \ No newline at end of file From 543e0ecf974fc0c474f0b15a9b61ca966c5c9dda Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 14:49:56 +0800 Subject: [PATCH 219/621] =?UTF-8?q?/third/dataSync/page-user=E8=BF=94?= =?UTF-8?q?=E5=9B=9EcustomerId,/gov/org/staff/editstaffinit=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=BF=90=E8=90=A5=E7=AB=AF=E8=B0=83=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/yantai/YtUserPageResDTO.java | 2 ++ .../main/resources/mapper/yantai/DataSyncUserDataDao.xml | 3 ++- .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java index 1600fa6052..38da48f7a9 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/yantai/YtUserPageResDTO.java @@ -50,5 +50,7 @@ public class YtUserPageResDTO { * 备注；目前为空 */ private String remark; + + private String customerId; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml index dbb8b3c455..fdcedc74d9 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml @@ -41,7 +41,8 @@ u.GENDER AS gender, u.`STATUS` AS status, IFNULL(u.STAFF_ID,'') AS staffId, - IFNULL(u.REMARK, '' ) AS remark + IFNULL(u.REMARK, '' ) AS remark, + u.CUSTOMER_ID as customerId FROM data_sync_user_data u LEFT JOIN data_sync_org_data o ON ( u.ORGANIZATION_ID = o.ORGANIZATION_ID ) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 9269f249ad..417cce8a29 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -135,8 +135,11 @@ public class StaffServiceImpl implements StaffService { @Override public Result editStaffInit(StaffInfoFromDTO fromDTO) { - CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); - fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); + //运营端-统一认证调用此接口时，客户id传值了。 + if(StringUtils.isBlank(fromDTO.getCustomerId())){ + CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); + fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); + } return epmetUserFeignClient.editStaffInit(fromDTO); } From 1e73bf6b5fdc6a1a681646b90525a0012db5d2ae Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 15:13:18 +0800 Subject: [PATCH 220/621] =?UTF-8?q?/resi/partymember/icPartyMember/1570322?= =?UTF-8?q?92946977587=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/controller/IcPartyMemberController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index a27833eb76..84c079c14a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -89,6 +89,7 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result>().ok(page); } + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@LoginUser TokenDto tokenDto, @PathVariable("id") String id){ IcPartyMemberDTO data = icPartyMemberService.get(tokenDto, id); From 79640cf5d2f2b4e444e8805fc3a0233bf3ebc23e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 15:15:48 +0800 Subject: [PATCH 221/621] =?UTF-8?q?/resi/partymember/icPartyMember/1570322?= =?UTF-8?q?92946977587=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/partymember/dto/partymember/IcPartyMemberDTO.java | 3 ++- .../partymember/controller/IcPartyMemberController.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java index 9832a35e5e..74c7166a2c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java @@ -63,7 +63,8 @@ public class IcPartyMemberDTO implements Serializable { */ @NotBlank(message = "当前网格id不能为空",groups ={AddGroup.class, UpdateGroup.class}) private String mobile; - + private String showMobile; + private String showIdCard; /** * 身份证号 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 84c079c14a..7628cfbb82 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -89,10 +89,14 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result>().ok(page); } - @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@LoginUser TokenDto tokenDto, @PathVariable("id") String id){ IcPartyMemberDTO data = icPartyMemberService.get(tokenDto, id); + if(null!=data){ + data.setShowMobile(data.getMobile()); + data.setShowIdCard(data.getIdCard()); + } return new Result().ok(data); } @NoRepeatSubmit From d835e21367c97e0c8814fa353a3c0963967d97e8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 15:22:58 +0800 Subject: [PATCH 222/621] =?UTF-8?q?=E6=8D=A2=E6=8D=A2=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/yantai/DataSyncUserAndOrgServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 51e99171ea..5866b1efdb 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.utils.UserData; import com.epmet.utils.YantaiApi; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -30,15 +31,17 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService @Override public Boolean yanTaiSyncUser(String organizationId) { - List data = YantaiApi.getChildOuInfoByGuid(organizationId); + List data = YantaiApi.getUserByOuGuid(organizationId); //todo 更新或插入数据 return false; } @Override public Boolean yanTaiSyncOrg(String organizationId) { - List data = YantaiApi.getUserByOuGuid(organizationId); + List data = YantaiApi.getChildOuInfoByGuid(organizationId); + if (CollectionUtils.isNotEmpty(data)){ + } return false; } From 342f93077bb16a495076fe09133a4f6942102635 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 15:51:21 +0800 Subject: [PATCH 223/621] =?UTF-8?q?/gov/org/staff/rolelist=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=BF=90=E8=90=A5=E7=AB=AF=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/StaffServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 417cce8a29..8eed306d5b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -126,10 +126,20 @@ public class StaffServiceImpl implements StaffService { return epmetUserFeignClient.getStaffList(fromDTO); } + /** + * 人员添加页面初始化 + * 备注：2022.10.18运营端-统一认证也会调用此接口，入参会给customerId + * @param fromDTO 参数 + * @return + */ @Override public Result> addStaffInit(StaffInfoFromDTO fromDTO) { - CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); - fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); + if(StringUtils.isBlank(fromDTO.getCustomerId())){ + if(StringUtils.isNotBlank(fromDTO.getAgencyId())){ + CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); + fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); + } + } return epmetUserFeignClient.addStaffInit(fromDTO); } From 5f64a715d9aa245945297cd8e964bd527e67aa2b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 15:54:11 +0800 Subject: [PATCH 224/621] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/DataSyncOrgDataDTO.java | 139 ++++++++++++++++++ .../com/epmet/dto/DataSyncUserDataDTO.java | 124 ++++++++++++++++ .../yantai/DataSyncUserAndOrgServiceImpl.java | 27 ++++ .../epmet/service/DataSyncOrgDataService.java | 78 ++++++++++ .../service/DataSyncUserDataService.java | 78 ++++++++++ .../impl/DataSyncOrgDataServiceImpl.java | 83 +++++++++++ .../impl/DataSyncUserDataServiceImpl.java | 83 +++++++++++ 7 files changed, 612 insertions(+) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/DataSyncOrgDataDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/DataSyncUserDataDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncOrgDataService.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncUserDataService.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncOrgDataServiceImpl.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/DataSyncOrgDataDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/DataSyncOrgDataDTO.java new file mode 100644 index 0000000000..fd5f9121c7 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/DataSyncOrgDataDTO.java @@ -0,0 +1,139 @@ +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-10-18 + */ +@Data +public class DataSyncOrgDataDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 联系人姓名 + */ + private String contact; + + /** + * 联系电话号码 + */ + private String contacttelephoneNumber; + + /** + * 详细地址 + */ + private String detailAddress; + + /** + * 组织机构第一名称 + */ + private String firstnameofOrganization; + + /** + * 组织机构全称 + */ + private String nameofOrganization; + + /** + * 排序号码 + */ + private String orderNumber; + + /** + * 组织机构简称 + */ + private String organizatioNabbreviation; + + /** + * 组织机构ID + */ + private String organizationId; + + /** + * 组织机构级别 + */ + private String organizationLevel; + + /** + * 组织机构路径 + */ + private String organizationPath; + + /** + * 组织机构类型 + */ + private String organizationType; + + /** + * 注册类型 + */ + private String registrationType; + + /** + * 统一社会信用代码 + */ + private String unifiedsocialcreditId; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 客户id;烟台id + */ + private String customerId; + + /** + * 上级组织机构id:ORGANIZATION_ID; 根级组织赋值0 + */ + private String pid; + + /** + * 上级组织机构名称：ORGANIZATIO_NABBREVIATION + */ + private String parentOrgName; + + /** + * 所有上级组织。不包含本身！ + */ + private String pids; + +} \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/DataSyncUserDataDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/DataSyncUserDataDTO.java new file mode 100644 index 0000000000..291d40d7de --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/DataSyncUserDataDTO.java @@ -0,0 +1,124 @@ +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-10-18 + */ +@Data +public class DataSyncUserDataDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 性别:0未知1男2女 + */ + private String gender; + + /** + * 手机号码 + */ + private String mobileTelephoneNumber; + + /** + * 排序号码 + */ + private String orderNumber; + + /** + * 职务 + */ + private String position; + + /** + * 职级 + */ + private String positionLevel; + + /** + * 电话号码 + */ + private String telephoneNumber; + + /** + * 统一用户编码 + */ + private String userGuid; + + /** + * 用户姓名 + */ + private String userName; + + /** + * 人员路径 + */ + private String userPath; + + /** + * data_sync_org_data.组织机构ID; + */ + private String organizationId; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 客户id + */ + private String customerId; + + /** + * 0未创建、1已创建 + */ + private String status; + + /** + * customer_staff.userId + */ + private String staffId; + + /** + * 备注；目前为空 + */ + private String remark; + +} \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 5866b1efdb..ada434a02e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -6,15 +6,21 @@ import com.epmet.dao.yantai.DataSyncUserDataDao; import com.epmet.dto.form.yantai.YtUserPageFormDTO; import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; +import com.epmet.service.DataSyncOrgDataService; +import com.epmet.service.DataSyncUserDataService; import com.epmet.utils.OrgData; import com.epmet.utils.UserData; import com.epmet.utils.YantaiApi; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * desc:烟台 从认证中心同步组织和用户信息 到本地 @@ -23,11 +29,17 @@ import java.util.List; * @date: 2022/10/17 3:42 下午 * @version: 1.0 */ +@Service +@Slf4j public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService { @Autowired private DataSyncUserDataDao dataSyncUserDataDao; @Autowired private DataSyncOrgDataDao dataSyncOrgDataDao; + @Autowired + private DataSyncOrgDataService dataSyncOrgDataService; + @Autowired + private DataSyncUserDataService dataSyncUserDataService; @Override public Boolean yanTaiSyncUser(String organizationId) { @@ -40,11 +52,26 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService public Boolean yanTaiSyncOrg(String organizationId) { List data = YantaiApi.getChildOuInfoByGuid(organizationId); if (CollectionUtils.isNotEmpty(data)){ + List needInsert = new ArrayList<>(); + data.forEach(d -> { + needInsert.add(d); + disposeYanTaiSyncOrg(d.getOrganizationId(),needInsert); + }); } return false; } + public void disposeYanTaiSyncOrg(String organizationId, List needInsert){ + List data = YantaiApi.getChildOuInfoByGuid(organizationId); + if (CollectionUtils.isNotEmpty(data)){ + needInsert.addAll(data); + data.forEach(d -> { + disposeYanTaiSyncOrg(d.getOrganizationId(),needInsert); + }); + } + } + /** * 运营端-统一认证 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncOrgDataService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncOrgDataService.java new file mode 100644 index 0000000000..3a3d40fe2d --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncOrgDataService.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.DataSyncOrgDataDTO; +import com.epmet.entity.yantai.DataSyncOrgDataEntity; + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-18 + */ +public interface DataSyncOrgDataService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return DataSyncOrgDataDTO + * @author generator + * @date 2022-10-18 + */ + DataSyncOrgDataDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-18 + */ + void save(DataSyncOrgDataDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-18 + */ + void update(DataSyncOrgDataDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncUserDataService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncUserDataService.java new file mode 100644 index 0000000000..0b5e41df00 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncUserDataService.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.DataSyncUserDataDTO; +import com.epmet.entity.yantai.DataSyncUserDataEntity; + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-18 + */ +public interface DataSyncUserDataService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return DataSyncUserDataDTO + * @author generator + * @date 2022-10-18 + */ + DataSyncUserDataDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-18 + */ + void save(DataSyncUserDataDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-18 + */ + void update(DataSyncUserDataDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncOrgDataServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncOrgDataServiceImpl.java new file mode 100644 index 0000000000..2191a77c85 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncOrgDataServiceImpl.java @@ -0,0 +1,83 @@ +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.yantai.DataSyncOrgDataDao; +import com.epmet.dto.DataSyncOrgDataDTO; +import com.epmet.entity.yantai.DataSyncOrgDataEntity; +import com.epmet.service.DataSyncOrgDataService; +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-10-18 + */ +@Service +public class DataSyncOrgDataServiceImpl extends BaseServiceImpl implements DataSyncOrgDataService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, DataSyncOrgDataDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, DataSyncOrgDataDTO.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 DataSyncOrgDataDTO get(String id) { + DataSyncOrgDataEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, DataSyncOrgDataDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(DataSyncOrgDataDTO dto) { + DataSyncOrgDataEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncOrgDataEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(DataSyncOrgDataDTO dto) { + DataSyncOrgDataEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncOrgDataEntity.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-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java new file mode 100644 index 0000000000..87ffb7a479 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java @@ -0,0 +1,83 @@ +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.yantai.DataSyncUserDataDao; +import com.epmet.dto.DataSyncUserDataDTO; +import com.epmet.entity.yantai.DataSyncUserDataEntity; +import com.epmet.service.DataSyncUserDataService; +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-10-18 + */ +@Service +public class DataSyncUserDataServiceImpl extends BaseServiceImpl implements DataSyncUserDataService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, DataSyncUserDataDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, DataSyncUserDataDTO.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 DataSyncUserDataDTO get(String id) { + DataSyncUserDataEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, DataSyncUserDataDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(DataSyncUserDataDTO dto) { + DataSyncUserDataEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncUserDataEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(DataSyncUserDataDTO dto) { + DataSyncUserDataEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncUserDataEntity.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 From df8e0d32f71c52304b9801f76a07c61192c819a0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 16:25:01 +0800 Subject: [PATCH 225/621] =?UTF-8?q?/gov/org/staff/editstaff=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E4=B8=8B=E8=BF=90=E8=90=A5=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/StaffController.java | 2 +- .../java/com/epmet/service/StaffService.java | 2 +- .../epmet/service/impl/StaffServiceImpl.java | 31 ++++++++++++------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 892f92087b..0463372db2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -98,7 +98,7 @@ public class StaffController { @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_UPDATE) public Result editStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitFromDTO fromDTO){ ValidatorUtils.validateEntity(fromDTO); - return staffService.editStaff(tokenDto, fromDTO); + return staffService.editStaff(fromDTO); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java index 9d9929a9ae..5a4a989166 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java @@ -62,7 +62,7 @@ public interface StaffService { * @param fromDTO 参数 * @return Result */ - Result editStaff(TokenDto tokenDto,StaffSubmitFromDTO fromDTO); + Result editStaff(StaffSubmitFromDTO fromDTO); /** * 人员编辑 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 8eed306d5b..954eb170df 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -191,13 +191,20 @@ public class StaffServiceImpl implements StaffService { return new Result(); } + /** + * + * @param tokenDto TokenDto tokenDto, + * @param fromDTO + * @return + */ @Override - public Result editStaff(TokenDto tokenDto, StaffSubmitFromDTO fromDTO) { - CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); - fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); - - fromDTO.setApp(tokenDto.getApp()); - fromDTO.setClient(tokenDto.getClient()); + public Result editStaff(StaffSubmitFromDTO fromDTO) { + if(StringUtils.isBlank(fromDTO.getCustomerId())){ + CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); + fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); + } + // fromDTO.setApp(tokenDto.getApp()); + // fromDTO.setClient(tokenDto.getClient()); Result result = epmetUserFeignClient.editStaff(fromDTO); if (!result.success()) { if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) { @@ -205,12 +212,14 @@ public class StaffServiceImpl implements StaffService { } return new Result().error(EpmetErrorCode.STAFF_EDIT_FAILED.getCode(), EpmetErrorCode.STAFF_EDIT_FAILED.getMsg()); } - if (tokenDto.getClient().equals("web")){ - Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(),fromDTO.getCustomerId())); - if (!roleUserAccess.success()){ - throw new EpmetException("save data to gov-role-user failure"); + // if (tokenDto.getClient().equals("web")){ + if(CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){ + Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(),fromDTO.getCustomerId())); + if (!roleUserAccess.success()){ + throw new EpmetException("save data to gov-role-user failure"); + } } - } + // } //2021.8.24 sun 人员信息编辑时删除工作人员的缓存信息 CustomerStaffRedis.delStaffInfoFormCache(fromDTO.getCustomerId(), fromDTO.getStaffId()); return result; From 7bcddfad6982405bed6637907f0c2d07a4ff49f6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 16:45:56 +0800 Subject: [PATCH 226/621] =?UTF-8?q?=E6=8B=89=E5=8F=96org?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/YanTaiConstant.java | 12 ++++++++++++ .../yantai/DataSyncUserAndOrgServiceImpl.java | 16 +++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/YanTaiConstant.java diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/YanTaiConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/YanTaiConstant.java new file mode 100644 index 0000000000..74e1d13560 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/YanTaiConstant.java @@ -0,0 +1,12 @@ +package com.epmet.constant; + +/** + * @Author zxc + * @DateTime 2022/10/18 16:43 + * @DESC + */ +public interface YanTaiConstant { + + String YT_CUSTOMER_ID = "1535072605621841922"; + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index ada434a02e..df431a925e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -1,11 +1,14 @@ package com.epmet.controller.yantai; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.yantai.DataSyncOrgDataDao; import com.epmet.dao.yantai.DataSyncUserDataDao; import com.epmet.dto.form.yantai.YtUserPageFormDTO; import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; +import com.epmet.entity.yantai.DataSyncOrgDataEntity; import com.epmet.service.DataSyncOrgDataService; import com.epmet.service.DataSyncUserDataService; import com.epmet.utils.OrgData; @@ -21,6 +24,9 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; + +import static com.epmet.constant.YanTaiConstant.YT_CUSTOMER_ID; /** * desc:烟台 从认证中心同步组织和用户信息 到本地 @@ -57,7 +63,15 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService needInsert.add(d); disposeYanTaiSyncOrg(d.getOrganizationId(),needInsert); }); - + List entities = needInsert.stream().map(m -> { + DataSyncOrgDataEntity entity = ConvertUtils.sourceToTarget(m, DataSyncOrgDataEntity.class); + entity.setCustomerId(YT_CUSTOMER_ID); + entity.setPid(""); + entity.setParentOrgName(""); + entity.setPids(""); + return entity; + }).collect(Collectors.toList()); + dataSyncOrgDataService.insertBatch(entities, NumConstant.ONE_HUNDRED); } return false; } From 4967e63e57b2ebbf71e9b9c863948041362ceb6d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 16:51:29 +0800 Subject: [PATCH 227/621] =?UTF-8?q?/gov/org/staff/editstaffinit=20?= =?UTF-8?q?=E8=BF=94=E5=8F=82=E5=A2=9E=E5=8A=A0agencyId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/StaffInfoFromDTO.java | 4 +++- .../java/com/epmet/dto/result/StaffInitResultDTO.java | 4 ++++ .../java/com/epmet/controller/StaffController.java | 1 + .../java/com/epmet/service/impl/StaffServiceImpl.java | 10 +++++++++- .../epmet/service/impl/CustomerStaffServiceImpl.java | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java index 133f0df8a4..7c2a885f06 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java @@ -14,6 +14,7 @@ import java.io.Serializable; @Data public class StaffInfoFromDTO implements Serializable { private static final long serialVersionUID = 1L; + public interface EditStaffInitGroup {} /** * 客户ID */ @@ -26,5 +27,6 @@ public class StaffInfoFromDTO implements Serializable { /** * 用户ID */ - String staffId; + @NotBlank(message = "staffId不能为空",groups = EditStaffInitGroup.class) + private String staffId; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java index 36cc283268..62c63698eb 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java @@ -46,4 +46,8 @@ public class StaffInitResultDTO implements Serializable { */ private List roleList; private List newRoleList; + /** + * customer_staff_agency.agency_id + */ + private String agencyId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 0463372db2..d3f9b9dd28 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -70,6 +70,7 @@ public class StaffController { @PostMapping("editstaffinit") @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_DETAIL) public Result editStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ + ValidatorUtils.validateEntity(fromDTO,StaffInfoFromDTO.EditStaffInitGroup.class); return staffService.editStaffInit(fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 954eb170df..a8c94bf3a4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -150,7 +150,15 @@ public class StaffServiceImpl implements StaffService { CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); } - return epmetUserFeignClient.editStaffInit(fromDTO); + CustomerStaffAgencyDTO customerStaffAgencyDTO=customerStaffAgencyService.getInfoByUserId(fromDTO.getStaffId()); + if (null == customerStaffAgencyDTO) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_staff_agency is null user_id :" + fromDTO.getStaffId(), "查询用户所属组织为空"); + } + Result res=epmetUserFeignClient.editStaffInit(fromDTO); + if (res.success() && null != res.getData()) { + res.getData().setAgencyId(customerStaffAgencyDTO.getAgencyId()); + } + return new Result().ok(res.getData()); } @Override diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 2a4585eb8a..54a44f35a5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -288,7 +288,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Tue, 18 Oct 2022 16:51:32 +0800 Subject: [PATCH 228/621] feign --- .../com/epmet/feign/ThirdOpenFeignClient.java | 20 +++++++++++++++++++ .../ThirdOpenFeignClientFallback.java | 10 ++++++++++ .../yantai/DataSyncUserAndOrgController.java | 13 +++++------- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java index 7b19e3efde..1f0f16c314 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java @@ -8,6 +8,7 @@ import com.epmet.feign.fallback.ThirdOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -69,4 +70,23 @@ public interface ThirdOpenFeignClient { */ @PostMapping("/third/blockchain/project/process") Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input); + + /** + * Desc: 从统一认证中心 拉取组织信息 + * @param orgId + * @author zxc + * @date 2022/10/18 16:50 + */ + @PostMapping("/third/dataSync/yanTai/sync/org") + Result getYanTaiOrgInfo(@RequestParam("orgId") String orgId); + + /** + * Desc: 从统一认证中心 拉取用户信息 + * @param orgId + * @author zxc + * @date 2022/10/18 16:50 + */ + @PostMapping("/third/dataSync/yanTai/sync/user") + Result getYanTaiUserInfo(@RequestParam("orgId") String orgId); + } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java index 973342dc57..006122b075 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java @@ -40,4 +40,14 @@ public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient { public Result blockChainProcessProject(BlockChainProcessProjectFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "blockChainProcessProject", input); } + + @Override + public Result getYanTaiOrgInfo(String orgId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getYanTaiOrgInfo", orgId); + } + + @Override + public Result getYanTaiUserInfo(String orgId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getYanTaiUserInfo", orgId); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java index 888e18ea3c..80f3a2f056 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java @@ -9,10 +9,7 @@ import com.epmet.dto.form.yantai.YtUserPageFormDTO; import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -33,8 +30,8 @@ public class DataSyncUserAndOrgController { * desc:从统一认证中心 拉取用户信息 * @return */ - @PostMapping("yantai/sync/user") - public Result templateList(String orgId) { + @PostMapping("yanTai/sync/user") + public Result getYanTaiUserInfo(@RequestParam("orgId")String orgId) { Boolean flag = dataSyncUserAndOrgService.yanTaiSyncUser(orgId); return new Result().ok(flag); } @@ -43,8 +40,8 @@ public class DataSyncUserAndOrgController { * desc:从统一认证中心 拉取组织信息 * @return */ - @PostMapping("yantai/sync/org") - public Result getExtJson(String orgId) { + @PostMapping("yanTai/sync/org") + public Result getYanTaiOrgInfo(@RequestParam("orgId")String orgId) { Boolean extJson = dataSyncUserAndOrgService.yanTaiSyncOrg(orgId); return new Result().ok(extJson); } From 4c77e949f7b26b725e5c6c463f15f7558e7f2aa7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 17:03:35 +0800 Subject: [PATCH 229/621] job --- .../com/epmet/task/YTUserAndOrgPullTask.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java new file mode 100644 index 0000000000..627efb5836 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java @@ -0,0 +1,42 @@ +package com.epmet.task; + + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.NatInfoScanTaskFormDTO; +import com.epmet.feign.EpmetThirdOpenFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.ThirdOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @author zxc + * @dscription 拉取yt用户信息和组织信息 + */ +@Slf4j +@Component("YTUserAndOrgPullTask") +public class YTUserAndOrgPullTask implements ITask { + + @Autowired + private ThirdOpenFeignClient thirdOpenFeignClient; + + @Override + public void run(String params) { + Result yanTaiOrgInfo = thirdOpenFeignClient.getYanTaiOrgInfo(""); + if (yanTaiOrgInfo.success()) { + log.info("yt拉取组织信息定时任务执行成功"); + } else { + log.error("yt拉取组织信息定时任务执行失败:" + yanTaiOrgInfo.getMsg()); + } + + Result yanTaiUserInfo = thirdOpenFeignClient.getYanTaiUserInfo(""); + if (yanTaiUserInfo.success()) { + log.info("yt拉取用户信息定时任务执行成功"); + } else { + log.error("yt拉取用户信息定时任务执行失败:" + yanTaiUserInfo.getMsg()); + } + } +} From bbbc092da80722af260441f094df0d7d68c2f039 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 17:04:12 +0800 Subject: [PATCH 230/621] job --- .../src/main/java/com/epmet/task/YTUserAndOrgPullTask.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java index 627efb5836..801a1d62e8 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java @@ -1,14 +1,8 @@ package com.epmet.task; - -import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.NatInfoScanTaskFormDTO; -import com.epmet.feign.EpmetThirdOpenFeignClient; -import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.ThirdOpenFeignClient; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; From cd8310c0fd464b07dd985e246effba4bcec063e5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Oct 2022 17:23:42 +0800 Subject: [PATCH 231/621] =?UTF-8?q?/gov/org/staff/editstaffinit=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/StaffInitResultDTO.java | 4 ++++ .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 1 + 2 files changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java index 62c63698eb..69f9e86294 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java @@ -50,4 +50,8 @@ public class StaffInitResultDTO implements Serializable { * customer_staff_agency.agency_id */ private String agencyId; + /** + * xxx-xxx + */ + private String agencyName; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index a8c94bf3a4..c642caddd2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -157,6 +157,7 @@ public class StaffServiceImpl implements StaffService { Result res=epmetUserFeignClient.editStaffInit(fromDTO); if (res.success() && null != res.getData()) { res.getData().setAgencyId(customerStaffAgencyDTO.getAgencyId()); + res.getData().setAgencyName(customerAgencyService.getAgencyName(customerStaffAgencyDTO.getAgencyId())); } return new Result().ok(res.getData()); } From a3b78a873b2564fe63b3102cdedf4e93e4edd57f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 Oct 2022 17:42:49 +0800 Subject: [PATCH 232/621] ai --- .../java/com/epmet/excel/handler/IcNatExcelImportListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java index 59f5eaab7b..c600349029 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java @@ -68,7 +68,7 @@ public class IcNatExcelImportListener implements ReadListener Date: Tue, 18 Oct 2022 22:15:59 +0800 Subject: [PATCH 233/621] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/processor/MaskProcessor.java | 7 ++++--- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index a7b42dd438..0ebc34c00c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -15,7 +15,6 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /** * desc:脱敏处理器 @@ -173,7 +172,7 @@ public class MaskProcessor { * @param originString * @return */ - private String maskIdCard(String originString) { + public static String maskIdCard(String originString) { IdCardRegexUtils regexUtil = IdCardRegexUtils.parse(originString); if (regexUtil == null) { @@ -221,7 +220,9 @@ public class MaskProcessor { public static void main(String[] args) { String[] idc = {"idCard"}; String[] idct = {MaskResponse.MASK_TYPE_ID_CARD}; - String r = new MaskProcessor(idc, idct).maskString("333333333333333333", MaskResponse.MASK_TYPE_ID_CARD); + String r = new MaskProcessor(idc, idct).maskString("王五(372284152412022222)", MaskResponse.MASK_TYPE_ID_CARD); System.out.println(r); + String s = MaskProcessor.maskIdCard("372284152412022222"); + System.out.println(s); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index ff931888c3..f4553cd9b8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; 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.processor.MaskProcessor; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -670,7 +671,7 @@ public class CoverageServiceImpl implements CoverageService { return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT), + re.getName().concat(StrConstant.BRACKET_LEFT).concat(MaskProcessor.maskIdCard(re.getIdCard())).concat(StrConstant.BRACKET_RIGNT), coordinates[1], coordinates[0]); }).collect(Collectors.toList()); @@ -684,7 +685,7 @@ public class CoverageServiceImpl implements CoverageService { return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdNum()).concat(StrConstant.BRACKET_RIGNT), + re.getName().concat(StrConstant.BRACKET_LEFT).concat(MaskProcessor.maskIdCard(re.getIdNum())).concat(StrConstant.BRACKET_RIGNT), coordinates[1], coordinates[0]); }).collect(Collectors.toList()); @@ -1276,4 +1277,4 @@ public class CoverageServiceImpl implements CoverageService { } return resultList; } -} \ No newline at end of file +} From 87486760e64dbbdb3b71674b350d8a3d2569fac0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 08:47:10 +0800 Subject: [PATCH 234/621] =?UTF-8?q?/data/aggregator/coverage/search?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dataaggre/controller/CoverageController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index 7a451a9f94..7815998386 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO; import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -74,6 +75,7 @@ public class CoverageController { * @author zxc * @date 2022/7/26 16:29 */ + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("search") public Result coverageHomeSearch(@RequestBody CoverageHomeSearchFormDTO formDTO, @LoginUser TokenDto tokenDto){ formDTO.setCustomerId(tokenDto.getCustomerId()); From f3fac956d620b976f2f6e98e71addab1d899db5a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 09:41:50 +0800 Subject: [PATCH 235/621] =?UTF-8?q?/data/aggregator/org/staffdetailv2?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index d2ee934888..7265e9bcae 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -504,8 +504,9 @@ public class GovOrgServiceImpl implements GovOrgService { public StaffDetailV2FormDTO staffDetailV2(StaffDetailV2ResultDTO formDTO) { //1.查询工作人员基本信息、角色信息 StaffDetailV2FormDTO result = epmetUserService.selectByStaffId(formDTO.getStaffId()); - if (null == result) { - return new StaffDetailV2FormDTO(); + if (null == result||StringUtils.isBlank(result.getStaffId())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"customer_staff is null staffId:"+formDTO.getStaffId(),"未查询到工作人员基本信息"); + // return new StaffDetailV2FormDTO(); } //2.查询工作人员注册组织关系信息 @@ -513,7 +514,7 @@ public class GovOrgServiceImpl implements GovOrgService { staffIdList.add(formDTO.getStaffId()); List list = customerAgencyDao.selelctStaffOrg(staffIdList); if (null == list || list.size() < NumConstant.ONE) { - throw new RenException("未查询到工作人员注册组织信息"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"未查询到工作人员注册组织信息","未查询到工作人员所属组织信息"); } //3.封装数据并返回 From 5b0624ebe2f70df5d7232cc26bb1ed4b0accc604 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 10:08:46 +0800 Subject: [PATCH 236/621] =?UTF-8?q?gov-issue=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E8=B5=B0=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-issue/gov-issue-server/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 7741561d9f..db38938089 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -179,7 +179,9 @@ callerRunsPolicy false - https://epmet-dev.elinkservice.cn/api/epmetscan/api + + + https://epmet-open.elinkservice.cn/api/epmetscan/api https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 From 50a3ca1dae488726ef2e1493df48309adbe7b1c7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 10:25:37 +0800 Subject: [PATCH 237/621] =?UTF-8?q?/gov/issue/issuesuggestion/save=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueSuggestionServiceImpl.java | 10 +++++----- .../java/com/epmet/service/impl/IssueServiceImpl.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSuggestionServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSuggestionServiceImpl.java index 20e2d01e6e..1b303c85e9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSuggestionServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSuggestionServiceImpl.java @@ -20,6 +20,7 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; @@ -96,7 +97,7 @@ public class IssueSuggestionServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); if (!textSyncScanResult.success()) { - log.warn("居民端用户对议题发表建议,内容审核服务返回失败"); - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + throw new EpmetException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(),EpmetErrorCode.TEXT_SCAN_FAILED.getMsg(),EpmetErrorCode.TEXT_SCAN_FAILED.getMsg()); } else { if (!textSyncScanResult.getData().isAllPass()) { - throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode()); + throw new EpmetException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(),EpmetErrorCode.TEXT_SCAN_FAILED.getMsg(),EpmetErrorCode.TEXT_SCAN_FAILED.getMsg()); } } //赋值网格id IssueDTO issueDTO = issueService.get(dto.getIssueId()); if (null == issueDTO) { - throw new RenException(String.format("根据议题id%s,没有找到议题信息", dto.getIssueId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),String.format("根据议题id%s,没有找到议题信息", dto.getIssueId()),"议题不存在"); } dto.setGridId(issueDTO.getGridId()); dto.setCustomerId(issueDTO.getCustomerId()); diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index f13aff5a82..573da12cb7 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -393,10 +393,10 @@ public class IssueServiceImpl implements IssueService { issueSuggestionDTO.setPublicFlag(formDTO.getPublicFlag() == true ? NumConstant.ONE : NumConstant.ZERO); issueSuggestionDTO.setCreatedBy(loginUserUtil.getLoginUserId()); Result result = govIssueOpenFeignClient.saveIssueSuggestion(issueSuggestionDTO); - if (result.success() && null != result.getData()) { - return new PublishSuggestionResultDTO(result.getData().getIssueId(), result.getData().getSuggestionId()); + if(result.success()||null==result.getData()||StringUtils.isBlank(result.getData().getSuggestionId())){ + throw new EpmetException(result.getCode(),result.getInternalMsg(),result.getMsg()); } - throw new RenException(result.getCode()); + return new PublishSuggestionResultDTO(result.getData().getIssueId(), result.getData().getSuggestionId()); } /** From 45612749f820bc0141bb04326b4c229ae862c679 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Oct 2022 11:02:07 +0800 Subject: [PATCH 238/621] =?UTF-8?q?=E6=A0=B9=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/task/YTUserAndOrgPullTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java index 801a1d62e8..e47d52bcd3 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/YTUserAndOrgPullTask.java @@ -19,14 +19,14 @@ public class YTUserAndOrgPullTask implements ITask { @Override public void run(String params) { - Result yanTaiOrgInfo = thirdOpenFeignClient.getYanTaiOrgInfo(""); + Result yanTaiOrgInfo = thirdOpenFeignClient.getYanTaiOrgInfo("44e05de9-34fa-48f6-b89f-02838d792cf9"); if (yanTaiOrgInfo.success()) { log.info("yt拉取组织信息定时任务执行成功"); } else { log.error("yt拉取组织信息定时任务执行失败:" + yanTaiOrgInfo.getMsg()); } - Result yanTaiUserInfo = thirdOpenFeignClient.getYanTaiUserInfo(""); + Result yanTaiUserInfo = thirdOpenFeignClient.getYanTaiUserInfo("44e05de9-34fa-48f6-b89f-02838d792cf9"); if (yanTaiUserInfo.success()) { log.info("yt拉取用户信息定时任务执行成功"); } else { From 8e1cd9dd6e378a6eb24b1bcadea9e05124f0b473 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 11:30:52 +0800 Subject: [PATCH 239/621] =?UTF-8?q?gov-project=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E8=B5=B0=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-project/gov-project-server/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 375daa8dd2..abb978b7ce 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -219,8 +219,9 @@ callerRunsPolicy false - https://epmet-dev.elinkservice.cn/api/epmetscan/api - + + + https://epmet-open.elinkservice.cn/api/epmetscan/api https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 From ed11d566e2ea5a98b5396c57fbf70db57210262a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 14:14:26 +0800 Subject: [PATCH 240/621] /dataSync/page-user --- .../epmet-third-server/src/main/resources/logback-spring.xml | 5 ++--- .../src/main/resources/mapper/yantai/DataSyncUserDataDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml index c95ac8b0f3..f8e2164fb7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml @@ -140,10 +140,9 @@ - + - @@ -158,7 +157,7 @@ - + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml index fdcedc74d9..e021884602 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml @@ -49,13 +49,13 @@ WHERE u.DEL_FLAG = '0' AND o.DEL_FLAG = '0' - + AND u.ORGANIZATION_ID = #{orgId} - + AND (o.ORGANIZATION_ID = #{orgId} OR o.pids LIKE concat( '%', #{orgId}, '%' ) ) From 995653e28642511ae9bf027d187e72f058b41120 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 14:17:14 +0800 Subject: [PATCH 241/621] =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/yantai/DataSyncUserDataDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml index e021884602..8e7241fcd4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml @@ -33,7 +33,7 @@ u.USER_GUID AS userGuid, u.ORGANIZATION_ID AS organizationId, (case when o.PARENT_ORG_NAME is not null and LENGTH(o.PARENT_ORG_NAME)>0 - then concat(o.PARENT_ORG_NAME,o.ORGANIZATIO_NABBREVIATION) + then concat(o.PARENT_ORG_NAME,'-',o.ORGANIZATIO_NABBREVIATION) else o.ORGANIZATIO_NABBREVIATION end)as orgName, u.USER_NAME AS userName, From 38249c5586e6723352181846cd04a3633e875d76 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Oct 2022 14:31:49 +0800 Subject: [PATCH 242/621] =?UTF-8?q?=E6=A0=B9=E7=BB=84=E7=BB=87=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 8 ++ .../redis/common/CustomerStaffRedis.java | 29 ++++ .../bean/CustomerStaffInfoDTOCache.java | 133 ++++++++++++++++++ .../yantai/DataSyncUserAndOrgServiceImpl.java | 14 +- .../epmet/feign/EpmetUserOpenFeignClient.java | 9 ++ .../EpmetUserOpenFeignClientFallback.java | 5 + .../controller/CustomerStaffController.java | 11 ++ .../java/com/epmet/dao/CustomerStaffDao.java | 2 + .../epmet/service/CustomerStaffService.java | 2 + .../impl/CustomerStaffServiceImpl.java | 19 +++ .../resources/mapper/CustomerStaffDao.xml | 6 + 11 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoDTOCache.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index c09f13f2f4..6d55e66238 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -533,6 +533,14 @@ public class RedisKeys { return rootPrefix.concat("gov:staff:").concat(customerId).concat(StrConstant.COLON).concat(staffId); } + public static String getCustomerAllStaffInfoKey(String customerId) { + return rootPrefix.concat("gov:allCustomerStaff:").concat(customerId).concat(StrConstant.COLON).concat("*"); + } + + public static String getCustomerStaffInfoKeyByMobile(String customerId,String mobile) { + return rootPrefix.concat("gov:allCustomerStaff:").concat(customerId).concat(StrConstant.COLON).concat(mobile); + } + /** * @description 网格信息 * diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java index 37904be02b..66abe790f3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.feign.CommonAggFeignClient; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; +import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoDTOCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import lombok.extern.slf4j.Slf4j; @@ -138,4 +139,32 @@ public class CustomerStaffRedis { return customerStaffRedis.redisUtils.delete(key); } + /** + * Desc: 拉取烟台用户时使用。 + * 根据客户ID 手机号获取工作人员信息，没有返回null + * @param customerId + * @param mobile + * @author zxc + * @date 2022/10/19 14:18 + */ + public static CustomerStaffInfoDTOCache getStaffInfoByMobile(String customerId, String mobile){ + String key = RedisKeys.getCustomerStaffInfoKeyByMobile(customerId, mobile); + Map roleMap = customerStaffRedis.redisUtils.hGetAll(key); + if (!CollectionUtils.isEmpty(roleMap)) { + return ConvertUtils.mapToEntity(roleMap, CustomerStaffInfoDTOCache.class); + } + return null; + } + + /** + * Desc: 【烟台用】删除所有工作人员信息 + * @param customerId + * @author zxc + * @date 2022/10/19 14:28 + */ + public static void delAllCustomerStaff(String customerId){ + String key = RedisKeys.getCustomerAllStaffInfoKey(customerId); + customerStaffRedis.redisUtils.deleteByPattern(key); + } + } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoDTOCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoDTOCache.java new file mode 100644 index 0000000000..70d5da942a --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoDTOCache.java @@ -0,0 +1,133 @@ +package com.epmet.commons.tools.redis.common.bean; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2022/10/19 14:26 + * @DESC + */ +@Data +public class CustomerStaffInfoDTOCache implements Serializable { + + private static final long serialVersionUID = 6967736754443092229L; + + + /** + * ID + */ + private String id; + + /** + * 关联User表的主键Id + */ + private String userId; + + /** + * 账户 + */ + private String userAccount; + + /** + * 真实姓名 + */ + private String realName; + + /** + * 性别0.未知，1男，2.女 + */ + private Integer gender; + + /** + * 邮箱 + */ + private String email; + + /** + * 手机号-唯一键 + */ + private String mobile; + + /** + * 地址 + */ + private String address; + + /** + * 删除标识 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * fulltime专职parttime兼职 + */ + private String workType; + + /** + * 头像 + */ + private String headPhoto; + + /** + * inactive未激活，active已激活 + */ + private String activeFlag; + + /** + * 激活时间 + */ + private Date activeTime; + + /** + * 未禁用enable,已禁用diabled + */ + private String enableFlag; + + /** + * 客户id + */ + private String customerId; + + /** + * 角色名称 + */ + private String roleName; + + /** + * 登录密码 + */ + private String password; + + /** + * 身份证号 + */ + private String idCard; +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index df431a925e..0eca37a078 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -1,7 +1,9 @@ package com.epmet.controller.yantai; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.yantai.DataSyncOrgDataDao; import com.epmet.dao.yantai.DataSyncUserDataDao; @@ -9,6 +11,7 @@ import com.epmet.dto.form.yantai.YtUserPageFormDTO; import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; import com.epmet.entity.yantai.DataSyncOrgDataEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.DataSyncOrgDataService; import com.epmet.service.DataSyncUserDataService; import com.epmet.utils.OrgData; @@ -46,10 +49,19 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService private DataSyncOrgDataService dataSyncOrgDataService; @Autowired private DataSyncUserDataService dataSyncUserDataService; + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + /** + * Desc: 从org表查询组织，在根据组织去查询用户 + * @param organizationId + * @author zxc + * @date 2022/10/19 13:27 + */ @Override public Boolean yanTaiSyncUser(String organizationId) { - List data = YantaiApi.getUserByOuGuid(organizationId); + epmetUserOpenFeignClient +// List data = YantaiApi.getUserByOuGuid(organizationId); //todo 更新或插入数据 return false; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index a2398b2d92..0137e8eb7c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -924,4 +924,13 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask") Result natInfoScanTask(@RequestBody NatInfoScanTaskFormDTO formDTO); + + /** + * Desc: 客户下所有工作人员放缓存 + * @param customerId + * @author zxc + * @date 2022/10/19 14:07 + */ + @PostMapping("/epmetuser/customerstaff/allCustomerStaffInCache") + Result allCustomerStaffInCache(@RequestParam("customerId")String customerId); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 4601ca1ef3..212252ab99 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -716,4 +716,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result natInfoScanTask(NatInfoScanTaskFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "natInfoScanTask", formDTO); } + + @Override + public Result allCustomerStaffInCache(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "allCustomerStaffInCache", customerId); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index 6c9d46dbb5..8bea2e4fbf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -618,5 +618,16 @@ public class CustomerStaffController { return new Result>().ok(customerStaffService.customerStaff(formDTO)); } + /** + * Desc: 客户下所有工作人员放缓存 + * @param customerId + * @author zxc + * @date 2022/10/19 14:07 + */ + @PostMapping("allCustomerStaffInCache") + public Result allCustomerStaffInCache(@RequestParam("customerId")String customerId){ + customerStaffService.allCustomerStaffInCache(customerId); + return new Result(); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index 1c127d7aa5..682c279996 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -251,5 +251,7 @@ public interface CustomerStaffDao extends BaseDao { List getStaffByCustomerId(@Param("customerId") String customerId); + List getAllStaffByCustomerId(@Param("customerId") String customerId); + void edit(CustomerStaffDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index b2a3442172..8c88c7680d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -398,4 +398,6 @@ public interface CustomerStaffService extends BaseService { void editToStaff(CustomerStaffDTO formDTO); List customerStaff(GridStaffUploadtFormDTO formDTO); + + void allCustomerStaffInCache(String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 54a44f35a5..657e590d64 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -1153,4 +1154,22 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl customerStaffs = baseDao.getAllStaffByCustomerId(customerId); + size = customerStaffs.size(); + if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(customerStaffs)){ + customerStaffs.forEach(c -> { + String key = RedisKeys.getCustomerStaffInfoKeyByMobile(customerId, c.getMobile()); + Map map = BeanUtil.beanToMap(c, false, true); + redisUtils.hMSet(key,map); + }); + } + no++; + }while (size == NumConstant.ONE_HUNDRED); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 60b32c4d32..88eca3f734 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -514,5 +514,11 @@ AND enable_flag = 'enable' AND customer_id = #{customerId} + From c1fdaaf54b1c8a009cbb4d5d5d2d9c9353897864 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 14:38:25 +0800 Subject: [PATCH 243/621] =?UTF-8?q?/gov/org/staff/editstaffinit=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=BF=90=E8=90=A5=E7=AB=AF=E5=8E=BB=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java | 1 + .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java index 7c2a885f06..1592c4fea3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java @@ -18,6 +18,7 @@ public class StaffInfoFromDTO implements Serializable { /** * 客户ID */ + @NotBlank(message = "customerId不能为空",groups = EditStaffInitGroup.class) private String customerId; /** * 机关ID diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index c642caddd2..9f337196ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -154,6 +154,10 @@ public class StaffServiceImpl implements StaffService { if (null == customerStaffAgencyDTO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_staff_agency is null user_id :" + fromDTO.getStaffId(), "查询用户所属组织为空"); } + //运营端-统一认证那调用的时候， agencyId为空，这里重新赋值下 + if(StringUtils.isBlank(fromDTO.getAgencyId())){ + fromDTO.setAgencyId(customerStaffAgencyDTO.getAgencyId()); + } Result res=epmetUserFeignClient.editStaffInit(fromDTO); if (res.success() && null != res.getData()) { res.getData().setAgencyId(customerStaffAgencyDTO.getAgencyId()); From 31134daaf903e017b16c55668c1b5838fccb13b6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Oct 2022 14:43:36 +0800 Subject: [PATCH 244/621] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 0eca37a078..0af3a39984 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -60,7 +60,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService */ @Override public Boolean yanTaiSyncUser(String organizationId) { - epmetUserOpenFeignClient + // List data = YantaiApi.getUserByOuGuid(organizationId); //todo 更新或插入数据 return false; From febc7ffbad2e8e6123156de21d1df5b2fa8608a4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 14:54:56 +0800 Subject: [PATCH 245/621] =?UTF-8?q?/gov/org/staff/editstaffinit=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=A0=E5=8F=82=EF=BC=9AagencyId+staffId?= =?UTF-8?q?=EF=BC=9B=E8=BF=90=E8=90=A5=E7=AB=AF=E4=BC=A0=E5=8F=82=EF=BC=9A?= =?UTF-8?q?customerId+staffId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java index 1592c4fea3..7c2a885f06 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java @@ -18,7 +18,6 @@ public class StaffInfoFromDTO implements Serializable { /** * 客户ID */ - @NotBlank(message = "customerId不能为空",groups = EditStaffInitGroup.class) private String customerId; /** * 机关ID From 3bd02ea44cbc3a9ad2697af7459f39ff433985a6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 19 Oct 2022 15:06:58 +0800 Subject: [PATCH 246/621] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9A=B4=E9=9C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ThirdLoginController.java | 17 +- .../com/epmet/service/ThirdLoginService.java | 7 + .../service/impl/ThirdLoginServiceImpl.java | 23 +- .../commons/tools/utils/api/yt}/OrgData.java | 2 +- .../tools/utils/api/yt/SM4UtilsForYanTai.java | 199 ++++++++++++++++++ .../commons/tools/utils/api/yt}/UserData.java | 2 +- .../tools/utils/api/yt}/YantaiApi.java | 54 ++++- .../yantai/DataSyncUserAndOrgServiceImpl.java | 8 +- 8 files changed, 293 insertions(+), 19 deletions(-) rename {epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils => epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt}/OrgData.java (96%) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/SM4UtilsForYanTai.java rename {epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils => epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt}/UserData.java (94%) rename {epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils => epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt}/YantaiApi.java (60%) diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index 44ca89df30..f5c8da7ad4 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -9,10 +9,7 @@ import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.ThirdLoginService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -219,4 +216,16 @@ public class ThirdLoginController { ValidatorUtils.validateEntity(formDTO); return new Result().ok(thirdLoginService.govLoginInternalDing(formDTO)); } + + /** + * 根据免登授权码, 获取登录用户身份 + * + * @param authCode 烟台认证中心 授权码 + * @return + */ + @PostMapping("sso-govlogin-yantai/{authCode}") + public Result yantaiSSOLogin(@RequestParam(value = "authCode") String authCode) { + return new Result().ok(thirdLoginService.yanTaiSSOLogin(authCode)); + } + } diff --git a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java index dff5e129e5..f939656023 100644 --- a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java @@ -117,4 +117,11 @@ public interface ThirdLoginService { * @return */ UserTokenResultDTO govLoginInternalDing(DingAppLoginMdFormDTO formDTO); + + /** + * desc:烟台sso根据authCode 获取本系统token + * @param authCode + * @return + */ + UserTokenResultDTO yanTaiSSOLogin(String authCode); } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index c7c79bb575..5e71f69be0 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -25,6 +25,8 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.api.yt.YantaiApi; +import com.epmet.commons.tools.utils.api.yt.YantaiSSOUser; import com.epmet.commons.tools.validator.PhoneValidatorUtils; import com.epmet.constant.AuthHttpUrlConstant; import com.epmet.constant.SmsTemplateConstant; @@ -33,10 +35,7 @@ import com.epmet.dto.dingres.DingUserDetailDTO; import com.epmet.dto.dingres.V2UserGetuserinfoResDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.EpmetMessageOpenFeignClient; -import com.epmet.feign.EpmetUserFeignClient; -import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.*; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.redis.CaptchaRedis; @@ -96,6 +95,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol private EpmetUserFeignClient epmetUserFeignClient; @Autowired private GovWebService govWebService; + @Autowired + private ThirdOpenFeignClient thirdOpenFeignClient; /** * @param formDTO @@ -1077,6 +1078,20 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol return govWebService.loginByThirdPlatform(loginGovParam); } + @Override + public UserTokenResultDTO yanTaiSSOLogin(String authCode) { + YantaiSSOUser ssoUserInfo = YantaiApi.getLoginToken(authCode); + if (ssoUserInfo== null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"登录失败-sso获取用户失败","登录失败-sso获取用户失败"); + } + + GovWebLoginFormDTO loginGovParam = new GovWebLoginFormDTO(); + loginGovParam.setCustomerId("1535072605621841922"); + loginGovParam.setPhone(ssoUserInfo.getClientId()); + + return govWebService.loginByThirdPlatform(loginGovParam); + } + /** * 最原始的企业内部应用开发，不授权给产品服务商 * @param miniAppId diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/OrgData.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/OrgData.java similarity index 96% rename from epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/OrgData.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/OrgData.java index f82b6fdef5..6c7ea48907 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/OrgData.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/OrgData.java @@ -1,5 +1,5 @@ -package com.epmet.utils; +package com.epmet.commons.tools.utils.api.yt; import lombok.Data; diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/SM4UtilsForYanTai.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/SM4UtilsForYanTai.java new file mode 100644 index 0000000000..6c2ca8c60a --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/SM4UtilsForYanTai.java @@ -0,0 +1,199 @@ +package com.epmet.commons.tools.utils.api.yt; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.commons.codec.binary.Base64; +import org.bouncycastle.jce.provider.BouncyCastleProvider; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.security.InvalidKeyException; +import java.security.Security; + +/** + * 烟台的认证中心-国密sm4加解密 + */ +public class SM4UtilsForYanTai { + private static String SM4_KEY = "yaweisoftware@xy"; + //编码格式 + private static final Charset encryptCharset = StandardCharsets.UTF_8; + + public enum Algorithm { + SM4("SM4","SM4","国密四,key长16byte"); + private String keyAlgorithm; + private String transformation; + private String description;//描述 + Algorithm(String keyAlgorithm, String transformation, String description) { + this.keyAlgorithm = keyAlgorithm; + this.transformation = transformation; + this.description = description; + } + public String getKeyAlgorithm() { + return this.keyAlgorithm; + } + public String getTransformation() { + return this.transformation; + } + public String getDescription() { + return this.description; + } + } + + private static final String PROVIDER_NAME = "BC"; + static { + Security.addProvider(new BouncyCastleProvider()); + } + + /** + * 自定字符串产生密钥 + * @param algorithm 加解密算法 + * @param keyStr 密钥字符串 + * @param charset 编码字符集 + * @return 密钥 + */ + public static SecretKey genKeyByStr(Algorithm algorithm, String keyStr, Charset charset) { + return readKeyFromBytes(algorithm, keyStr.getBytes(charset)); + } + + /** + * 根据指定字节数组产生密钥 + * @param algorithm 加解密算法 + * @param keyBytes 密钥字节数组 + * @return 密钥 + */ + public static SecretKey readKeyFromBytes(Algorithm algorithm, byte[] keyBytes) { + return new SecretKeySpec(keyBytes, algorithm.getKeyAlgorithm()); + } + + /****************************加密*********************************/ + /** + * 加密字符串，并进行base64编码 + * @param algorithm 加解密算法 + * @param key 密钥 + * @param data 明文 + * @param charset 编码字符集 + * @return 密文 + * @throws InvalidKeyException 密钥错误 + */ + public static String encryptBase64(Algorithm algorithm, SecretKey key, String data, Charset charset) throws InvalidKeyException { + return Base64.encodeBase64String(encrypt(algorithm, key, data.getBytes(charset))); + } + + /** + * 加密字节数组 + * @param algorithm 加解密算法 + * @param key 密钥 + * @param data 明文 + * @return 密文 + * @throws InvalidKeyException 密钥错误 + */ + public static byte[] encrypt(Algorithm algorithm, SecretKey key, byte[] data) throws InvalidKeyException { + try { + return cipherDoFinal(algorithm, Cipher.ENCRYPT_MODE, key, data); + } catch (BadPaddingException e) { + throw new RuntimeException(e);//明文没有具体格式要求，不会出错。所以这个异常不需要外部捕获。 + } + } + + /** + * 加解密字节数组 + * @param algorithm 加解密算法 + * @param opmode 操作：1加密，2解密 + * @param key 密钥 + * @param data 数据 + * @throws InvalidKeyException 密钥错误 + * @throws BadPaddingException 解密密文错误(加密模式没有) + */ + private static byte[] cipherDoFinal(Algorithm algorithm, int opmode, SecretKey key, byte[] data) throws InvalidKeyException, BadPaddingException { + Cipher cipher; + try { + cipher = Cipher.getInstance(algorithm.getTransformation(), PROVIDER_NAME); + } catch (Exception e) { + //NoSuchAlgorithmException：加密算法名是本工具类提供的，如果错了业务没有办法处理。所以这个异常不需要外部捕获。 + //NoSuchProviderException：Provider是本工具类提供的，如果错了业务没有办法处理。所以这个异常不需要外部捕获。 + //NoSuchPaddingException：没有特定的填充机制，与环境有关，业务没有办法处理。所以这个异常不需要外部捕获。 + throw new RuntimeException(e); + } + cipher.init(opmode, key); + try { + return cipher.doFinal(data); + } catch (IllegalBlockSizeException e) { + throw new RuntimeException(e);//业务不需要将数据分块(好像由底层处理了)，如果错了业务没有办法处理。所以这个异常不需要外部捕获。 + } + } + + /****************************解密*********************************/ + /** + * 对字符串先进行base64解码，再解密 + * @param algorithm 加解密算法 + * @param key 密钥 + * @param data 密文 + * @param charset 编码字符集 + * @return 明文 + * @throws InvalidKeyException 密钥错误 + * @throws BadPaddingException 密文错误 + */ + public static String decryptBase64(Algorithm algorithm, SecretKey key, String data, Charset charset) + throws InvalidKeyException, BadPaddingException { + return new String(decrypt(algorithm, key, Base64.decodeBase64(data)), charset); + } + + /** + * 解密字节数组 + * @param algorithm 加解密算法 + * @param key 密钥 + * @param data 密文 + * @return 明文 + * @throws InvalidKeyException 密钥错误 + * @throws BadPaddingException 密文错误 + */ + public static byte[] decrypt(Algorithm algorithm, SecretKey key, byte[] data) throws InvalidKeyException, BadPaddingException { + return cipherDoFinal(algorithm, Cipher.DECRYPT_MODE, key, data); + } + + public static String Encrypt(String data) throws InvalidKeyException { + SecretKey key = genKeyByStr(Algorithm.SM4, SM4_KEY, encryptCharset); + return encryptBase64(Algorithm.SM4, key, data, encryptCharset); + } + public static String Decrypt(String data) throws BadPaddingException, InvalidKeyException { + SecretKey key = genKeyByStr(Algorithm.SM4, SM4_KEY, encryptCharset); + return decryptBase64(Algorithm.SM4, key, data, encryptCharset); + } + //加密 + public static String dealEncryptData(Object data) throws JsonProcessingException, InvalidKeyException { + ObjectMapper objectMapper = new ObjectMapper(); + String dataString = ""; + try { + if(data instanceof String){ + dataString = (String) data; + }else { + dataString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(data); + } + String dataEncrypt = Encrypt(dataString); + return dataEncrypt; + }catch (Exception e){ + return dataString; + } + } + //解密 + public static String dealDecryptData(Object data) throws JsonProcessingException, BadPaddingException, InvalidKeyException { + String dataString = ""; + try { + ObjectMapper objectMapper = new ObjectMapper(); + if (data instanceof String) { + dataString = (String) data; + } else { + dataString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(data); + } + String dataDecrypt = Decrypt(dataString); + return dataDecrypt; + }catch (Exception e){ + return dataString; + } + } +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/UserData.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/UserData.java similarity index 94% rename from epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/UserData.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/UserData.java index 99d78d63d7..b7d3abca4e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/UserData.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/UserData.java @@ -1,5 +1,5 @@ -package com.epmet.utils; +package com.epmet.commons.tools.utils.api.yt; import lombok.Data; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/YantaiApi.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java similarity index 60% rename from epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/YantaiApi.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java index e788f605c1..cbab66f5b8 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/utils/YantaiApi.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java @@ -1,12 +1,12 @@ -package com.epmet.utils; +package com.epmet.commons.tools.utils.api.yt; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; -import com.epmet.controller.yantai.SM4UtilsForYanTai; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -25,6 +25,7 @@ import java.util.Map; @Slf4j public class YantaiApi { private static final String SSO_SERVER = "http://localhost:8080/"; + private static final String CLIENT_ID = "1000006"; /** * desc:根据组织id获取下级组织 @@ -75,7 +76,7 @@ public class YantaiApi { String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); //pwd = URLEncoder.encode(pwd, "UTF-8"); System.out.println("加密组织Id = " + organizationIdEn); - String url = "ouinfo/getUserByOuGuid?organizationId=" + organizationIdEn; + String url = SSO_SERVER+"ouinfo/getUserByOuGuid?organizationId=" + organizationIdEn; Map headerMap = new HashMap<>(); Map paramMap = new HashMap<>(); @@ -93,4 +94,51 @@ public class YantaiApi { } return new ArrayList<>(); } + + /** + * desc:根据组织id获取下级组织 + * + * @param code + * @return + */ + public static YantaiSSOUser getLoginToken(String code) { + try { + if (StringUtils.isBlank(code)){ + throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + } + //加密 + String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(code); + //pwd = URLEncoder.encode(pwd, "UTF-8"); + System.out.println("加密组织Id = " + organizationIdEn); + String url = "logintoken?client_id="+CLIENT_ID+"&client_code=" + code; + + Map headerMap = new HashMap<>(); + Map paramMap = new HashMap<>(); + log.info("getUserByOuGuid request param: url:{},header:{}", url, headerMap); + Result result = HttpClientManager.getInstance().sendGet(url, paramMap, headerMap); + log.info("getUserByOuGuid request result:{}", result); + JSONObject jsonObject = JSONObject.parseObject(result.getData()); + //解密 + String errcode = jsonObject.getString("errcode"); + if (!NumConstant.ZERO_STR.equals(errcode)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取token失败","获取token失败"); + } + String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); + YantaiSSOUser userData = JSON.parseObject(data, YantaiSSOUser.class); + log.info("getUserByOuGuid request real result:{}", JSON.toJSONString(userData)); + return userData; + } catch (Exception e) { + log.error("getUserByOuGuid exception", e); + } + return null; + } + + public static void main(String[] args) { + String serverUrl = "http://172.20.46.155:8080/sso/login"; + Map param = new HashMap<>(); + param.put("client_id","1000006"); + param.put("redirect_url","https://epmet-open.elinkservice.cn/epmet-oper-gov/"); + Result stringResult = HttpClientManager.getInstance().sendGet(serverUrl, param); + System.out.println(JSON.toJSONString(stringResult)); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 0af3a39984..4261969097 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -1,10 +1,10 @@ package com.epmet.controller.yantai; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.api.yt.OrgData; +import com.epmet.commons.tools.utils.api.yt.YantaiApi; import com.epmet.dao.yantai.DataSyncOrgDataDao; import com.epmet.dao.yantai.DataSyncUserDataDao; import com.epmet.dto.form.yantai.YtUserPageFormDTO; @@ -14,9 +14,6 @@ import com.epmet.entity.yantai.DataSyncOrgDataEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.DataSyncOrgDataService; import com.epmet.service.DataSyncUserDataService; -import com.epmet.utils.OrgData; -import com.epmet.utils.UserData; -import com.epmet.utils.YantaiApi; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -26,7 +23,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import static com.epmet.constant.YanTaiConstant.YT_CUSTOMER_ID; From 2e2894d6825856f996da89b2d990f299ea5cf364 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 15:13:41 +0800 Subject: [PATCH 247/621] =?UTF-8?q?/data/aggregator/org/staffdetailv2?= =?UTF-8?q?=E7=9A=84szsqRoles=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 6820ef9f8c..e89800fa69 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -736,7 +736,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { getStaffExistRoleFormDTO.setCustomerId(dto.getCustomerId()); Result> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO); if (staffExistRole.success()&&CollectionUtils.isNotEmpty(staffExistRole.getData())){ - List szsqRoles=staffExistRole.getData().stream().map(m -> m.getRoleName()).distinct().collect(Collectors.toList()); + // 过滤selected=true的 + List szsqRoles=staffExistRole.getData().stream().filter(t->t.getSelected()).map(m -> m.getRoleName()).distinct().collect(Collectors.toList()); result.setSzsqRoles(szsqRoles); } return result; From 883d11ef94f82ba884ff85a0c563d623de28b332 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 19 Oct 2022 15:21:31 +0800 Subject: [PATCH 248/621] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9A=B4=E9=9C=B2=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/utils/api/yt/YantaiSSOUser.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java new file mode 100644 index 0000000000..99d31cc439 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java @@ -0,0 +1,30 @@ + +package com.epmet.commons.tools.utils.api.yt; + +import lombok.Data; + +import java.io.Serializable; + +/** + * sso：认证中心 用户信息 + * @author liujianjun + */ +@Data +public class YantaiSSOUser implements Serializable { + + private static final long serialVersionUID = -2794280342919451106L; + + /** + * 他说这个是手机号 + */ + private String clientId; + private String departmentCode; + private String expirationTime; + private String ip; + private String issueTime; + private String registerGuid; + private String registerName; + private String userGuid; + private String userName; + +} From 1294fe08be91b59b2e8aacd42c06f8c1a15824e3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Oct 2022 15:22:11 +0800 Subject: [PATCH 249/621] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yantai/DataSyncUserAndOrgServiceImpl.java | 49 +++++++++++++++++-- .../epmet/dao/yantai/DataSyncOrgDataDao.java | 2 + .../mapper/yantai/DataSyncOrgDataDao.xml | 6 +++ .../impl/CustomerStaffServiceImpl.java | 10 ++-- 4 files changed, 60 insertions(+), 7 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 4261969097..6b81da281f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -1,16 +1,22 @@ package com.epmet.controller.yantai; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoDTOCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.api.yt.OrgData; +import com.epmet.commons.tools.utils.api.yt.UserData; import com.epmet.commons.tools.utils.api.yt.YantaiApi; import com.epmet.dao.yantai.DataSyncOrgDataDao; import com.epmet.dao.yantai.DataSyncUserDataDao; +import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.yantai.YtUserPageFormDTO; import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; import com.epmet.entity.yantai.DataSyncOrgDataEntity; +import com.epmet.entity.yantai.DataSyncUserDataEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.DataSyncOrgDataService; import com.epmet.service.DataSyncUserDataService; @@ -56,9 +62,46 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService */ @Override public Boolean yanTaiSyncUser(String organizationId) { - -// List data = YantaiApi.getUserByOuGuid(organizationId); - //todo 更新或插入数据 + String customerId = "45687aa479955f9d06204d415238f7cc"; + // 缓存初始化staffs + epmetUserOpenFeignClient.allCustomerStaffInCache(customerId); + Integer no = NumConstant.ONE; + Integer size; + do { + // 分批获取org + PageInfo pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> dataSyncOrgDataDao.getAllList(customerId)); + size = pageInfo.getList().size(); + if (CollectionUtils.isNotEmpty(pageInfo.getList())){ + List needInsert = new ArrayList<>(); + pageInfo.getList().forEach(org -> { + // 根据org查用户 + List data = YantaiApi.getUserByOuGuid(org.getOrganizationId()); + if (CollectionUtils.isNotEmpty(data)){ + for (UserData u : data) { + CustomerStaffInfoDTOCache staffInfo = CustomerStaffRedis.getStaffInfoByMobile(customerId, u.getMobileTelephoneNumber()); + DataSyncUserDataEntity entity = ConvertUtils.sourceToTarget(u, DataSyncUserDataEntity.class); + entity.setCustomerId(customerId); + entity.setRemark(""); + if (null == staffInfo){ + entity.setStatus(NumConstant.ZERO_STR); + entity.setOrganizationId(""); + entity.setStaffId(""); + }else { + CustomerStaffInfoCacheResult staffInfo1 = CustomerStaffRedis.getStaffInfo(customerId, staffInfo.getUserId()); + entity.setStatus(NumConstant.ONE_STR); + entity.setOrganizationId(null == staffInfo1 ? "" : staffInfo1.getAgencyId()); + entity.setStaffId(staffInfo.getUserId()); + } + needInsert.add(entity); + } + } + }); + dataSyncUserDataService.insertBatch(needInsert,NumConstant.FIVE_HUNDRED); + } + no++; + }while (size == NumConstant.ONE_HUNDRED); + // 删除staffs缓存 + CustomerStaffRedis.delAllCustomerStaff(customerId); return false; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java index edad699db9..b0b0529b62 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java @@ -22,4 +22,6 @@ public interface DataSyncOrgDataDao extends BaseDao { * @return */ List queryList(@Param("pid") String pid); + + List getAllList(@Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml index 6f81c501f3..14931417d7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml @@ -46,4 +46,10 @@ order by d.ORDER_NUMBER asc + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 657e590d64..1d229ba369 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -61,6 +61,8 @@ import com.epmet.service.GovStaffRoleService; import com.epmet.service.StaffRoleService; import com.epmet.service.UserService; import com.epmet.util.ModuleConstant; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -1159,10 +1161,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl customerStaffs = baseDao.getAllStaffByCustomerId(customerId); - size = customerStaffs.size(); - if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(customerStaffs)){ - customerStaffs.forEach(c -> { + PageInfo pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> baseDao.getAllStaffByCustomerId(customerId)); + size = pageInfo.getList().size(); + if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(pageInfo.getList())){ + pageInfo.getList().forEach(c -> { String key = RedisKeys.getCustomerStaffInfoKeyByMobile(customerId, c.getMobile()); Map map = BeanUtil.beanToMap(c, false, true); redisUtils.hMSet(key,map); From 204444a511c098dd2fbf5ab3a6ea38b3571f8754 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 16:36:22 +0800 Subject: [PATCH 250/621] =?UTF-8?q?/gov/org/staff/addstaffv2=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=BF=90=E8=90=A5=E7=AB=AF=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddStaffV2FromDTO.java | 5 ++++- .../com/epmet/controller/StaffController.java | 22 +++++++++++++++---- .../epmet/service/impl/StaffServiceImpl.java | 6 ++--- .../impl/CustomerStaffServiceImpl.java | 3 ++- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java index ecdfba89f9..7bc3b93076 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java @@ -74,5 +74,8 @@ public class AddStaffV2FromDTO implements Serializable { private List newRoles; - private String currentStaffId; + /** + * 烟台用：当前登录用户 + */ + private String currentUserId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index d3f9b9dd28..4b925df93e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -4,13 +4,17 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.enums.RequirePermissionEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.StaffService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -204,10 +208,20 @@ public class StaffController { @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_CREATE) public Result addStaffV2(@LoginUser TokenDto tokenDto, @RequestBody AddStaffV2FromDTO fromDTO){ ValidatorUtils.validateEntity(fromDTO, AddStaffV2FromDTO.AddStaff.class); - fromDTO.setCustomerId(tokenDto.getCustomerId()); - fromDTO.setApp(tokenDto.getApp()); - fromDTO.setClient(tokenDto.getClient()); - fromDTO.setCurrentStaffId(tokenDto.getUserId()); + if(AppClientConstant.APP_OPER.equals(tokenDto.getApp())){ + if(StringUtils.isBlank(fromDTO.getCustomerId())){ + // 该接口烟台运营端-统一认证也在用，所以客户id，运营端必传。 + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"运营端操作，customerId不能为空","运营端操作，customerId不能为空"); + } + }else{ + //小程序端或者数字社区从token里面取 + fromDTO.setCustomerId(tokenDto.getCustomerId()); + } + //因为添加的是工作人员，这里写死吧！ + fromDTO.setApp("gov"); + fromDTO.setClient("wxmp"); + //当前登录用户 + fromDTO.setCurrentUserId(tokenDto.getUserId()); return staffService.addStaffV2(fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 9f337196ca..d364fabda6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -575,8 +575,8 @@ public class StaffServiceImpl implements StaffService { //1.根据新增人员类型判断查询机关信息 OrgResultDTO orgDTO = customerAgencyDao.selectAgencyDetail(fromDTO.getOrgId(), fromDTO.getOrgType()); if (null == orgDTO) { - logger.error(String.format("工作人员新增，根据新增人员组织类型未查询到相关组织信息,orgId->%s,orgType->%s", fromDTO.getOrgId(), fromDTO.getOrgType())); - throw new RenException("根据新增人员组织类型未查询到相关组织信息"); + logger.warn(String.format("工作人员新增，根据新增人员组织类型未查询到相关组织信息,orgId->%s,orgType->%s", fromDTO.getOrgId(), fromDTO.getOrgType())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"根据新增人员组织类型未查询到相关组织信息","组织不存在"); } //2.调用user服务，新增用户信息 @@ -655,7 +655,7 @@ public class StaffServiceImpl implements StaffService { || "0c41b272ee9ee95ac6f184ad548a30eb".equals(fromDTO.getCustomerId())) { YtSyncStaffIdFormDTO ytSyncStaffIdFormDTO = ConvertUtils.sourceToTarget(fromDTO,YtSyncStaffIdFormDTO.class); ytSyncStaffIdFormDTO.setStaffId(result.getData().getUserId()); - ytSyncStaffIdFormDTO.setOperUserId(fromDTO.getCurrentStaffId()); + ytSyncStaffIdFormDTO.setOperUserId(fromDTO.getCurrentUserId()); epmetThirdOpenFeignClient.dataSyncUpdateStaff(ytSyncStaffIdFormDTO); } //2022.10.18加个返参，借用下StaffDetailResultDTO不再新建dto了 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 1d229ba369..d931b46a2c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -349,7 +349,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg()); + // return new Result().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"手机号已存在","手机号已存在"); } //USER表插入数据 UserEntity userEntity = new UserEntity(); From 9513601af001f5190a8066061dc01fb6518e384a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 16:47:38 +0800 Subject: [PATCH 251/621] =?UTF-8?q?/gov/org/staff/addstaffv2=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=BF=90=E8=90=A5=E7=AB=AF=E8=B0=83=E7=94=A8;staff/ed?= =?UTF-8?q?itstaff=E8=B0=83=E6=95=B4=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/StaffController.java | 2 +- .../java/com/epmet/service/impl/StaffServiceImpl.java | 11 +++-------- .../epmet/service/impl/CustomerStaffServiceImpl.java | 3 ++- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 4b925df93e..bcc8e2f55e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -101,7 +101,7 @@ public class StaffController { */ @PostMapping("editstaff") @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_UPDATE) - public Result editStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitFromDTO fromDTO){ + public Result editStaff(@RequestBody StaffSubmitFromDTO fromDTO){ ValidatorUtils.validateEntity(fromDTO); return staffService.editStaff(fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index d364fabda6..a81f868ac5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -216,14 +216,12 @@ public class StaffServiceImpl implements StaffService { CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); } + // epmetUserFeignClient.editStaff没有用到这俩参数，就注释了。 // fromDTO.setApp(tokenDto.getApp()); // fromDTO.setClient(tokenDto.getClient()); Result result = epmetUserFeignClient.editStaff(fromDTO); if (!result.success()) { - if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) { - return new Result().error(result.getCode(), result.getMsg()); - } - return new Result().error(EpmetErrorCode.STAFF_EDIT_FAILED.getCode(), EpmetErrorCode.STAFF_EDIT_FAILED.getMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),result.getInternalMsg(),result.getMsg()); } // if (tokenDto.getClient().equals("web")){ if(CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){ @@ -584,10 +582,7 @@ public class StaffServiceImpl implements StaffService { submitDTO.setAgencyId(orgDTO.getAgencyId()); Result result = epmetUserFeignClient.addStaff(submitDTO); if (!result.success()) { - if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) { - return new Result().error(result.getCode(), result.getMsg()); - } - return new Result().error(EpmetErrorCode.STAFF_ADD_FAILED.getCode(), EpmetErrorCode.STAFF_ADD_FAILED.getMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),result.getInternalMsg(),result.getMsg()); } //3.人员机关表总人数加一、关系表新增关系数据 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index d931b46a2c..24d9eb6729 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -470,7 +470,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg()); + // return new Result().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"手机号已存在","手机号已存在"); } CustomerStaffEntity customerStaffEntity = baseDao.selectByUserId(fromDTO.getStaffId()); From 7ac6ba4d2b828511f09f0b0fe873538616ec5049 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 16:59:15 +0800 Subject: [PATCH 252/621] =?UTF-8?q?ImportEpidemicSpecialAttention=E4=BA=BA?= =?UTF-8?q?=E5=AE=B6=E6=98=AF=E8=AF=81=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/ImportEpidemicSpecialAttention.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java index 52135be6e5..c31e0f0cd0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java @@ -30,7 +30,7 @@ public class ImportEpidemicSpecialAttention extends ExcelVerifyInfo { /** * 身份证号 */ - @Excel(name = "身份证号") + @Excel(name = "证件号") private String idCard; /** From 3f6f36cd9ae6291a02d987c86b7c45997c3f75da Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Oct 2022 17:04:58 +0800 Subject: [PATCH 253/621] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/data/IcNatImportExcelData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java index 052b0cb1eb..eca5620a39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java @@ -24,9 +24,9 @@ public class IcNatImportExcelData { @Length(max = 15, message = "手机号长度不正确，应小于15位") private String mobile; - @NotBlank(message = "身份证号为必填项") - @ExcelProperty("身份证号") - @Length(max = 18, message = "身份证号长度不正确，应小于18位") + @NotBlank(message = "证件号为必填项") + @ExcelProperty("证件号") + @Length(max = 18, message = "证件号长度不正确，应小于18位") private String idCard; @NotNull(message = "检测时间为必填项") From e60958c0b8bf54a264ec11cdd356c6c7f116a326 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Oct 2022 17:14:09 +0800 Subject: [PATCH 254/621] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/excel/ic_nat.xlsx | Bin 9220 -> 9167 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx index d9038bfdc4faa94007e45287efb4b4b9e34a099b..fc749ef474f7a951c7e3881cb32b9efec6a7ee24 100644 GIT binary patch delta 5010 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 delta 5115 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 From 271a9ad65855facb14085ce5bb441e39135b2313 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Oct 2022 18:16:03 +0800 Subject: [PATCH 255/621] =?UTF-8?q?/gov/org/staff/editstaffinit=E8=BF=94?= =?UTF-8?q?=E5=9B=9EcustomerId=EF=BC=8Cstaff=5Forg=5Frelation=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E4=B8=8B=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/StaffOrgRelationDTO.java | 2 +- .../src/main/java/com/epmet/dto/result/StaffInitResultDTO.java | 1 + .../src/main/java/com/epmet/entity/StaffOrgRelationEntity.java | 2 +- .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffOrgRelationDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffOrgRelationDTO.java index 47e3105b3d..e1b2602373 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffOrgRelationDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffOrgRelationDTO.java @@ -60,7 +60,7 @@ public class StaffOrgRelationDTO implements Serializable { private String orgId; /** - * 工作人员添加入口类型(组织:agency;部门:dept;网格:gridId) + * 工作人员的添加入口类型(组织:agency;部门:dept;网格:grid) */ private String orgType; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java index 69f9e86294..87b641b564 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java @@ -13,6 +13,7 @@ import java.util.List; @Data public class StaffInitResultDTO implements Serializable { private static final long serialVersionUID = 1L; + private String customerId; /** * 人员ID */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffOrgRelationEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffOrgRelationEntity.java index 99c242b25d..04ef0c00d2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffOrgRelationEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffOrgRelationEntity.java @@ -56,7 +56,7 @@ public class StaffOrgRelationEntity extends BaseEpmetEntity { private String orgId; /** - * 工作人员添加入口类型(组织:agency;部门:dept;网格:gridId) + * 工作人员的添加入口类型(组织:agency;部门:dept;网格:grid) */ private String orgType; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 24d9eb6729..62af329caf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -303,6 +303,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Wed, 19 Oct 2022 18:25:59 +0800 Subject: [PATCH 256/621] =?UTF-8?q?/gov/org/staff/editstaff,staff=5Frole.c?= =?UTF-8?q?ustomerId=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 62af329caf..a5d32a11b0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -496,6 +496,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Wed, 19 Oct 2022 18:38:57 +0800 Subject: [PATCH 257/621] =?UTF-8?q?/data/aggregator/org/staffdetailv2?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99=E3=80=82=E8=BF=94=E5=9B=9E?= =?UTF-8?q?customerId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java | 1 + .../service/epmetuser/impl/EpmetUserServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java index 2a320915e8..ea1763af18 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java @@ -46,5 +46,6 @@ public class StaffDetailV2FormDTO implements Serializable { * 数字社区里的角色名称 */ private List szsqRoles; + private String customerId; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index e89800fa69..7f2fa0e263 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -7,6 +7,8 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.IdAndNameDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; @@ -720,7 +722,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { //基本信息 CustomerStaffDTO dto = customerStaffDao.selectByStaffId(staffId); if (null == dto) { - return result; + // return result; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"customer_staff is null staffId:"+staffId,"未查询到工作人员基础信息"); } //角色信息 List list = staffRoleDao.selectByStaffId(staffId); From 1014523743a0602f87e19a0d79feaaa253f2d26c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 20 Oct 2022 08:56:21 +0800 Subject: [PATCH 258/621] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/NatListResultDTO.java | 2 +- .../excel/data/IcNatImportExcelData.java | 6 +++--- .../src/main/resources/excel/ic_nat.xlsx | Bin 9203 -> 9198 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java index 43f9582b8c..ee3f03e5e9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java @@ -60,7 +60,7 @@ public class NatListResultDTO implements Serializable { * 身份证号 */ @ColumnWidth(25) - @ExcelProperty(value = "身份证号",order = 3) + @ExcelProperty(value = "证件号",order = 3) private String idCard; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java index ae0cb210d7..b54c571f8f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java @@ -24,9 +24,9 @@ public class IcNatImportExcelData { @Length(max = 15, message = "手机号长度不正确，应小于15位") private String mobile; - @NotBlank(message = "身份证号为必填项") - @ExcelProperty("身份证号") - @Length(max = 18, message = "身份证号长度不正确，应小于18位") + @NotBlank(message = "证件号为必填项") + @ExcelProperty("证件号") + @Length(max = 18, message = "证件号长度不正确，应小于18位") private String idCard; // @NotNull(message = "检测时间为必填项") diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx index 31cc19219bf74629dbeba6c13449990ad7f8208e..524d327bd7032cf01b51e60fcf15ec903428035d 100644 GIT binary patch delta 4508 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 X0001G1e1US8k5)~5C+yC00000gV1hy From 1b3a4a4262e28c915b436607cfc68a57da65366e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 09:08:04 +0800 Subject: [PATCH 259/621] LOUTI --- .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index a5d32a11b0..0bcb0b5eee 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -478,6 +478,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 09:13:55 +0800 Subject: [PATCH 260/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85/go?= =?UTF-8?q?v/project/icEvent/detail=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/IcEventController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 3eb4d8eefa..711e66623d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -275,6 +275,7 @@ public class IcEventController { * @Author sun * @Description 事件管理-详情 **/ + @MaskResponse(fieldNames = { "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From ae604e81294c0269766eee61a6e683e2f384c704 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 09:24:41 +0800 Subject: [PATCH 261/621] /staff/editstaffinit --- .../src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java index 7c2a885f06..9bcd6dcb8c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -14,7 +15,7 @@ import java.io.Serializable; @Data public class StaffInfoFromDTO implements Serializable { private static final long serialVersionUID = 1L; - public interface EditStaffInitGroup {} + public interface EditStaffInitGroup extends CustomerClientShowGroup {} /** * 客户ID */ From 0e5b917f8e0fc5c78067f36b47b97d6a9699e51b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 09:52:31 +0800 Subject: [PATCH 262/621] =?UTF-8?q?1=E3=80=81=E5=B1=85=E6=B0=91=E9=98=B2?= =?UTF-8?q?=E7=96=AB=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B/epmetuser/epidemi?= =?UTF-8?q?cPrevention/detail=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcEpidemicPreventionController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java index 3fd2bd60fc..e06bed1fc6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java @@ -82,6 +82,7 @@ public class IcEpidemicPreventionController{ * @Author zhaoqifeng * @Date 2022/3/29 16:13 */ + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From 9c1d6913065a9b8dc5d4aee26cbe2861007fe9a7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 20 Oct 2022 09:58:39 +0800 Subject: [PATCH 263/621] =?UTF-8?q?=E6=98=8E=E6=96=87=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/pom.xml | 12 ++++ .../controller/EpmetUserController.java | 14 +++++ .../service/epmetuser/EpmetUserService.java | 13 ++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 60 +++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 27873367ec..30999f1c99 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -126,6 +126,18 @@ 2.0.0 compile + + com.epmet + epmet-commons-rocketmq + 2.0.0 + compile + + + com.epmet + epmet-message-client + 2.0.0 + compile + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 9b9c7a0ef1..24d9c5a738 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -14,6 +14,8 @@ import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.excel.StaffPatrollExcel; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; +import com.epmet.dto.form.DetailByTypeFormDTO; +import com.epmet.dto.result.DetailByTypeResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -285,4 +287,16 @@ public class EpmetUserController { return new Result>().ok(epmetUserService.gridMemberPatrolList(formDTO)); } + /** + * Desc: 数据明文查询 + * @param formDTO + * @author zxc + * @date 2022/10/17 13:45 + */ + @PostMapping("detailByType") + public Result detailByType(@RequestBody DetailByTypeFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, DetailByTypeFormDTO.DetailByTypeForm.class); + return new Result().ok(epmetUserService.detailByType(formDTO,tokenDto)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 901087a7ba..6ff3e02f90 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.epmetuser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.epmetuser.form.*; @@ -20,6 +21,8 @@ import com.epmet.dataaggre.entity.epmetuser.IcPointVaccinesInoculationEntity; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; +import com.epmet.dto.form.DetailByTypeFormDTO; +import com.epmet.dto.result.DetailByTypeResultDTO; import java.util.List; import java.util.Map; @@ -250,4 +253,14 @@ public interface EpmetUserService { List listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search); List listNucleicPoints(String customerId, String agencyId,String staffOrgIds, String search); + + + /** + * Desc: 数据明文查询 + * @param formDTO + * @author zxc + * @date 2022/10/17 13:45 + */ + DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index f93c66675b..7b672ab2bd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -2,16 +2,26 @@ package com.epmet.dataaggre.service.epmetuser.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.rocketmq.constants.TopicConstants; +import com.epmet.commons.rocketmq.messages.CheckMQMsg; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.IdAndNameDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; +import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; +import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.IpUtils; import com.epmet.constant.BadgeConstant; +import com.epmet.constant.NeighborhoodConstant; import com.epmet.constant.OrgInfoConstant; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmetuser.*; @@ -42,7 +52,11 @@ import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.opercustomize.CustomerFootBarService; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; +import com.epmet.dto.form.DetailByTypeFormDTO; +import com.epmet.dto.form.SystemMsgFormDTO; +import com.epmet.dto.result.DetailByTypeResultDTO; import com.epmet.dto.result.StaffRoleResultDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -51,8 +65,11 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.text.NumberFormat; import java.util.*; import java.util.stream.Collectors; @@ -98,6 +115,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { private IcPointVaccinesInoculationDao pointVaccinesInoculationDao; @Resource private IcPointNucleicMonitoringDao pointNucleicMonitoringDao; + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; /** * @Description 根据UserIds查询 @@ -971,4 +990,45 @@ public class EpmetUserServiceImpl implements EpmetUserService { query.like(StringUtils.isNotBlank(search), IcPointNucleicMonitoringEntity::getName, search); return pointNucleicMonitoringDao.selectList(query); } + + @Override + public DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto) { + DetailByTypeResultDTO result = new DetailByTypeResultDTO(); + String customerId = tokenDto.getCustomerId(); + String userId = tokenDto.getUserId(); + CheckMQMsg msg = new CheckMQMsg(); + if (formDTO.getType().equals(NeighborhoodConstant.HOUSE)){ + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId()); + if (null == houseInfo){ + throw new EpmetException("查询房屋信息失败："+formDTO.getId()); + } + result.setMobile(houseInfo.getOwnerPhone()); + result.setIdCard(houseInfo.getOwnerIdCard()); + msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息"); + msg.setType("checkHouse"); + msg.setTypeDisplay("查看"+houseInfo.getAllName()+"房屋的敏感信息"); + }else if (formDTO.getType().equals(NeighborhoodConstant.IC_RESI_USER)){ + IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId()); + if (null == icResiUserInfo){ + throw new EpmetException("查询icResiUser失败："+formDTO.getId()); + } + result.setIdCard(icResiUserInfo.getIdCard()); + result.setMobile(icResiUserInfo.getMobile()); + msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息"); + msg.setType("checkIcResiUser"); + msg.setTypeDisplay("查看"+icResiUserInfo.getName()+"的敏感信息"); + } + // 发送mq消息 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + msg.setOperateTime(new Date()); + msg.setUserId(userId); + msg.setFromApp(tokenDto.getApp()); + msg.setIp(IpUtils.getIpAddr(request)); + msg.setFromClient(tokenDto.getClient()); + SystemMsgFormDTO form = new SystemMsgFormDTO(); + form.setMessageType(TopicConstants.CHECK_OR_EXPORT); + form.setContent(msg); + epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); + return result; + } } From 55a24ec49cff3b919b5365aca86130a285c7ca04 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:34:42 +0800 Subject: [PATCH 264/621] =?UTF-8?q?menu/batch-save=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E6=88=91=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/OperMenuController.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index c04455b92e..e29946ca4c 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -1,11 +1,9 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -69,6 +67,23 @@ public class OperMenuController { return new Result(); } + /** + * 疯狂家按钮，我要写个接口批量赠.... + * @param formList + * @param tokenDto + * @return + */ + @PostMapping("batch-save") + public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ + //效验数据 + ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); + for(OperMenuDTO dto:formList){ + operMenuService.save(dto,tokenDto); + } + return new Result(); + } + + @PutMapping public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From ea3b3119d9a5e5c3f8ed2314620ead7528e16c8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:35:30 +0800 Subject: [PATCH 265/621] =?UTF-8?q?=E9=9D=A0=EF=BC=8C=E5=8A=A0=E9=94=99?= =?UTF-8?q?=E5=9C=B0=E6=96=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/OperMenuController.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index e29946ca4c..b9146e88ad 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -67,23 +67,6 @@ public class OperMenuController { return new Result(); } - /** - * 疯狂家按钮，我要写个接口批量赠.... - * @param formList - * @param tokenDto - * @return - */ - @PostMapping("batch-save") - public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ - //效验数据 - ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); - for(OperMenuDTO dto:formList){ - operMenuService.save(dto,tokenDto); - } - return new Result(); - } - - @PutMapping public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From 6532184e73f20b7e4b597e5fe2407134db77caed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:37:00 +0800 Subject: [PATCH 266/621] /gov/access/menu/batch-save --- .../com/epmet/controller/GovMenuController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java index ef763f4a43..69de505fed 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -59,6 +59,22 @@ public class GovMenuController { return new Result(); } + /** + * 疯狂家按钮，我要写个接口批量赠.... + * @param formList + * @param tokenDto + * @return + */ + @PostMapping("batch-save") + public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ + //效验数据 + ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); + for(GovMenuDTO dto:formList){ + govMenuService.save(dto,tokenDto); + } + return new Result(); + } + @PutMapping public Result update(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From 8992ac40a1d8207171d65b5579f8128a2079465d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 20 Oct 2022 11:15:57 +0800 Subject: [PATCH 267/621] =?UTF-8?q?=E6=98=8E=E6=96=87=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/epmetuser/IcResiUserDao.java | 11 +++ .../epmetuser/impl/EpmetUserServiceImpl.java | 74 +++++++++++++++++-- .../mapper/epmetuser/IcResiUserDao.xml | 38 ++++++++++ .../epmet/constant/NeighborhoodConstant.java | 47 ++++++++++++ .../com/epmet/dto/IcNatCompareRecordDTO.java | 3 + .../mapper/IcNatCompareRecordDao.xml | 1 + 6 files changed, 166 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java index 3b3a66dd50..e666aab317 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -30,6 +30,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 用户基础信息 @@ -138,4 +139,14 @@ public interface IcResiUserDao extends BaseDao { @Param("agencyId")String agencyId, @Param("staffOrgIds")String staffOrgIds, @Param("search")String search); + + Map getTripReportRecordInfo(@Param("id")String id); + + Map getVaccineRecordInfo(@Param("id")String id); + + Map getSpecialAttentionInfo(@Param("id")String id); + + Map getNoNatCompareInfo(@Param("id")String id); + + Map getNatInfo(@Param("id")String id); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 7b672ab2bd..5e731980d8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -997,6 +997,10 @@ public class EpmetUserServiceImpl implements EpmetUserService { String customerId = tokenDto.getCustomerId(); String userId = tokenDto.getUserId(); CheckMQMsg msg = new CheckMQMsg(); + IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId()); + if (null == icResiUserInfo){ + throw new EpmetException("查询icResiUser失败："+formDTO.getId()); + } if (formDTO.getType().equals(NeighborhoodConstant.HOUSE)){ HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId()); if (null == houseInfo){ @@ -1005,22 +1009,76 @@ public class EpmetUserServiceImpl implements EpmetUserService { result.setMobile(houseInfo.getOwnerPhone()); result.setIdCard(houseInfo.getOwnerIdCard()); msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息"); - msg.setType("checkHouse"); - msg.setTypeDisplay("查看"+houseInfo.getAllName()+"房屋的敏感信息"); }else if (formDTO.getType().equals(NeighborhoodConstant.IC_RESI_USER)){ - IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId()); - if (null == icResiUserInfo){ - throw new EpmetException("查询icResiUser失败："+formDTO.getId()); - } result.setIdCard(icResiUserInfo.getIdCard()); result.setMobile(icResiUserInfo.getMobile()); msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息"); - msg.setType("checkIcResiUser"); - msg.setTypeDisplay("查看"+icResiUserInfo.getName()+"的敏感信息"); + }else if (formDTO.getType().equals(NeighborhoodConstant.JMFYXX)){ + result.setIdCard(icResiUserInfo.getIdCard()); + result.setMobile(icResiUserInfo.getMobile()); + msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息(居民防疫信息)"); + }else if (formDTO.getType().equals(NeighborhoodConstant.ROUTE_FOLLOW)){ + Map info = icResiUserDao.getTripReportRecordInfo(formDTO.getId()); + if (null == info){ + throw new EpmetException("未查询到行程随访信息："+formDTO.getId()); + } + result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); + result.setMobile(info.get(NeighborhoodConstant.MOBILE)); + msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(行程随访)"); + }else if (formDTO.getType().equals(NeighborhoodConstant.VACCINATION_RECORD)){ + Map info = icResiUserDao.getVaccineRecordInfo(formDTO.getId()); + if (null == info){ + throw new EpmetException("未查询到疫苗接种信息："+formDTO.getId()); + } + result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); + result.setMobile(info.get(NeighborhoodConstant.MOBILE)); + msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(疫苗接种记录)"); + }else if (formDTO.getType().equals(NeighborhoodConstant.VACCINE_SPECIAL_ATTENTION) + || formDTO.getType().equals(NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_QUARANTINE) + || formDTO.getType().equals(NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY)){ + Map info = icResiUserDao.getSpecialAttentionInfo(formDTO.getId()); + if (null == info){ + throw new EpmetException("未查询到特别关注名单信息："+formDTO.getId()); + } + result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); + result.setMobile(info.get(NeighborhoodConstant.MOBILE)); + String cMsg = ""; + switch (formDTO.getType()){ + case NeighborhoodConstant.VACCINE_SPECIAL_ATTENTION: + cMsg = "疫苗接种关注名单"; + break; + case NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_QUARANTINE: + cMsg = "重点人群关注名单(防疫隔离)"; + break; + case NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY: + cMsg = "重点人群关注名单(历史记录)"; + break; + default: + } + msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息("+cMsg+")"); + + }else if (formDTO.getType().equals(NeighborhoodConstant.NO_NAT_COMPARE)){ + Map info = icResiUserDao.getNoNatCompareInfo(formDTO.getId()); + if (null == info){ + throw new EpmetException("未查询到未做核酸比对信息："+formDTO.getId()); + } + result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); + result.setMobile(info.get(NeighborhoodConstant.MOBILE)); + msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(未做核酸比对)"); + }else if (formDTO.getType().equals(NeighborhoodConstant.NAT_RECORD)){ + Map info = icResiUserDao.getNatInfo(formDTO.getId()); + if (null == info){ + throw new EpmetException("未查询到核酸检测信息："+formDTO.getId()); + } + result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); + result.setMobile(info.get(NeighborhoodConstant.MOBILE)); + msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(核酸检测信息)"); } // 发送mq消息 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); msg.setOperateTime(new Date()); + msg.setType(formDTO.getType()); + msg.setTypeDisplay(msg.getContent()); msg.setUserId(userId); msg.setFromApp(tokenDto.getApp()); msg.setIp(IpUtils.getIpAddr(request)); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index d89996a58a..c8e2bd94f9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -283,4 +283,42 @@ having volunteerCategory is null or volunteerCategory = '' + + + + + + + + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java index fe92bcd3c2..c71c0de90c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java @@ -6,12 +6,59 @@ package com.epmet.constant; */ public interface NeighborhoodConstant { + String MOBILE = "MOBILE"; + String ID_CARD = "ID_CARD"; + String NAME = "NAME"; + String GRID = "grid"; String NEIGHBOR_HOOD= "neighbourHood"; String BUILDING = "building"; String HOUSE = "house"; + /** + * ic居民 + */ String IC_RESI_USER = "icResiUser"; + /** + * 居民防疫信息 + */ + String JMFYXX = "JMFYXX"; + + /** + * 行程随访 + */ + String ROUTE_FOLLOW = "routeFollow"; + + /** + * 疫苗接种记录 + */ + String VACCINATION_RECORD = "vaccinationRecord"; + + /** + * 疫苗接种关注名单 + */ + String VACCINE_SPECIAL_ATTENTION = "vaccineSpecialAttention"; + + /** + * 未做核酸比对 + */ + String NO_NAT_COMPARE = "noNatCompare"; + + /** + * 核酸检测记录 + */ + String NAT_RECORD = "natRecord"; + + /** + * 重点人群关注名单【防疫隔离】 + */ + String FOCUS_GROUP_SPECIAL_ATTENTION_QUARANTINE = "focusGroupSpecialAttentionQuarantine"; + + /** + * 重点人群关注名单【历史记录】 + */ + String FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY = "focusGroupSpecialAttentionHistory"; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java index 9bde2314d1..b422af6b61 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java @@ -30,6 +30,9 @@ public class IcNatCompareRecordDTO implements Serializable { @ExcelIgnore private String relationId; + @ExcelIgnore + private String recordId; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml index 2a33a5680b..0e3fcaa606 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml @@ -7,6 +7,7 @@ + \ No newline at end of file From e338601bbce0a861d97cc66f98924d0daad44105 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 14:11:44 +0800 Subject: [PATCH 277/621] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9A=B4=E9=9C=B2=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ThirdLoginController.java | 2 +- .../commons/tools/utils/api/yt/TestMs4.java | 184 ++++++++++++++++++ .../commons/tools/utils/api/yt/YantaiApi.java | 123 ++++++++++-- .../tools/utils/api/yt/YantaiSSOUser.java | 5 + .../impl/IcFollowUpRecordServiceImpl.java | 3 +- 5 files changed, 294 insertions(+), 23 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/TestMs4.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index f5c8da7ad4..3f23ee88c8 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -224,7 +224,7 @@ public class ThirdLoginController { * @return */ @PostMapping("sso-govlogin-yantai/{authCode}") - public Result yantaiSSOLogin(@RequestParam(value = "authCode") String authCode) { + public Result yantaiSSOLogin(@PathVariable(value = "authCode") String authCode) { return new Result().ok(thirdLoginService.yanTaiSSOLogin(authCode)); } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/TestMs4.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/TestMs4.java new file mode 100644 index 0000000000..1a9853705d --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/TestMs4.java @@ -0,0 +1,184 @@ +package com.epmet.commons.tools.utils.api.yt; + + +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.pqc.math.linearalgebra.ByteUtils; + +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.spec.SecretKeySpec; +import java.security.*; +import java.util.Arrays; + +/** + * sm4加密算法工具类 + * + * @explain sm4加密、解密与加密结果验证 可逆算法 + * @Autor：jingyao + */ +public class TestMs4 { + static { + Security.addProvider(new BouncyCastleProvider()); + } + + private static final String ENCODING = "UTF-8"; + public static final String ALGORITHM_NAME = "SM4"; + // 加密算法/分组加密模式/分组填充方式 + // PKCS5Padding-以8个字节为一组进行分组加密 + // 定义分组加密模式使用：PKCS5Padding + public static final String ALGORITHM_NAME_ECB_PADDING = "SM4/ECB/PKCS5Padding"; + // 128-32位16进制；256-64位16进制 + public static final int DEFAULT_KEY_SIZE = 128; + + /** + * 生成ECB暗号 + * + * @param algorithmName 算法名称 + * @param mode 模式 + * @param key + * @return + * @throws Exception + * @explain ECB模式（电子密码本模式：Electronic codebook） + */ + private static Cipher generateEcbCipher(String algorithmName, int mode, byte[] key) throws Exception { + Cipher cipher = Cipher.getInstance(algorithmName, BouncyCastleProvider.PROVIDER_NAME); + Key sm4Key = new SecretKeySpec(key, ALGORITHM_NAME); + cipher.init(mode, sm4Key); + return cipher; + } + + /** + * 自动生成密钥 + * + * @return + * @throws NoSuchAlgorithmException + * @throws NoSuchProviderException + * @explain + */ + public static byte[] generateKey() throws Exception { + return generateKey(DEFAULT_KEY_SIZE); + } + + + //加密****************************************** + + /** + * @param keySize + * @return + * @throws Exception + * @explain 系统产生秘钥 + */ + public static byte[] generateKey(int keySize) throws Exception { + KeyGenerator kg = KeyGenerator.getInstance(ALGORITHM_NAME, BouncyCastleProvider.PROVIDER_NAME); + kg.init(keySize, new SecureRandom()); + return kg.generateKey().getEncoded(); + } + + /** + * sm4加密 + * + * @param hexKey 16进制密钥（忽略大小写） + * @param paramStr 待加密字符串 + * @return 返回16进制的加密字符串 + * @throws Exception + * @explain 加密模式：ECB 密文长度不固定，会随着被加密字符串长度的变化而变化 + */ + public static String encryptEcb(String hexKey, String paramStr) throws Exception { + String cipherText = ""; + // 16进制字符串-->byte[] + byte[] keyData = ByteUtils.fromHexString(hexKey); + // String-->byte[] + byte[] srcData = paramStr.getBytes(ENCODING); + // 加密后的数组 + byte[] cipherArray = encrypt_Ecb_Padding(keyData, srcData); + // byte[]-->hexString + cipherText = ByteUtils.toHexString(cipherArray); + return cipherText; + } + + /** + * 加密模式之Ecb + * + * @param key + * @param data + * @return + * @throws Exception + */ + public static byte[] encrypt_Ecb_Padding(byte[] key, byte[] data) throws Exception { + Cipher cipher = generateEcbCipher(ALGORITHM_NAME_ECB_PADDING, Cipher.ENCRYPT_MODE, key);//声称Ecb暗号,通过第二个参数判断加密还是解密 + return cipher.doFinal(data); + } + + //解密**************************************** + + /** + * sm4解密 + * + * @param hexKey 16进制密钥 + * @param cipherText 16进制的加密字符串（忽略大小写） + * @return 解密后的字符串 + * @throws Exception + * @explain 解密模式：采用ECB + */ + public static String decryptEcb(String hexKey, String cipherText) throws Exception { + // 用于接收解密后的字符串 + String decryptStr = ""; + // hexString-->byte[] + byte[] keyData = ByteUtils.fromHexString(hexKey); + // hexString-->byte[] + byte[] cipherData = ByteUtils.fromHexString(cipherText); + // 解密 + byte[] srcData = decrypt_Ecb_Padding(keyData, cipherData); + // byte[]-->String + decryptStr = new String(srcData, ENCODING); + return decryptStr; + } + + /** + * 解密 + * + * @param key + * @param cipherText + * @return + * @throws Exception + * @explain + */ + public static byte[] decrypt_Ecb_Padding(byte[] key, byte[] cipherText) throws Exception { + Cipher cipher = generateEcbCipher(ALGORITHM_NAME_ECB_PADDING, Cipher.DECRYPT_MODE, key);//生成Ecb暗号,通过第二个参数判断加密还是解密 + return cipher.doFinal(cipherText); + } + + /** + * 校验加密前后的字符串是否为同一数据 + * + * @param hexKey 16进制密钥（忽略大小写） + * @param cipherText 16进制加密后的字符串 + * @param paramStr 加密前的字符串 + * @return 是否为同一数据 + * @throws Exception + * @explain + */ + public static boolean verifyEcb(String hexKey, String cipherText, String paramStr) throws Exception { + // 用于接收校验结果 + boolean flag = false; + // hexString-->byte[] + byte[] keyData = ByteUtils.fromHexString(hexKey); + // 将16进制字符串转换成数组 + byte[] cipherData = ByteUtils.fromHexString(cipherText); + // 解密 + byte[] decryptData = decrypt_Ecb_Padding(keyData, cipherData); + // 将原字符串转换成byte[] + byte[] srcData = paramStr.getBytes(ENCODING); + // 判断2个数组是否一致 + flag = Arrays.equals(decryptData, srcData); + return flag; + } + + public static void main(String[] args) throws Exception { + String text = "5d22ea44c7599a48f0d4446b1b7fbb4bb8353922df437d39c3a38549c0f2549cbd021ada00a8be83027ae06203c3daea2eedc5bd0875c7e509c7049045c5349577f2c21bcec328a5ea0bf341191e5bdba978566dddd16f1cf1928ff5cbd826dd33289fb45a8a04585f1f24ab04f59426371a5a0a0f2ee3e7b00d2bdfba7810524ce4c33130eda077546fa4c4191d0117f7a44e1cadac6c69a7d437653be1f958a459e0f025d471e09ab4636c38013032948ffb0827040ed6f3436be090f545186928a7b0b2bfc65782452606607ce8555ba130caacad73998da704428a07276a2699889c9872eebba5de8b72cdbe88705483293b00ab3ecb3aa57d283a4ecab40b71bc0a10e9ec626f07b2293255349fb2270d37e81c5c3d0de0b0f0706ed1872f60f039ce2e51effc39aef9747d67457e072cf3170a9c19589c1bab1a7d9d80"; + String s = TestMs4.decryptEcb("dbcff4c9f4774e6cb56080f279149d59", text); + System.out.println(s); + } + +} + diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java index cbab66f5b8..84195d6711 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java @@ -7,9 +7,12 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; +import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import javax.crypto.BadPaddingException; +import java.security.InvalidKeyException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -24,8 +27,10 @@ import java.util.Map; */ @Slf4j public class YantaiApi { - private static final String SSO_SERVER = "http://localhost:8080/"; - private static final String CLIENT_ID = "1000006"; + private static final String SSO_SERVER = "http://172.20.46.155:8080/sso/"; + private static final String CLIENT_ID = "1000009"; + private static final String CLIENT_SECRET = "a1f9879119bc4080ab5575f832b7d98b"; + private static final String SSO_CLIENT_TOKEN = "PRm5Db96atozjPQsJOuwlA=="; /** * desc:根据组织id获取下级组织 @@ -35,8 +40,8 @@ public class YantaiApi { */ public static List getChildOuInfoByGuid(String organizationId) { try { - if (StringUtils.isBlank(organizationId)){ - throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + if (StringUtils.isBlank(organizationId)) { + throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); } //加密 String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); @@ -69,14 +74,14 @@ public class YantaiApi { */ public static List getUserByOuGuid(String organizationId) { try { - if (StringUtils.isBlank(organizationId)){ - throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + if (StringUtils.isBlank(organizationId)) { + throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); } //加密 String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); //pwd = URLEncoder.encode(pwd, "UTF-8"); System.out.println("加密组织Id = " + organizationIdEn); - String url = SSO_SERVER+"ouinfo/getUserByOuGuid?organizationId=" + organizationIdEn; + String url = SSO_SERVER + "ouinfo/getUserByOuGuid?organizationId=" + organizationIdEn; Map headerMap = new HashMap<>(); Map paramMap = new HashMap<>(); @@ -103,29 +108,41 @@ public class YantaiApi { */ public static YantaiSSOUser getLoginToken(String code) { try { - if (StringUtils.isBlank(code)){ - throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + if (StringUtils.isBlank(code)) { + throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); } //加密 String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(code); //pwd = URLEncoder.encode(pwd, "UTF-8"); - System.out.println("加密组织Id = " + organizationIdEn); - String url = "logintoken?client_id="+CLIENT_ID+"&client_code=" + code; + log.info("getLoginToken加密组织Id = " + organizationIdEn); + String url = SSO_SERVER + "logintoken?client_id=" + CLIENT_ID + "&client_code=" + code; Map headerMap = new HashMap<>(); Map paramMap = new HashMap<>(); log.info("getUserByOuGuid request param: url:{},header:{}", url, headerMap); Result result = HttpClientManager.getInstance().sendGet(url, paramMap, headerMap); + if (!result.success() || StringUtils.isBlank(result.getData())) { + log.info("getUserByOuGuid fail result:{}", JSON.toJSONString(result)); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取token为空", "获取token为空"); + } log.info("getUserByOuGuid request result:{}", result); JSONObject jsonObject = JSONObject.parseObject(result.getData()); //解密 String errcode = jsonObject.getString("errcode"); - if (!NumConstant.ZERO_STR.equals(errcode)){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取token失败","获取token失败"); + if (!NumConstant.ZERO_STR.equals(errcode)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取token失败", "获取token失败"); } - String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); + String sencondData = jsonObject.getString("data"); + log.info("getLoginToken jiami data:{}", sencondData); + //String data = SM4UtilsForYanTai.dealDecryptData(sencondData); + + + String data = TestMs4.decryptEcb(CLIENT_SECRET, sencondData); + log.info("getLoginToken jiemi data:{}", sencondData); YantaiSSOUser userData = JSON.parseObject(data, YantaiSSOUser.class); log.info("getUserByOuGuid request real result:{}", JSON.toJSONString(userData)); + String userInfoMobile = getUserInfoMobile(userData.getUserGuid()); + userData.setMobile(userInfoMobile); return userData; } catch (Exception e) { log.error("getUserByOuGuid exception", e); @@ -133,12 +150,76 @@ public class YantaiApi { return null; } - public static void main(String[] args) { - String serverUrl = "http://172.20.46.155:8080/sso/login"; - Map param = new HashMap<>(); - param.put("client_id","1000006"); - param.put("redirect_url","https://epmet-open.elinkservice.cn/epmet-oper-gov/"); - Result stringResult = HttpClientManager.getInstance().sendGet(serverUrl, param); - System.out.println(JSON.toJSONString(stringResult)); + public static String getUserInfoMobile(String userId) { + try { + JSONObject token = new JSONObject(); + token.put("token", "iJCDUgCBV/Zk5FkkaxLypA=="); + // token.put("token","iJCDUgCBV/Zk5FkkaxLypA=="); + token.put("expiration", System.currentTimeMillis()); + + String tokanStr = SM4UtilsForYanTai.dealEncryptData(token.toString()); + String userIdEn = SM4UtilsForYanTai.dealEncryptData(userId); + System.out.println(tokanStr + "__" + userIdEn); + String serverUrl = "http://172.20.46.155:8082/person/userInfo/getUserByUserGuid"; + //String serverUrl = "http://120.220.248.247:8081/person/userInfo/getUserByUserGuid"; + Map param = new HashMap<>(); + param.put("userGuid", userIdEn); + Map headerMap = new HashMap<>(); + headerMap.put("Authorization", "Bearer " + tokanStr); + Result result = HttpClientManager.getInstance().sendGet(serverUrl, param, headerMap); + System.out.println(JSON.toJSONString(result)); + if (!result.success() || StringUtils.isBlank(result.getData())) { + log.info("getUserInfoMobile fail result:{}", JSON.toJSONString(result)); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); + } + String data = result.getData(); + log.info("getUserInfoMobile jiami data:{}", JSON.parseObject(data)); + JSONObject jsonObject = JSON.parseObject(data); + String secondCode = jsonObject.getString("code"); + String secondMessage = jsonObject.getString("message"); + if (!"200".equals(secondCode)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取人员信息接口返回失败" + secondMessage, "获取人员信息接口返回失败" + secondMessage); + } + String data1 = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); + String telephoneNumber = JSON.parseObject(data1).getString("mobileTelephoneNumber"); + log.info("getUserInfoMobile jiemi data:{}", telephoneNumber); + return telephoneNumber; + } catch (Exception e) { + log.error("getUserInfoMobile exception", e); + } + return null; + } + + public static void main(String[] args) throws BadPaddingException, InvalidKeyException, JsonProcessingException { +// JSONObject token = new JSONObject(); +// token.put("token", SSO_CLIENT_TOKEN); +// token.put("expiration", System.currentTimeMillis()); +// +// String tokanStr = SM4UtilsForYanTai.dealEncryptData(token.toString()); +// String testUserId = "0ffd76e2-27b5-4b33-be9a-186f9f878bf1"; +// String userId = SM4UtilsForYanTai.dealEncryptData(testUserId); +// System.out.println(tokanStr + "__" + userId); +// String serverUrl = "http://172.20.46.155:8082/person/userInfo/getUserByUserGuid"; +// //String serverUrl = "http://120.220.248.247:8081/person/userInfo/getUserByUserGuid"; +// Map param = new HashMap<>(); +// param.put("userGuid", userId); +// Map headerMap = new HashMap<>(); +// headerMap.put("Authorization", "Bearer " + tokanStr); +// Result stringResult = HttpClientManager.getInstance().sendGet(serverUrl, param, headerMap); +// System.out.println(JSON.toJSONString(stringResult)); +// +// String data = stringResult.getData(); +// JSONObject jsonObject = JSON.parseObject(data); +// String secondCode = jsonObject.getString("code"); +// String secondMessage = jsonObject.getString("message"); +// System.out.println(secondCode); +// System.out.println(secondMessage); +// String data1 = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); +// System.out.println("======" + data1); + String s = SM4UtilsForYanTai.dealDecryptData("R5TbfdZPJ7QA9uo02EGT/uDWyUWapZTmTQZwwLYnX5ZChQhV8bYa17yJ+d+KC5vUm9P/O9J25pkpKSzUSaXEmJz3oniLQdj3OyhmZFghKAKVbK/By+3oyVQG3ApRUMwir64RkvnjpP7MjgUaXXongNRheMrsarV2fjr8ZYDzIH0bhsTDgo0/qNSSmFc+0sWmcvraDyeeI5nRNyjaBzybuBQzOCkqf3LtQAwnqWj8lCVPi5dH7KiTzM0pwZWzhfr21xzaw80fQkUMznBfkiJJM8nI2vqgZfa6TgtTH3h7JYLq8LDcu5UMJpMuVjbWwW41N41I+c9magDCUOJ9LkbmrUTvg2Y0asccP7U3jt9NNgwmRT5L/vxNmuapDaADjFR83P3ospRaclr3vo9OWMORSw=="); + System.out.println("sssssss:"+s); + + + getLoginToken("0d554bccfbac4be3846d643252daf92b"); } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java index 99d31cc439..d2285ce0f3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java @@ -27,4 +27,9 @@ public class YantaiSSOUser implements Serializable { private String userGuid; private String userName; + /** + * 二次请求结果 + */ + private String mobile; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java index 1e3c46f9f1..0999660b0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java @@ -83,6 +83,7 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 14:49:13 +0800 Subject: [PATCH 278/621] mingwen buquan --- .../epmet/dto/ComplementLogOperationDTO.java | 21 +++++++++++++ .../java/com/epmet/dao/LogOperationDao.java | 6 +++- .../service/impl/LogOperationServiceImpl.java | 30 +++++++++++++++++-- .../main/resources/mapper/LogOperationDao.xml | 26 ++++++++++++++-- .../mapper/epmetuser/IcResiUserDao.xml | 17 +++++++---- 5 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/ComplementLogOperationDTO.java diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/ComplementLogOperationDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/ComplementLogOperationDTO.java new file mode 100644 index 0000000000..ff363c2ad6 --- /dev/null +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/ComplementLogOperationDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/20 14:21 + * @DESC + */ +@Data +public class ComplementLogOperationDTO implements Serializable { + + private static final long serialVersionUID = 7563210356670229204L; + + private String staffId; + + private String orgId; + private String orgIdPath; +} diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java index 9b68f81ed7..bb2a615faf 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java @@ -18,12 +18,14 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.ComplementLogOperationDTO; import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.entity.LogOperationEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 操作日指标 @@ -41,6 +43,8 @@ public interface LogOperationDao extends BaseDao { @Param("operatorMobile")String operatorMobile, @Param("category")String category); - List getStaffId(); + Map getStaffId(); + + void updateBatchLog(@Param("list") List list); } \ No newline at end of file diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java index 189f83cf7e..314b5577fb 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java @@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.LogOperationDao; +import com.epmet.dto.ComplementLogOperationDTO; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.CustomerStaffFormDTO; import com.epmet.dto.region.LogOperationResultDTO; @@ -22,6 +25,7 @@ import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; @@ -214,10 +218,32 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR Integer no = NumConstant.ONE; Integer size; do { - PageInfo pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> logOperationDao.getStaffId()); + PageInfo> pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> logOperationDao.getStaffId()); size = pageInfo.getList().size(); - + if (!CollectionUtils.isEmpty(pageInfo.getList())){ + List needUpdate = new ArrayList<>(); + for (Map m : pageInfo.getList()) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(m.get("CUSTOMER_ID"), m.get("OPERATOR_ID")); + if (null == staffInfo){ + logger.warn("未查询到工作人员信息"+m.get("OPERATOR_ID")); + continue; + } + ComplementLogOperationDTO dto = new ComplementLogOperationDTO(); + dto.setStaffId(staffInfo.getStaffId()); + dto.setOrgId(staffInfo.getAgencyId()); + dto.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId())); + needUpdate.add(dto); + } + if (!CollectionUtils.isEmpty(needUpdate)){ + updateLog(needUpdate); + } + } no++; }while (size == NumConstant.ONE_HUNDRED); } + + @Transactional(rollbackFor = Exception.class) + public void updateLog(List list){ + logOperationDao.updateBatchLog(list); + } } diff --git a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml index 2a962daf18..92a3f0fa5c 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml +++ b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml @@ -26,6 +26,27 @@ + + update log_operation + + + + when OPERATOR_ID = #{item.staffId} then #{item.orgId} + + + + + when OPERATOR_ID = #{item.staffId} then #{item.orgIdPath} + + + UPDATED_TIME = NOW() + + where 1=1 + + OPERATOR_ID = #{item.staffId} + + + - SELECT - OPERATOR_ID + OPERATOR_ID, + CUSTOMER_ID FROM log_operation GROUP BY OPERATOR_ID diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index c8e2bd94f9..d80dceb72d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -287,22 +287,25 @@ - select MOBILE, - ID_CARD + ID_CARD, + NAME from ic_epidemic_special_attention where id = #{id} @@ -310,14 +313,16 @@ From ef1dc23316c6e1352a5f513b7b91e1a8f06ec525 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 20 Oct 2022 15:02:10 +0800 Subject: [PATCH 279/621] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/LogOperationController.java | 6 ++++-- .../src/main/java/com/epmet/dao/LogOperationDao.java | 5 +++-- .../java/com/epmet/service/LogOperationService.java | 3 ++- .../epmet/service/impl/LogOperationServiceImpl.java | 10 ++++++++-- .../src/main/resources/mapper/LogOperationDao.xml | 1 + 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java index 52d96b8697..419ff38b21 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java @@ -1,8 +1,10 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -52,7 +54,7 @@ public class LogOperationController { * @return */ @PostMapping("page") - public Result> page(@RequestBody LogOperationListFormDTO formDTO){ + public Result> page(@RequestBody LogOperationListFormDTO formDTO, @LoginUser TokenDto tokenDto){ return new Result>().ok(logOperationService.page(loginUserUtil.getLoginUserCustomerId(), formDTO.getStartTime(), formDTO.getEndTime(), @@ -60,7 +62,7 @@ public class LogOperationController { formDTO.getOperatorMobile(), formDTO.getPageNo(), formDTO.getPageSize(), - formDTO.getCategory())); + formDTO.getCategory(),tokenDto)); } @PostMapping("complementLogOperation") diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java index bb2a615faf..be1858c9e2 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java @@ -41,9 +41,10 @@ public interface LogOperationDao extends BaseDao { @Param("endTime")String endTime, @Param("operatorName")String operatorName, @Param("operatorMobile")String operatorMobile, - @Param("category")String category); + @Param("category")String category, + @Param("agencyId")String agencyId); - Map getStaffId(); + List> getStaffId(); void updateBatchLog(@Param("list") List list); diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java index a60ba94ff7..ce56a25a6e 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java @@ -1,6 +1,7 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.entity.LogOperationEntity; @@ -41,7 +42,7 @@ public interface LogOperationService { String endTime, String operatorName, String operatorMobile, - Integer pageNo, Integer pageSize,String category); + Integer pageNo, Integer pageSize, String category, TokenDto tokenDto); void complementLogOperation(); diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java index 314b5577fb..fae8de2b7c 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java @@ -8,9 +8,11 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.LogOperationDao; import com.epmet.dto.ComplementLogOperationDTO; @@ -199,10 +201,14 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR */ @Override public PageData page(String customerId, String startTime, String endTime, String operatorName, String operatorMobile, - Integer pageNo, Integer pageSize,String category) { + Integer pageNo, Integer pageSize, String category, TokenDto tokenDto) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询工作人员信息："+tokenDto.getUserId()); + } // 列表/导出查询 PageHelper.startPage(pageNo, pageSize); - List list = logOperationDao.pageList(customerId, startTime, endTime, operatorName, operatorMobile,category); + List list = logOperationDao.pageList(customerId, startTime, endTime, operatorName, operatorMobile,category,staffInfo.getAgencyId()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } diff --git a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml index 92a3f0fa5c..749e9b4288 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml +++ b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml @@ -64,6 +64,7 @@ WHERE lo.del_flag = '0' AND lo.CUSTOMER_ID = #{customerId} + AND lo.ORG_ID_PATH LIKE concat('%',#{agencyId},'%') AND lo.CATEGORY = #{category} From 67b47a5b29342cec93a7b2c1c1859300f8cfe39a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 20 Oct 2022 15:36:02 +0800 Subject: [PATCH 280/621] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8A=A0=20=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/entity/LogOperationEntity.java | 2 ++ .../listener/AuthOperationLogListener.java | 2 ++ .../CheckAndExportOperationLogListener.java | 2 ++ .../epmet/service/impl/IcLoginServiceImpl.java | 16 ++++++++++++---- .../commons/rocketmq/messages/CheckMQMsg.java | 2 ++ .../commons/rocketmq/messages/LoginMQMsg.java | 2 ++ .../epmetuser/impl/EpmetUserServiceImpl.java | 10 ++++++++-- .../com/epmet/constant/NeighborhoodConstant.java | 2 ++ 8 files changed, 32 insertions(+), 6 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java index 537d1fc9b2..e576d3823a 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java @@ -79,6 +79,8 @@ public class LogOperationEntity extends BaseEpmetEntity { * 操作人手机号 */ private String operatorMobile; + private String orgId; + private String orgIdPath; /** * 操作时间,该时间不是插入数据的时间，而是操作发生的真实时间 diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java index 6f8afd1418..fb1feb3ac8 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java @@ -78,6 +78,8 @@ public class AuthOperationLogListener implements MessageListenerConcurrently { logEntity.setOperatorMobile(operatorInfo.getMobile()); logEntity.setOperatingTime(msgObj.getLoginTime()); logEntity.setContent("成功登录系统"); + logEntity.setOrgIdPath(msgObj.getOrgIdPath()); + logEntity.setOrgId(msgObj.getOrgId()); DistributedLock distributedLock = null; RLock lock = null; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java index b11751f3eb..977117ac84 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java @@ -76,6 +76,8 @@ public class CheckAndExportOperationLogListener implements MessageListenerConcur logEntity.setOperatorMobile(operatorInfo.getMobile()); logEntity.setOperatingTime(msgObj.getOperateTime()); logEntity.setContent(msgObj.getContent()); + logEntity.setOrgId(msgObj.getOrgId()); + logEntity.setOrgIdPath(msgObj.getOrgIdPath()); DistributedLock distributedLock = null; RLock lock = null; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java index ea0ae6d5fb..4740033245 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java @@ -5,11 +5,14 @@ import com.epmet.auth.constants.AuthOperationConstants; import com.epmet.commons.rocketmq.messages.LoginMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.IcTokenDto; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.IpUtils; @@ -23,6 +26,7 @@ import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.service.IcLoginService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; @@ -78,7 +82,7 @@ public class IcLoginServiceImpl implements IcLoginService, ResultDataResolver { //7.发送登录事件 try { - sendLoginEvent(staffId, app, client); + sendLoginEvent(staffId, app, client,agencyInfo.getCustomerId()); } catch (RenException e) { log.error(e.getInternalMsg()); } catch (Exception e) { @@ -113,16 +117,20 @@ public class IcLoginServiceImpl implements IcLoginService, ResultDataResolver { * @author wxz * @date 2021.10.26 13:45:59 */ - private void sendLoginEvent(String userId, String fromApp, String fromClient) { + private void sendLoginEvent(String userId, String fromApp, String fromClient, String customerId) { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+userId); + } LoginMQMsg loginMQMsg = new LoginMQMsg(); loginMQMsg.setUserId(userId); loginMQMsg.setLoginTime(new Date()); loginMQMsg.setIp(IpUtils.getIpAddr(request)); loginMQMsg.setFromApp(fromApp); loginMQMsg.setFromClient(fromClient); - + loginMQMsg.setOrgId(staffInfo.getAgencyId()); + loginMQMsg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId())); SystemMsgFormDTO form = new SystemMsgFormDTO(); form.setMessageType(AuthOperationConstants.LOGIN); form.setContent(loginMQMsg); diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java index 462133adfe..30b1595e20 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java @@ -27,5 +27,7 @@ public class CheckMQMsg { private String fromApp; private String fromClient; + private String orgId; + private String orgIdPath; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java index 646db43501..46f400d6d1 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java @@ -22,5 +22,7 @@ public class LoginMQMsg { private String fromApp; private String fromClient; + private String orgId; + private String orgIdPath; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index cff0f63234..79f949b525 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -997,7 +997,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { String customerId = tokenDto.getCustomerId(); String userId = tokenDto.getUserId(); CheckMQMsg msg = new CheckMQMsg(); - if (formDTO.getType().equals(NeighborhoodConstant.HOUSE)){ + if (formDTO.getType().equals(NeighborhoodConstant.CHECK_HOUSE)){ HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId()); if (null == houseInfo){ throw new EpmetException("查询房屋信息失败："+formDTO.getId()); @@ -1005,7 +1005,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { result.setMobile(houseInfo.getOwnerPhone()); result.setIdCard(houseInfo.getOwnerIdCard()); msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息"); - }else if (formDTO.getType().equals(NeighborhoodConstant.IC_RESI_USER)){ + }else if (formDTO.getType().equals(NeighborhoodConstant.CHECK_IC_RESI_USER)){ IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId()); if (null == icResiUserInfo){ throw new EpmetException("查询icResiUser失败："+formDTO.getId()); @@ -1084,6 +1084,12 @@ public class EpmetUserServiceImpl implements EpmetUserService { msg.setType(formDTO.getType()); msg.setTypeDisplay(msg.getContent()); msg.setUserId(userId); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if(null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+userId); + } + msg.setOrgId(staffInfo.getAgencyId()); + msg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId())); msg.setFromApp(tokenDto.getApp()); msg.setIp(IpUtils.getIpAddr(request)); msg.setFromClient(tokenDto.getClient()); diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java index c71c0de90c..261b951496 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java @@ -15,11 +15,13 @@ public interface NeighborhoodConstant { String NEIGHBOR_HOOD= "neighbourHood"; String BUILDING = "building"; String HOUSE = "house"; + String CHECK_HOUSE = "checkHouse"; /** * ic居民 */ String IC_RESI_USER = "icResiUser"; + String CHECK_IC_RESI_USER = "checkIcResiUser"; /** * 居民防疫信息 From 48f61754876b3c63e29f182ec3ee604e19348c5f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 20 Oct 2022 15:44:11 +0800 Subject: [PATCH 281/621] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ThirdLoginServiceImpl.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index e1ab790e0f..d27d7ad672 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.commons.rocketmq.messages.LoginMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -19,6 +20,7 @@ import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.redis.common.CustomerDingDingRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.DingMiniInfoCache; import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.security.dto.TokenDto; @@ -208,7 +210,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol //7.发送登录事件 try { - sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP); + sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP,userWechatDTO.getCustomerId()); } catch (RenException e) { log.error(e.getInternalMsg()); } catch (Exception e) { @@ -439,7 +441,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol //6.发送登录事件 try { - sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP); + sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP, formDTO.getCustomerId()); } catch (RenException e) { log.error(e.getInternalMsg()); } catch (Exception e) { @@ -501,7 +503,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol //6.发送登录事件 try { - sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP); + sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP, formDTO.getCustomerId()); } catch (RenException e) { log.error(e.getInternalMsg()); } catch (Exception e) { @@ -820,7 +822,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol * @author wxz * @date 2021.06.08 15:27 */ - private void sendLoginEvent(String userId, String appId, String fromApp, String fromClient) { + private void sendLoginEvent(String userId, String appId, String fromApp, String fromClient,String customerId) { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); LoginMQMsg loginMQMsg = new LoginMQMsg(); @@ -830,7 +832,12 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol loginMQMsg.setIp(IpUtils.getIpAddr(request)); loginMQMsg.setFromApp(fromApp); loginMQMsg.setFromClient(fromClient); - + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+userId); + } + loginMQMsg.setOrgId(staffInfo.getAgencyId()); + loginMQMsg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId())); SystemMsgFormDTO form = new SystemMsgFormDTO(); form.setMessageType(AuthOperationConstants.LOGIN); form.setContent(loginMQMsg); From 5d4b981c4752af7c5a86afbe22c39c1353222c75 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 20 Oct 2022 15:48:05 +0800 Subject: [PATCH 282/621] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/listener/PointOperationLogListener.java | 2 ++ .../commons/rocketmq/messages/PointRuleChangedMQMsg.java | 2 ++ .../commons/rocketmq/messages/ProjectChangedMQMsg.java | 3 +++ .../com/epmet/service/impl/PointRuleServiceImpl.java | 9 +++++++++ 4 files changed, 16 insertions(+) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java index aa4f50a768..e20f4eecb1 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java @@ -80,6 +80,8 @@ public class PointOperationLogListener implements MessageListenerConcurrently { logEntity.setOperatorName(operatorInfo.getName()); logEntity.setOperatingTime(msgObj.getOperatingTime()); logEntity.setContent(content); + logEntity.setOrgId(msgObj.getOrgId()); + logEntity.setOrgIdPath(msgObj.getOrgIdPath()); DistributedLock distributedLock = null; RLock lock = null; diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java index 073d18821c..f3d2516276 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java @@ -28,6 +28,8 @@ public class PointRuleChangedMQMsg { private String fromApp; private String fromClient; + private String orgId; + private String orgIdPath; private Date operatingTime; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java index 5f33faae98..8e5f60f31c 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java @@ -36,5 +36,8 @@ public class ProjectChangedMQMsg implements Serializable { private String fromApp; private String fromClient; + private String orgId; + private String orgIdPath; + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java index 251046a50f..358dfd5e92 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java @@ -26,11 +26,14 @@ import com.epmet.commons.rocketmq.messages.PointRuleChangedMQMsg; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.CommonOperateTypeEnum; import com.epmet.commons.tools.enums.EventEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; +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.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; @@ -206,6 +209,12 @@ public class PointRuleServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 15:59:03 +0800 Subject: [PATCH 283/621] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=20=E5=88=A0=E9=99=A4=E5=B1=85=E6=B0=91=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/redis/common/CustomerResiUserRedis.java | 11 +++++++++++ .../main/java/com/epmet/dto/form/TransferFormDTO.java | 3 +++ .../com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 3 files changed, 15 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java index 39e1995d9b..2efa0bdbf1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java @@ -114,4 +114,15 @@ public class CustomerResiUserRedis { return resultData; } + /** + * Desc: 删除Ic居民缓存 + * @param icResiUserId + * @author zxc + * @date 2022/10/20 15:57 + */ + public static Boolean delIcResiUserInfo(String icResiUserId){ + String key = RedisKeys.getIcResiUserKey(icResiUserId); + return customerResiUserRedis.redisUtils.delete(key); + } + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java index 5eb7013261..8bce2e24ad 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java @@ -51,5 +51,8 @@ public class TransferFormDTO implements Serializable { * 协办单位类型，1社区自组织，2联建单位 */ private String assistanceUnitType; + + private String operateStaffId; + private String customerId; } 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 e602218bee..bae8e89c0b 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 @@ -694,6 +694,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 16:35:24 +0800 Subject: [PATCH 284/621] =?UTF-8?q?=E4=B8=8D=E7=94=A8=E5=8A=A0=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/AuthOperationLogListener.java | 2 -- .../listener/PointOperationLogListener.java | 2 -- .../com/epmet/service/impl/IcLoginServiceImpl.java | 10 ++-------- .../epmet/service/impl/ThirdLoginServiceImpl.java | 14 ++++---------- .../commons/rocketmq/messages/LoginMQMsg.java | 2 -- .../rocketmq/messages/PointRuleChangedMQMsg.java | 2 -- .../rocketmq/messages/ProjectChangedMQMsg.java | 3 --- .../epmet/service/impl/PointRuleServiceImpl.java | 6 ------ .../java/com/epmet/dto/form/TransferFormDTO.java | 2 -- 9 files changed, 6 insertions(+), 37 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java index fb1feb3ac8..6f8afd1418 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java @@ -78,8 +78,6 @@ public class AuthOperationLogListener implements MessageListenerConcurrently { logEntity.setOperatorMobile(operatorInfo.getMobile()); logEntity.setOperatingTime(msgObj.getLoginTime()); logEntity.setContent("成功登录系统"); - logEntity.setOrgIdPath(msgObj.getOrgIdPath()); - logEntity.setOrgId(msgObj.getOrgId()); DistributedLock distributedLock = null; RLock lock = null; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java index e20f4eecb1..aa4f50a768 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java @@ -80,8 +80,6 @@ public class PointOperationLogListener implements MessageListenerConcurrently { logEntity.setOperatorName(operatorInfo.getName()); logEntity.setOperatingTime(msgObj.getOperatingTime()); logEntity.setContent(content); - logEntity.setOrgId(msgObj.getOrgId()); - logEntity.setOrgIdPath(msgObj.getOrgIdPath()); DistributedLock distributedLock = null; RLock lock = null; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java index 4740033245..16d7e2ba5e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java @@ -82,7 +82,7 @@ public class IcLoginServiceImpl implements IcLoginService, ResultDataResolver { //7.发送登录事件 try { - sendLoginEvent(staffId, app, client,agencyInfo.getCustomerId()); + sendLoginEvent(staffId, app, client); } catch (RenException e) { log.error(e.getInternalMsg()); } catch (Exception e) { @@ -117,20 +117,14 @@ public class IcLoginServiceImpl implements IcLoginService, ResultDataResolver { * @author wxz * @date 2021.10.26 13:45:59 */ - private void sendLoginEvent(String userId, String fromApp, String fromClient, String customerId) { + private void sendLoginEvent(String userId, String fromApp, String fromClient) { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); - if (null == staffInfo){ - throw new EpmetException("未查询到工作人员信息："+userId); - } LoginMQMsg loginMQMsg = new LoginMQMsg(); loginMQMsg.setUserId(userId); loginMQMsg.setLoginTime(new Date()); loginMQMsg.setIp(IpUtils.getIpAddr(request)); loginMQMsg.setFromApp(fromApp); loginMQMsg.setFromClient(fromClient); - loginMQMsg.setOrgId(staffInfo.getAgencyId()); - loginMQMsg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId())); SystemMsgFormDTO form = new SystemMsgFormDTO(); form.setMessageType(AuthOperationConstants.LOGIN); form.setContent(loginMQMsg); diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index d27d7ad672..9850feb4b3 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -210,7 +210,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol //7.发送登录事件 try { - sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP,userWechatDTO.getCustomerId()); + sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP); } catch (RenException e) { log.error(e.getInternalMsg()); } catch (Exception e) { @@ -441,7 +441,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol //6.发送登录事件 try { - sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP, formDTO.getCustomerId()); + sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP); } catch (RenException e) { log.error(e.getInternalMsg()); } catch (Exception e) { @@ -503,7 +503,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol //6.发送登录事件 try { - sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP, formDTO.getCustomerId()); + sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP); } catch (RenException e) { log.error(e.getInternalMsg()); } catch (Exception e) { @@ -822,7 +822,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol * @author wxz * @date 2021.06.08 15:27 */ - private void sendLoginEvent(String userId, String appId, String fromApp, String fromClient,String customerId) { + private void sendLoginEvent(String userId, String appId, String fromApp, String fromClient) { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); LoginMQMsg loginMQMsg = new LoginMQMsg(); @@ -832,12 +832,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol loginMQMsg.setIp(IpUtils.getIpAddr(request)); loginMQMsg.setFromApp(fromApp); loginMQMsg.setFromClient(fromClient); - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); - if (null == staffInfo){ - throw new EpmetException("未查询到工作人员信息："+userId); - } - loginMQMsg.setOrgId(staffInfo.getAgencyId()); - loginMQMsg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId())); SystemMsgFormDTO form = new SystemMsgFormDTO(); form.setMessageType(AuthOperationConstants.LOGIN); form.setContent(loginMQMsg); diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java index 46f400d6d1..646db43501 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java @@ -22,7 +22,5 @@ public class LoginMQMsg { private String fromApp; private String fromClient; - private String orgId; - private String orgIdPath; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java index f3d2516276..073d18821c 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java @@ -28,8 +28,6 @@ public class PointRuleChangedMQMsg { private String fromApp; private String fromClient; - private String orgId; - private String orgIdPath; private Date operatingTime; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java index 8e5f60f31c..5f33faae98 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java @@ -36,8 +36,5 @@ public class ProjectChangedMQMsg implements Serializable { private String fromApp; private String fromClient; - private String orgId; - private String orgIdPath; - } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java index 358dfd5e92..f8210046bd 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java @@ -209,12 +209,6 @@ public class PointRuleServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 16:52:23 +0800 Subject: [PATCH 285/621] =?UTF-8?q?=E5=88=A0=E9=99=A4org=E7=9A=84=E6=98=8E?= =?UTF-8?q?=E6=96=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcHouseController.java | 11 ----- .../com/epmet/service/IcHouseService.java | 7 --- .../service/impl/IcHouseServiceImpl.java | 47 ------------------- 3 files changed, 65 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 00a9076821..e7b5ac7e56 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -154,15 +154,4 @@ public class IcHouseController { return icHouseService.checkHomeInfo(formDTO); } - /** - * Desc: 数据明文查询 - * @param formDTO - * @author zxc - * @date 2022/10/17 13:45 - */ - @PostMapping("detailByType") - public Result detailByType(@RequestBody DetailByTypeFormDTO formDTO,@LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO, DetailByTypeFormDTO.DetailByTypeForm.class); - return new Result().ok(icHouseService.detailByType(formDTO,tokenDto)); - } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 0b2e40f86d..0855d78104 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -138,12 +138,5 @@ public interface IcHouseService extends BaseService { */ Result checkHomeInfo(CheckHouseInfoFormDTO formDTO); - /** - * Desc: 数据明文查询 - * @param formDTO - * @author zxc - * @date 2022/10/17 13:45 - */ - DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index a44882b549..943d6f9eee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -416,51 +416,4 @@ public class IcHouseServiceImpl extends BaseServiceImpl().ok(checkHomeInfoResultInfo); } - - /** - * Desc: 数据明文查询 - * @param formDTO - * @author zxc - * @date 2022/10/17 13:45 - */ - @Override - public DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto) { - DetailByTypeResultDTO result = new DetailByTypeResultDTO(); - String customerId = tokenDto.getCustomerId(); - String userId = tokenDto.getUserId(); - CheckMQMsg msg = new CheckMQMsg(); - if (formDTO.getType().equals(NeighborhoodConstant.HOUSE)){ - HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId()); - if (null == houseInfo){ - throw new EpmetException("查询房屋信息失败："+formDTO.getId()); - } - result.setMobile(houseInfo.getOwnerPhone()); - result.setIdCard(houseInfo.getOwnerIdCard()); - msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息"); - msg.setType("checkHouse"); - msg.setTypeDisplay("查看"+houseInfo.getAllName()+"房屋的敏感信息"); - }else if (formDTO.getType().equals(NeighborhoodConstant.IC_RESI_USER)){ - IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId()); - if (null == icResiUserInfo){ - throw new EpmetException("查询icResiUser失败："+formDTO.getId()); - } - result.setIdCard(icResiUserInfo.getIdCard()); - result.setMobile(icResiUserInfo.getMobile()); - msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息"); - msg.setType("checkIcResiUser"); - msg.setTypeDisplay("查看"+icResiUserInfo.getName()+"的敏感信息"); - } - // 发送mq消息 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - msg.setOperateTime(new Date()); - msg.setUserId(userId); - msg.setFromApp(tokenDto.getApp()); - msg.setIp(IpUtils.getIpAddr(request)); - msg.setFromClient(tokenDto.getClient()); - SystemMsgFormDTO form = new SystemMsgFormDTO(); - form.setMessageType(TopicConstants.CHECK_OR_EXPORT); - form.setContent(msg); - epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); - return result; - } } From bb3e626ef4e3969c023119e729ab1b3ff749384d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 21:50:58 +0800 Subject: [PATCH 286/621] 1111 --- .../main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 5e71f69be0..57cd0be2d3 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -1087,7 +1087,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol GovWebLoginFormDTO loginGovParam = new GovWebLoginFormDTO(); loginGovParam.setCustomerId("1535072605621841922"); - loginGovParam.setPhone(ssoUserInfo.getClientId()); + loginGovParam.setPhone(ssoUserInfo.getMobile()); return govWebService.loginByThirdPlatform(loginGovParam); } From 5706a4457fd8f769860b06e30ececfdc5a60ae3c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 23:07:49 +0800 Subject: [PATCH 287/621] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AE=A2=E6=88=B7Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/GovWebServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java index 92e1de27a5..91828cb561 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java @@ -95,6 +95,7 @@ public class GovWebServiceImpl implements GovWebService, ResultDataResolver { //5.生成token存到redis并返回 UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); + userTokenResultDTO.setCustomerId(formDTO.getCustomerId()); userTokenResultDTO.setToken(this.packagingUserToken(formDTO, resultDTO.getUserId())); return userTokenResultDTO; From ca28a3b9fbf06621569b6de771668e08ab769103 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 23:49:03 +0800 Subject: [PATCH 288/621] =?UTF-8?q?=E6=94=BE=E5=BC=80todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/YtHsResUtils.java | 29 +++++++++---------- .../impl/DataSyncConfigServiceImpl.java | 10 ++----- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index cb28cf5419..46686d75f9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -41,10 +41,10 @@ public class YtHsResUtils { param.put(ROW_NUM, rowNum); param.put(PAGE_SIZE, pageSize); log.info("hscy api param:{}", param); - //todo 核酸检测 mock数据 放开她 - //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hscyxxcx", param); - String mockData = "{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-17 07:15:22\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}"; - Result result = new Result().ok(mockData); + + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hscyxxcx", param); + //String mockData = "{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-17 07:15:22\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}"; + //Result result = new Result().ok(mockData); log.info("hscy api result:{}", JSON.toJSONString(result)); if (result.success()) { return JSON.parseObject(result.getData(), YtHscyResDTO.class); @@ -72,10 +72,9 @@ public class YtHsResUtils { param.put(ROW_NUM, rowNum); param.put(PAGE_SIZE, pageSize); log.info("hsjc api param:{}", param); - //todo 核酸检测 mock数据 放开她 - //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hsjcxx", param); - String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-20 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}"; - Result result = new Result().ok(mockData); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hsjcxx", param); +// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-20 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}"; +// Result result = new Result().ok(mockData); log.info("hsjc api result:{}", JSON.toJSONString(result)); if (result.success()) { return JSON.parseObject(result.getData(), YtHsjcResDTO.class); @@ -109,10 +108,9 @@ public class YtHsResUtils { log.info("siWang api param:{}", param); - //todo 放开他 - //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"mzt_hhrysj1", param); - String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"data\\\\\\\":[{\\\\\\\"AGE\\\\\\\":\\\\\\\"82\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\":\\\\\\\"1933-02-23\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\":\\\\\\\"莱州市殡仪馆\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\":\\\\\\\"2016-01-03 13:01\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600555c2849\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\":\\\\\\\"2016-01-02\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\":\\\\\\\"山东省莱州市光州西路420号\\\\\\\",\\\\\\\"FOLK\\\\\\\":\\\\\\\"01\\\\\\\",\\\\\\\"ID_CARD\\\\\\\":\\\\\\\"370625193302231929\\\\\\\",\\\\\\\"NAME\\\\\\\":\\\\\\\"陈秀芬\\\\\\\",\\\\\\\"NATION\\\\\\\":\\\\\\\"156\\\\\\\",\\\\\\\"POPULACE\\\\\\\":\\\\\\\"3381C300B4B9439FE05319003C0A0897\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\":\\\\\\\"烟台市莱州市文昌路街道\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600694e2877\\\\\\\",\\\\\\\"RN\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"SEX\\\\\\\":\\\\\\\"2\\\\\\\"}],\\\\\\\"fields\\\\\\\":[\\\\\\\"RN\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\",\\\\\\\"NAME\\\\\\\",\\\\\\\"SEX\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\",\\\\\\\"ID_CARD\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\",\\\\\\\"AGE\\\\\\\",\\\\\\\"NATION\\\\\\\",\\\\\\\"FOLK\\\\\\\",\\\\\\\"IF_LOCAL\\\\\\\",\\\\\\\"POPULACE\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\",\\\\\\\"WORK_NAME\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\"],\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\"}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; - Result result = new Result().ok(mockData); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"mzt_hhrysj1", param); +// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"data\\\\\\\":[{\\\\\\\"AGE\\\\\\\":\\\\\\\"82\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\":\\\\\\\"1933-02-23\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\":\\\\\\\"莱州市殡仪馆\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\":\\\\\\\"2016-01-03 13:01\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600555c2849\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\":\\\\\\\"2016-01-02\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\":\\\\\\\"山东省莱州市光州西路420号\\\\\\\",\\\\\\\"FOLK\\\\\\\":\\\\\\\"01\\\\\\\",\\\\\\\"ID_CARD\\\\\\\":\\\\\\\"370625193302231929\\\\\\\",\\\\\\\"NAME\\\\\\\":\\\\\\\"陈秀芬\\\\\\\",\\\\\\\"NATION\\\\\\\":\\\\\\\"156\\\\\\\",\\\\\\\"POPULACE\\\\\\\":\\\\\\\"3381C300B4B9439FE05319003C0A0897\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\":\\\\\\\"烟台市莱州市文昌路街道\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600694e2877\\\\\\\",\\\\\\\"RN\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"SEX\\\\\\\":\\\\\\\"2\\\\\\\"}],\\\\\\\"fields\\\\\\\":[\\\\\\\"RN\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\",\\\\\\\"NAME\\\\\\\",\\\\\\\"SEX\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\",\\\\\\\"ID_CARD\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\",\\\\\\\"AGE\\\\\\\",\\\\\\\"NATION\\\\\\\",\\\\\\\"FOLK\\\\\\\",\\\\\\\"IF_LOCAL\\\\\\\",\\\\\\\"POPULACE\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\",\\\\\\\"WORK_NAME\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\"],\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\"}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; +// Result result = new Result().ok(mockData); log.info("siWang api result:{}", JSON.toJSONString(result)); String data = result.getData(); JSONObject jsonObject = JSON.parseObject(data); @@ -166,10 +164,9 @@ public class YtHsResUtils { log.info("canji api param:{}", param); - //todo 上线放开她 - //Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"sdcl_xxzx_czcjr1", param); - String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"result\\\\\\\":true,\\\\\\\"errorcode\\\\\\\":0,\\\\\\\"msg\\\\\\\":\\\\\\\"获取成功\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"isNewRecord\\\\\\\":true,\\\\\\\"delFlag\\\\\\\":\\\\\\\"0\\\\\\\",\\\\\\\"pageNo\\\\\\\":0,\\\\\\\"pageSize\\\\\\\":0,\\\\\\\"name\\\\\\\":\\\\\\\"数据同步测试用户\\\\\\\",\\\\\\\"genderName\\\\\\\":\\\\\\\"男\\\\\\\",\\\\\\\"citizenId\\\\\\\":\\\\\\\"370682198002072719\\\\\\\",\\\\\\\"cardNum\\\\\\\":\\\\\\\"370283199912010302\\\\\\\",\\\\\\\"idtKindName\\\\\\\":\\\\\\\"精神\\\\\\\",\\\\\\\"idtLevelName\\\\\\\":\\\\\\\"二级\\\\\\\",\\\\\\\"eduLevelName\\\\\\\":\\\\\\\"小学\\\\\\\",\\\\\\\"marriagerName\\\\\\\":\\\\\\\"未婚\\\\\\\",\\\\\\\"guardian\\\\\\\":\\\\\\\"盖希仁\\\\\\\",\\\\\\\"guardianPhone\\\\\\\":\\\\\\\"13854516627\\\\\\\",\\\\\\\"guardianRName\\\\\\\":\\\\\\\"兄/弟/姐/妹\\\\\\\",\\\\\\\"raceName\\\\\\\":\\\\\\\"汉族\\\\\\\",\\\\\\\"certDate\\\\\\\":1620779842000,\\\\\\\"residentAdd\\\\\\\":\\\\\\\"姜疃镇凤头村248号附1号\\\\\\\",\\\\\\\"nowAdd\\\\\\\":\\\\\\\"山东省烟台市莱阳市姜疃镇凤头村委会\\\\\\\",\\\\\\\"phoneNo\\\\\\\":\\\\\\\"13854516627\\\\\\\"}}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; - Result result = new Result().ok(mockData); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"sdcl_xxzx_czcjr1", param); +// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"result\\\\\\\":true,\\\\\\\"errorcode\\\\\\\":0,\\\\\\\"msg\\\\\\\":\\\\\\\"获取成功\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"isNewRecord\\\\\\\":true,\\\\\\\"delFlag\\\\\\\":\\\\\\\"0\\\\\\\",\\\\\\\"pageNo\\\\\\\":0,\\\\\\\"pageSize\\\\\\\":0,\\\\\\\"name\\\\\\\":\\\\\\\"数据同步测试用户\\\\\\\",\\\\\\\"genderName\\\\\\\":\\\\\\\"男\\\\\\\",\\\\\\\"citizenId\\\\\\\":\\\\\\\"370682198002072719\\\\\\\",\\\\\\\"cardNum\\\\\\\":\\\\\\\"370283199912010302\\\\\\\",\\\\\\\"idtKindName\\\\\\\":\\\\\\\"精神\\\\\\\",\\\\\\\"idtLevelName\\\\\\\":\\\\\\\"二级\\\\\\\",\\\\\\\"eduLevelName\\\\\\\":\\\\\\\"小学\\\\\\\",\\\\\\\"marriagerName\\\\\\\":\\\\\\\"未婚\\\\\\\",\\\\\\\"guardian\\\\\\\":\\\\\\\"盖希仁\\\\\\\",\\\\\\\"guardianPhone\\\\\\\":\\\\\\\"13854516627\\\\\\\",\\\\\\\"guardianRName\\\\\\\":\\\\\\\"兄/弟/姐/妹\\\\\\\",\\\\\\\"raceName\\\\\\\":\\\\\\\"汉族\\\\\\\",\\\\\\\"certDate\\\\\\\":1620779842000,\\\\\\\"residentAdd\\\\\\\":\\\\\\\"姜疃镇凤头村248号附1号\\\\\\\",\\\\\\\"nowAdd\\\\\\\":\\\\\\\"山东省烟台市莱阳市姜疃镇凤头村委会\\\\\\\",\\\\\\\"phoneNo\\\\\\\":\\\\\\\"13854516627\\\\\\\"}}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; +// Result result = new Result().ok(mockData); log.info("canji api result:{}", JSON.toJSONString(result)); if (result.success()) { /*返回示例 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 2517791025..fbdb3eb7d1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -8,13 +8,11 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; -import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.exception.EpmetException; 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.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; @@ -180,7 +178,6 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList = null; //设置查询数据范围 formDTO.setOrgList(config.getScopeList()); @@ -241,7 +237,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList) { From b36e4876073a3ffb7423beaaf81fb437d2e4bd1c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 20 Oct 2022 23:54:53 +0800 Subject: [PATCH 289/621] =?UTF-8?q?=E6=94=BE=E5=BC=80todo12312?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 47d402e7d2..c2e6565703 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; +import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.exception.EpmetException; From 6a999b27fd33cadbcd66998ddbb6303931dc990b Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Oct 2022 08:50:14 +0800 Subject: [PATCH 290/621] token --- .../java/com/epmet/commons/tools/utils/YtHsResUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 46686d75f9..adb090d8f6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -36,7 +36,7 @@ public class YtHsResUtils { public static YtHscyResDTO hscy(String cardNo, Integer rowNum, Integer pageSize) { try { Map param = new HashMap<>(); - param.put(APP_KEY, APP_KEY_VALUE); + param.put(APP_KEY, "tz45j4kuWcnnjoJOVSlzGWJgI"); param.put(CARD_NO, cardNo); param.put(ROW_NUM, rowNum); param.put(PAGE_SIZE, pageSize); @@ -67,7 +67,7 @@ public class YtHsResUtils { //String param = String.format("&card_no=%s&ROWNUM=%s&PAGESIZE=%s", cardNo, rowNum, pageSize); //String apiUrl = url.concat(param); Map param = new HashMap<>(); - param.put(APP_KEY, APP_KEY_VALUE); + param.put(APP_KEY, "DR4jF5Be7sCsqDmCamq2tmYCl"); param.put(CARD_NO, cardNo); param.put(ROW_NUM, rowNum); param.put(PAGE_SIZE, pageSize); @@ -100,7 +100,7 @@ public class YtHsResUtils { // 4)start开始默认0 // 5)limit每页记录数 Map param = new HashMap<>(); - param.put(APP_KEY, APP_KEY_VALUE); + param.put(APP_KEY, "IGE8TMM6f4t1Sef7FfstOLHAL"); param.put("id_card", cardNo); param.put("name", userName); param.put("start", 0); @@ -157,7 +157,7 @@ public class YtHsResUtils { // 2)name姓名 // 3)citizenId身份证号 Map param = new HashMap<>(); - param.put(APP_KEY, APP_KEY_VALUE); + param.put(APP_KEY, "EWGsaK0aM21wkDjCIWbahGVk2"); param.put("citizenId", idCard); param.put("name", userName); From 32d383951f0f65a9c8824d5a1239493a1597037e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Oct 2022 09:04:25 +0800 Subject: [PATCH 291/621] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/StrConstant.java | 2 + .../commons/tools/utils/YtHsResUtils.java | 63 +++++++++---------- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index b89a521218..1dd825b18e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -13,6 +13,8 @@ import org.springframework.http.MediaType; public interface StrConstant { String UTF_8 = CharEncoding.UTF_8; + String HTTP_STATUS_OK = "200"; + String HTTP_RESP_CODE = "code"; String ISO_8859_1 = CharEncoding.ISO_8859_1; diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index adb090d8f6..3a23dac10d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -2,6 +2,7 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; @@ -19,14 +20,10 @@ import java.util.Map; @Slf4j public class YtHsResUtils { private static String SERVER_URL = "http://10.2.2.60:8191/sjzt/server/"; - private static final String APP_KEY_VALUE = "DR4jF5Be7sCsqDmCamq2tmYCl"; private static final String APP_KEY = "appkey"; private static final String CARD_NO = "card_no"; - private static final String USER_NAME = "name"; private static final String ROW_NUM = "ROWNUM"; private static final String PAGE_SIZE = "PAGESIZE"; - private static final String START = "ROWNUM"; - private static final String LIMIT = "PAGESIZE"; /** * desc:核酸采样查询 @@ -42,12 +39,18 @@ public class YtHsResUtils { param.put(PAGE_SIZE, pageSize); log.info("hscy api param:{}", param); - Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hscyxxcx", param); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hscyxxcx", param); //String mockData = "{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-17 07:15:22\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}"; //Result result = new Result().ok(mockData); log.info("hscy api result:{}", JSON.toJSONString(result)); if (result.success()) { - return JSON.parseObject(result.getData(), YtHscyResDTO.class); + String data = result.getData(); + JSONObject jsonObject = JSON.parseObject(data); + if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) { + return JSON.parseObject(result.getData(), YtHscyResDTO.class); + } else { + log.warn("hscy 调用蓝图接口败"); + } } } catch (Exception e) { log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); @@ -64,20 +67,25 @@ public class YtHsResUtils { */ public static YtHsjcResDTO hsjc(String cardNo, Integer rowNum, Integer pageSize) { try { - //String param = String.format("&card_no=%s&ROWNUM=%s&PAGESIZE=%s", cardNo, rowNum, pageSize); - //String apiUrl = url.concat(param); Map param = new HashMap<>(); param.put(APP_KEY, "DR4jF5Be7sCsqDmCamq2tmYCl"); param.put(CARD_NO, cardNo); param.put(ROW_NUM, rowNum); param.put(PAGE_SIZE, pageSize); log.info("hsjc api param:{}", param); - Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hsjcxx", param); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hsjcxx", param); // String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-20 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}"; // Result result = new Result().ok(mockData); log.info("hsjc api result:{}", JSON.toJSONString(result)); if (result.success()) { - return JSON.parseObject(result.getData(), YtHsjcResDTO.class); + String data = result.getData(); + JSONObject jsonObject = JSON.parseObject(data); + if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) { + return JSON.parseObject(result.getData(), YtHsjcResDTO.class); + } else { + log.warn("hsjc 调用蓝图接口败"); + } + } } catch (Exception e) { log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); @@ -108,19 +116,22 @@ public class YtHsResUtils { log.info("siWang api param:{}", param); - Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"mzt_hhrysj1", param); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "mzt_hhrysj1", param); // String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"data\\\\\\\":[{\\\\\\\"AGE\\\\\\\":\\\\\\\"82\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\":\\\\\\\"1933-02-23\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\":\\\\\\\"莱州市殡仪馆\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\":\\\\\\\"2016-01-03 13:01\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600555c2849\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\":\\\\\\\"2016-01-02\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\":\\\\\\\"山东省莱州市光州西路420号\\\\\\\",\\\\\\\"FOLK\\\\\\\":\\\\\\\"01\\\\\\\",\\\\\\\"ID_CARD\\\\\\\":\\\\\\\"370625193302231929\\\\\\\",\\\\\\\"NAME\\\\\\\":\\\\\\\"陈秀芬\\\\\\\",\\\\\\\"NATION\\\\\\\":\\\\\\\"156\\\\\\\",\\\\\\\"POPULACE\\\\\\\":\\\\\\\"3381C300B4B9439FE05319003C0A0897\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\":\\\\\\\"烟台市莱州市文昌路街道\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600694e2877\\\\\\\",\\\\\\\"RN\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"SEX\\\\\\\":\\\\\\\"2\\\\\\\"}],\\\\\\\"fields\\\\\\\":[\\\\\\\"RN\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\",\\\\\\\"NAME\\\\\\\",\\\\\\\"SEX\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\",\\\\\\\"ID_CARD\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\",\\\\\\\"AGE\\\\\\\",\\\\\\\"NATION\\\\\\\",\\\\\\\"FOLK\\\\\\\",\\\\\\\"IF_LOCAL\\\\\\\",\\\\\\\"POPULACE\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\",\\\\\\\"WORK_NAME\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\"],\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\"}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; // Result result = new Result().ok(mockData); log.info("siWang api result:{}", JSON.toJSONString(result)); + if (!result.success()) { + return new YtDataSyncResDTO(); + } String data = result.getData(); JSONObject jsonObject = JSON.parseObject(data); //他们的结果是成功的 - if (jsonObject != null && "200".equals(jsonObject.getString("code"))) { + if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) { //第一层 JSONObject firstData = JSON.parseObject(jsonObject.getString("data")); //第二层 data - if (firstData != null && "200".equals(firstData.getString("code"))) { + if (firstData != null && StrConstant.HTTP_STATUS_OK.equals(firstData.getString(StrConstant.HTTP_RESP_CODE))) { //第一层 JSONObject secondData = JSON.parseObject(firstData.getString("data")); Object thirdData = ""; @@ -164,38 +175,20 @@ public class YtHsResUtils { log.info("canji api param:{}", param); - Result result = HttpClientManager.getInstance().sendGet(SERVER_URL+"sdcl_xxzx_czcjr1", param); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "sdcl_xxzx_czcjr1", param); // String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"result\\\\\\\":true,\\\\\\\"errorcode\\\\\\\":0,\\\\\\\"msg\\\\\\\":\\\\\\\"获取成功\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"isNewRecord\\\\\\\":true,\\\\\\\"delFlag\\\\\\\":\\\\\\\"0\\\\\\\",\\\\\\\"pageNo\\\\\\\":0,\\\\\\\"pageSize\\\\\\\":0,\\\\\\\"name\\\\\\\":\\\\\\\"数据同步测试用户\\\\\\\",\\\\\\\"genderName\\\\\\\":\\\\\\\"男\\\\\\\",\\\\\\\"citizenId\\\\\\\":\\\\\\\"370682198002072719\\\\\\\",\\\\\\\"cardNum\\\\\\\":\\\\\\\"370283199912010302\\\\\\\",\\\\\\\"idtKindName\\\\\\\":\\\\\\\"精神\\\\\\\",\\\\\\\"idtLevelName\\\\\\\":\\\\\\\"二级\\\\\\\",\\\\\\\"eduLevelName\\\\\\\":\\\\\\\"小学\\\\\\\",\\\\\\\"marriagerName\\\\\\\":\\\\\\\"未婚\\\\\\\",\\\\\\\"guardian\\\\\\\":\\\\\\\"盖希仁\\\\\\\",\\\\\\\"guardianPhone\\\\\\\":\\\\\\\"13854516627\\\\\\\",\\\\\\\"guardianRName\\\\\\\":\\\\\\\"兄/弟/姐/妹\\\\\\\",\\\\\\\"raceName\\\\\\\":\\\\\\\"汉族\\\\\\\",\\\\\\\"certDate\\\\\\\":1620779842000,\\\\\\\"residentAdd\\\\\\\":\\\\\\\"姜疃镇凤头村248号附1号\\\\\\\",\\\\\\\"nowAdd\\\\\\\":\\\\\\\"山东省烟台市莱阳市姜疃镇凤头村委会\\\\\\\",\\\\\\\"phoneNo\\\\\\\":\\\\\\\"13854516627\\\\\\\"}}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; // Result result = new Result().ok(mockData); log.info("canji api result:{}", JSON.toJSONString(result)); + if (result.success()) { - /*返回示例 - { - "code":"200", - "msg":"请求成功", - "data":"{ - \"code\":200, - \"data\":{ - \\\"result\\\":true, - \\\"errorcode\\\":0, - \\\"msg\\\":\\\"获取成功\\\", - \\\"data\\\":{ - \\\"isNewRecord\\\":\\\"true\\\", - } - } - \"message\":\"\" - }", - "total":0 - } - */ String data = result.getData(); JSONObject jsonObject = JSON.parseObject(data); //他们的结果是成功的 - if (jsonObject != null && "200".equals(jsonObject.getString("code"))) { + if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) { //第一层data JSONObject realObject = JSON.parseObject(jsonObject.getString("data")); - if (realObject != null && "200".equals(realObject.getString("code"))) { + if (realObject != null && StrConstant.HTTP_STATUS_OK.equals(realObject.getString(StrConstant.HTTP_RESP_CODE))) { //第二层 data String thirdData = realObject.getString("data"); return JSON.parseObject(thirdData, YtDataSyncResDTO.class); From e2f209c669c1e26b5ed2b89a112447756f6f75b9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Oct 2022 09:20:57 +0800 Subject: [PATCH 292/621] =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IssueServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 573da12cb7..8db95668b7 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -22,7 +22,6 @@ import com.epmet.resi.group.dto.topic.form.TopicDetailBatchFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.IssueService; -import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -393,8 +392,8 @@ public class IssueServiceImpl implements IssueService { issueSuggestionDTO.setPublicFlag(formDTO.getPublicFlag() == true ? NumConstant.ONE : NumConstant.ZERO); issueSuggestionDTO.setCreatedBy(loginUserUtil.getLoginUserId()); Result result = govIssueOpenFeignClient.saveIssueSuggestion(issueSuggestionDTO); - if(result.success()||null==result.getData()||StringUtils.isBlank(result.getData().getSuggestionId())){ - throw new EpmetException(result.getCode(),result.getInternalMsg(),result.getMsg()); + if(!result.success()||null==result.getData()||StringUtils.isBlank(result.getData().getSuggestionId())){ + throw new EpmetException(result.getCode(),"gov-issue saveIssueSuggestion error:"+result.getInternalMsg(),result.getMsg()); } return new PublishSuggestionResultDTO(result.getData().getIssueId(), result.getData().getSuggestionId()); } From d3515ce827ce751a9f0550466b1bc6e11223cd11 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 21 Oct 2022 10:22:06 +0800 Subject: [PATCH 293/621] =?UTF-8?q?=E5=AE=A2=E6=88=B7ID=E6=8D=A2=E6=88=90y?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 6b81da281f..7179573098 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -62,7 +62,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService */ @Override public Boolean yanTaiSyncUser(String organizationId) { - String customerId = "45687aa479955f9d06204d415238f7cc"; + String customerId = YT_CUSTOMER_ID; // 缓存初始化staffs epmetUserOpenFeignClient.allCustomerStaffInCache(customerId); Integer no = NumConstant.ONE; From 74b61e313ac206a25ea8eb81e0b402adbb79eaa9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Oct 2022 10:32:07 +0800 Subject: [PATCH 294/621] =?UTF-8?q?=E6=94=B9=E4=B8=8B=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/ScanContentUtils.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java index 6427301a18..728263e229 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java @@ -3,6 +3,7 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.scan.param.*; @@ -16,6 +17,7 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 扫描内容工具类 @@ -31,6 +33,15 @@ public class ScanContentUtils { * @return */ public static Result imgSyncScan(String url, ImgScanParamDTO param) { + //start 测试环境停机了，先这样改试试 + EnvEnum currentEnv = EnvEnum.getCurrentEnv(); + if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())){ + SyncScanResult syncScanResult=new SyncScanResult(); + syncScanResult.setSuccessDataIds(param.getTasks().stream().map(c -> c.getDataId()).collect(Collectors.toList())); + syncScanResult.setAllPass(true); + return new Result().ok(syncScanResult); + }//end + log.debug("imgSyncScan param:{}", JSON.toJSONString(param)); if (StringUtils.isBlank(url) || param == null) { throw new RenException("参数错误"); @@ -57,6 +68,15 @@ public class ScanContentUtils { * @return */ public static Result textSyncScan(String url, TextScanParamDTO param) { + //start 测试环境停机了，先这样改试试 + EnvEnum currentEnv = EnvEnum.getCurrentEnv(); + if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())){ + SyncScanResult syncScanResult=new SyncScanResult(); + syncScanResult.setSuccessDataIds(param.getTasks().stream().map(c -> c.getDataId()).collect(Collectors.toList())); + syncScanResult.setAllPass(true); + return new Result().ok(syncScanResult); + }//end + log.debug("textSyncScan param:{}", JSON.toJSONString(param)); if (StringUtils.isBlank(url) || param == null) { throw new RenException("参数错误"); From 1bd9d050ab402f5470d6ff50009a82f0df79f82c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Oct 2022 10:42:18 +0800 Subject: [PATCH 295/621] =?UTF-8?q?ScanContentUtils.imgSyncScan+textSyncSc?= =?UTF-8?q?an=E6=9C=AC=E6=9C=BAor=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/ScanContentUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java index 728263e229..e04227d5dc 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java @@ -35,7 +35,7 @@ public class ScanContentUtils { public static Result imgSyncScan(String url, ImgScanParamDTO param) { //start 测试环境停机了，先这样改试试 EnvEnum currentEnv = EnvEnum.getCurrentEnv(); - if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())){ + if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())||EnvEnum.DEV.getCode().equals(currentEnv.getCode())){ SyncScanResult syncScanResult=new SyncScanResult(); syncScanResult.setSuccessDataIds(param.getTasks().stream().map(c -> c.getDataId()).collect(Collectors.toList())); syncScanResult.setAllPass(true); @@ -70,7 +70,7 @@ public class ScanContentUtils { public static Result textSyncScan(String url, TextScanParamDTO param) { //start 测试环境停机了，先这样改试试 EnvEnum currentEnv = EnvEnum.getCurrentEnv(); - if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())){ + if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())||EnvEnum.DEV.getCode().equals(currentEnv.getCode())){ SyncScanResult syncScanResult=new SyncScanResult(); syncScanResult.setSuccessDataIds(param.getTasks().stream().map(c -> c.getDataId()).collect(Collectors.toList())); syncScanResult.setAllPass(true); From 1508d1fdf6a732ea8716113d845eb4d62be4b057 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Oct 2022 12:03:32 +0800 Subject: [PATCH 296/621] @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask") --- .../src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 368ed8720b..21347f6b23 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -924,7 +924,6 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask") Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO); - Result natInfoScanTask(@RequestBody NatInfoScanTaskFormDTO formDTO); /** * Desc: 根据网格ID查询所有注册居民 From a582053be621de29228975cf33a9a739713519fb Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Oct 2022 14:21:31 +0800 Subject: [PATCH 297/621] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/api/yt/YantaiApi.java | 149 ++++++++++++------ 1 file changed, 98 insertions(+), 51 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java index 84195d6711..3590186d68 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.utils.Result; import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import javax.crypto.BadPaddingException; import java.security.InvalidKeyException; @@ -28,9 +29,19 @@ import java.util.Map; @Slf4j public class YantaiApi { private static final String SSO_SERVER = "http://172.20.46.155:8080/sso/"; + /** + * 相当于 appKey + */ private static final String CLIENT_ID = "1000009"; + /** + * 相当于 appSecret 用于解密 他们重定向回来的code 解密他们的token 获取用户嘻嘻 + */ private static final String CLIENT_SECRET = "a1f9879119bc4080ab5575f832b7d98b"; - private static final String SSO_CLIENT_TOKEN = "PRm5Db96atozjPQsJOuwlA=="; + /** + * 调用sso后台api接口的 秘钥 + */ + private static final String SSO_API_TOKEN = "iJCDUgCBV/Zk5FkkaxLypA=="; + private static final String SSO_BACKGROUND_SERVER_URL = "http://172.20.46.155:8082/"; /** * desc:根据组织id获取下级组织 @@ -46,15 +57,24 @@ public class YantaiApi { //加密 String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); //pwd = URLEncoder.encode(pwd, "UTF-8"); - System.out.println("加密组织Id = " + organizationIdEn); - String url = "ouinfo/getChildOuInfoByGuid?organizationId=" + organizationIdEn; + String url = SSO_BACKGROUND_SERVER_URL + "person/ouinfo/getChildOuInfoByGuid"; - Map headerMap = new HashMap<>(); Map paramMap = new HashMap<>(); - log.info("getChildOuInfoByGuid request param: url:{},header:{}", url, headerMap); - Result result = HttpClientManager.getInstance().sendGet(url, paramMap, headerMap); + paramMap.put("organizationId",organizationIdEn); + + log.info("getChildOuInfoByGuid request param:{} url:{}",paramMap, url); + Result result = HttpClientManager.getInstance().sendGet(url, paramMap, getApiHeaderMap()); log.info("getChildOuInfoByGuid request result:{}", result); + if (!result.success()){ + return new ArrayList<>(); + } JSONObject jsonObject = JSONObject.parseObject(result.getData()); + String secondCode = jsonObject.getString("code"); + String secondMessage = jsonObject.getString("message"); + if (!"200".equals(secondCode)) { + log.warn("getChildOuInfoByGuid 接口错误"); + return new ArrayList<>(); + } //解密 String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); List orgData = JSON.parseArray(data, OrgData.class); @@ -80,15 +100,24 @@ public class YantaiApi { //加密 String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); //pwd = URLEncoder.encode(pwd, "UTF-8"); - System.out.println("加密组织Id = " + organizationIdEn); - String url = SSO_SERVER + "ouinfo/getUserByOuGuid?organizationId=" + organizationIdEn; + String url = SSO_BACKGROUND_SERVER_URL + "person/serInfo/getUserByOuGuid"; + - Map headerMap = new HashMap<>(); Map paramMap = new HashMap<>(); - log.info("getUserByOuGuid request param: url:{},header:{}", url, headerMap); - Result result = HttpClientManager.getInstance().sendGet(url, paramMap, headerMap); + paramMap.put("organizationId",organizationIdEn); + log.info("getUserByOuGuid request param: url:{},param:{}", url, paramMap); + Result result = HttpClientManager.getInstance().sendGet(url, paramMap, getApiHeaderMap()); log.info("getUserByOuGuid request result:{}", result); + if (!result.success()){ + return new ArrayList<>(); + } JSONObject jsonObject = JSONObject.parseObject(result.getData()); + String secondCode = jsonObject.getString("code"); + String secondMessage = jsonObject.getString("message"); + if (!"200".equals(secondCode)) { + log.warn("getUserByOuGuid 接口错误"); + return new ArrayList<>(); + } //解密 String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); List userData = JSON.parseArray(data, UserData.class); @@ -152,21 +181,15 @@ public class YantaiApi { public static String getUserInfoMobile(String userId) { try { - JSONObject token = new JSONObject(); - token.put("token", "iJCDUgCBV/Zk5FkkaxLypA=="); - // token.put("token","iJCDUgCBV/Zk5FkkaxLypA=="); - token.put("expiration", System.currentTimeMillis()); - String tokanStr = SM4UtilsForYanTai.dealEncryptData(token.toString()); String userIdEn = SM4UtilsForYanTai.dealEncryptData(userId); - System.out.println(tokanStr + "__" + userIdEn); - String serverUrl = "http://172.20.46.155:8082/person/userInfo/getUserByUserGuid"; + + String serverUrl = SSO_BACKGROUND_SERVER_URL + "person/userInfo/getUserByUserGuid"; //String serverUrl = "http://120.220.248.247:8081/person/userInfo/getUserByUserGuid"; Map param = new HashMap<>(); param.put("userGuid", userIdEn); - Map headerMap = new HashMap<>(); - headerMap.put("Authorization", "Bearer " + tokanStr); - Result result = HttpClientManager.getInstance().sendGet(serverUrl, param, headerMap); + + Result result = HttpClientManager.getInstance().sendGet(serverUrl, param, getApiHeaderMap()); System.out.println(JSON.toJSONString(result)); if (!result.success() || StringUtils.isBlank(result.getData())) { log.info("getUserInfoMobile fail result:{}", JSON.toJSONString(result)); @@ -190,36 +213,60 @@ public class YantaiApi { return null; } + @NotNull + private static Map getApiHeaderMap() { + Map headerMap = new HashMap<>(); + try { + JSONObject token = new JSONObject(); + token.put("token", SSO_API_TOKEN); + // token.put("token","iJCDUgCBV/Zk5FkkaxLypA=="); + token.put("expiration", System.currentTimeMillis()); + + String tokanStr = SM4UtilsForYanTai.dealEncryptData(token.toString()); + headerMap.put("Authorization", "Bearer " + tokanStr); + } catch (Exception e) { + log.error("getApiHeaderMap exception", e); + } + return headerMap; + } + public static void main(String[] args) throws BadPaddingException, InvalidKeyException, JsonProcessingException { -// JSONObject token = new JSONObject(); -// token.put("token", SSO_CLIENT_TOKEN); -// token.put("expiration", System.currentTimeMillis()); -// -// String tokanStr = SM4UtilsForYanTai.dealEncryptData(token.toString()); -// String testUserId = "0ffd76e2-27b5-4b33-be9a-186f9f878bf1"; -// String userId = SM4UtilsForYanTai.dealEncryptData(testUserId); -// System.out.println(tokanStr + "__" + userId); -// String serverUrl = "http://172.20.46.155:8082/person/userInfo/getUserByUserGuid"; -// //String serverUrl = "http://120.220.248.247:8081/person/userInfo/getUserByUserGuid"; -// Map param = new HashMap<>(); -// param.put("userGuid", userId); -// Map headerMap = new HashMap<>(); -// headerMap.put("Authorization", "Bearer " + tokanStr); -// Result stringResult = HttpClientManager.getInstance().sendGet(serverUrl, param, headerMap); -// System.out.println(JSON.toJSONString(stringResult)); -// -// String data = stringResult.getData(); -// JSONObject jsonObject = JSON.parseObject(data); -// String secondCode = jsonObject.getString("code"); -// String secondMessage = jsonObject.getString("message"); -// System.out.println(secondCode); -// System.out.println(secondMessage); -// String data1 = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); -// System.out.println("======" + data1); - String s = SM4UtilsForYanTai.dealDecryptData("R5TbfdZPJ7QA9uo02EGT/uDWyUWapZTmTQZwwLYnX5ZChQhV8bYa17yJ+d+KC5vUm9P/O9J25pkpKSzUSaXEmJz3oniLQdj3OyhmZFghKAKVbK/By+3oyVQG3ApRUMwir64RkvnjpP7MjgUaXXongNRheMrsarV2fjr8ZYDzIH0bhsTDgo0/qNSSmFc+0sWmcvraDyeeI5nRNyjaBzybuBQzOCkqf3LtQAwnqWj8lCVPi5dH7KiTzM0pwZWzhfr21xzaw80fQkUMznBfkiJJM8nI2vqgZfa6TgtTH3h7JYLq8LDcu5UMJpMuVjbWwW41N41I+c9magDCUOJ9LkbmrUTvg2Y0asccP7U3jt9NNgwmRT5L/vxNmuapDaADjFR83P3ospRaclr3vo9OWMORSw=="); - System.out.println("sssssss:"+s); - - - getLoginToken("0d554bccfbac4be3846d643252daf92b"); + + //testGetUserByUserId(); + + //code只能用一次 + //getLoginToken("0d554bccfbac4be3846d643252daf92b"); + + String organizationId = "44e05de9-34fa-48f6-b89f-02838d792cf9"; + List childOuInfoByGuid = getChildOuInfoByGuid(organizationId); + System.out.println("childOuInfoByGuid:"+JSON.toJSONString(childOuInfoByGuid)); + List userByOuGuid = getUserByOuGuid(organizationId); + System.out.println("getUserByOuGuid:"+JSON.toJSONString(userByOuGuid)); + + Map apiHeaderMap = getApiHeaderMap(); + System.out.println(apiHeaderMap); + //testGetUserByUserId(); + } + + private static void testGetUserByUserId() throws JsonProcessingException, InvalidKeyException, BadPaddingException { + String testUserId = "0ffd76e2-27b5-4b33-be9a-186f9f878bf1"; + + String serverUrl = SSO_BACKGROUND_SERVER_URL +"person/userInfo/getUserByUserGuid"; + //String serverUrl = "http://120.220.248.247:8081/person/userInfo/getUserByUserGuid"; + Map param = new HashMap<>(); + param.put("userGuid", SM4UtilsForYanTai.dealEncryptData(testUserId)); + Result stringResult = HttpClientManager.getInstance().sendGet(serverUrl, param, getApiHeaderMap()); + System.out.println(JSON.toJSONString(stringResult)); + + String data = stringResult.getData(); + JSONObject jsonObject = JSON.parseObject(data); + String secondCode = jsonObject.getString("code"); + String secondMessage = jsonObject.getString("message"); + System.out.println(secondCode); + System.out.println(secondMessage); + String data1 = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); + System.out.println("======" + data1); + String s = SM4UtilsForYanTai.dealDecryptData("EsOeQX+A8+GG26lzLnuKeuylkBDRFcTbF+gE/jURIzddlVI8RToQQhzK4EHy0WfpS/L4dSAJC93UyVLJhj+r/pup2RFq/GjpH7Md+1Mjg3dM+eyDuGql71bUrldQwJXYnHrQm3Mn7tk5m2eLhEVNkFvdELjuy3Kg8YihZXf2Sox+kxtmK4DSIn/gxhVCoUneWeL0cA6JGHI6jNuq97rzgcNK3Mwen8MxOoWP3n3r+kIpwZCwIlL70MrBjIZ6FHIhcxpqL82gpLSe1K0TFgeWw+9PMo1yv4cGZn7rU86TDlQFoDP86dVa1jrBoyUmW/vvLXrMKwfBaiv9/EUzcCLZWYxEwH93n0X/NYCYem3pfv4uXk5A7/D+Npgj9OKCEIz0ROn0UW5NiXI5Vibz0dywaq4sfsR/LiwjV81QOGY9tsHzN2+MnyTVpQg1l7looNnq1j+wwLneS0aDmbTqBLEn/baph/Hnr2L/9HYpWfXkhz93XRNAdsbxhXdG5ZIiJSwNasHinPR3e2Hmn/02GOsBPFUifbyNUtslt4RS/gwboonBoXz8wrmXi+PfzUXwN8f2CKdBNEHl72USp70NtBSJUPAkHdXZEQPgGRped63Z9GA="); + System.out.println("sssssss:" + s); } } From 5d7f5352771e42e5c98b167d2da7c45e2f85816f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 21 Oct 2022 15:00:33 +0800 Subject: [PATCH 298/621] =?UTF-8?q?=E6=AE=8B=E7=96=BE=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSyncRecordDisabilityServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index 3b564f19e7..e3d397c44d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -109,6 +109,9 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl Date: Fri, 21 Oct 2022 15:45:54 +0800 Subject: [PATCH 299/621] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index c2e6565703..b7590a5987 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -252,6 +252,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); From 972e583dfd924ff596b2b2fab49bcb8346067f8d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Oct 2022 15:49:57 +0800 Subject: [PATCH 300/621] genderCn --- .../main/resources/mapper/DataSyncRecordDisabilityDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml index 889ca27c1c..bca57f359e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml @@ -132,6 +132,12 @@ when d.deal_status = 2 then '处理失败' else '处理失败' end) as dealStatusName, d.now_add as address, + ( + case when d.GENDER='1' then '男' + when d.GENDER='2' then '女' + else '未知' + end + )as genderCn, d.* FROM data_sync_record_disability d WHERE DEL_FLAG = 0 From f34870dec4fa04b5c352d9e45f456a76456a6f5a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Oct 2022 16:05:21 +0800 Subject: [PATCH 301/621] =?UTF-8?q?=E8=A1=A8=E5=86=B3=E4=B8=AD=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/VotingIssueListResultDTO.java | 5 ++++- .../src/main/resources/mapper/IssueDao.xml | 8 +++++--- .../com/epmet/dto/result/VotingIssueListResultDTO.java | 4 ++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java index 6725684610..038d40a90d 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java @@ -19,7 +19,10 @@ public class VotingIssueListResultDTO implements Serializable { * 议题发布时间 * */ private Long issuePublishTime; - + /** + * 议题发布时间 + */ + private String issuePublishTimeStr; /** * 议题Id * */ diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 306a5c0204..77e9db60da 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -232,6 +232,7 @@ + @@ -247,7 +248,8 @@ UNIX_TIMESTAMP( i.created_time ) AS issuePublishTime, i.SOURCE_ID AS sourceId, i.SOURCE_TYPE as sourceType, - ia.url + ia.url, + DATE_FORMAT(i.created_time,'%Y-%m-%d %H:%i') as created_time FROM issue i left join issue_attachment ia @@ -257,7 +259,7 @@ AND i.GRID_ID = #{gridId} AND i.ISSUE_STATUS = 'voting' ORDER BY - i.created_time DESC,ia.SORT asc + i.created_time DESC @@ -291,7 +293,7 @@ AND i.ISSUE_STATUS = 'closed' AND i.RESOLVE_TYPE = 'resolved' ORDER BY - i.created_time DESC,ia.sort asc + i.created_time DESC SELECT + ID, USER_ID, ID_CARD FROM ic_nat @@ -194,30 +195,29 @@ - when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natTime} + when ID = #{l.id} then #{l.natTime} - when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natAddress} + when ID = #{l.id} then #{l.natAddress} - when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natResult} + when ID = #{l.id} then #{l.natResult} - when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.mobile} + when ID = #{l.id} then #{l.mobile} UPDATED_TIME = NOW() WHERE DEL_FLAG = '0' - AND USER_ID = #{l.userId} - AND ID_CARD = #{l.idCard} + AND ID = #{l.id} From 4921cc8b5584ca8e9e35af405cbfe64e9e05f450 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 24 Oct 2022 11:00:18 +0800 Subject: [PATCH 305/621] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E6=94=B9ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/YtHsResUtils.java | 6 +++--- .../com/epmet/service/impl/DataSyncConfigServiceImpl.java | 5 ++++- .../src/main/resources/mapper/IcNatDao.xml | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 3a23dac10d..d30e1087cb 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -40,8 +40,8 @@ public class YtHsResUtils { log.info("hscy api param:{}", param); Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hscyxxcx", param); - //String mockData = "{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-17 07:15:22\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}"; - //Result result = new Result().ok(mockData); +// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-24 06:48:28\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}]}"; +// Result result = new Result().ok(mockData); log.info("hscy api result:{}", JSON.toJSONString(result)); if (result.success()) { String data = result.getData(); @@ -74,7 +74,7 @@ public class YtHsResUtils { param.put(PAGE_SIZE, pageSize); log.info("hsjc api param:{}", param); Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hsjcxx", param); -// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-20 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}"; +// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-24 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-24 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}"; // Result result = new Result().ok(mockData); log.info("hsjc api result:{}", JSON.toJSONString(result)); if (result.success()) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index b7590a5987..7fc6aa2bb6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -539,7 +539,10 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl existInfo.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true))); + entities.forEach(e -> existInfo.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> { + e.setExistStatus(true); + e.setId(i.getId()); + })); Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), NumConstant.FIVE_HUNDRED)) { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index df1cda47a4..991bc5220d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -216,9 +216,10 @@ UPDATED_TIME = NOW() WHERE DEL_FLAG = '0' + AND ID IN( - AND ID = #{l.id} - + #{l.id} + ) From 4c71aa04b4e299733c70764b884d17ac06c40578 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 24 Oct 2022 14:07:17 +0800 Subject: [PATCH 306/621] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/ArticleController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index 7ab6795c57..88782d0506 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -468,4 +468,16 @@ public class ArticleController { articleService.addOrSaveDraft(formDTO); return new Result(); } + + /** + * 已发布的文章可以编辑 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("updateArticle") + public Result updateArticleId(@LoginUser TokenDto tokenDto,@RequestBody AddOrSaveDraftFormDTO formDTO){ + // todo + return new Result(); + } } From 386adfca8e47d3cfae99a50fdd89d265d98f7d09 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 24 Oct 2022 15:15:11 +0800 Subject: [PATCH 307/621] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EpidemicPreventionFormDTO.java | 6 +++ .../IcEpidemicPreventionController.java | 9 ++++ .../excel/EpidemicPreventionExportExcel.java | 34 ++++++++++++ .../com/epmet/service/IcResiUserService.java | 4 ++ .../service/impl/IcResiUserServiceImpl.java | 53 ++++++++++++++++++- .../main/resources/mapper/IcResiUserDao.xml | 6 +++ 6 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/EpidemicPreventionExportExcel.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java index 4cd9156ea1..147bcad3ee 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java @@ -67,6 +67,12 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab * 结束日期 */ private String endDate; + + /** + * 核酸检测开始、结束时间 eg:2022-10-10 + */ + private String natStartDate; + private String natEndDate; /** * 疫苗接种次数 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java index 3fd2bd60fc..695a739b89 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java @@ -33,6 +33,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; /** @@ -67,6 +69,13 @@ public class IcEpidemicPreventionController{ return new Result>().ok(result); } + @PostMapping("epidemicPreventionExport") + public void epidemicPreventionExport(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + icResiUserService.epidemicPreventionExport(formDTO,response); + } + @PostMapping("user-list") public Result> userList(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/EpidemicPreventionExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/EpidemicPreventionExportExcel.java new file mode 100644 index 0000000000..33486ab15a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/EpidemicPreventionExportExcel.java @@ -0,0 +1,34 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Author zxc + * @DateTime 2022/10/24 14:36 + */ +@Data +public class EpidemicPreventionExportExcel { + + @ExcelProperty(value = "姓名") + @ColumnWidth(20) + private String name; + + @ExcelProperty(value = "所属网格") + @ColumnWidth(20) + private String gridName; + + @ExcelProperty(value = "所属房屋") + @ColumnWidth(20) + private String houseName; + + @ExcelProperty(value = "手机号") + @ColumnWidth(20) + private String mobile; + + @ExcelProperty(value = "证件号") + @ColumnWidth(20) + private String idCard; + +} 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 e3e0f75e1f..246f87a15d 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 @@ -32,6 +32,8 @@ import com.epmet.entity.IcResiUserEntity; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -521,4 +523,6 @@ public interface IcResiUserService extends BaseService { void updateYlfn(); IcResiUserInfoCache getIcResiUserInfo(String userId); + + void epidemicPreventionExport(EpidemicPreventionFormDTO formDTO, HttpServletResponse response) throws IOException; } 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 bae8e89c0b..662ce7b8fe 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 @@ -19,6 +19,9 @@ package com.epmet.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -47,6 +50,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.*; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.constant.IcPlatformConstant; import com.epmet.constant.IcResiUserConstant; import com.epmet.constant.UserConstant; @@ -59,6 +63,8 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; +import com.epmet.excel.DataSyncRecordDisabilityExcel; +import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; @@ -83,6 +89,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Timestamp; @@ -1673,8 +1682,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.getEpidemicPreventionList(formDTO); + List list = new ArrayList<>(); + if (formDTO.getIsPage()){ + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + list = baseDao.getEpidemicPreventionList(formDTO); + }else { + list = baseDao.getEpidemicPreventionList(formDTO); + } + PageInfo pageInfo = new PageInfo<>(list); if (CollectionUtils.isNotEmpty(list)) { //查询网格名称 @@ -3544,4 +3559,38 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = null; + do { + PageData data = epidemicPreventionList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), EpidemicPreventionExportExcel.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + + } } 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 e8b69faefa..7c651b76bc 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 @@ -865,6 +865,12 @@ AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") < #{endDate} + + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") > #{natStartDate} + + + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") < #{natEndDate} + GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD WHERE a.DEL_FLAG = '0' From d3a89ced33c3a57ae3ad6ba35dd1dd6b7f7d65cd Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 24 Oct 2022 15:18:38 +0800 Subject: [PATCH 308/621] =?UTF-8?q?=E7=BB=84=E7=BB=87id=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=B5=8B=E4=BA=86=E4=B8=80=E4=B8=8B=E5=A4=96=E7=BD=91ip=20?= =?UTF-8?q?=E4=B8=8D=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java index 3590186d68..e5c885f4a2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java @@ -42,6 +42,7 @@ public class YantaiApi { */ private static final String SSO_API_TOKEN = "iJCDUgCBV/Zk5FkkaxLypA=="; private static final String SSO_BACKGROUND_SERVER_URL = "http://172.20.46.155:8082/"; + //private static final String SSO_BACKGROUND_SERVER_URL = "http://120.220.248.247:8081/"; /** * desc:根据组织id获取下级组织 @@ -240,7 +241,9 @@ public class YantaiApi { String organizationId = "44e05de9-34fa-48f6-b89f-02838d792cf9"; List childOuInfoByGuid = getChildOuInfoByGuid(organizationId); System.out.println("childOuInfoByGuid:"+JSON.toJSONString(childOuInfoByGuid)); - List userByOuGuid = getUserByOuGuid(organizationId); + //先用他说的有人的组织id联调 + String orgId = "2b271845-ed51-48aa-9935-00b9e7e06311"; + List userByOuGuid = getUserByOuGuid(orgId); System.out.println("getUserByOuGuid:"+JSON.toJSONString(userByOuGuid)); Map apiHeaderMap = getApiHeaderMap(); From fc1992863de1fb042e319e4c4fbc1bfd08d79f44 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 24 Oct 2022 15:25:09 +0800 Subject: [PATCH 309/621] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/UpdateArticleFormDTO.java | 92 ++++++++++++++ .../com/epmet/constant/ArticleConstant.java | 1 + .../epmet/controller/ArticleController.java | 10 +- .../java/com/epmet/dao/ArticleContentDao.java | 8 +- .../java/com/epmet/dao/ArticleCoverDao.java | 3 +- .../com/epmet/dao/ArticlePublishRangeDao.java | 2 + .../entity/ArticleOperateRecordEntity.java | 1 + .../com/epmet/service/ArticleService.java | 6 + .../service/impl/ArticleServiceImpl.java | 119 +++++++++++++++++- .../resources/mapper/ArticleContentDao.xml | 10 ++ .../main/resources/mapper/ArticleCoverDao.xml | 6 +- .../mapper/ArticlePublishRangeDao.xml | 8 +- 12 files changed, 258 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java new file mode 100644 index 0000000000..b575bf90c6 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java @@ -0,0 +1,92 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @Description 修改文章 + * @Author yzm + * @Date 2022/10/24 14:12 + */ +@Data +public class UpdateArticleFormDTO { + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 文章id + */ + @NotBlank(message = "articleId不能为空", groups = {AddUserInternalGroup.class}) + private String articleId; + + @NotBlank(message = "文章标题不能为空", groups = {AddUserShowGroup.class}) + @Length(max = 50, message = "文章标题最长为50个字") + private String title; + + /** + * 发布范围IDs + */ + @NotEmpty(message = "发布范围不能为空", groups = AddUserShowGroup.class) + private List gridIdList; + + /** + * 发布范围Names + */ + @NotBlank(message = "发布范围名称不能为空", groups = AddUserShowGroup.class) + private String publishRangeDesc; + + @NotBlank(message = "发布单位不能为空", groups = AddUserShowGroup.class) + private String publisher; + + @NotBlank(message = "发布单位名称不能为空", groups = AddUserShowGroup.class) + private String publisherName; + + /** + * 发布单位类型 机关:agency；部门：department；网格：grid + */ + @NotBlank(message = "发布单位类型不能为空", groups = AddUserShowGroup.class) + private String publisherType; + + /** + * 封面图地址 + */ + private String imgUrl; + + @NotBlank(message = "发布时间不能为空", groups = AddUserShowGroup.class) + private String publishDate; + + /** + * 文章标签 + */ + private List tagNameList; + + @NotBlank(message = "文章内容不能为空", groups = {AddUserShowGroup.class}) + private String content; + + /** + * 是否置顶 1是；0否； + */ + @NotNull(message = "请选择是否置顶", groups = AddUserShowGroup.class) + private Integer isTop; + + /** + * token中获取 + */ + @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) + private String userId; + /** + * token中获取 + */ + @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) + private String customerId; +} + diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java index 29d8bca111..2899d54c7b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java @@ -20,6 +20,7 @@ public interface ArticleConstant { */ String PUBLISHED = "published"; String PUBLISH = "publish"; + String UPDATE_ARTICEL="update"; String PUBLISH_CONTENT = "发布文章"; /** * 发布状态-已下线 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index 88782d0506..d640fb464d 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -471,13 +471,19 @@ public class ArticleController { /** * 已发布的文章可以编辑 + * * @param tokenDto * @param formDTO * @return */ @PostMapping("updateArticle") - public Result updateArticleId(@LoginUser TokenDto tokenDto,@RequestBody AddOrSaveDraftFormDTO formDTO){ - // todo + public Result updateArticle(@LoginUser TokenDto tokenDto, @RequestBody UpdateArticleFormDTO formDTO) { + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO, UpdateArticleFormDTO.AddUserShowGroup.class, UpdateArticleFormDTO.AddUserInternalGroup.class); + articleService.updateArticle(formDTO); return new Result(); } + + } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleContentDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleContentDao.java index 44d12946d9..227fa89114 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleContentDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleContentDao.java @@ -29,5 +29,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ArticleContentDao extends BaseDao { - + /** + * 只支持富文本的文章 + * 如果是最开始一段文字，一个图片那种文章在article_content表会有多条 + * @param articleId + * @return + */ + ArticleContentEntity selectByArticleId(String articleId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleCoverDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleCoverDao.java index cd087445ae..3f3dc05374 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleCoverDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleCoverDao.java @@ -29,5 +29,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ArticleCoverDao extends BaseDao { - + + ArticleCoverEntity selectByArticleId(String articleId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticlePublishRangeDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticlePublishRangeDao.java index 9fe5fa1614..77bedc971e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticlePublishRangeDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticlePublishRangeDao.java @@ -47,4 +47,6 @@ public interface ArticlePublishRangeDao extends BaseDao selectInitData(@Param("customerIdList") List customerIdList); + + int deleteByArticleId(@Param("articleId") String articleId,@Param("operUserId")String operUserId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java index ff89979fb8..ee00d068d2 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java @@ -64,6 +64,7 @@ public class ArticleOperateRecordEntity extends BaseEpmetEntity { /** * 操作类型 发布文章：publish；取消文章置顶：canceltop；设置置顶：settom；下线文章：offline；修改文章发布范围：updatepublishrange + * 修改文章：update */ private String opType; diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index 8f0914bfe4..5438ed4bd5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -257,4 +257,10 @@ public interface ArticleService extends BaseService { PublishedListResultDTO detailV2(ArticleListFormDTO formDTO); void topArticle(String articleId, String type,String imgUrl); + + /** + * 修改文章 + * @param formDTO + */ + void updateArticle(UpdateArticleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 4e94222164..af49ec4ca4 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -1435,7 +1435,13 @@ public class ArticleServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper(); + queryWrapper.eq(ArticleTagsEntity::getCustomerId,customerId) + .eq(ArticleTagsEntity::getArticleId,articleId); + articleTagsDao.delete(queryWrapper); + articleTagsService.insertBatch(articleTags); + } } /** @@ -1543,7 +1549,7 @@ public class ArticleServiceImpl extends BaseServiceImpl DraftConstant.PREVIEW_CONTENT_MAX_LENGTH ? getPreviewContent(formDTO.getContent()).substring(NumConstant.ZERO,DraftConstant.PREVIEW_CONTENT_MAX_LENGTH) : getPreviewContent(formDTO.getContent())); + articleEntity.setPublishDate(DateUtils.stringToDate(formDTO.getPublishDate(),DateUtils.DATE_PATTERN)); + articleEntity.setPublisherId(formDTO.getPublisher()); + articleEntity.setTags(CollectionUtils.isEmpty(formDTO.getTagNameList()) ? "" : formDTO.getTagNameList().stream().collect(Collectors.joining("|"))); + articleEntity.setOrgId(staffInfo.getAgencyId()); + articleEntity.setOrgIdPath(StringUtils.isBlank(agencyInfo.getPids()) || agencyInfo.getPids().equals(NumConstant.ZERO_STR) ? agencyInfo.getId() : agencyInfo.getPids().concat(":").concat(agencyInfo.getId())); + articleEntity.setRichTextFlag(NumConstant.ONE_STR); + baseDao.updateById(articleEntity); + // 2.内容 + ArticleContentEntity articleContent = articleContentDao.selectByArticleId(formDTO.getArticleId()); + articleContent.setContent(formDTO.getContent()); + articleContentDao.updateById(articleContent); + // 3.操作记录 + ArticleOperateRecordEntity articleOperateRecord = new ArticleOperateRecordEntity(); + articleOperateRecord.setCustomerId(formDTO.getCustomerId()); + articleOperateRecord.setArticleId(formDTO.getArticleId()); + articleOperateRecord.setGridIds(CollectionUtils.isEmpty(formDTO.getGridIdList()) ? "" : formDTO.getGridIdList().stream().collect(Collectors.joining(":"))); + articleOperateRecord.setOpUser(staffInfo.getAgencyName().concat("-").concat(staffInfo.getRealName())); + articleOperateRecord.setContent(articleOperateRecord.getOpUser() + "发布文章【" +formDTO.getTitle() + "】"); + articleOperateRecord.setOpType(ArticleConstant.UPDATE_ARTICEL); + articleOperateRecord.setOpTime(new Date()); + articleOperateRecordService.insert(articleOperateRecord); + // 4.发布范围 + if (!CollectionUtils.isEmpty(formDTO.getGridIdList())){ + List rangeList = new ArrayList<>(); + formDTO.getGridIdList().forEach(g -> { + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(g); + if (null == gridInfoCache){ + throw new EpmetException("未查询到网格信息:"+g); + } + ArticlePublishRangeEntity articlePublishRange = ConvertUtils.sourceToTarget(gridInfoCache,ArticlePublishRangeEntity.class); + articlePublishRange.setCustomerId(formDTO.getCustomerId()); + articlePublishRange.setArticleId(formDTO.getArticleId()); + articlePublishRange.setGridId(g); + articlePublishRange.setAgencyGridName(gridInfoCache.getGridNamePath()); + articlePublishRange.setAgencyId(gridInfoCache.getPid()); + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(gridInfoCache.getPid()); + if (null == agencyInfoCache){ + throw new EpmetException("未查询到组织信息:"+gridInfoCache.getPid()); + } + articlePublishRange.setPids(agencyInfoCache.getPids()); + articlePublishRange.setPublishStatus(ArticleConstant.PUBLISHED); + articlePublishRange.setId(null); + rangeList.add(articlePublishRange); + }); + if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(rangeList)){ + //先删除，后插入 + articlePublishRangeDao.deleteByArticleId(formDTO.getArticleId(),formDTO.getUserId()); + articlePublishRangeService.insertBatch(rangeList); + } + } + // 5.文章标签 + UpdateCustomerTagCacheDTO updateCustomerTagCacheDTO = updateCustomerTagV2(formDTO.getUserId(), formDTO.getCustomerId(), StringUtils.isBlank(articleEntity.getTags()) ? "" : articleEntity.getTags()); + if (null != updateCustomerTagCacheDTO){ + addArticleTagsV2(updateCustomerTagCacheDTO,formDTO.getCustomerId(),articleEntity.getId()); + } + // 6.更新网格tag + List updateGridTagCacheDTOS = updateGridTagV2(updateCustomerTagCacheDTO, formDTO.getCustomerId(), formDTO.getGridIdList(), formDTO.getUserId()); + // 7.文章封面 + if (StringUtils.isNotBlank(formDTO.getImgUrl())){ + ArticleCoverEntity articleCoverEntity = articleCoverDao.selectByArticleId(formDTO.getArticleId()); + if (null != articleCoverEntity) { + articleCoverEntity.setImgUrl(formDTO.getImgUrl()); + articleCoverEntity.setAuditStatus("pass"); + articleCoverDao.updateById(articleCoverEntity); + }else{ + ArticleCoverEntity articleCover = new ArticleCoverEntity(); + articleCover.setCustomerId(formDTO.getCustomerId()); + articleCover.setArticleId(formDTO.getArticleId()); + articleCover.setImgUrl(formDTO.getImgUrl()); + articleCover.setAuditStatus("pass"); + articleCoverDao.insert(articleCover); + } + } + // 8.更新redis + try { + this.updateCacheCustomerTag(updateCustomerTagCacheDTO); + this.updateCacheGridTag(updateGridTagCacheDTOS); + } catch (Exception e) { + //我觉着没必要抛出异常吧，日志打印一下吧 + log.warn("scanAllPassPublishArticle update redis exception", e); + // throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); + } + + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml index fb55860502..52007cee9e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml @@ -4,4 +4,14 @@ + + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleCoverDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleCoverDao.xml index 684910ea8d..1bd90e218e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleCoverDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleCoverDao.xml @@ -3,5 +3,9 @@ - + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml index c58c230891..2b2fcb4e3b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml @@ -35,5 +35,11 @@ ORDER BY GRID_ID - + + update article_publish_range r + set r.del_flag='1', + r.UPDATED_BY = #{operUserId}, + r.UPDATED_TIME = now() + where r.ARTICLE_ID = #{articleId} + \ No newline at end of file From b03873fd4042241e038c3c050b877bdabcf5501e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 24 Oct 2022 15:31:21 +0800 Subject: [PATCH 310/621] =?UTF-8?q?=E6=B3=A8=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/constant/ArticleConstant.java | 3 +++ .../java/com/epmet/service/impl/ArticleServiceImpl.java | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java index 2899d54c7b..25f68c9a6d 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java @@ -20,6 +20,9 @@ public interface ArticleConstant { */ String PUBLISHED = "published"; String PUBLISH = "publish"; + /** + * pc,已发布的文章可编辑 + */ String UPDATE_ARTICEL="update"; String PUBLISH_CONTENT = "发布文章"; /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index af49ec4ca4..3ff421c8e6 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -1856,7 +1856,7 @@ public class ArticleServiceImpl extends BaseServiceImpl { GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(g); if (null == gridInfoCache){ - throw new EpmetException("未查询到网格信息:"+g); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"gridId:"+g,"发布范围：网格信息查询异常"); } ArticlePublishRangeEntity articlePublishRange = ConvertUtils.sourceToTarget(gridInfoCache,ArticlePublishRangeEntity.class); articlePublishRange.setCustomerId(formDTO.getCustomerId()); @@ -1876,8 +1876,9 @@ public class ArticleServiceImpl extends BaseServiceImpl Date: Mon, 24 Oct 2022 16:05:11 +0800 Subject: [PATCH 311/621] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ArticleController.java | 21 ++++++ .../service/ArticleOperateRecordService.java | 8 +++ .../com/epmet/service/ArticleService.java | 15 +++++ .../service/ArticleVisitRecordService.java | 2 + .../impl/ArticleOperateRecordServiceImpl.java | 21 ++++-- .../service/impl/ArticleServiceImpl.java | 67 +++++++++++++++++++ .../impl/ArticleVisitRecordServiceImpl.java | 12 ++++ 7 files changed, 142 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index d640fb464d..611c9d2b79 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -37,6 +37,7 @@ import com.epmet.service.ArticleOperateRecordService; import com.epmet.service.ArticleService; import com.epmet.service.DraftService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; @@ -485,5 +486,25 @@ public class ArticleController { return new Result(); } + /** + * 删除文章,所有相关表都删除吧 + * article 文章表 + * article_content 文章内容表 + * article_cover 文章封面表 + * article_operate_record 文章操作记录表 + * article_publish_range 文章发布范围表 + * article_tags 文章标签表 + * article_visit_record 文章访问记录表 + * @param tokenDto + * @param articleIds + * @return + */ + @PostMapping("delete") + public Result delete(@LoginUser TokenDto tokenDto, @RequestBody List articleIds) { + if (CollectionUtils.isNotEmpty(articleIds)) { + articleService.delete(articleIds, tokenDto.getCustomerId(), tokenDto.getUserId()); + } + return new Result(); + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleOperateRecordService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleOperateRecordService.java index 368ecfcef7..ddb1db33e7 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleOperateRecordService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleOperateRecordService.java @@ -103,4 +103,12 @@ public interface ArticleOperateRecordService extends BaseService listOfArticleOperation(String articleId); + + /** + * + * @param articleId + * @param customerId + * @param currentOperUserId + */ + void deleteByArticleId(String articleId, String customerId, String currentOperUserId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index 5438ed4bd5..dca18d0bb7 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -263,4 +263,19 @@ public interface ArticleService extends BaseService { * @param formDTO */ void updateArticle(UpdateArticleFormDTO formDTO); + + /** + * 删除文章 + * article 文章表 + * article_content 文章内容表 + * article_cover 文章封面表 + * article_operate_record 文章操作记录表 + * article_publish_range 文章发布范围表 + * article_tags 文章标签表 + * article_visit_record 文章访问记录表 + * @param articleIds + * @param customerId + * @param currentOperUserId + */ + void delete(List articleIds,String customerId,String currentOperUserId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleVisitRecordService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleVisitRecordService.java index cdaa50388c..502d0f638a 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleVisitRecordService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleVisitRecordService.java @@ -92,4 +92,6 @@ public interface ArticleVisitRecordService extends BaseService updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ArticleOperateRecordEntity::getDelFlag, NumConstant.ONE_STR) + .set(ArticleOperateRecordEntity::getUpdatedBy, currentOperUserId) + .set(ArticleOperateRecordEntity::getUpdatedTime, new Date()); + updateWrapper.eq(ArticleOperateRecordEntity::getArticleId, articleId); + baseDao.update(null,updateWrapper); + } } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 3ff421c8e6..6f6c6985fb 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -1924,4 +1925,70 @@ public class ArticleServiceImpl extends BaseServiceImpl articleIds, String customerId, String currentOperUserId) { + Date now=new Date(); + for(String articleId:articleIds){ + //文章表 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ArticleEntity::getDelFlag, NumConstant.ONE_STR) + .set(ArticleEntity::getUpdatedBy, currentOperUserId) + .set(ArticleEntity::getUpdatedTime, now); + updateWrapper.eq(ArticleEntity::getId, articleId); + baseDao.update(null, updateWrapper); + + //文章内容表 + LambdaUpdateWrapper articleContentUpdate = new LambdaUpdateWrapper<>(); + articleContentUpdate.set(ArticleContentEntity::getDelFlag, NumConstant.ONE_STR) + .set(ArticleContentEntity::getUpdatedBy, currentOperUserId) + .set(ArticleContentEntity::getUpdatedTime, now); + articleContentUpdate.eq(ArticleContentEntity::getArticleId, articleId); + articleContentDao.update(null,articleContentUpdate); + //文章封面表 + LambdaUpdateWrapper articleCoverUpdate = new LambdaUpdateWrapper<>(); + articleCoverUpdate.set(ArticleCoverEntity::getDelFlag, NumConstant.ONE_STR) + .set(ArticleCoverEntity::getUpdatedBy, currentOperUserId) + .set(ArticleCoverEntity::getUpdatedTime, now); + articleCoverUpdate.eq(ArticleCoverEntity::getArticleId, articleId); + articleCoverDao.update(null,articleCoverUpdate); + //文章操作记录表 + articleOperateRecordService.deleteByArticleId(articleId,customerId,currentOperUserId); + + //文章发布范围表 + LambdaUpdateWrapper publishRangeUpdate = new LambdaUpdateWrapper<>(); + publishRangeUpdate.set(ArticlePublishRangeEntity::getDelFlag, NumConstant.ONE_STR) + .set(ArticlePublishRangeEntity::getUpdatedBy, currentOperUserId) + .set(ArticlePublishRangeEntity::getUpdatedTime, now); + publishRangeUpdate.eq(ArticlePublishRangeEntity::getArticleId, articleId); + articlePublishRangeDao.update(null,publishRangeUpdate); + //文章标签表 + LambdaUpdateWrapper articleTagsUpdate = new LambdaUpdateWrapper<>(); + articleTagsUpdate.set(ArticleTagsEntity::getDelFlag, NumConstant.ONE_STR) + .set(ArticleTagsEntity::getUpdatedBy, currentOperUserId) + .set(ArticleTagsEntity::getUpdatedTime, now); + articleTagsUpdate.eq(ArticleTagsEntity::getArticleId, articleId); + articleTagsDao.update(null,articleTagsUpdate); + //文章访问记录表 + articleVisitRecordService.deleteByArticleId(articleId,customerId,currentOperUserId); + } + } + + } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleVisitRecordServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleVisitRecordServiceImpl.java index 8b4ce81966..93f631b14d 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleVisitRecordServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleVisitRecordServiceImpl.java @@ -18,9 +18,11 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.ArticleVisitRecordDao; @@ -33,6 +35,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -105,4 +108,13 @@ public class ArticleVisitRecordServiceImpl extends BaseServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ArticleVisitRecordEntity::getDelFlag, NumConstant.ONE_STR) + .set(ArticleVisitRecordEntity::getUpdatedBy, currentOperUserId) + .set(ArticleVisitRecordEntity::getUpdatedTime, new Date()); + updateWrapper.eq(ArticleVisitRecordEntity::getArticleId, articleId); + baseDao.update(null,updateWrapper); + } } \ No newline at end of file From de9902f5c71ec322e6eea92a628a29633cef729b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 24 Oct 2022 16:26:51 +0800 Subject: [PATCH 312/621] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=A0=B8=E9=85=B8?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/yqfk/IcNatCompareRecordPageFormDTO.java | 11 +++++++++++ .../controller/IcNatCompareRecordController.java | 5 +++++ .../main/resources/mapper/IcNatCompareRecordDao.xml | 9 +++++++++ 3 files changed, 25 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java index c5f6ddd53e..96ca61e0c7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java @@ -38,5 +38,16 @@ public class IcNatCompareRecordPageFormDTO extends PageFormDTO { private String customerId; private String userId; private String agencyId; + + /** + * 检测时间 + */ + private String natDate; + /** + * 1:已检测 + * 0：未检测 + */ + private String natStatus; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java index aa611e8252..8c1c245fde 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java @@ -27,6 +27,7 @@ import com.epmet.service.IcNatCompareRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; @@ -61,6 +62,7 @@ public class IcNatCompareRecordController implements ResultDataResolver { /** * 未做核酸比对-分页查询 + * http://yapi.elinkservice.cn/project/245/interface/api/8129 * @param tokenDto * @param formDTO * @return @@ -68,6 +70,9 @@ public class IcNatCompareRecordController implements ResultDataResolver { @RequestMapping("page") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result> page(@LoginUser TokenDto tokenDto, @RequestBody IcNatCompareRecordPageFormDTO formDTO){ + if (StringUtils.isNotBlank(formDTO.getNatDate()) && StringUtils.isBlank(formDTO.getNatStatus())) { + formDTO.setNatStatus(NumConstant.ONE_STR); + } formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); PageData page = icNatCompareRecordService.page(formDTO); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml index 0e3fcaa606..5015b8612a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml @@ -55,6 +55,15 @@ AND (r.AGENCY_ID = #{agencyId} or r.pids like concat('%',#{agencyId},'%') ) + + + + AND DATE_FORMAT( r.LATEST_NAT_TIME, '%Y%m%d' ) = #{natDate} + + + AND DATE_FORMAT( r.LATEST_NAT_TIME, '%Y%m%d' ) != #{natDate} + + ORDER BY r.IMPORT_TIME DESC,r.AGENCY_ID desc From 82ef981a20a3cbe69cf854439363e3b39b672538 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 24 Oct 2022 16:30:08 +0800 Subject: [PATCH 313/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNatDTO.java | 5 +++++ .../dto/result/ResiAndLocalResiResultDTO.java | 19 +++++++++++++++++++ .../java/com/epmet/dao/IcResiUserDao.java | 9 +++++++++ .../java/com/epmet/entity/IcNatEntity.java | 5 +++++ .../handler/IcNatExcelImportListener.java | 17 +++++++++++++++-- .../epmet/service/impl/IcNatServiceImpl.java | 4 +++- .../migration/V0.0.78__ic_nat_add_local.sql | 1 + .../main/resources/mapper/IcResiUserDao.xml | 19 +++++++++++++++++++ 8 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiAndLocalResiResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java index 66c9828dfd..e8cec48fb4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java @@ -36,6 +36,11 @@ public class IcNatDTO implements Serializable { */ private String isResiUser; + /** + * 是否本辖区居民，1：是；0：否 + */ + private String isLocalResiUser; + /** * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiAndLocalResiResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiAndLocalResiResultDTO.java new file mode 100644 index 0000000000..d03e83d124 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiAndLocalResiResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/24 16:09 + */ +@Data +public class ResiAndLocalResiResultDTO implements Serializable { + private static final long serialVersionUID = -7702043408016900850L; + + private Integer isLocal; + private Integer isResi; + + private String userId; +} 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 dd9e97bbae..8caa220af2 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 @@ -430,4 +430,13 @@ public interface IcResiUserDao extends BaseDao { List getIcUserCount(IcUserCountFormDTO formDTO); List icUserStatisList(UserChartFormDTO formDTO); + + /** + * @Description 根据身份证获取组织下的居民个数 + * @param agencyId + * @param idCard + * @Author zxc + * @Date 2022/10/24 15:47 + */ + ResiAndLocalResiResultDTO getResiCount(@Param("agencyId")String agencyId,@Param("idCard")String idCard,@Param("customerId")String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java index 7cbe8cdd66..93589747e9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java @@ -34,6 +34,11 @@ public class IcNatEntity extends BaseEpmetEntity { */ private String isResiUser; + /** + * 是否本辖区居民，1：是；0：否 + */ + private String isLocalResiUser; + /** * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java index c600349029..d2c14a0c88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java @@ -2,12 +2,15 @@ package com.epmet.excel.handler; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dao.IcResiUserDao; +import com.epmet.dto.result.ResiAndLocalResiResultDTO; import com.epmet.entity.IcNatEntity; import com.epmet.excel.data.IcNatImportExcelData; import com.epmet.service.impl.IcNatServiceImpl; @@ -53,8 +56,9 @@ public class IcNatExcelImportListener implements ReadListener otherRows = new ArrayList<>(); private IcNatServiceImpl icNatService; + private IcResiUserDao icResiUserDao; - public IcNatExcelImportListener(String currentUserId, String currentAgencyId, String currentAgencyPids, IcNatServiceImpl icNatService) { + public IcNatExcelImportListener(String currentUserId, String currentAgencyId, String currentAgencyPids, IcNatServiceImpl icNatService, IcResiUserDao icResiUserDao) { this.currentUserId = currentUserId; this.currentAgencyId = currentAgencyId; this.currentAgencyPids = currentAgencyPids; @@ -101,7 +105,16 @@ public class IcNatExcelImportListener implements ReadListener imp IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); if (StringUtils.isNotBlank(formDTO.getUserId())) { entity.setIsResiUser("1"); + ResiAndLocalResiResultDTO resiCount = icResiUserDao.getResiCount(formDTO.getAgencyId(), formDTO.getIdCard(), formDTO.getCustomerId()); + entity.setIsLocalResiUser(resiCount.getIsLocal() == NumConstant.ZERO ? NumConstant.ZERO_STR : NumConstant.ONE_STR); } insert(entity); //3.核酸记录关系表新增与组织的关系数据 @@ -345,7 +347,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp String agencyId = loginUserDetails.getAgencyId(); - IcNatExcelImportListener listener = new IcNatExcelImportListener(userId, agencyId, loginUserDetails.getOrgIdPath().replace(":".concat(agencyId), ""), this); + IcNatExcelImportListener listener = new IcNatExcelImportListener(userId, agencyId, loginUserDetails.getOrgIdPath().replace(":".concat(agencyId), ""), this, icResiUserDao); EasyExcel.read(filePath.toFile(), IcNatImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead(); diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql new file mode 100644 index 0000000000..9309fde879 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql @@ -0,0 +1 @@ +alter table ic_nat add COLUMN `IS_LOCAL_RESI_USER` VARCHAR(1) COMMENT '是否本辖区居民，1：是；0：否'after IS_RESI_USER \ 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 7c651b76bc..b5f8788719 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 @@ -1383,4 +1383,23 @@ ORDER BY `name` ASC + + + From e15f353229d3a6af64ce33bb3a7efe133d2971ee Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 24 Oct 2022 16:38:56 +0800 Subject: [PATCH 314/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-user-server/src/main/resources/mapper/IcNatDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index 991bc5220d..81b1c78e4f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -75,7 +75,7 @@ AND b.sample_time #{sampleEndTime} - AND b.is_resi_user = #{isResiUser} + AND b.is_local_resi_user = #{isResiUser} ORDER BY b.nat_time DESC, b.id ASC From aa62e03c738894411538325ac649459d0d917363 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 24 Oct 2022 17:19:27 +0800 Subject: [PATCH 315/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcNatController.java | 5 +++++ .../com/epmet/excel/handler/IcNatExcelImportListener.java | 2 ++ .../src/main/java/com/epmet/service/IcNatService.java | 3 +++ .../main/java/com/epmet/service/impl/IcNatServiceImpl.java | 7 +++++++ 4 files changed, 17 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index bcb2a2d134..279cb39113 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java @@ -314,5 +314,10 @@ public class IcNatController implements ResultDataResolver { } } + @PostMapping("initNatLocal") + public Result initNatLocal(){ + icNucleinService.initNatLocal(); + return new Result(); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java index d2c14a0c88..23387928b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java @@ -63,6 +63,7 @@ public class IcNatExcelImportListener implements ReadListener { Integer updateIsResiFlag(String customerId, String icResiUserId); void updateBatchNat(List entities); + + void initNatLocal(); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 992b613454..303b45bc25 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -474,6 +474,13 @@ public class IcNatServiceImpl extends BaseServiceImpl imp } } + @Override + public void initNatLocal() { + Integer no = NumConstant.ONE; + Integer size; + + } + /** * 批量持久化 * @param entities From 5c70d4d453071e27c8dfe080fb1f04a2f174e847 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 24 Oct 2022 17:39:38 +0800 Subject: [PATCH 316/621] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=BE=E5=88=B0rel?= =?UTF-8?q?ation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNatDTO.java | 5 ----- .../src/main/java/com/epmet/dto/IcNatRelationDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/IcNatEntity.java | 5 ----- .../java/com/epmet/entity/IcNatRelationEntity.java | 5 +++++ .../epmet/excel/handler/IcNatExcelImportListener.java | 11 +---------- .../java/com/epmet/service/impl/IcNatServiceImpl.java | 2 -- .../db/migration/V0.0.78__ic_nat_add_local.sql | 2 +- 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java index e8cec48fb4..66c9828dfd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java @@ -36,11 +36,6 @@ public class IcNatDTO implements Serializable { */ private String isResiUser; - /** - * 是否本辖区居民，1：是；0：否 - */ - private String isLocalResiUser; - /** * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java index 69654aca84..6156c545f9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java @@ -42,6 +42,11 @@ public class IcNatRelationDTO implements Serializable { */ private String icNatId; + /** + * 是否本辖区居民，1：是；0：否 + */ + private String isLocalResiUser; + /** * 关系数据的绑定途径【居民端录入：resi; 数字社区录入：icresi; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java index 93589747e9..7cbe8cdd66 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java @@ -34,11 +34,6 @@ public class IcNatEntity extends BaseEpmetEntity { */ private String isResiUser; - /** - * 是否本辖区居民，1：是；0：否 - */ - private String isLocalResiUser; - /** * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java index 7dd51b4d55..4e48d55d36 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java @@ -41,6 +41,11 @@ public class IcNatRelationEntity extends BaseEpmetEntity { */ private String icNatId; + /** + * 是否本辖区居民，1：是；0：否 + */ + private String isLocalResiUser; + /** * 关系数据的绑定途径【居民端录入：resi; 数字社区录入：icresi; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java index 23387928b5..8fa732459a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java @@ -106,16 +106,7 @@ public class IcNatExcelImportListener implements ReadListener imp IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); if (StringUtils.isNotBlank(formDTO.getUserId())) { entity.setIsResiUser("1"); - ResiAndLocalResiResultDTO resiCount = icResiUserDao.getResiCount(formDTO.getAgencyId(), formDTO.getIdCard(), formDTO.getCustomerId()); - entity.setIsLocalResiUser(resiCount.getIsLocal() == NumConstant.ZERO ? NumConstant.ZERO_STR : NumConstant.ONE_STR); } insert(entity); //3.核酸记录关系表新增与组织的关系数据 diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql index 9309fde879..ef7236dae3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql @@ -1 +1 @@ -alter table ic_nat add COLUMN `IS_LOCAL_RESI_USER` VARCHAR(1) COMMENT '是否本辖区居民，1：是；0：否'after IS_RESI_USER \ No newline at end of file +alter table ic_nat_relation add COLUMN `IS_LOCAL_RESI_USER` VARCHAR(1) COMMENT '是否本辖区居民，1：是；0：否'after IC_NAT_ID \ No newline at end of file From 206719d304c3f7cfead8213c5785cc2d69b58645 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 24 Oct 2022 18:09:07 +0800 Subject: [PATCH 317/621] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcHouseListFormDTO.java | 30 ++++++++++++++----- .../src/main/resources/mapper/IcHouseDao.xml | 6 ++++ 2 files changed, 28 insertions(+), 8 deletions(-) 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 4c32424b09..e2022b1420 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 @@ -16,6 +16,28 @@ public class IcHouseListFormDTO extends PageFormDTO { private static final long serialVersionUID = -1L; + /** + * 10.24需求http://zentao.elinkservice.cn/story-view-710.html + * 小区id + */ + private String neighborHoodId; + /** + * 10.24需求http://zentao.elinkservice.cn/story-view-710.html + * 新增楼栋id + */ + private String buildingId; + /** + * 10.24需求http://zentao.elinkservice.cn/story-view-710.html + * 新增单元id + */ + private String buildingUnitId; + /** + * 10.24需求http://zentao.elinkservice.cn/story-view-710.html + * 新增：房号 + */ + private String houseId; + + /** * 组织类别 */ @@ -51,14 +73,6 @@ public class IcHouseListFormDTO extends PageFormDTO { * 房屋状态 【1：出租 0：自住 2：闲置 3:未出售】 */ private String rentFlag; - /** - * 楼栋ID - */ - private String buildingId; - /** - * 小区ID - */ - private String neighborHoodId; /** * 搜索关键词，社区查询，搜索输入的关键词 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 6e417b0aed..441dfe7f1b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -147,6 +147,12 @@ AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId} + + AND a.BUILDING_UNIT_ID = #{buildingUnitId} + + + AND a.ID = #{houseId} + AND b.id = #{id} From 2c3c1ab217e8228f8734af735ba2074a29299836 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 08:35:26 +0800 Subject: [PATCH 318/621] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/api/yt/YantaiApi.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java index e5c885f4a2..95a54779b0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java @@ -41,7 +41,13 @@ public class YantaiApi { * 调用sso后台api接口的 秘钥 */ private static final String SSO_API_TOKEN = "iJCDUgCBV/Zk5FkkaxLypA=="; + /** + * 政务网地址 + */ private static final String SSO_BACKGROUND_SERVER_URL = "http://172.20.46.155:8082/"; + /** + * 互联网地址 + */ //private static final String SSO_BACKGROUND_SERVER_URL = "http://120.220.248.247:8081/"; /** @@ -101,7 +107,7 @@ public class YantaiApi { //加密 String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); //pwd = URLEncoder.encode(pwd, "UTF-8"); - String url = SSO_BACKGROUND_SERVER_URL + "person/serInfo/getUserByOuGuid"; + String url = SSO_BACKGROUND_SERVER_URL + "person/userInfo/getUserByOuGuid"; Map paramMap = new HashMap<>(); @@ -242,8 +248,9 @@ public class YantaiApi { List childOuInfoByGuid = getChildOuInfoByGuid(organizationId); System.out.println("childOuInfoByGuid:"+JSON.toJSONString(childOuInfoByGuid)); //先用他说的有人的组织id联调 - String orgId = "2b271845-ed51-48aa-9935-00b9e7e06311"; - List userByOuGuid = getUserByOuGuid(orgId); + //String orgId = "2b271845-ed51-48aa-9935-00b9e7e06311"; + //orgId = "2b271845-ed51-48aa-9935-00b9e7e05778"; + List userByOuGuid = getUserByOuGuid(organizationId); System.out.println("getUserByOuGuid:"+JSON.toJSONString(userByOuGuid)); Map apiHeaderMap = getApiHeaderMap(); From c19cd59b327873ca6e558b2a02660fe1555c907d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Oct 2022 10:20:46 +0800 Subject: [PATCH 319/621] =?UTF-8?q?data=5Fsync=5Forg=5Fdata+data=5Fsync=5F?= =?UTF-8?q?user=5Fdata=20=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.17__yt_sync_organduser.sql | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.17__yt_sync_organduser.sql diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.17__yt_sync_organduser.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.17__yt_sync_organduser.sql new file mode 100644 index 0000000000..5249bca97b --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.17__yt_sync_organduser.sql @@ -0,0 +1,52 @@ +CREATE TABLE `data_sync_org_data` ( + `ID` varchar(64) NOT NULL COMMENT '主键ID', + `CONTACT` varchar(64) DEFAULT NULL COMMENT '联系人姓名', + `CONTACTTELEPHONE_NUMBER` varchar(64) DEFAULT NULL COMMENT '联系电话号码', + `DETAIL_ADDRESS` varchar(64) DEFAULT NULL COMMENT '详细地址', + `FIRSTNAMEOF_ORGANIZATION` varchar(64) DEFAULT NULL COMMENT '组织机构第一名称', + `NAMEOF_ORGANIZATION` varchar(64) DEFAULT NULL COMMENT '组织机构全称', + `ORDER_NUMBER` varchar(64) DEFAULT NULL COMMENT '排序号码', + `ORGANIZATIO_NABBREVIATION` varchar(64) NOT NULL COMMENT '组织机构简称', + `ORGANIZATION_ID` varchar(64) NOT NULL COMMENT '组织机构ID', + `ORGANIZATION_LEVEL` varchar(64) DEFAULT NULL COMMENT '组织机构级别', + `ORGANIZATION_PATH` varchar(256) NOT NULL COMMENT '组织机构路径', + `ORGANIZATION_TYPE` varchar(64) DEFAULT NULL COMMENT '组织机构类型', + `REGISTRATION_TYPE` varchar(64) DEFAULT NULL COMMENT '注册类型', + `UNIFIEDSOCIALCREDIT_ID` varchar(64) DEFAULT NULL COMMENT '统一社会信用代码', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id;烟台id', + `PID` varchar(64) NOT NULL COMMENT '上级组织机构id:ORGANIZATION_ID; 根级组织赋值0', + `PARENT_ORG_NAME` varchar(64) DEFAULT NULL COMMENT '上一级组织机构名称：ORGANIZATIO_NABBREVIATION', + `PIDS` varchar(255) DEFAULT NULL COMMENT '所有上级组织。不包含本身！如果是根组织，此列为空串', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE `data_sync_user_data` ( + `ID` varchar(64) NOT NULL COMMENT '主键ID', + `GENDER` varchar(64) DEFAULT NULL COMMENT '性别:0未知1男2女', + `MOBILE_TELEPHONE_NUMBER` varchar(64) NOT NULL COMMENT '手机号码', + `ORDER_NUMBER` varchar(64) DEFAULT NULL COMMENT '排序号码', + `POSITION` varchar(64) DEFAULT NULL COMMENT '职务', + `POSITION_LEVEL` varchar(64) DEFAULT NULL COMMENT '职级', + `TELEPHONE_NUMBER` varchar(64) DEFAULT NULL COMMENT '电话号码', + `USER_GUID` varchar(64) DEFAULT NULL COMMENT '统一用户编码', + `USER_NAME` varchar(64) NOT NULL COMMENT '用户姓名', + `USER_PATH` varchar(128) DEFAULT NULL COMMENT '人员路径', + `ORGANIZATION_ID` varchar(64) NOT NULL COMMENT 'data_sync_org_data.组织机构ID;', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `STATUS` varchar(1) DEFAULT '0' COMMENT '0未创建、1已创建', + `STAFF_ID` varchar(64) DEFAULT NULL COMMENT 'customer_staff.userId，已创建的此列不能为空', + `REMARK` varchar(255) DEFAULT NULL COMMENT '备注；目前为空', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file From 2e1c025c61abbf2669be27d25106118aa8ab3c48 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 11:57:33 +0800 Subject: [PATCH 320/621] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/RelationAndNatResultDTO.java | 26 ++++++++ .../src/main/java/com/epmet/dao/IcNatDao.java | 20 ++++++ .../impl/DataSyncConfigServiceImpl.java | 1 + .../epmet/service/impl/IcNatServiceImpl.java | 66 +++++++++++++++++-- .../src/main/resources/mapper/IcNatDao.xml | 48 +++++++++++++- .../main/resources/mapper/IcResiUserDao.xml | 2 +- 6 files changed, 156 insertions(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RelationAndNatResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RelationAndNatResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RelationAndNatResultDTO.java new file mode 100644 index 0000000000..cc3da4c846 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RelationAndNatResultDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/25 09:37 + */ +@Data +public class RelationAndNatResultDTO implements Serializable { + private static final long serialVersionUID = 5245015978083295931L; + + private String relationId; + private String natId; + private String staffAgencyIdPath; + private String idCard; + + /** + * 默认不是本辖区居民 + */ + private String isLocalResiUser = NumConstant.ZERO_STR; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java index f21ec91eb3..7b8b0a0ab7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java @@ -6,7 +6,9 @@ import com.epmet.dto.form.MyNatListFormDTO; import com.epmet.dto.result.MyNatListResultDTO; import com.epmet.dto.result.NatListResultDTO; import com.epmet.dto.result.NatUserInfoResultDTO; +import com.epmet.dto.result.RelationAndNatResultDTO; import com.epmet.entity.IcNatEntity; +import com.epmet.entity.IcResiUserEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,4 +68,22 @@ public interface IcNatDao extends BaseDao { void updateBatchNat(@Param("list")List entities); + List getRelationAndNat(); + + List getResiByIdCards(@Param("idCards")List idCards); + + /** + * @Description 批量更新关系 + * @param list + * @Author zxc + * @Date 2022/10/25 10:56 + */ + void updateRelation(@Param("list") List list); + + /** + * @Description 更新的 userType != 'import' + * @Author zxc + * @Date 2022/10/25 11:13 + */ + void updateRelationOther(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 7fc6aa2bb6..632e27828b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -557,6 +557,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl imp if (null == agencyInfo) { throw new RenException(String.format("获取组织缓存信息失败%s", formDTO.getAgencyId())); } + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException(String.format("获取工作人员信息失败%s", formDTO.getStaffId())); + } //2.新增核酸基础信息数据 IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); if (StringUtils.isNotBlank(formDTO.getUserId())) { @@ -136,9 +141,12 @@ public class IcNatServiceImpl extends BaseServiceImpl imp } insert(entity); //3.核酸记录关系表新增与组织的关系数据 + ResiAndLocalResiResultDTO resiCount = icResiUserDao.getResiCount(formDTO.getAgencyId(), formDTO.getIdCard(), formDTO.getCustomerId()); IcNatRelationEntity relationEntity = ConvertUtils.sourceToTarget(formDTO, IcNatRelationEntity.class); relationEntity.setIcNatId(entity.getId()); - relationEntity.setPids(StringUtils.isNotBlank(agencyInfo.getPids()) ? agencyInfo.getPids() + ":" + formDTO.getAgencyId() : formDTO.getAgencyId()); + relationEntity.setIsLocalResiUser(resiCount.getIsLocal() == NumConstant.ZERO ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + relationEntity.setAgencyId(staffInfo.getAgencyId()); + relationEntity.setPids(StringUtils.isNotBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId() : staffInfo.getAgencyId()); icNatRelationDao.insert(relationEntity); //3.新增通知表信息 @@ -476,7 +484,47 @@ public class IcNatServiceImpl extends BaseServiceImpl imp public void initNatLocal() { Integer no = NumConstant.ONE; Integer size; + // 查询关系表 + do { + // user_type = 'import' + PageInfo pageInfo = PageHelper.startPage(no, NumConstant.ONE_THOUSAND).doSelectPageInfo(() -> baseDao.getRelationAndNat()); + List list = pageInfo.getList(); + size = list.size(); + if (CollectionUtils.isNotEmpty(list)){ + List users = baseDao.getResiByIdCards(list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList())); + if (CollectionUtils.isNotEmpty(users)){ + for (RelationAndNatResultDTO l : list) { + for (IcResiUserEntity u : users) { + if (l.getStaffAgencyIdPath().contains(u.getAgencyId())){ + l.setIsLocalResiUser(NumConstant.ONE_STR); + break; + } + } + } + updateRelation(list,NumConstant.ONE_STR); + } + } + }while (size == NumConstant.ONE_THOUSAND); + // 其他类型的userType直接是居民的组织信息，所以直接赋值 is_local_resi_user = '1' + updateRelation(null,NumConstant.TWO_STR); + } + /** + * @Description 更新核酸关系表 + * @param list + * @param type 1:userType为import；2：除了import + * @Author zxc + * @Date 2022/10/25 10:55 + */ + @Transactional(rollbackFor = Exception.class) + public void updateRelation(List list,String type){ + if (NumConstant.ONE_STR.equals(type)){ + if (CollectionUtils.isNotEmpty(list)){ + baseDao.updateRelation(list); + } + }else { + baseDao.updateRelationOther(); + } } /** @@ -542,6 +590,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp return; } + // 存在某时间的核酸检测信息 if (resiNat != null) { boolean needUpdate = false; // 有这个人，也是导入的，那就要更新le @@ -593,8 +642,9 @@ public class IcNatServiceImpl extends BaseServiceImpl imp } // 还要创建关系。只有本辖区及下级居民，才建立关系 + // 2022-10-25 修改：导入的都插入关系 if (resi != null) { - createNatRelation(resiNat.getId(), resi.getAgencyId(), resi.getPids()); + createNatRelation(resiNat.getId(), resi.getAgencyId(), agencyPids,agencyId); } return; @@ -609,7 +659,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp // 还要创建关系。只有本辖区及下级居民，才建立关系 if (resi != null) { - createNatRelation(e.getId(), resi.getAgencyId(), resi.getPids()); + createNatRelation(e.getId(), resi.getAgencyId(), agencyPids,agencyId); } } @@ -649,11 +699,15 @@ public class IcNatServiceImpl extends BaseServiceImpl imp /** * 创建nat关系 * @param natId - * @param currentUserAgencyId + * @param currentUserAgencyId 居民所属组织 + * @param staffAgencyId 工作人员所属组织 + * @param agencyPids 工作人员所属组织路径 */ - private void createNatRelation(String natId, String currentUserAgencyId, String agencyPids) { + private void createNatRelation(String natId, String currentUserAgencyId, String agencyPids,String staffAgencyId) { // 没有关系创建关系，有关系就跳过 + // 2022-10-25 修改：不管是不是本辖区居民，都创建关系，用 is_local_resi_user区分是不是本辖区居民 + // 组织ID都改成工作人员所属组织ID LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcNatRelationEntity::getIcNatId, natId); query.eq(IcNatRelationEntity::getAgencyId, currentUserAgencyId); @@ -666,6 +720,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp relation.setPids(String.join(":", Arrays.asList(agencyPids, currentUserAgencyId))); relation.setIcNatId(natId); relation.setUserType("import"); + relation.setIsLocalResiUser(agencyPids.contains(currentUserAgencyId) ? NumConstant.ONE_STR : NumConstant.ZERO_STR); icNatRelationDao.insert(relation); } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index 81b1c78e4f..63f7f4b726 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -75,7 +75,7 @@ AND b.sample_time #{sampleEndTime} - AND b.is_local_resi_user = #{isResiUser} + AND a.is_local_resi_user = #{isResiUser} ORDER BY b.nat_time DESC, b.id ASC @@ -169,6 +169,29 @@ + + + + DELETE FROM ic_nat WHERE id = #{icNatId} @@ -222,4 +245,27 @@ ) + + + + UPDATE ic_nat_relation + + + + when ID = #{l.relationId} then #{l.isLocalResiUser} + + + UPDATED_TIME = NOW() + + WHERE ID IN( + + #{l.relationId} + ) + + + UPDATE ic_nat_relation + set IS_LOCAL_RESI_USER = '1', + UPDATED_TIME = NOW() + where user_type != 'import' + 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 b5f8788719..1203976d6c 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 @@ -1391,7 +1391,7 @@ FROM ic_resi_user WHERE DEL_FLAG = '0' AND `STATUS` = 0 - AND AGENCY_ID = #{agencyId} + AND PIDS LIKE CONCAT('%',#{agencyId},'%') AND ID_CARD = #{idCard}) AS isLocal, COUNT(ID) AS isResi, id as userId From b56bed065a3ce1339f5717c96e39920621a17b19 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 12:03:03 +0800 Subject: [PATCH 321/621] =?UTF-8?q?=E7=BB=84=E7=BB=87ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 7179573098..f7af284abc 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -80,16 +80,15 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService for (UserData u : data) { CustomerStaffInfoDTOCache staffInfo = CustomerStaffRedis.getStaffInfoByMobile(customerId, u.getMobileTelephoneNumber()); DataSyncUserDataEntity entity = ConvertUtils.sourceToTarget(u, DataSyncUserDataEntity.class); + entity.setOrganizationId(org.getOrganizationId()); entity.setCustomerId(customerId); entity.setRemark(""); if (null == staffInfo){ entity.setStatus(NumConstant.ZERO_STR); - entity.setOrganizationId(""); entity.setStaffId(""); }else { CustomerStaffInfoCacheResult staffInfo1 = CustomerStaffRedis.getStaffInfo(customerId, staffInfo.getUserId()); entity.setStatus(NumConstant.ONE_STR); - entity.setOrganizationId(null == staffInfo1 ? "" : staffInfo1.getAgencyId()); entity.setStaffId(staffInfo.getUserId()); } needInsert.add(entity); From 47c5a4d4bce0b76aa582980e9450b03c53b7b051 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 13:25:02 +0800 Subject: [PATCH 322/621] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=AC=E6=9C=BA?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/api/yt/YantaiApi.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java index 95a54779b0..8cf49c6410 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java @@ -50,6 +50,49 @@ public class YantaiApi { */ //private static final String SSO_BACKGROUND_SERVER_URL = "http://120.220.248.247:8081/"; + /** + * desc:根据组织id获取本级组织信息 + * + * @param organizationId + * @return + */ + public static OrgData getOuInfoByOuGuid(String organizationId) { + try { + if (StringUtils.isBlank(organizationId)) { + throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + } + //加密 + String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId); + //pwd = URLEncoder.encode(pwd, "UTF-8"); + String url = SSO_BACKGROUND_SERVER_URL + "person/ouinfo/getOuInfoByOuGuid"; + + Map paramMap = new HashMap<>(); + paramMap.put("organizationId",organizationIdEn); + + log.info("getOuInfoByOuGuid request param:{} url:{}",paramMap, url); + Result result = HttpClientManager.getInstance().sendGet(url, paramMap, getApiHeaderMap()); + log.info("getOuInfoByOuGuid request result:{}", result); + if (!result.success()){ + return new OrgData(); + } + JSONObject jsonObject = JSONObject.parseObject(result.getData()); + String secondCode = jsonObject.getString("code"); + String secondMessage = jsonObject.getString("message"); + if (!"200".equals(secondCode)) { + log.warn("getOuInfoByOuGuid 接口错误"); + return new OrgData(); + } + //解密 + String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data")); + OrgData orgData = JSON.parseObject(data, OrgData.class); + log.info("getChildOuInfoByGuid request real result:{}", JSON.toJSONString(orgData)); + return orgData; + } catch (Exception e) { + log.error("getChildOuInfoByGuid exception", e); + } + return new OrgData(); + } + /** * desc:根据组织id获取下级组织 * @@ -245,6 +288,8 @@ public class YantaiApi { //getLoginToken("0d554bccfbac4be3846d643252daf92b"); String organizationId = "44e05de9-34fa-48f6-b89f-02838d792cf9"; + OrgData ouInfoByOuGuid = getOuInfoByOuGuid(organizationId); + System.out.println("ouInfoByOuGuid:"+JSON.toJSONString(ouInfoByOuGuid)); List childOuInfoByGuid = getChildOuInfoByGuid(organizationId); System.out.println("childOuInfoByGuid:"+JSON.toJSONString(childOuInfoByGuid)); //先用他说的有人的组织id联调 From b1f71eb64ff0b1e746c896eddf1c8c73c94369e4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 13:50:09 +0800 Subject: [PATCH 323/621] =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSyncRecordDisabilityServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index e3d397c44d..d91d29cc3a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -97,7 +98,10 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl Date: Tue, 25 Oct 2022 14:24:12 +0800 Subject: [PATCH 324/621] MOBILE_TELEPHONE_NUMBER --- .../src/main/resources/mapper/yantai/DataSyncUserDataDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml index 8e7241fcd4..c989699e9f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncUserDataDao.xml @@ -37,7 +37,7 @@ else o.ORGANIZATIO_NABBREVIATION end)as orgName, u.USER_NAME AS userName, - u.TELEPHONE_NUMBER AS telephoneNumber, + u.MOBILE_TELEPHONE_NUMBER AS telephoneNumber, u.GENDER AS gender, u.`STATUS` AS status, IFNULL(u.STAFF_ID,'') AS staffId, From f1824bf0abd103589321a5e90e90f2d72d044786 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 14:30:42 +0800 Subject: [PATCH 325/621] emm --- .../commons/tools/utils/api/yt/OrgData.java | 13 ++++++ .../yantai/DataSyncUserAndOrgServiceImpl.java | 41 +++++++++++++++---- .../epmet/dao/yantai/DataSyncOrgDataDao.java | 2 + .../epmet/dao/yantai/DataSyncUserDataDao.java | 3 ++ .../epmet/service/DataSyncOrgDataService.java | 2 + .../service/DataSyncUserDataService.java | 2 + .../impl/DataSyncOrgDataServiceImpl.java | 6 +++ .../impl/DataSyncUserDataServiceImpl.java | 5 +++ .../db/migration/V0.0.18__yt_alter_sync.sql | 1 + .../mapper/yantai/DataSyncOrgDataDao.xml | 6 +++ .../mapper/yantai/DataSyncUserDataDao.xml | 6 +++ 11 files changed, 78 insertions(+), 9 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.18__yt_alter_sync.sql diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/OrgData.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/OrgData.java index 6c7ea48907..b5b7e96e09 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/OrgData.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/OrgData.java @@ -74,6 +74,19 @@ public class OrgData implements Serializable { */ private String unifiedSocialCreditId; + /** + * 上级ID + */ + private String pid; + /** + * orgId全路径 + */ + private String pids; + + /** + * 上级组织名 + */ + private String parentOrgName; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index f7af284abc..5f2ae5c4fc 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -63,6 +63,11 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService @Override public Boolean yanTaiSyncUser(String organizationId) { String customerId = YT_CUSTOMER_ID; + // 先删除 旧数据 + Integer delSize = NumConstant.ZERO; + do { + delSize = dataSyncUserDataService.deleteByCustomerId(customerId); + }while (delSize == NumConstant.ONE_THOUSAND); // 缓存初始化staffs epmetUserOpenFeignClient.allCustomerStaffInCache(customerId); Integer no = NumConstant.ONE; @@ -106,19 +111,34 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService @Override public Boolean yanTaiSyncOrg(String organizationId) { + // 先删除 旧数据 + Integer delSize = NumConstant.ZERO; + do { + delSize = dataSyncOrgDataService.deleteByCustomerId(YT_CUSTOMER_ID); + }while (delSize == NumConstant.ONE_THOUSAND); + List needInsert = new ArrayList<>(); + // 根组织 + OrgData rootOrg = YantaiApi.getOuInfoByOuGuid(organizationId); + if (null == rootOrg){ + log.error("未查询到根组织："+organizationId); + return true; + } + rootOrg.setPid(""); + rootOrg.setPids(""); + rootOrg.setNameOfOrganization(""); + needInsert.add(rootOrg); List data = YantaiApi.getChildOuInfoByGuid(organizationId); if (CollectionUtils.isNotEmpty(data)){ - List needInsert = new ArrayList<>(); data.forEach(d -> { + d.setPid(organizationId); + d.setPids(organizationId.concat(":").concat(d.getOrganizationId())); + d.setNameOfOrganization(rootOrg.getNameOfOrganization()); needInsert.add(d); - disposeYanTaiSyncOrg(d.getOrganizationId(),needInsert); + disposeYanTaiSyncOrg(d,needInsert); }); List entities = needInsert.stream().map(m -> { DataSyncOrgDataEntity entity = ConvertUtils.sourceToTarget(m, DataSyncOrgDataEntity.class); entity.setCustomerId(YT_CUSTOMER_ID); - entity.setPid(""); - entity.setParentOrgName(""); - entity.setPids(""); return entity; }).collect(Collectors.toList()); dataSyncOrgDataService.insertBatch(entities, NumConstant.ONE_HUNDRED); @@ -126,12 +146,15 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService return false; } - public void disposeYanTaiSyncOrg(String organizationId, List needInsert){ - List data = YantaiApi.getChildOuInfoByGuid(organizationId); + public void disposeYanTaiSyncOrg(OrgData orgData, List needInsert){ + List data = YantaiApi.getChildOuInfoByGuid(orgData.getOrganizationId()); if (CollectionUtils.isNotEmpty(data)){ - needInsert.addAll(data); data.forEach(d -> { - disposeYanTaiSyncOrg(d.getOrganizationId(),needInsert); + d.setPid(orgData.getOrganizationId()); + d.setPids(orgData.getPids().concat(":").concat(d.getOrganizationId())); + d.setNameOfOrganization(orgData.getNameOfOrganization()); + needInsert.add(d); + disposeYanTaiSyncOrg(d,needInsert); }); } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java index b0b0529b62..b9f2a0eca4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java @@ -24,4 +24,6 @@ public interface DataSyncOrgDataDao extends BaseDao { List queryList(@Param("pid") String pid); List getAllList(@Param("customerId") String customerId); + + Integer deleteByCustomerId(@Param("customerId")String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java index f1bc42e2e8..b36d45240b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncUserDataDao.java @@ -38,4 +38,7 @@ public interface DataSyncUserDataDao extends BaseDao { @Param("staffId")String staffId, @Param("name")String name, @Param("mobile")String mobile); + + Integer deleteByCustomerId(@Param("customerId")String customerId); + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncOrgDataService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncOrgDataService.java index 3a3d40fe2d..72b77a4888 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncOrgDataService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/DataSyncOrgDataService.java @@ -75,4 +75,6 @@ public interface DataSyncOrgDataService extends BaseService + + delete from data_sync_org_data + where customer_id = #{customerId} + and del_flag = 0 + limit 1000 + From d9922197aa2ffd88445661ad16bea20167c9ce1e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Oct 2022 14:33:13 +0800 Subject: [PATCH 326/621] =?UTF-8?q?=E5=8A=A0=E4=BF=A9=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.18__yt_alter_sync.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.18__yt_alter_sync.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.18__yt_alter_sync.sql index 73315b0673..930f3df2e4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.18__yt_alter_sync.sql +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.18__yt_alter_sync.sql @@ -1 +1,4 @@ -alter table data_sync_org_data modify column PIDS varchar(1024) comment '所有上级组织。不包含本身！如果是根组织，此列为空串' \ No newline at end of file +alter table data_sync_org_data modify column PIDS varchar(1024) comment '所有上级组织。不包含本身！如果是根组织，此列为空串'; + +CREATE INDEX idx_data_sync_orgid on data_sync_org_data(ORGANIZATION_ID); +CREATE INDEX idx_data_sync_userorgid on data_sync_user_data(ORGANIZATION_ID); \ No newline at end of file From adc91f5c0d7f27bc236fb90078bcb294e493a1a7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Oct 2022 14:39:53 +0800 Subject: [PATCH 327/621] /epmetuser/icNatCompareRecord/page --- .../src/main/resources/mapper/IcNatCompareRecordDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml index 5015b8612a..cc94b06d4b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml @@ -58,10 +58,10 @@ - AND DATE_FORMAT( r.LATEST_NAT_TIME, '%Y%m%d' ) = #{natDate} + AND DATE_FORMAT( c.LATEST_NAT_TIME, '%Y%m%d' ) = #{natDate} - AND DATE_FORMAT( r.LATEST_NAT_TIME, '%Y%m%d' ) != #{natDate} + AND DATE_FORMAT( c.LATEST_NAT_TIME, '%Y%m%d' ) != #{natDate} ORDER BY From 195e2c617d04ca24dcbf83294782ecaa100aaf08 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 15:04:07 +0800 Subject: [PATCH 328/621] emm --- .../controller/yantai/DataSyncUserAndOrgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 5f2ae5c4fc..16d281ed0c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -67,7 +67,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService Integer delSize = NumConstant.ZERO; do { delSize = dataSyncUserDataService.deleteByCustomerId(customerId); - }while (delSize == NumConstant.ONE_THOUSAND); + }while (null != delSize && delSize == NumConstant.ONE_THOUSAND); // 缓存初始化staffs epmetUserOpenFeignClient.allCustomerStaffInCache(customerId); Integer no = NumConstant.ONE; @@ -115,7 +115,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService Integer delSize = NumConstant.ZERO; do { delSize = dataSyncOrgDataService.deleteByCustomerId(YT_CUSTOMER_ID); - }while (delSize == NumConstant.ONE_THOUSAND); + }while (null != delSize && delSize == NumConstant.ONE_THOUSAND); List needInsert = new ArrayList<>(); // 根组织 OrgData rootOrg = YantaiApi.getOuInfoByOuGuid(organizationId); From 970e59652d2293733e56a936fb31347e04a026a8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 15:18:09 +0800 Subject: [PATCH 329/621] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/DataSyncRecordDisabilityDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml index bca57f359e..1d16260551 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml @@ -112,7 +112,7 @@ when id = #{item.id} then '处理失败' - when id = #{item.id} then '处理成功' + when id = #{item.id} then '' From 076482840ab1755b46ffbffc1f97de361276e4df Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Oct 2022 15:34:05 +0800 Subject: [PATCH 330/621] todo --- .../epmet/controller/IcNeighborHoodController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index f44e52c44f..894e31c4bc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -151,6 +151,19 @@ public class IcNeighborHoodController { return new Result>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId())); } + /** + * 入参：gridId、agencyId + * 返回当前组织及下级下的所有小区 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("neighborhood-options") + public Result> queryNeighborHoodOptions(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { + // List list=icNeighborHoodService.queryNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId()); + return new Result>().ok(null); + } + /** * 获取用户组织下小区列表 * From 1b69f4e0838c5758e2254ea816c47c79c99b0e96 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 15:39:35 +0800 Subject: [PATCH 331/621] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSyncRecordDisabilityServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java index d91d29cc3a..4ee1cdb64e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java @@ -245,6 +245,7 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl all = Arrays.asList(ids); + // 根据IDs查询烟台拉取的残疾信息 List entities = baseDao.selectBatchIds(all); IcFormOptionsQueryFormDTO formDTO = new IcFormOptionsQueryFormDTO(); formDTO.setCustomerId(customerId); @@ -273,7 +274,8 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl StringUtils.isBlank(e.getCjzk()) || StringUtils.isBlank(e.getCjlb())).forEach(e -> e.setUpdateStatus(true)); + // cjzk，cjlb为空的，处理结果赋值 处理失败 +// entities.stream().filter(e -> StringUtils.isBlank(e.getCjzk()) || StringUtils.isBlank(e.getCjlb())).forEach(e -> e.setUpdateStatus(true)); // 变更记录 List collect = entities.stream().map(m -> { CategoryStatusAndIdDTO dto = new CategoryStatusAndIdDTO(); From cd64f360cdacb8375d924fb7d65bcbd47e264fbc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Oct 2022 16:07:15 +0800 Subject: [PATCH 332/621] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8Cgov/org/icneighborhood/neighborhood-options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/NeighborHoodOptionFormDTO.java | 23 +++++++++++++++++ .../controller/IcNeighborHoodController.java | 11 +++++--- .../java/com/epmet/dao/IcNeighborHoodDao.java | 4 +++ .../epmet/service/IcNeighborHoodService.java | 8 ++++++ .../impl/IcNeighborHoodServiceImpl.java | 25 +++++++++++++++++++ .../resources/mapper/IcNeighborHoodDao.xml | 15 +++++++++++ 6 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/NeighborHoodOptionFormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/NeighborHoodOptionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/NeighborHoodOptionFormDTO.java new file mode 100644 index 0000000000..dbb6177931 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/NeighborHoodOptionFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/10/25 15:44 + */ +@Data +public class NeighborHoodOptionFormDTO extends PageFormDTO { + private String agencyId; + private String gridId; + private String neighborHoodName; + + /** + * 当前登录用户：： + */ + private String staffId; + private String customerId; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 894e31c4bc..a8cf04b4cb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -39,6 +39,7 @@ import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.NeighborHoodOptionFormDTO; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -155,13 +156,15 @@ public class IcNeighborHoodController { * 入参：gridId、agencyId * 返回当前组织及下级下的所有小区 * @param tokenDto - * @param dto + * @param formDTO * @return */ @PostMapping("neighborhood-options") - public Result> queryNeighborHoodOptions(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) { - // List list=icNeighborHoodService.queryNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId()); - return new Result>().ok(null); + public Result> queryNeighborHoodOptions(@LoginUser TokenDto tokenDto, @RequestBody NeighborHoodOptionFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + List list=icNeighborHoodService.queryNeighborHoodOptions(formDTO); + return new Result>().ok(list); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index afe0374247..2fd4f25eee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -18,12 +18,14 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseInformationFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; +import com.epmet.dto.form.NeighborHoodOptionFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcHouseEntity; import com.epmet.entity.IcNeighborHoodEntity; @@ -220,4 +222,6 @@ public interface IcNeighborHoodDao extends BaseDao { * @return */ IcNeighborHoodEntity getNeighborHoodInfoByName(CheckHouseInfoFormDTO formDTO); + + List queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index 266d0f9b41..2755cf3af0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -27,6 +27,7 @@ import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.NeighborHoodAndManagementDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; +import com.epmet.dto.form.NeighborHoodOptionFormDTO; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.IcNeighborHoodDetailDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; @@ -195,4 +196,11 @@ public interface IcNeighborHoodService extends BaseService * @return com.epmet.commons.tools.utils.Result */ Result neighborhoodDetail(String neighborhoodId); + + /** + * 返回当前组织及下级下的所有小区 + * @param formDTO + * @return + */ + List queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index e14ea745ab..719bb0c27c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -51,6 +51,7 @@ import com.epmet.dto.*; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.NeighborHoodOptionFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.excel.IcNeighborHoodExcel; @@ -824,4 +825,28 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl().ok(result); } + /** + * 返回当前组织及下级下的所有小区 + * + * @param formDTO + * @return + */ + @Override + public List queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getGridId()) && StringUtils.isBlank(formDTO.getAgencyId())) { + // 默认查询当前工作人员所属组织及下级的 + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + formDTO.setAgencyId(staffInfoCacheResult.getAgencyId()); + } + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.queryNeighborHoodOptions(formDTO); + return list; + } + + + + + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 96ec0dd57f..1a0b871150 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -673,4 +673,19 @@ + From ce06ac05d5053a371319aa172dd9f12b38915607 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Oct 2022 16:30:48 +0800 Subject: [PATCH 333/621] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8Cgov/org/icneighborhood/neighborhood-options=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 1a0b871150..0120d31bb0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -682,9 +682,15 @@ WHERE h.DEL_FLAG = '0' AND h.CUSTOMER_ID = #{customerId} - AND ( h.AGENCY_ID = #{agencyId} OR h.AGENCY_PIDS LIKE concat( '%', #{agencyId}, '%' ) ) - and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%') - and h.GRID_ID=#{gridId} + + AND ( h.AGENCY_ID = #{agencyId} OR h.AGENCY_PIDS LIKE concat( '%', #{agencyId}, '%' ) ) + + + and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%') + + + and h.GRID_ID=#{gridId} + ORDER BY h.NEIGHBOR_HOOD_NAME ASC From 10239dd05e5c91e8b2402ae67d5232ddea008552 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Oct 2022 16:37:01 +0800 Subject: [PATCH 334/621] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 719bb0c27c..56e473038d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -838,7 +838,6 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl list = baseDao.queryNeighborHoodOptions(formDTO); return list; } From 9b5d77f4d29c4d1f14e3c747fa7738a5d00e145a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 16:53:01 +0800 Subject: [PATCH 335/621] xin zeng --- .../java/com/epmet/service/impl/IcNatServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 21b2a973a3..0a7c8e5a3c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -134,14 +134,16 @@ public class IcNatServiceImpl extends BaseServiceImpl imp if (null == staffInfo){ throw new EpmetException(String.format("获取工作人员信息失败%s", formDTO.getStaffId())); } + ResiAndLocalResiResultDTO resiCount = icResiUserDao.getResiCount(formDTO.getAgencyId(), formDTO.getIdCard(), formDTO.getCustomerId()); //2.新增核酸基础信息数据 IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); - if (StringUtils.isNotBlank(formDTO.getUserId())) { + /*if (StringUtils.isNotBlank(formDTO.getUserId())) { entity.setIsResiUser("1"); - } + }*/ + entity.setIsResiUser(org.apache.commons.lang3.StringUtils.isNotBlank(resiCount.getUserId()) ? NumConstant.ONE_STR : NumConstant.ZERO_STR); + entity.setUserId(null == resiCount.getUserId() ? "" : resiCount.getUserId()); insert(entity); //3.核酸记录关系表新增与组织的关系数据 - ResiAndLocalResiResultDTO resiCount = icResiUserDao.getResiCount(formDTO.getAgencyId(), formDTO.getIdCard(), formDTO.getCustomerId()); IcNatRelationEntity relationEntity = ConvertUtils.sourceToTarget(formDTO, IcNatRelationEntity.class); relationEntity.setIcNatId(entity.getId()); relationEntity.setIsLocalResiUser(resiCount.getIsLocal() == NumConstant.ZERO ? NumConstant.ZERO_STR : NumConstant.ONE_STR); From b3d16dbef995da7413d9ed75ad0f8113d21c4187 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 17:18:32 +0800 Subject: [PATCH 336/621] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=B1=85=E6=B0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/NatListResultDTO.java | 6 ++++++ .../src/main/resources/mapper/IcNatDao.xml | 1 + 2 files changed, 7 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java index ee3f03e5e9..a93294b14f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java @@ -89,6 +89,12 @@ public class NatListResultDTO implements Serializable { @ExcelIgnore private String isResiUser; + /** + * 是否本辖区居民(0:否 1:是) + */ + @ExcelIgnore + private String isLocalResiUser; + /** * 检测地点 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index 63f7f4b726..37fcc7dc3b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -38,6 +38,7 @@ a.user_type userType, b.user_id userId, b.is_resi_user isResiUser, + a.is_local_resi_user isLocalResiUser, b.`name` `name`, b.mobile mobile, b.id_card idCard, From d45190b67474010c236066ccedbcdd62bb2640c8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Oct 2022 17:34:20 +0800 Subject: [PATCH 337/621] ; --- .../main/resources/db/migration/V0.0.78__ic_nat_add_local.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql index ef7236dae3..8102f6a087 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql @@ -1 +1 @@ -alter table ic_nat_relation add COLUMN `IS_LOCAL_RESI_USER` VARCHAR(1) COMMENT '是否本辖区居民，1：是；0：否'after IC_NAT_ID \ No newline at end of file +alter table ic_nat_relation add COLUMN `IS_LOCAL_RESI_USER` VARCHAR(1) COMMENT '是否本辖区居民，1：是；0：否'after IC_NAT_ID; \ No newline at end of file From 8221c1bc4b43b3de5661bcbd5b968ea3d668b96b Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 19:56:38 +0800 Subject: [PATCH 338/621] =?UTF-8?q?gov-voice=20=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=20=E5=85=9A=E5=BB=BA=E5=A3=B0?= =?UTF-8?q?=E9=9F=B3=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/TagServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java index ce703e9f18..0803ba91dd 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.PostConstruct; import java.util.*; import java.util.stream.Collectors; @@ -133,6 +134,7 @@ public class TagServiceImpl implements TagService { return tagRedis.getResiTag(formDto); } + @PostConstruct @Override public Boolean initTag(InitTagFormDTO formDto) { List customerTagList = tagCustomerDao.selectInitData(formDto.getCustomerIdList()); From 9d37d0c2b37172a3632756be160be7e606fd5f78 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 20:13:21 +0800 Subject: [PATCH 339/621] =?UTF-8?q?Revert=20"gov-voice=20=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E5=88=9D=E5=A7=8B=E5=8C=96=20=E5=85=9A?= =?UTF-8?q?=E5=BB=BA=E5=A3=B0=E9=9F=B3=E6=A0=87=E7=AD=BE"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8221c1bc --- .../src/main/java/com/epmet/service/impl/TagServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java index 0803ba91dd..ce703e9f18 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java @@ -24,7 +24,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.annotation.PostConstruct; import java.util.*; import java.util.stream.Collectors; @@ -134,7 +133,6 @@ public class TagServiceImpl implements TagService { return tagRedis.getResiTag(formDto); } - @PostConstruct @Override public Boolean initTag(InitTagFormDTO formDto) { List customerTagList = tagCustomerDao.selectInitData(formDto.getCustomerIdList()); From 3b55d153163d84aa5e473a5b3784684a7f0398e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 20:17:38 +0800 Subject: [PATCH 340/621] =?UTF-8?q?gov-voice=20=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=20=E5=85=9A=E5=BB=BA=E5=A3=B0?= =?UTF-8?q?=E9=9F=B3=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/TagServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java index ce703e9f18..cbfba74bb5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.PostConstruct; import java.util.*; import java.util.stream.Collectors; @@ -46,6 +47,12 @@ public class TagServiceImpl implements TagService { @Autowired private ArticlePublishRangeDao articlePublishRangeDao; + @PostConstruct + public void initDataToRedis(){ + //加载党建声音标签到redis + this.initTag(new InitTagFormDTO()); + } + /** * @Description 已发布列表页的标签——政府端 * @param tokenDto From 9ec98cd171ca37cc34f20e9eea035f2208ebc3b6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 10:07:34 +0800 Subject: [PATCH 341/621] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E5=8D=AB=E4=B8=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=89=80=E5=B1=9E=E5=85=9A=E6=94=AF=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/GetListSocietyOrgFormDTO.java | 5 +++ .../controller/IcSocietyOrgController.java | 3 +- .../service/impl/ActLiveRecServiceImpl.java | 3 +- .../service/impl/IcSocietyOrgServiceImpl.java | 5 +-- .../dto/form/CustomerFootBarFormDTO.java | 2 +- .../service/impl/ResiGroupServiceImpl.java | 3 ++ .../partymember/IcPartymemberStyleDTO.java | 6 ++-- .../IcPartymemberStyleController.java | 1 + .../impl/IcPartymemberStyleServiceImpl.java | 3 ++ .../service/impl/IcResiUserServiceImpl.java | 35 +++++++++++++------ 10 files changed, 49 insertions(+), 17 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java index 9f0357a1d7..f13cef1bb6 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java @@ -57,4 +57,9 @@ public class GetListSocietyOrgFormDTO implements Serializable { //token中userId所属组织Id private String agencyId; + /** + * resi:居民端 + */ + private String app; + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 3267ef36bb..89159c015b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -142,6 +142,7 @@ public class IcSocietyOrgController implements ResultDataResolver { public Result getList(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setApp(tokenDto.getApp()); return new Result().ok(societyOrgService.getList(formDTO)); } @@ -171,7 +172,7 @@ public class IcSocietyOrgController implements ResultDataResolver { // formDTO.setIsPage(false); // GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO); // ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExportExcel.class); - + formDTO.setApp(tokenDto.getApp()); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); formDTO.setIsPage(false); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java index c45a4aeadc..4ef1610fd0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; @@ -95,7 +96,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl liveRecList(TokenDto tokenDto,Map map) { if (!map.containsKey("actId") || StringUtils.isEmpty(map.get("actId"))) { logger.warn("传参中没有actId,或者actId为空,userId:" + tokenDto.getUserId() + "客户id:" + tokenDto.getCustomerId()); - throw new RenException("actId不能为空"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"actId不能为空","活动id不能为空"); } // 数据汇总 ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 063064f9cd..013ea62d1c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -148,10 +149,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl achievementList = new ArrayList<>(); //1.小组创建时间 ResiGroupEntity group = baseDao.selectById(formDTO.getGroupId()); + if (null == group) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "resi_group is null groupId:" + formDTO.getGroupId(), "小组不存在"); + } resultDTO.setCreatedDate(DateUtils.dateToTimestamp(group.getCreatedTime())); //2.即将完成的3个成就 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java index a2cda91a24..6e567e606a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java @@ -19,6 +19,7 @@ package com.epmet.resi.partymember.dto.partymember; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -34,10 +35,11 @@ import java.util.List; public class IcPartymemberStyleDTO implements Serializable { private static final long serialVersionUID = 1L; - + public interface DetailGroup {} /** - * 楼栋主键 + * 主键 */ + @NotBlank(message = "党员风采主键不能为空",groups = DetailGroup.class) private String id; /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java index ef2469b7b0..786f22d542 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java @@ -84,6 +84,7 @@ public class IcPartymemberStyleController { @PostMapping("detail") public Result get(@RequestBody IcPartymemberStyleDTO dto) { + ValidatorUtils.validateEntity(dto,IcPartymemberStyleDTO.DetailGroup.class); IcPartymemberStyleDTO data = icPartymemberStyleService.get(dto.getId()); return new Result().ok(data); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index d277201298..435038822f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -156,6 +156,9 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { if (!hash.containsKey("SSZB")) { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } } } else { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } partyMemberDTO.setCustomerId(tokenDto.getCustomerId()); @@ -541,20 +547,29 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } } } else { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } } else if (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty())) { if (formMap.containsKey("ic_party_member")) { for (LinkedHashMap hash : formMap.get("ic_party_member")) { if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } } } From ef470302c76069dce30f698a2d096e437e15ecc9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 26 Oct 2022 12:11:40 +0800 Subject: [PATCH 342/621] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/filter/LogMsgSendFilter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index 9164f6d142..dd7bc540ed 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -49,6 +49,10 @@ public class LogMsgSendFilter extends LevelFilter { //如果日志级别等于设置的日志级别 则发送消息 if (event.getLevel().isGreaterOrEqual(Level.ERROR)) { try { + //排除其他包路径的东西 + if (!event.getLoggerName().startsWith(baseProjectPackage)){ + return FilterReply.DENY; + } getServerInfo(); if (EnvEnum.LOCAL.getName().equals(activeEnv)){ //交给其他filter继续向下处理 From 68578f08ee58224af3195cc2972deb134ea67413 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 13:48:15 +0800 Subject: [PATCH 343/621] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=9C=BA=E6=89=80=E7=B1=BB?= =?UTF-8?q?=E5=88=ABplace=5Fcategory=E3=80=81=E8=A7=84=E6=A8=A1scale=5Ftot?= =?UTF-8?q?al?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/entity/IcEnterpriseEntity.java | 15 +++++++++++- .../db/migration/V0.0.44__place_category.sql | 24 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java index d022fabf3d..e0377272f7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java @@ -45,6 +45,12 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { */ private String placeType; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + private String PLACE_CATEGORY; /** * 场所名称 */ @@ -66,7 +72,8 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { private String latitude; /** - * 字典value,场所规模【 + * 10.26需求：此列就不再用了 + * 字典value,场所规模【 0:10人以下 1:10-20人 2:21-40人 @@ -75,6 +82,12 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { */ private String scale; + /** + * 10.26需求： + * 规模，手输数字 + */ + private Integer scaleTotal; + /** * 场所负责人 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql new file mode 100644 index 0000000000..cc1680ef63 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql @@ -0,0 +1,24 @@ +alter table ic_enterprise MODIFY COLUMN `SCALE` varchar(128) NOT NULL DEFAULT'-1' COMMENT '已弃用该字段，字典value,场所规模【\r\n0:10人以下\r\n1:10-20人\r\n2:21-40人\r\n3:41-100人\r\n4:100人以上】'; +alter table ic_enterprise ADD COLUMN `SCALE_TOTAL` int(11) NOT NULL COMMENT '规模，手输数字' AFTER SCALE; +alter table ic_enterprise add COLUMN PLACE_CATEGORY varchar(32) NOT NULL DEFAULT '0' COMMENT '场所类别：0九小场所、1企事业单位' after PLACE_TYPE; + + +update ic_enterprise e +set e.SCALE_TOTAL=5 +where e.SCALE=0; + +update ic_enterprise e +set e.SCALE_TOTAL=15 +where e.SCALE=1; + +update ic_enterprise e +set e.SCALE_TOTAL=30 +where e.SCALE=2; + +update ic_enterprise e +set e.SCALE_TOTAL=70 +where e.SCALE=3; + +update ic_enterprise e +set e.SCALE_TOTAL=100 +where e.SCALE=4; From 41942101a71916234582961b59d95bed56404ecf Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 26 Oct 2022 13:49:47 +0800 Subject: [PATCH 344/621] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/filter/LogMsgSendFilter.java | 2 +- .../tools/utils/DingdingMsgSender.java | 101 ++++++++++++------ 2 files changed, 72 insertions(+), 31 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index dd7bc540ed..bec26ea89d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -51,7 +51,7 @@ public class LogMsgSendFilter extends LevelFilter { try { //排除其他包路径的东西 if (!event.getLoggerName().startsWith(baseProjectPackage)){ - return FilterReply.DENY; + return super.decide(event); } getServerInfo(); if (EnvEnum.LOCAL.getName().equals(activeEnv)){ diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java index bb663ac327..b4912c17ee 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java @@ -1,6 +1,8 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; +import com.dingtalk.api.DefaultDingTalkClient; +import com.dingtalk.api.request.OapiRobotSendRequest; import com.epmet.commons.tools.dto.form.DingTalkTextMsg; import com.google.common.collect.Lists; import org.apache.commons.codec.binary.Base64; @@ -12,9 +14,13 @@ import org.springframework.stereotype.Component; import javax.annotation.PreDestroy; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; +import javax.validation.constraints.NotNull; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; import java.util.concurrent.ArrayBlockingQueue; /** @@ -115,36 +121,71 @@ public class DingdingMsgSender { running = false; } - /** - * 发送POST 请求 - * - * @param param 请求参数，JSON格式 - * @return - */ - private Result sendMsg(DingTalkTextMsg param) { - if (StringUtils.isBlank(param.getWebHook())) { - param.setWebHook(webHook); - } - if (StringUtils.isBlank(param.getSecret())) { - param.setSecret(secret); - } - Result result = new Result().error(); - Long timestamp = System.currentTimeMillis(); - try { - String stringToSign = timestamp + "\n" + param.getSecret(); - Mac mac = Mac.getInstance("HmacSHA256"); - mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256")); - byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)); - String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); - String url = param.getWebHook(); - url = url.concat("×tamp=" + timestamp + "&sign=" + sign); - String jsonStrParam = param.getMsgContent(); - result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam); - } catch (Exception e) { - logger.warn("sendPostByJSON error", e); - } - return result; - } + /** + * 发送POST 请求 + * + * @param param 请求参数，JSON格式 + * @return + */ + @Deprecated + private Result sendMsg(DingTalkTextMsg param) { + if (StringUtils.isBlank(param.getWebHook())) { + param.setWebHook(webHook); + } + if (StringUtils.isBlank(param.getSecret())) { + param.setSecret(secret); + } + Result result = new Result().error(); + try { + String url = getUrlString(param, System.currentTimeMillis()); + String jsonStrParam = param.getMsgContent(); + result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam); + } catch (Exception e) { + logger.warn("sendPostByJSON error", e); + } + return result; + } + + @NotNull + private String getUrlString(DingTalkTextMsg param, Long timestamp) throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException { + String stringToSign = timestamp + "\n" + param.getSecret(); + Mac mac = Mac.getInstance("HmacSHA256"); + mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256")); + byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)); + String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); + String url = param.getWebHook(); + url = url.concat("×tamp=" + timestamp + "&sign=" + sign); + return url; + } + + /** + * 发送POST 请求 + * + * @param param 请求参数，JSON格式 + * @return + */ + public Result sendMsgSdk(DingTalkTextMsg param) { + if (StringUtils.isBlank(param.getWebHook())) { + param.setWebHook(webHook); + } + if (StringUtils.isBlank(param.getSecret())) { + param.setSecret(secret); + } + Result result = new Result().error(); + try { + String url = getUrlString(param, System.currentTimeMillis()); + DefaultDingTalkClient client = new DefaultDingTalkClient(url); + OapiRobotSendRequest request = new OapiRobotSendRequest(); + request.setMsgtype("text"); + OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text(); + text.setContent("sdk"+param.getContent()); + request.setText(text); + client.execute(request); + } catch (Exception e) { + logger.warn("sendPostByJSON error", e); + } + return result; + } public static void main(String[] args) { for (int i = 0; i < 50; i++) { From 4702a8f222e2f98f727dfa37440519020c79619e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 13:49:55 +0800 Subject: [PATCH 345/621] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=9C=BA=E6=89=80=E7=B1=BB?= =?UTF-8?q?=E5=88=ABplace=5Fcategory=E3=80=81=E8=A7=84=E6=A8=A1scale=5Ftot?= =?UTF-8?q?al=20=2045?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{V0.0.44__place_category.sql => V0.0.45__place_category.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/{V0.0.44__place_category.sql => V0.0.45__place_category.sql} (100%) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.45__place_category.sql similarity index 100% rename from epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.44__place_category.sql rename to epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.45__place_category.sql From 9568c67928944559ad10cffb6b2518b57bc1af7a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 14:42:01 +0800 Subject: [PATCH 346/621] =?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 --- .../resources/template/Controller.java.vm | 10 --- .../resources/template/ServiceImpl.java.vm | 4 - .../com/epmet/dto/IcEmployeeRegisterDTO.java | 79 ++++++++++++++++++ .../dto/IcEmployeeRegisterDetailDTO.java | 74 +++++++++++++++++ .../epmet/dto/IcGroupPeopleRegisterDTO.java | 79 ++++++++++++++++++ .../IcEmployeeRegisterController.java | 71 ++++++++++++++++ .../IcEmployeeRegisterDetailController.java | 72 ++++++++++++++++ .../IcGroupPeopleRegisterController.java | 72 ++++++++++++++++ .../com/epmet/dao/IcEmployeeRegisterDao.java | 16 ++++ .../dao/IcEmployeeRegisterDetailDao.java | 16 ++++ .../epmet/dao/IcGroupPeopleRegisterDao.java | 16 ++++ .../IcEmployeeRegisterDetailEntity.java | 44 ++++++++++ .../entity/IcEmployeeRegisterEntity.java | 49 +++++++++++ .../entity/IcGroupPeopleRegisterEntity.java | 49 +++++++++++ .../IcEmployeeRegisterDetailService.java | 78 +++++++++++++++++ .../service/IcEmployeeRegisterService.java | 78 +++++++++++++++++ .../service/IcGroupPeopleRegisterService.java | 78 +++++++++++++++++ .../IcEmployeeRegisterDetailServiceImpl.java | 83 +++++++++++++++++++ .../impl/IcEmployeeRegisterServiceImpl.java | 83 +++++++++++++++++++ .../IcGroupPeopleRegisterServiceImpl.java | 83 +++++++++++++++++++ .../mapper/IcEmployeeRegisterDao.xml | 6 ++ .../mapper/IcEmployeeRegisterDetailDao.xml | 6 ++ .../mapper/IcGroupPeopleRegisterDao.xml | 6 ++ 23 files changed, 1138 insertions(+), 14 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml diff --git a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm index 1e489dca52..c26eeb8447 100644 --- a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm +++ b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm @@ -2,7 +2,6 @@ package ${package}.controller; import ${main}.commons.tools.aop.NoRepeatSubmit; import ${main}.commons.tools.page.PageData; -import ${main}.commons.tools.utils.ExcelUtils; import ${main}.commons.tools.utils.Result; import ${main}.commons.tools.validator.AssertUtils; import ${main}.commons.tools.validator.ValidatorUtils; @@ -10,7 +9,6 @@ import ${main}.commons.tools.validator.group.AddGroup; import ${main}.commons.tools.validator.group.UpdateGroup; import ${main}.commons.tools.validator.group.DefaultGroup; import ${package}.dto.${className}DTO; -import ${package}.excel.${className}Excel; import ${package}.service.${className}Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -71,12 +69,4 @@ public class ${className}Controller { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List<${className}DTO> list = ${classname}Service.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ${className}Excel.class); - } - - - } diff --git a/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm b/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm index f0bcfe2a7e..de6efd193d 100644 --- a/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm +++ b/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm @@ -9,7 +9,6 @@ import ${package}.commons.tools.constant.FieldConstant; import ${package}.dao.${className}Dao; import ${package}.dto.${className}DTO; import ${package}.entity.${className}Entity; -import ${package}.redis.${className}Redis; import ${package}.service.${className}Service; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,9 +28,6 @@ import java.util.Map; @Service public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${className}Entity> implements ${className}Service { - @Autowired - private ${className}Redis ${classname}Redis; - @Override public PageData<${className}DTO> page(Map params) { IPage<${className}Entity> page = baseDao.selectPage( diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java new file mode 100644 index 0000000000..16ec39997f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -0,0 +1,79 @@ +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-10-26 + */ +@Data +public class IcEmployeeRegisterDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号或护照号 + */ + private String idCard; + + /** + * 删除标识：0.未删除 1.已删除 + */ + 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-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java new file mode 100644 index 0000000000..40d12c1fd4 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java @@ -0,0 +1,74 @@ +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-10-26 + */ +@Data +public class IcEmployeeRegisterDetailDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * ic_employee_register.ID + */ + private String registerId; + + /** + * 疫苗接种次数：0,1,2,3 + */ + private Integer ymjzCount; + + /** + * 最近一次核酸检测时间：yyyy-MM-dd 日期 + */ + private Date latestNatTime; + + /** + * 删除标识：0.未删除 1.已删除 + */ + 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-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java new file mode 100644 index 0000000000..bc4e876b7c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java @@ -0,0 +1,79 @@ +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-10-26 + */ +@Data +public class IcGroupPeopleRegisterDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 核酸检测时间：yyyy-MM-dd 日期 + */ + private Date natTime; + + /** + * 受众人数 + */ + private Integer szTotal; + + /** + * 核酸检测人数 + */ + private Integer hsjcTotal; + + /** + * 删除标识：0.未删除 1.已删除 + */ + 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-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java new file mode 100644 index 0000000000..270d3c7f9b --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -0,0 +1,71 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.IcEmployeeRegisterDTO; +import com.epmet.service.IcEmployeeRegisterService; +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-10-26 + */ +@RestController +@RequestMapping("icEmployeeRegister") +public class IcEmployeeRegisterController { + + @Autowired + private IcEmployeeRegisterService icEmployeeRegisterService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEmployeeRegisterService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcEmployeeRegisterDTO data = icEmployeeRegisterService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcEmployeeRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icEmployeeRegisterService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcEmployeeRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icEmployeeRegisterService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icEmployeeRegisterService.delete(ids); + return new Result(); + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java new file mode 100644 index 0000000000..6b23562985 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.IcEmployeeRegisterDetailDTO; +import com.epmet.service.IcEmployeeRegisterDetailService; +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-10-26 + */ +@RestController +@RequestMapping("icEmployeeRegisterDetail") +public class IcEmployeeRegisterDetailController { + + @Autowired + private IcEmployeeRegisterDetailService icEmployeeRegisterDetailService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEmployeeRegisterDetailService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcEmployeeRegisterDetailDTO data = icEmployeeRegisterDetailService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcEmployeeRegisterDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icEmployeeRegisterDetailService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcEmployeeRegisterDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icEmployeeRegisterDetailService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icEmployeeRegisterDetailService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java new file mode 100644 index 0000000000..ffc54df114 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.IcGroupPeopleRegisterDTO; +import com.epmet.service.IcGroupPeopleRegisterService; +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-10-26 + */ +@RestController +@RequestMapping("icGroupPeopleRegister") +public class IcGroupPeopleRegisterController { + + @Autowired + private IcGroupPeopleRegisterService icGroupPeopleRegisterService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icGroupPeopleRegisterService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcGroupPeopleRegisterDTO data = icGroupPeopleRegisterService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icGroupPeopleRegisterService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcGroupPeopleRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icGroupPeopleRegisterService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icGroupPeopleRegisterService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java new file mode 100644 index 0000000000..87bcce87fa --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEmployeeRegisterEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcEmployeeRegisterDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java new file mode 100644 index 0000000000..a9d0408825 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcEmployeeRegisterDetailDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java new file mode 100644 index 0000000000..b60b0155c0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcGroupPeopleRegisterEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcGroupPeopleRegisterDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java new file mode 100644 index 0000000000..14f90935c5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java @@ -0,0 +1,44 @@ +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-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_employee_register_detail") +public class IcEmployeeRegisterDetailEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * ic_employee_register.ID + */ + private String registerId; + + /** + * 疫苗接种次数：0,1,2,3 + */ + private Integer ymjzCount; + + /** + * 最近一次核酸检测时间：yyyy-MM-dd 日期 + */ + private Date latestNatTime; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java new file mode 100644 index 0000000000..dcae1e3c2d --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java @@ -0,0 +1,49 @@ +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-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_employee_register") +public class IcEmployeeRegisterEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号或护照号 + */ + private String idCard; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java new file mode 100644 index 0000000000..3f4dffc18e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java @@ -0,0 +1,49 @@ +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-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_group_people_register") +public class IcGroupPeopleRegisterEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 核酸检测时间：yyyy-MM-dd 日期 + */ + private Date natTime; + + /** + * 受众人数 + */ + private Integer szTotal; + + /** + * 核酸检测人数 + */ + private Integer hsjcTotal; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java new file mode 100644 index 0000000000..658dc475bf --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.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.IcEmployeeRegisterDetailDTO; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; + +import java.util.List; +import java.util.Map; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcEmployeeRegisterDetailService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEmployeeRegisterDetailDTO + * @author generator + * @date 2022-10-26 + */ + IcEmployeeRegisterDetailDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcEmployeeRegisterDetailDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcEmployeeRegisterDetailDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java new file mode 100644 index 0000000000..1ccb4a8b5c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.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.IcEmployeeRegisterDTO; +import com.epmet.entity.IcEmployeeRegisterEntity; + +import java.util.List; +import java.util.Map; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcEmployeeRegisterService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEmployeeRegisterDTO + * @author generator + * @date 2022-10-26 + */ + IcEmployeeRegisterDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcEmployeeRegisterDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcEmployeeRegisterDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java new file mode 100644 index 0000000000..d38ba6d9e9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.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.IcGroupPeopleRegisterDTO; +import com.epmet.entity.IcGroupPeopleRegisterEntity; + +import java.util.List; +import java.util.Map; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcGroupPeopleRegisterService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcGroupPeopleRegisterDTO + * @author generator + * @date 2022-10-26 + */ + IcGroupPeopleRegisterDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcGroupPeopleRegisterDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcGroupPeopleRegisterDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java new file mode 100644 index 0000000000..76c2e52a1f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java @@ -0,0 +1,83 @@ +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.IcEmployeeRegisterDetailDao; +import com.epmet.dto.IcEmployeeRegisterDetailDTO; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; +import com.epmet.service.IcEmployeeRegisterDetailService; +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-10-26 + */ +@Service +public class IcEmployeeRegisterDetailServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterDetailService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcEmployeeRegisterDetailDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcEmployeeRegisterDetailDTO.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 IcEmployeeRegisterDetailDTO get(String id) { + IcEmployeeRegisterDetailEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcEmployeeRegisterDetailDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEmployeeRegisterDetailDTO dto) { + IcEmployeeRegisterDetailEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEmployeeRegisterDetailDTO dto) { + IcEmployeeRegisterDetailEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.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-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java new file mode 100644 index 0000000000..57cd680a61 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -0,0 +1,83 @@ +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.IcEmployeeRegisterDao; +import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.entity.IcEmployeeRegisterEntity; +import com.epmet.service.IcEmployeeRegisterService; +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-10-26 + */ +@Service +public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcEmployeeRegisterDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcEmployeeRegisterDTO.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 IcEmployeeRegisterDTO get(String id) { + IcEmployeeRegisterEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcEmployeeRegisterDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEmployeeRegisterDTO dto) { + IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEmployeeRegisterDTO dto) { + IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.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-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java new file mode 100644 index 0000000000..8f3cd6e4b6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -0,0 +1,83 @@ +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.IcGroupPeopleRegisterDao; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.entity.IcGroupPeopleRegisterEntity; +import com.epmet.service.IcGroupPeopleRegisterService; +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-10-26 + */ +@Service +public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl implements IcGroupPeopleRegisterService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcGroupPeopleRegisterDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcGroupPeopleRegisterDTO.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 IcGroupPeopleRegisterDTO get(String id) { + IcGroupPeopleRegisterEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcGroupPeopleRegisterDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcGroupPeopleRegisterDTO dto) { + IcGroupPeopleRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcGroupPeopleRegisterEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcGroupPeopleRegisterDTO dto) { + IcGroupPeopleRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcGroupPeopleRegisterEntity.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-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml new file mode 100644 index 0000000000..d71375c8b1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml new file mode 100644 index 0000000000..2ca17eecfd --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml new file mode 100644 index 0000000000..5b4d514d4c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From df957a47014d2eaa709abc1682a7390d2de89d87 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 26 Oct 2022 15:00:34 +0800 Subject: [PATCH 347/621] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0=20=E8=B0=83=E6=95=B4=E4=B8=BAsdk2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/DingdingMsgSender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java index b4912c17ee..044b1d393c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java @@ -178,7 +178,7 @@ public class DingdingMsgSender { OapiRobotSendRequest request = new OapiRobotSendRequest(); request.setMsgtype("text"); OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text(); - text.setContent("sdk"+param.getContent()); + text.setContent(param.getContent()); request.setText(text); client.execute(request); } catch (Exception e) { From 19faf7b2a9184a15d8bbdd9cc2feb244ad1696b8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 15:11:52 +0800 Subject: [PATCH 348/621] placeCategory --- .../src/main/java/com/epmet/entity/IcEnterpriseEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java index e0377272f7..931756bbac 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java @@ -50,7 +50,7 @@ public class IcEnterpriseEntity extends BaseEpmetEntity { * 场所类别：0九小场所、1企事业单位 * 默认0 */ - private String PLACE_CATEGORY; + private String placeCategory; /** * 场所名称 */ From a16e8a1c11970543cf0fb4ec68ff41cb8aaa2dc6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 15:20:36 +0800 Subject: [PATCH 349/621] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ArticleServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 6f6c6985fb..c471734d6b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -1849,8 +1849,18 @@ public class ArticleServiceImpl extends BaseServiceImpl Date: Wed, 26 Oct 2022 15:43:24 +0800 Subject: [PATCH 350/621] emm --- .../com/epmet/dto/IcEmployeeRegisterDTO.java | 16 ++++++++++++++++ .../controller/IcEmployeeRegisterController.java | 8 +++----- .../IcGroupPeopleRegisterController.java | 7 +++---- .../epmet/service/IcEmployeeRegisterService.java | 3 +-- .../service/IcGroupPeopleRegisterService.java | 3 +-- .../impl/IcEmployeeRegisterServiceImpl.java | 9 ++++++--- .../impl/IcGroupPeopleRegisterServiceImpl.java | 8 +++++--- 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java index 16ec39997f..4a77649bdd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -2,8 +2,13 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * 员工登记表 @@ -24,28 +29,39 @@ public class IcEmployeeRegisterDTO implements Serializable { /** * 客户id */ + @NotBlank(message = "customerId不能为空",groups = {AddGroup.class}) private String customerId; /** * 场所id */ + @NotBlank(message = "enterpriseId不能为空",groups = {AddGroup.class}) private String enterpriseId; /** * 姓名 */ + @NotBlank(message = "name不能为空",groups = {AddGroup.class}) private String name; /** * 手机号 */ + @NotBlank(message = "mobile不能为空",groups = {AddGroup.class}) private String mobile; /** * 身份证号或护照号 */ + @NotBlank(message = "idCard不能为空",groups = {AddGroup.class}) private String idCard; + @NotNull(message = "ymjzCount不能为空",groups = {AddGroup.class}) + private Integer ymjzCount; + + @NotNull(message = "latestNatTime不能为空",groups = {AddGroup.class}) + private Date latestNatTime; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index 270d3c7f9b..7e5e6d1e38 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -37,14 +37,14 @@ public class IcEmployeeRegisterController { return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @PostMapping(value = "{id}") public Result get(@PathVariable("id") String id){ IcEmployeeRegisterDTO data = icEmployeeRegisterService.get(id); return new Result().ok(data); } @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@RequestBody IcEmployeeRegisterDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -62,9 +62,7 @@ public class IcEmployeeRegisterController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); + public Result delete(@RequestBody List ids){ icEmployeeRegisterService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index ffc54df114..601c1688e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.service.IcGroupPeopleRegisterService; +import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,7 +38,7 @@ public class IcGroupPeopleRegisterController { return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @PostMapping(value = "{id}") public Result get(@PathVariable("id") String id){ IcGroupPeopleRegisterDTO data = icGroupPeopleRegisterService.get(id); return new Result().ok(data); @@ -62,9 +63,7 @@ public class IcGroupPeopleRegisterController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); + public Result delete(@RequestBody List ids){ icGroupPeopleRegisterService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java index 1ccb4a8b5c..bf7f89162f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -68,11 +68,10 @@ public interface IcEmployeeRegisterService extends BaseService ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java index d38ba6d9e9..818c92f448 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -68,11 +68,10 @@ public interface IcGroupPeopleRegisterService extends BaseService ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 57cd680a61..073fb7af2d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.entity.IcEmployeeRegisterEntity; import com.epmet.service.IcEmployeeRegisterService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,6 +64,7 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { + if (CollectionUtils.isNotEmpty(ids)){ + baseDao.deleteBatchIds(ids); + } } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java index 8f3cd6e4b6..8f4920bdee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.dao.IcGroupPeopleRegisterDao; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import com.epmet.service.IcGroupPeopleRegisterService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -75,9 +76,10 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl ids) { + if (CollectionUtils.isNotEmpty(ids)){ + baseDao.deleteBatchIds(ids); + } } } \ No newline at end of file From 3af0ec6d35de461c9dc99ce23c989a01f7173fa2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 16:21:35 +0800 Subject: [PATCH 351/621] =?UTF-8?q?=E5=8A=A0=E7=82=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcNatController.java | 8 ++++++++ .../java/com/epmet/service/impl/IcNatServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index 279cb39113..00fa15ae2e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java @@ -314,6 +314,14 @@ public class IcNatController implements ResultDataResolver { } } + /** + * 需求原描述：http://zentao.elinkservice.cn/story-view-709.html + * 3、核酸检测信息页面，本辖区居民选项，查询是都是居民信息里居民，现在的是否意思是你点新增的时候，是从居民信息里选的，还是你手动录入的 + * 无论是导入、新增、定时任务拉取 + * 根据身份证号取居民信息表数，如果agencyId与当前操作用户所属组织id一致，那说明就是他组织下的 本辖区居民 + * 上线后需要此接口：/epmetuser/icNat/initNatLocal + * @return + */ @PostMapping("initNatLocal") public Result initNatLocal(){ icNucleinService.initNatLocal(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 0a7c8e5a3c..c3c5bc5cc5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -14,7 +14,6 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; -import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.*; @@ -509,6 +508,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp }while (size == NumConstant.ONE_THOUSAND); // 其他类型的userType直接是居民的组织信息，所以直接赋值 is_local_resi_user = '1' updateRelation(null,NumConstant.TWO_STR); + log.error("/epmetuser/icNat/initNatLocal更新核酸检测记录关系表，是否是本辖区居民标志 end"); } /** From 73420a13a6d75c8be6163b193142b3954324869e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 26 Oct 2022 16:23:57 +0800 Subject: [PATCH 352/621] =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=85=B0=E5=9B=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=AF=94=E5=AF=B9=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E9=99=90=E6=B5=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/YtHsResUtils.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index d30e1087cb..9a4ac14de1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -6,11 +6,14 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; +import com.google.common.util.concurrent.RateLimiter; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; /** * @Description @@ -24,6 +27,11 @@ public class YtHsResUtils { private static final String CARD_NO = "card_no"; private static final String ROW_NUM = "ROWNUM"; private static final String PAGE_SIZE = "PAGESIZE"; + /** + * rate is "2 permits per second" + */ + private static final Map rateLimiterMap = new ConcurrentHashMap<>(); + /** * desc:核酸采样查询 @@ -32,6 +40,8 @@ public class YtHsResUtils { */ public static YtHscyResDTO hscy(String cardNo, Integer rowNum, Integer pageSize) { try { + tryAcquire("hscy"); + Map param = new HashMap<>(); param.put(APP_KEY, "tz45j4kuWcnnjoJOVSlzGWJgI"); param.put(CARD_NO, cardNo); @@ -60,6 +70,12 @@ public class YtHsResUtils { return resultResult; } + private static void tryAcquire(String hscy) { + RateLimiter rateLimiter = rateLimiterMap.getOrDefault(hscy, RateLimiter.create(2.0)); + rateLimiterMap.putIfAbsent(hscy,rateLimiter); + rateLimiter.tryAcquire(1, TimeUnit.SECONDS); + } + /** * desc:核酸结果查询 * @@ -67,6 +83,8 @@ public class YtHsResUtils { */ public static YtHsjcResDTO hsjc(String cardNo, Integer rowNum, Integer pageSize) { try { + tryAcquire("hsjc"); + Map param = new HashMap<>(); param.put(APP_KEY, "DR4jF5Be7sCsqDmCamq2tmYCl"); param.put(CARD_NO, cardNo); @@ -102,6 +120,7 @@ public class YtHsResUtils { */ public static YtDataSyncResDTO siWang(String cardNo, String userName) { try { + tryAcquire("siWang"); // 1)appkey秘钥 // 2)name姓名 必填 // 3)idcard身份证号 必填 @@ -159,6 +178,7 @@ public class YtHsResUtils { * @remark：默认失败 因为一旦成功没有数据 会影响残疾人的数据 接口失败数据不做任何处理 */ public static YtDataSyncResDTO canji(String idCard, String userName) { + tryAcquire("canji"); YtDataSyncResDTO failResult = new YtDataSyncResDTO(); failResult.setCode(500); From 03e2defded6bfa2a78e59bcaaa8ec4ff56d10913 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 16:52:38 +0800 Subject: [PATCH 353/621] =?UTF-8?q?=E7=99=BB=E8=AE=B0=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/CustomerAgencyConstant.java | 3 + .../controller/IcEnterpriseController.java | 16 +++++ .../epmet/service/IcEnterpriseService.java | 12 ++++ .../service/impl/IcEnterpriseServiceImpl.java | 71 +++++++++++++++++-- 4 files changed, 96 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index d738d662f8..c41372e2a7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -89,4 +89,7 @@ public interface CustomerAgencyConstant { String AREA_CODE_SWITCH_CLOSED="closed"; String AREA_CODE_SWITCH_OPEN="open"; + + String JUMP_URL = "http://192.168.1.140/epmet-oper/#/staffRegister?"; +// String JUMP_URL = "https://epmet-open.elinkservice.cn/epmet-oper-gov/#/staffRegister?"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index 01e3778203..7d9afd1a83 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -343,4 +343,20 @@ public class IcEnterpriseController implements ResultDataResolver { icEnterpriseService.sendEnterprisePatrolRemindMessage(); return new Result(); } + + /** + * @Description 登记码导出 + * @param formDTO + * @param tokenDto + * @Author zxc + * @Date 2022/10/26 15:55 + */ + @PostMapping("qrCodeExport") + public void qrCodeExport(@RequestBody EnterprisePageFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setCurrentStaffId(tokenDto.getUserId()); + formDTO.setPageFlag(false); + icEnterpriseService.qrCodeExport(formDTO,response); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java index 23790b5caa..e141e008e3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java @@ -10,7 +10,11 @@ import com.epmet.dto.result.EnterpriseDetailDTO; import com.epmet.dto.result.EnterprisePatrolResultDTO; import com.epmet.entity.IcEnterpriseEntity; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.nio.file.Path; +import java.util.List; import java.util.Map; /** @@ -91,4 +95,12 @@ public interface IcEnterpriseService extends BaseService { */ PageData page(Map params); + /** + * @Description 登记码导出 + * @param formDTO + * @Author zxc + * @Date 2022/10/26 15:55 + */ + void qrCodeExport(EnterprisePageFormDTO formDTO, HttpServletResponse response) throws IOException; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index d0f5a1ba08..2de6c29e74 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -23,10 +23,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.FileUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.constant.SmsTemplateConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; @@ -60,12 +57,22 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import static com.epmet.constant.CustomerAgencyConstant.JUMP_URL; +import static com.epmet.service.impl.HouseServiceImpl.bufferedImageToInputStream; /** * 企事业单位表 @@ -303,8 +310,13 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = baseDao.selectList(formDTO); + List list = new ArrayList<>(); + if (formDTO.getPageFlag()){ + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getPageFlag()); + list = baseDao.selectList(formDTO); + }else { + list = baseDao.selectList(formDTO); + } PageInfo pageInfo = new PageInfo<>(list); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { //规模名称 @@ -562,4 +574,51 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = list(formDTO).getList(); + if (CollectionUtils.isEmpty(list)){ + return; + } + response.reset(); + //文件的名称 + String downloadFilename = "登记码压缩包.zip"; + //转换中文否则可能会产生乱码 + downloadFilename = URLEncoder.encode(downloadFilename, "UTF-8"); + // 指明response的返回对象是文件流 + response.setContentType("application/octet-stream; charset=UTF-8"); + //设置下载格式和名称 + response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename); + ZipOutputStream zip = new ZipOutputStream(response.getOutputStream()); + for (EnterpriseDetailDTO l : list) { + try { + String content = JUMP_URL + "enterpriseId=" + l.getEnterpriseId() + "&customerId=" + formDTO.getCustomerId() + "&placeOrgName=" + l.getPlaceOrgName(); + BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(l.getPlaceOrgName(), content); + byte[] buf = new byte[8192]; + int len; + //添加到zip + zip.putNextEntry(new ZipEntry(l.getPlaceOrgName()+l.getEnterpriseId()+".png")); + InputStream inputStream = bufferedImageToInputStream(image); + //输出压缩包 + while ((len = inputStream.read(buf)) > 0) { + zip.write(buf, 0, len); + } + inputStream.close(); + } catch (IOException e) { + log.error(e.getMessage()); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "组装zip信息有误", "组装zip信息有误"); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + zip.close(); + } + } \ No newline at end of file From 5c5f6112355aa6000ca55d05df8c1bc59073f8c2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 16:53:59 +0800 Subject: [PATCH 354/621] emm --- .../java/com/epmet/service/impl/IcEnterpriseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 2de6c29e74..934c387f1d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -604,7 +604,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl 0) { From 631abd8412b0ada88a422c537f49d135b2dd559c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 17:06:51 +0800 Subject: [PATCH 355/621] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcGroupPeopleRegisterDTO.java | 10 ++++++++++ .../controller/IcGroupPeopleRegisterController.java | 2 +- .../service/impl/IcEmployeeRegisterServiceImpl.java | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java index bc4e876b7c..f55ddf7420 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java @@ -2,8 +2,13 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * 受众群体登记表 @@ -24,26 +29,31 @@ public class IcGroupPeopleRegisterDTO implements Serializable { /** * 客户id */ + @NotBlank(message = "customerId不能为空",groups = {AddGroup.class}) private String customerId; /** * 场所id */ + @NotBlank(message = "enterpriseId不能为空",groups = {AddGroup.class}) private String enterpriseId; /** * 核酸检测时间：yyyy-MM-dd 日期 */ + @NotNull(message = "natTime不能为空",groups = {AddGroup.class}) private Date natTime; /** * 受众人数 */ + @NotNull(message = "szTotal不能为空",groups = {AddGroup.class}) private Integer szTotal; /** * 核酸检测人数 */ + @NotNull(message = "customerId不能为空",groups = {AddGroup.class}) private Integer hsjcTotal; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index 601c1688e8..31d6189892 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -45,7 +45,7 @@ public class IcGroupPeopleRegisterController { } @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 073fb7af2d..3f72e7261d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -8,7 +8,9 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; import com.epmet.entity.IcEmployeeRegisterEntity; +import com.epmet.service.IcEmployeeRegisterDetailService; import com.epmet.service.IcEmployeeRegisterService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -29,6 +31,9 @@ import java.util.Map; @Service public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterService { + @Autowired + private IcEmployeeRegisterDetailService icEmployeeRegisterDetailService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -64,8 +69,10 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Wed, 26 Oct 2022 17:23:42 +0800 Subject: [PATCH 356/621] emm --- .../src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java | 2 ++ .../src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java index 4a77649bdd..365cf14365 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.epmet.commons.tools.validator.group.AddGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -60,6 +61,7 @@ public class IcEmployeeRegisterDTO implements Serializable { private Integer ymjzCount; @NotNull(message = "latestNatTime不能为空",groups = {AddGroup.class}) + @JsonFormat(pattern="yyyy-MM-dd") private Date latestNatTime; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java index f55ddf7420..f3342f1177 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.epmet.commons.tools.validator.group.AddGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -42,6 +43,7 @@ public class IcGroupPeopleRegisterDTO implements Serializable { * 核酸检测时间：yyyy-MM-dd 日期 */ @NotNull(message = "natTime不能为空",groups = {AddGroup.class}) + @JsonFormat(pattern="yyyy-MM-dd") private Date natTime; /** From 5c8f7be43e8cb91f1aea34cba2559363b2f0b0d1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 17:23:59 +0800 Subject: [PATCH 357/621] =?UTF-8?q?=E5=B7=AE=E5=AF=BC=E5=85=A5=E4=BA=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EnterpriseFormDTO.java | 14 ++++++++- .../epmet/dto/result/EnterpriseDetailDTO.java | 13 ++++++++ .../epmet/excel/EnterpriseExportExcelDTO.java | 16 ++++++++++ .../service/impl/IcEnterpriseServiceImpl.java | 31 +++++++++++++------ .../main/resources/mapper/IcEnterpriseDao.xml | 1 + 5 files changed, 65 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java index 61f8470c60..eebdaa319d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -44,6 +45,14 @@ public class EnterpriseFormDTO implements Serializable { @NotBlank(message = "场所类型不能为空", groups = {AddShow.class}) private String placeType; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @NotBlank(message = "场所类别不能为空", groups = {AddShow.class}) + private String placeCategory; + /** * 场所名称 */ @@ -77,9 +86,12 @@ public class EnterpriseFormDTO implements Serializable { 3:41-100人 4:100人以上】 */ - @NotBlank(message = "规模不能为空", groups = {AddShow.class}) + // @NotBlank(message = "规模不能为空", groups = {AddShow.class}) private String scale; + @NotNull(message = "规模不能为空",groups ={AddShow.class} ) + private Integer scaleTotal; + /** * 场所负责人 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java index 2d787ab00f..001066cade 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java @@ -37,7 +37,19 @@ public class EnterpriseDetailDTO implements Serializable { * 场所类型：来源于ic_coverage_category_dict */ private String placeType; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + private String placeCategory; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + private String placeCategoryName; /** * 场所类型名称 */ @@ -73,6 +85,7 @@ public class EnterpriseDetailDTO implements Serializable { */ private String scale; + private Integer scaleTotal; /** * 规模名称 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java index 213e0c294b..9188b748b7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java @@ -22,7 +22,22 @@ public class EnterpriseExportExcelDTO { @ExcelProperty(value = "场所类型") @ColumnWidth(25) private String placeTypeName; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @ExcelIgnore + private String placeCategory; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @ExcelProperty(value = "场所类别") + @ColumnWidth(25) + private String placeCategoryName; /** * 网格所属的组织Id @@ -70,6 +85,7 @@ public class EnterpriseExportExcelDTO { @ExcelIgnore private String scale; + private Integer scaleTotal; /** * 规模名称 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 934c387f1d..a06d5c9d48 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -44,7 +44,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.MapUtils; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; @@ -62,7 +61,6 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; @@ -258,15 +256,23 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + // Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); + // resultDto.setScaleName(dictMap.containsKey(resultDto.getScale()) ? dictMap.get(resultDto.getScale()) : StrConstant.EPMETY_STR); //规模名称 - Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); - Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); - resultDto.setScaleName(dictMap.containsKey(resultDto.getScale()) ? dictMap.get(resultDto.getScale()) : StrConstant.EPMETY_STR); + resultDto.setScaleName(resultDto.getScaleTotal()+"人"); if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "0".equals(enterpriseEntity.getLatestResult())) { resultDto.setLatestResultName("合格"); } else if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "1".equals(enterpriseEntity.getLatestResult())) { resultDto.setLatestResultName("不合格"); } + if ("0".equals(resultDto.getPlaceCategory())) { + // 0九小场所、1企事业单位 + resultDto.setPlaceCategoryName("九小场所"); + } else if ("1".equals(resultDto.getPlaceCategory())) { + resultDto.setPlaceCategoryName("企事业单位"); + } return resultDto; } @@ -319,9 +325,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(list); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { - //规模名称 - Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); - Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); + //规模名称 已废弃用字典表，改为手动输入数字了 + // Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + // Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); for (EnterpriseDetailDTO detailDTO : list) { GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(detailDTO.getGridId()); if (null != gridInfoCache) { @@ -334,7 +340,14 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index 0a3d9a321a..bc7c954052 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -43,6 +43,7 @@ ie.AGENCY_ID, ie.AGENCY_PIDS, ie.PLACE_TYPE, + ie.PLACE_CATEGORY, ie.PLACE_ORG_NAME, ie.ADDRESS, ie.LONGITUDE, From d77f065604a53e13276b05d7106b4a80ad9ffe75 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 17:28:15 +0800 Subject: [PATCH 358/621] epmetuser/epidemicPrevention/page --- .../src/main/resources/mapper/IcResiUserDao.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 1203976d6c..497d96a25b 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 @@ -849,10 +849,10 @@ FROM ic_vaccine WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} - AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") > #{startDate} + AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") >= #{startDate} - AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") < #{endDate} + AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") <= #{endDate} GROUP BY ID_CARD ) b ON a.ID_CARD = b.ID_CARD LEFT JOIN ( @@ -860,16 +860,16 @@ FROM ic_nat WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} - AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") > #{startDate} + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") >= #{startDate} - AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") < #{endDate} + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") <= #{endDate} - AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") > #{natStartDate} + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") >= #{natStartDate} - AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") < #{natEndDate} + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") <= #{natEndDate} GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD WHERE From f1aa2c8dafac984b4f4a82550fca9e64853b9874 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 17:38:46 +0800 Subject: [PATCH 359/621] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dao/IcEmployeeRegisterDao.java | 21 ++++++++++++++++++- .../impl/IcEmployeeRegisterServiceImpl.java | 12 +++++++++-- .../mapper/IcEmployeeRegisterDao.xml | 16 ++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index 87bcce87fa..d287c78231 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -3,6 +3,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcEmployeeRegisterEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 员工登记表 @@ -12,5 +15,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcEmployeeRegisterDao extends BaseDao { - + + /** + * @Description 根据身份证查询是否存在 + * @param idCard + * @Author zxc + * @Date 2022/10/26 17:34 + */ + IcEmployeeRegisterEntity getEmployeeRegisterByIdCard(@Param("idCard")String idCard); + + /** + * @Description 根据主表ID删除子表 + * @param registerIds + * @Author zxc + * @Date 2022/10/26 17:34 + */ + void delRegisterDetail(@Param("registerIds")List registerIds); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 3f72e7261d..792ea69b5b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -68,8 +68,15 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { if (CollectionUtils.isNotEmpty(ids)){ baseDao.deleteBatchIds(ids); + baseDao.delRegisterDetail(ids); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index d71375c8b1..0509004b8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -3,4 +3,20 @@ + + + update ic_employee_register_detail + set del_flag = 1, + updated_time = NOW() + where REGISTER_ID in ( + + #{registerId} + + ) + + + \ No newline at end of file From f0940203c90801091c2664ade739c667e2f327f6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 18:27:35 +0800 Subject: [PATCH 360/621] daoru --- .../epmet/excel/EnterpriseImportExcelDTO.java | 19 ++++++++++++++++++ .../IcEnterpriseExcelImportListener.java | 3 ++- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9284 -> 9302 bytes 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 8507192422..64c847d684 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -21,6 +21,16 @@ public class EnterpriseImportExcelDTO { private String placeTypeName; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @NotBlank(message = "场所类别不能为空") + @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + private String placeCategoryName; + + @NotBlank(message = "场所区域不能为空") @ExcelProperty(value = "场所区域") private String gridName; @@ -72,6 +82,15 @@ public class EnterpriseImportExcelDTO { @ExcelProperty(value = "场所类型") private String placeTypeName; + /** + * 10.26需求： + * 场所类别：0九小场所、1企事业单位 + * 默认0 + */ + @ColumnWidth(20) + @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + private String placeCategoryName; + @ColumnWidth(20) @ExcelProperty(value = "场所区域") private String gridName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java index ac55be4e46..7ace7c5c5f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java @@ -86,7 +86,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener originList=icEnterpriseServiceImpl.selectForUniqueName(enterpriseEntity.getGridId(),enterpriseEntity.getPlaceOrgName(),null); @@ -117,6 +117,7 @@ public class IcEnterpriseExcelImportListener implements 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 bOu+xxGuS97)c^IW7D>j;i7CqXPx5~NM{eDn delta 5283 zcmZ9QXEYq%*2YKg#2`isqn9AM=q;m0L}#K!@7)Mt5TYB5UPcchQKR>e=p=e?A<5{y zGuM6ZyY71b?^)}dv)0-BeAxThU!LEzTCZ9)5{oEJGyhH(3ji=f=3s%~@yYGlJx{13 zVC>7_Bb1~kyzG-`D!{i82vlSdAL?*r1NPODIa-7!<;G`58!2sBud=(U;o&6Hu6W-p zc~>!xi9g$ueJ5_hQ_4-Ov=O>d(!b#p<2KPOuZXJAB2G&OesCbcA4#4-X7CMalFhW} z=ey#6_hxtGHq!gjVE7UqM`oeit+mQH9zCQ>JKR!XZuRYg4T{BSCHWoCm@~t+3IFON zTcND(0eLyfXBmLom#B<2PS1!(d3R{~BjWN{vFIe{nO)=H$QQ(dJ;`!RZlHDTsIh^8 z4p|mR03N^jtLwtKMd9J$7i+T!P9Ct2KcwfNU@zdLgM8*;Owd03 z!2k;fB@@I)bc>QAqA43jCZp{+##yCdCE-sP12F+^u!I z+&#Pnt$n?H;O?#h{;n=1Nn@J#D)jA#VU!2jHM7KTh2|4DmK0>TB?ARrTWGS1+0i~x zm{vOP7y`jTY1!p;ioA34jsTh>*v34m#zPikmQ~NWk8X+A*fRSK!NfAw40B>d$!!2G zx2}(E?E}p9SxpT%5-4Rgy^weH6F{YjM@NCw%q7>Q zuB=d9AggEJg}jO!^M$BN{QL!l+kl%Je{N(=Me`jvlCnGai$dk=u%eY$tCu?I5^2nd z^vGabMWU4_FSzS)?t6*s$7O*VKoJWn)WNFj^2Wzqdh5`((Fpb_KM5#ry)Isf%-B4# zcfO`CHwwD79wY-V^osn6DAXaBF0&G+ zNA0^z9l2A{B%aT0$O6gU17Dv#Z$h}RJEkN$+h}ngNUL3wf$+Ev#Maf!Y;AfkbP&kJ z(CrM=pXr^J75x<{;jpB{$L3cvEvY_gFD6pCHCtS#oq{RNt+!tVxT;5bs>A5*+V5Vx zw>)RuUrr{sUR#0-na%J_VbP2hD7#4cgGgH3D-&fgucUIEq`38QSKik77@7mjZp|Kh zHjd2ohNu#z>eN>#IuBS2R1g_)fBOiN{4BNjMWLV(tI}`P&o41#$#cdHYTcyS4fK3N zwf2e4Pn>d3>NSk&B~CNeOYJRWX(q-grseo&ix}#nBt&Oy|)i|KjwzpVJ8G!(K%NJ^)zq63*^; zj$X{$-MwvGn)W+<+v+-1rAjTm1am`VyoDY9I$S?_d~GL%InlPg+v&E*dz*cGa=f#7 z=(T;yY+(cMd%+i51s{2YvPJCKP9O)j<>kjl%}4X{hT(6_yB-BgWXp~0$&Ut0=iUax z&ekh5&UOZF4$o6}x+}h=%j^HG`_I4iS*G!9#uSQkg}oshytsF&!)7(uOE`zvpzBUIQPu;ru3X zSZt}h)>6Wmm;m3H616ce;CkcFimqOXNd{bsSYA^(kw2c{g75?EFOxzq{Bk@#F7Eqq|gN$h<>SW2jfoUf4=0` z9|B&grNNu7Kd7aMZS?J-_j!J0&-(1{OJ}wBK8N5~s(?kZF*OrbjmqKTagH}CaIaZ# z^7~ZJnnJVf8@2^sQx4yDUERl}+h;EJRR-{@H8StdCc2Q|KC~}>rFFfA>U5cp@A1OQ zJm^vtXZxzd_L5k1EzYzgXhptBR{+s+JzXtg3Zr;T(1C7UuKv}d>Ru%yb?`~sT_ybe zyIRBY$)TQv-4t<&oWmcCS8OHQ2~3>^&Tx7*ufoWYZKbt5We_Y!3K_!Zq>R4N#DWM% zZOKGErF~`i+ogl?;&D-ulh!pgjl0YRb!;o63e3A`U+QI|7+IlKrHfnKvZ0$VewTcz zWa~Ehs~3l%kO#H_-_WG|etjD!Gh=YnVkvAF)<#*4ATspziuV$1@^+A}R24|eOz?lc zyzEwClSOldP_r>epFbL!O`LZC%(P9#)DjceUNfKens7is7*}`v))7*8%R7EEBHr$k?eA(_ zdHUUe-M6NxxlD3yNpo^^;rv{H$S`r3F&&I4M?CZpiJK zw!aN2?!?;4c50t!XH~rz?z_t?`HdF4uYAmv@FK0Wswy04)l@$p zGnC=7OtIXHLqKfAuc#e~_#7p7>6e<%`axuJ(|+TIYCoo}dA=6^G$(Zy0mOVH=t%u* z;de^EapM=%H_WH_GkOz9r6OsQz1xt4yw>uzAL=ishLl)#SeqoScz-0d4CKxk``oKl zjG>`o&Yk|M5-@WL52$8-==Q9fCZo63Ihz5eV!uaps_y)3z+y#~1!*{Qz65SV&*jR_ zph;I1+(}cN>f#XRD-%~0;GByJHr@Sg;;Oag z#29HTF$$UZ5%0CkHk>Sg;;s8Ts81O!qGwy%BJ#yxn!nI2^HYiB`LD(h_#0j6+YzT_^R?C z3K;)bF@Y>MVSsOJLebAZ&ft*0<51K#)GY6jEEwLi!)F;zq!UH?usbH2@{;l)I|;Ea z-gyLSGTfslGTh_OLvxznS>NIW*I9C0d4OtuKD_+u)dyLLT7?2mN^;S1n+v5c;Xh-h z%B{T8QQomT+LDrn!*b!)|{3c~PITbtNem52zaDY=ZEvcA?yOo*9# zX=wzP=j9}h1;#H-edUDE6iluL3E?CtBrDZsu&CqFr8OnSu_ku?2q!jr9FYdy|F~fT zdy>kQgm{9ziW>)Q)^5@FB9v3%Ibnevz>s|W)vK#o2xA)nU} zKkC6#F$JiWU!hLLSD>%3v^PkFk~xX1BI1-i+Oxl(7LXZuHK{Jw;!(r{E}d-ciia29 zk@K*cdXIhXG$Lu$0vRbPM;knlD2&6U7@!t)EsRsK+xs@W>#(M*rUsDwW1N0?C%q8g z$8acEPf^8qHfE*#h{j%taV=n0&ii4uahL6uR9bz{i!}#OFysw{=4}1kY%G|;OHfLv z+W)=6W%JC_CM%||(_rbhqBz>LMnou~cP^{;^<0{grm;p0HA~M>~|;2P)4kZ+775+kqvd z4qFr}5qCU0{i)<)e!?0jT7Dc_qM9uN9fM-ouN%(p6Ac$(&U*%aS-cMz@CqzWmxBpa z8LkUdCQklL@=ujJ6cNPSAYO3ocS_t|s}^Y2ZUBjXvh^Jc*Z729;QN5z$T^j0P@wGH z@E4gx*~YcgTeQ|g2_yR@XW_)jz4FtHsMh{*S#ed3#aTPaAT&`yKc7dKa+sap)t^75 z6ioywTitZj(NVoPls-wmSt+gdjquZ*L$*r2Vx}BW^53}KotFnHS7=>wEp3!XJ?pWh z^3JnKuXku_2`}N{3HA{!%o~~Z+Z7!V6FS8;TZGD3o$t{mPp5?q4V=*?sr=&R?BoR( zGO#myv0dc$#94q(R~;#wyixtDs;U1K5c#1UUD{`#cdHn^$O0q~&tV7IQ^?Cp-+2UF zgV}G3 z^KldjbBa4`hLiZNa|dVDK@u1~JRzG&p^nX~FVTiP0T|9V)zKyJjKTJ& zVWml{Rl;XGhG<%8D4BI&-{f>w>gV5C=Jig_5Lf5G&mS5a8ycS%6&lR%DB*v8rIsep{&=GnF1jOopDg(8>mPGUl-_*Zmfs{(>g!~t;GmTBGs3Q{>w zUpmV=OgZHyC8qxC2nOe$=03DhD(2U{5!FP7&@sS$e+b>f6cFAjQ?#@(Mw_ zVlj4U1ZSz$Fm1vpU7o#G4C(z*!=XfKTNG7WJk$L=K`|qyOseA?&Hv)0N^4Z0rg+$d z=(?Q{G(XFc$)qMJFTEs<4>4a*`7>G=?#%wTVu?v{!=$mE9emm$xt6m|9sdEv_ruR? zO#@yOL_364TBwq%6Z7}^C`IAlM21`w%Nhn#!8O8^d@Z7?uf^s|@mUC4{|?$kzHaz+ z=fg)^ItI`kbWP?+iQ8y!ZL5AHzC)%nN-*zmCU%$QQ;yUNg(ewVW_g7f| ztp9DB+J?wI+&H-36v$qBD)`Hx`xZQCV>_gnUM`^!%gs$p9I zZ|={r^KSM#!t8eshyB~1PQ4E*pqQUy{D8y-nW9q~A{m!gP;Q1@O4No#zaIZSh{qED zb~@GKeRqLgOri`Wd#W!aPWMOA&^Y#qCzV&6q6O$L8v&c#RIO~F%k3R|abYH$rN+v*m za%nI1*mFeoTCVc}@ZW*G7wq4R z>fh@>f5VWCtXvHL Date: Wed, 26 Oct 2022 23:10:36 +0800 Subject: [PATCH 361/621] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=20=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=20=E6=98=AF=E9=94=99=E8=AF=AF=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/YtHsResUtils.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 9a4ac14de1..9010c9b84a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -63,7 +63,7 @@ public class YtHsResUtils { } } } catch (Exception e) { - log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); + log.error(String.format("烟台核酸检测结果查询异常cardNo:%s", cardNo), e); } YtHscyResDTO resultResult = new YtHscyResDTO(); resultResult.setData(new ArrayList<>()); @@ -106,7 +106,7 @@ public class YtHsResUtils { } } catch (Exception e) { - log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); + log.error(String.format("烟台核酸检测结果查询异常cardNo:%s", cardNo), e); } YtHsjcResDTO resultResult = new YtHsjcResDTO(); resultResult.setData(new ArrayList<>()); @@ -154,7 +154,7 @@ public class YtHsResUtils { //第一层 JSONObject secondData = JSON.parseObject(firstData.getString("data")); Object thirdData = ""; - if (secondData != null && secondData.getJSONArray("data") != null) { + if (secondData != null && secondData.getJSONArray("data") != null && secondData.getJSONArray("data").size() >0 ) { //第二层 data thirdData = secondData.getJSONArray("data").get(0); } @@ -166,7 +166,7 @@ public class YtHsResUtils { log.warn("siWang 调用蓝图接口败"); } } catch (Exception e) { - log.error(String.format("烟台siWang结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); + log.error(String.format("烟台siWang结果查询异常cardNo:%s", cardNo), e); } return new YtDataSyncResDTO(); } @@ -221,15 +221,15 @@ public class YtHsResUtils { } } catch (Exception e) { - log.error(String.format("烟台canji结果查询异常cardNo:%s,异常信息:%s", idCard, e.getMessage())); + log.error(String.format("烟台canji结果查询异常cardNo:%s,异常信息:%s", idCard), e); } return failResult; } public static void main(String[] args) { - YtDataSyncResDTO canji = canji("123", "123"); - System.out.println("残疾结果：" + JSON.toJSON(canji)); + //YtDataSyncResDTO canji = canji("123", "123"); + //System.out.println("残疾结果：" + JSON.toJSON(canji)); YtDataSyncResDTO siwang = siWang("1213", "!23"); From 9ad8b23deb7c7aa27101aaa7fa27a1d9885287ad Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 08:48:06 +0800 Subject: [PATCH 362/621] no++ --- .../src/main/java/com/epmet/service/impl/IcNatServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index c3c5bc5cc5..48ed9d56fe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -505,6 +505,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp updateRelation(list,NumConstant.ONE_STR); } } + no++; }while (size == NumConstant.ONE_THOUSAND); // 其他类型的userType直接是居民的组织信息，所以直接赋值 is_local_resi_user = '1' updateRelation(null,NumConstant.TWO_STR); From 67a4600b24c92e4bc7ccca7becbb3ff5da6aef34 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 10:43:07 +0800 Subject: [PATCH 363/621] =?UTF-8?q?=E6=9A=82=E6=8F=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmployeeRegisterListFormDTO.java | 41 +++++++++++++ .../result/EmployeeRegisterListResultDTO.java | 37 ++++++++++++ .../IcEmployeeRegisterController.java | 50 ++++++++++++++++ .../com/epmet/dao/IcEmployeeRegisterDao.java | 10 ++++ .../service/IcEmployeeRegisterService.java | 18 ++++++ .../impl/IcEmployeeRegisterServiceImpl.java | 59 +++++++++++++++++++ .../mapper/IcEmployeeRegisterDao.xml | 56 ++++++++++++++++++ 7 files changed, 271 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java new file mode 100644 index 0000000000..d1bac85f97 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/27 09:01 + */ +@Data +public class EmployeeRegisterListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -5327830228503748858L; + + private String customerId; + private String staffId; + private String agencyId; + + /** + * 核酸检测开始、结束日期，eg：2022-02-02 + */ + private String natStartDate; + private String natEndDate; + + /** + * 检查状态，1：已检测；0：未检测 + */ + private String checkStatus; + + private String placeOrgName; + + /** + * 场所类别：0九小场所、1企事业单位 + */ + private String placeCategory; + + private String name; + private String mobile; + private String idCard; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java new file mode 100644 index 0000000000..2411cb228b --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/27 09:10 + */ +@Data +public class EmployeeRegisterListResultDTO implements Serializable { + private static final long serialVersionUID = -7966608283208846072L; + + private String placeOrgName; + private String name; + private String mobile; + private String idCard; + private Integer ymjzCount; + private String latestNatTime; + private String dbCompare; + private String dbCompareName; + private String registerId; + + public EmployeeRegisterListResultDTO() { + this.placeOrgName = ""; + this.name = ""; + this.mobile = ""; + this.idCard = ""; + this.ymjzCount = NumConstant.ZERO; + this.latestNatTime = ""; + this.dbCompare = ""; + this.dbCompareName = ""; + this.registerId = ""; + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index 7e5e6d1e38..4b6672909e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -1,7 +1,11 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.dto.form.PageFormDTO; 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.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,6 +13,8 @@ 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.IcEmployeeRegisterDTO; +import com.epmet.dto.form.EmployeeRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.service.IcEmployeeRegisterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +49,12 @@ public class IcEmployeeRegisterController { return new Result().ok(data); } + /** + * @Description 新增 + * @param dto + * @Author zxc + * @Date 2022/10/27 08:57 + */ @NoRepeatSubmit @PostMapping("add") public Result save(@RequestBody IcEmployeeRegisterDTO dto){ @@ -61,9 +73,47 @@ public class IcEmployeeRegisterController { return new Result(); } + /** + * @Description 批量删除 + * @param ids + * @Author zxc + * @Date 2022/10/27 08:57 + */ @PostMapping("delete") public Result delete(@RequestBody List ids){ icEmployeeRegisterService.delete(ids); return new Result(); } + + /** + * @Description 员工疫情管理列表 + * @param formDTO + * @param tokenDto + * @Author zxc + * @Date 2022/10/27 09:15 + */ + @PostMapping("list") + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + public Result> employeeRegisterList(@RequestBody EmployeeRegisterListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icEmployeeRegisterService.employeeRegisterList(formDTO)); + } + + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @param tokenDto + * @Author zxc + * @Date 2022/10/27 09:22 + */ + @PostMapping("detailList") + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + public Result> employeeRegisterDetailList(@RequestBody EmployeeRegisterListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icEmployeeRegisterService.employeeRegisterDetailList(formDTO)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index d287c78231..e5756c7a2b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -1,6 +1,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.EmployeeRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,4 +34,12 @@ public interface IcEmployeeRegisterDao extends BaseDao */ void delRegisterDetail(@Param("registerIds")List registerIds); + /** + * @Description 员工疫情管理列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:15 + */ + List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java index bf7f89162f..fdcbcc1b2a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -3,6 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.dto.form.EmployeeRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterEntity; import java.util.List; @@ -74,4 +76,20 @@ public interface IcEmployeeRegisterService extends BaseService ids); + + /** + * @Description 员工疫情管理列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:15 + */ + PageData employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:22 + */ + PageData employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 792ea69b5b..f9d8b66383 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -3,15 +3,22 @@ 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.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.dto.form.EmployeeRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterDetailEntity; import com.epmet.entity.IcEmployeeRegisterEntity; import com.epmet.service.IcEmployeeRegisterDetailService; import com.epmet.service.IcEmployeeRegisterService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +72,12 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { @@ -98,4 +117,44 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl employeeRegisterList(EmployeeRegisterListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + PageData result = new PageData<>(); + List list; + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + list = baseDao.employeeRegisterList(formDTO); + result.setList(list); + result.setTotal(list.size()); + } + // 数据库比对 + + return result; + } + + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 09:22 + */ + @Override + public PageData employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO) { + return null; + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 0509004b8e..b1bf72b8dc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -19,4 +19,60 @@ select * from ic_employee_register where del_flag = 0 and id_card = #{idCard} + + + \ No newline at end of file From 0f2a1e08be89040e170e76e7c94da6d28d0f2ac4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 11:16:00 +0800 Subject: [PATCH 364/621] =?UTF-8?q?=E5=8F=97=E4=BC=97=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/GroupPeopleRegisterListFormDTO.java | 27 ++++++++++++++ .../GroupPeopleRegisterListResultDTO.java | 20 +++++++++++ .../IcGroupPeopleRegisterController.java | 20 +++++++++++ .../epmet/dao/IcGroupPeopleRegisterDao.java | 8 ++++- .../service/IcGroupPeopleRegisterService.java | 11 ++++++ .../IcGroupPeopleRegisterServiceImpl.java | 35 +++++++++++++++++++ .../mapper/IcEmployeeRegisterDao.xml | 2 +- .../mapper/IcGroupPeopleRegisterDao.xml | 22 ++++++++++++ 8 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupPeopleRegisterListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupPeopleRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupPeopleRegisterListFormDTO.java new file mode 100644 index 0000000000..d9c82abb2b --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GroupPeopleRegisterListFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/27 10:47 + */ +@Data +public class GroupPeopleRegisterListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 6837328932168590069L; + + private String customerId; + private String staffId; + private String agencyId; + + /** + * 核酸检测开始、结束日期，eg：2022-02-02 + */ + private String natStartDate; + private String natEndDate; + + private String placeOrgName; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java new file mode 100644 index 0000000000..172d875f03 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/27 10:53 + */ +@Data +public class GroupPeopleRegisterListResultDTO implements Serializable { + private static final long serialVersionUID = -3000826126115218664L; + + private String placeOrgName; + private String natTime; + private String szTotal; + private String hsjcTotal; + private String id; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index 31d6189892..60b4d04d47 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -1,7 +1,10 @@ package com.epmet.controller; +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.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,6 +12,8 @@ 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.IcGroupPeopleRegisterDTO; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.service.IcGroupPeopleRegisterService; import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; @@ -68,4 +73,19 @@ public class IcGroupPeopleRegisterController { return new Result(); } + /** + * @Description 受众群体列表 + * @param tokenDto + * @param formDTO + * @Author zxc + * @Date 2022/10/27 10:51 + */ + @PostMapping("list") + public Result> groupPeopleRegisterList(@LoginUser TokenDto tokenDto, @RequestBody GroupPeopleRegisterListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icGroupPeopleRegisterService.groupPeopleRegisterList(formDTO)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java index b60b0155c0..f8dbd340e7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 受众群体登记表 * @@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcGroupPeopleRegisterDao extends BaseDao { - + + List groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java index 818c92f448..bf9da45602 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -3,6 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import java.util.List; @@ -74,4 +76,13 @@ public interface IcGroupPeopleRegisterService extends BaseService ids); + + /** + * @Description 受众群体列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 10:51 + */ + PageData groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java index 8f4920bdee..abb40f2269 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -3,13 +3,21 @@ 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.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcGroupPeopleRegisterDao; import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; +import com.epmet.dto.result.EmployeeRegisterListResultDTO; +import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import com.epmet.service.IcGroupPeopleRegisterService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -82,4 +90,31 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl groupPeopleRegisterList(GroupPeopleRegisterListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + PageData result = new PageData<>(); + List list; + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.groupPeopleRegisterList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + list = baseDao.groupPeopleRegisterList(formDTO); + result.setList(list); + result.setTotal(list.size()); + } + return result; + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index b1bf72b8dc..cc07dec0d6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -37,7 +37,7 @@ ie.PLACE_ORG_NAME, ie.PLACE_CATEGORY FROM ic_enterprise ie - left join JOIN ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 + left join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml index 5b4d514d4c..6e1d642ad1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -3,4 +3,26 @@ + \ No newline at end of file From 860fd66421d61f9581c3b5f69f76f9f83d35ec33 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 12:35:37 +0800 Subject: [PATCH 365/621] test --- .../IcEmployeeRegisterController.java | 6 ++---- .../IcGroupPeopleRegisterController.java | 10 +++++---- .../impl/IcEmployeeRegisterServiceImpl.java | 21 ++++++++++--------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index 4b6672909e..b31e4f7b7a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -7,11 +7,10 @@ import com.epmet.commons.tools.dto.form.PageFormDTO; 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.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.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; import com.epmet.dto.result.EmployeeRegisterListResultDTO; @@ -19,7 +18,6 @@ import com.epmet.service.IcEmployeeRegisterService; 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; @@ -50,7 +48,7 @@ public class IcEmployeeRegisterController { } /** - * @Description 新增 + * @Description 新增 员工登记：http://yapi.elinkservice.cn/project/102/interface/api/8214 * @param dto * @Author zxc * @Date 2022/10/27 08:57 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index 31d6189892..0c92958083 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -3,18 +3,15 @@ package com.epmet.controller; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; 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.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.service.IcGroupPeopleRegisterService; -import oracle.jdbc.proxy.annotation.Post; 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; @@ -44,6 +41,11 @@ public class IcGroupPeopleRegisterController { return new Result().ok(data); } + /** + * 受众群体登记 http://yapi.elinkservice.cn/project/102/interface/api/8220 + * @param dto + * @return + */ @NoRepeatSubmit @PostMapping("add") public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index f9d8b66383..9e4d1b5058 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -3,12 +3,12 @@ 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.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; @@ -25,7 +25,6 @@ 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; @@ -81,17 +80,19 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Thu, 27 Oct 2022 12:40:17 +0800 Subject: [PATCH 366/621] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E3=80=81=E5=8F=97=E4=BC=97=E7=BE=A4=E4=BD=93=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=99=90=E5=88=B6token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 0aeca8950b..3fa85a8919 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -522,6 +522,9 @@ epmet: - /gov/org/ichouse/houseoption - /epmetuser/icresicollect/save - /gov/org/customergrid/gridoption + # 员工登记、受众群体登记 + - /gov/org/icEmployeeRegister/add + - /gov/org/icGroupPeopleRegister/add # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: - /data/report/** From ad10113dba736a3d226462cbec3042c079ec537b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 13:04:50 +0800 Subject: [PATCH 367/621] =?UTF-8?q?=E4=B8=8D=E5=81=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/EmployeeRegisterListResultDTO.java | 4 ---- .../com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java | 2 -- 2 files changed, 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java index 2411cb228b..047c5374dd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java @@ -19,8 +19,6 @@ public class EmployeeRegisterListResultDTO implements Serializable { private String idCard; private Integer ymjzCount; private String latestNatTime; - private String dbCompare; - private String dbCompareName; private String registerId; public EmployeeRegisterListResultDTO() { @@ -30,8 +28,6 @@ public class EmployeeRegisterListResultDTO implements Serializable { this.idCard = ""; this.ymjzCount = NumConstant.ZERO; this.latestNatTime = ""; - this.dbCompare = ""; - this.dbCompareName = ""; this.registerId = ""; } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 9e4d1b5058..64086e6e90 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -142,8 +142,6 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Thu, 27 Oct 2022 13:07:09 +0800 Subject: [PATCH 368/621] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=99=BB=E8=AE=B0=EF=BC=8C=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E5=94=AF=E4=B8=80=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEmployeeRegisterServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 64086e6e90..aecf01c5ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.Map; @@ -88,9 +89,12 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Thu, 27 Oct 2022 13:30:51 +0800 Subject: [PATCH 369/621] =?UTF-8?q?/gov/issue/issuevotedetail/joinvote?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IssueVoteDetailServiceImpl.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index eedfd2bb77..e0c4f58193 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -46,6 +47,7 @@ import com.epmet.redis.IssueVoteDetailRedis; import com.epmet.service.IssueService; import com.epmet.service.IssueVoteDetailService; import com.epmet.utils.ModuleConstants; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -207,10 +209,21 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(IssueVoteDetailEntity::getIssueId,checkVoteFormDTO.getIssueId()) + .eq(IssueVoteDetailEntity::getCreatedBy,checkVoteFormDTO.getUserId()) + .orderByDesc(IssueVoteDetailEntity::getCreatedTime); + List list=baseDao.selectList(queryWrapper); + if(CollectionUtils.isNotEmpty(list)){ resultDTO.setJoinVote(true); - resultDTO.setAttitude(issueVoteDetailDTO.getAttitude()); + resultDTO.setAttitude(list.get(0).getAttitude()); return resultDTO; } if (issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){ From d66b524f1f318b4f7be184d108b576176c13a076 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 13:33:45 +0800 Subject: [PATCH 370/621] /gov/issue/issuevotestatistical/votecount --- .../src/main/resources/mapper/IssueVoteStatisticalDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml index fa89630a63..8026d7b5ed 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml @@ -39,6 +39,7 @@ del_flag = 0 AND issue_id = #{issueId} AND created_by = #{userId} + order by CREATED_TIME desc limit 1 From bf479207d7fa619d3d7009d2609d6f0211fda95f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 13:49:45 +0800 Subject: [PATCH 371/621] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmployeeRegisterListFormDTO.java | 9 +++++++ .../IcEmployeeRegisterController.java | 2 +- .../com/epmet/dao/IcEmployeeRegisterDao.java | 8 ++++++ .../impl/IcEmployeeRegisterServiceImpl.java | 13 +++++++++- .../mapper/IcEmployeeRegisterDao.xml | 26 ++++++++++++++++++- 5 files changed, 55 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java index d1bac85f97..85f2da1d18 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -38,4 +39,12 @@ public class EmployeeRegisterListFormDTO extends PageFormDTO implements Serializ private String name; private String mobile; private String idCard; + + public interface RegisterDetailList{} + + /** + * 人员详情列表使用 + */ + @NotBlank(message = "registerId不能为空",groups = RegisterDetailList.class) + private String registerId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index b31e4f7b7a..4df78f16b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -109,7 +109,7 @@ public class IcEmployeeRegisterController { @PostMapping("detailList") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result> employeeRegisterDetailList(@RequestBody EmployeeRegisterListFormDTO formDTO, @LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class, EmployeeRegisterListFormDTO.RegisterDetailList.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icEmployeeRegisterService.employeeRegisterDetailList(formDTO)); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index e5756c7a2b..56843e67c7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -42,4 +42,12 @@ public interface IcEmployeeRegisterDao extends BaseDao */ List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + /** + * @Description 员工疫情管理详情列表 + * @param formDTO + * @Author zxc + * @Date 2022/10/27 13:24 + */ + List employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index aecf01c5ca..5748cde435 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -157,7 +157,18 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl employeeRegisterDetailList(EmployeeRegisterListFormDTO formDTO) { - return null; + PageData result = new PageData<>(); + List list; + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterDetailList(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + list = baseDao.employeeRegisterDetailList(formDTO); + result.setTotal(list.size()); + result.setList(list); + } + return result; } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index cc07dec0d6..177aae0e96 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -37,7 +37,7 @@ ie.PLACE_ORG_NAME, ie.PLACE_CATEGORY FROM ic_enterprise ie - left join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 + INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') @@ -75,4 +75,28 @@ GROUP BY t.registerId ORDER BY LATEST_NAT_TIME desc + + + \ No newline at end of file From 0fe5fce924a28eeecf4319285005860129186efc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 13:51:37 +0800 Subject: [PATCH 372/621] 1 --- .../controller/IcEmployeeRegisterController.java | 6 +++--- .../controller/IcGroupPeopleRegisterController.java | 2 +- .../java/com/epmet/dao/IcEmployeeRegisterDao.java | 2 +- .../epmet/service/IcEmployeeRegisterService.java | 2 +- .../service/impl/IcEmployeeRegisterServiceImpl.java | 13 ++++++++++--- .../main/resources/mapper/IcEmployeeRegisterDao.xml | 3 ++- .../resources/mapper/IcGroupPeopleRegisterDao.xml | 4 ++-- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index b31e4f7b7a..9ebbfef654 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -72,14 +72,14 @@ public class IcEmployeeRegisterController { } /** - * @Description 批量删除 + * @Description 批量删除 http://yapi.elinkservice.cn/project/102/interface/api/8238 * @param ids * @Author zxc * @Date 2022/10/27 08:57 */ @PostMapping("delete") - public Result delete(@RequestBody List ids){ - icEmployeeRegisterService.delete(ids); + public Result delete(@LoginUser TokenDto tokenDto,@RequestBody List ids){ + icEmployeeRegisterService.delete(ids,tokenDto.getUserId()); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index 200e985304..f618805920 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -76,7 +76,7 @@ public class IcGroupPeopleRegisterController { } /** - * @Description 受众群体列表 + * @Description 受众群体列表 http://yapi.elinkservice.cn/project/102/interface/api/8244 * @param tokenDto * @param formDTO * @Author zxc diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index e5756c7a2b..06ad450b4a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -32,7 +32,7 @@ public interface IcEmployeeRegisterDao extends BaseDao * @Author zxc * @Date 2022/10/26 17:34 */ - void delRegisterDetail(@Param("registerIds")List registerIds); + void delRegisterDetail(@Param("registerIds")List registerIds,@Param("operUserId")String operUserId); /** * @Description 员工疫情管理列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java index fdcbcc1b2a..ebaa0a4d8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -75,7 +75,7 @@ public interface IcEmployeeRegisterService extends BaseService ids); + void delete(List ids,String operUserId); /** * @Description 员工疫情管理列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index aecf01c5ca..43b383d283 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -1,9 +1,11 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +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.page.PageData; @@ -115,10 +117,15 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { + public void delete(List ids,String operUserId) { if (CollectionUtils.isNotEmpty(ids)){ - baseDao.deleteBatchIds(ids); - baseDao.delRegisterDetail(ids); + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.in(IcEmployeeRegisterEntity::getId,ids); + updateWrapper.set(IcEmployeeRegisterEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcEmployeeRegisterEntity::getUpdatedBy,operUserId) + .set(IcEmployeeRegisterEntity::getUpdatedTime,new Date()); + baseDao.update(null,updateWrapper); + baseDao.delRegisterDetail(ids,operUserId); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index cc07dec0d6..0be6f12084 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -7,7 +7,8 @@ update ic_employee_register_detail set del_flag = 1, - updated_time = NOW() + updated_time = NOW(), + UPDATED_BY = #{operUserId} where REGISTER_ID in ( #{registerId} diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml index 6e1d642ad1..ea2a031caa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -13,7 +13,7 @@ FROM ic_enterprise ie INNER JOIN ic_group_people_register pr ON pr.ENTERPRISE_ID = ie.ID AND pr.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 - AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') AND ie.PLACE_ORG_NAME LIKE CONCAT('%',#{placeOrgName},'%') @@ -23,6 +23,6 @@ AND DATE_FORMAT(pr.NAT_TIME,'%Y-%m-%d') >= #{natEndDate} - ORDER BY pr.NAT_TIME DESC + ORDER BY pr.NAT_TIME DESC,pr.CREATED_TIME desc \ No newline at end of file From 7a3cc5a0deca1f33ac76e58d6b39017e07621151 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 14:09:40 +0800 Subject: [PATCH 373/621] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=84=B1=E6=95=8F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dao/govorg/CustomerAgencyDao.java | 9 +++++++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 8 ++++++++ .../dataaggre/service/govorg/GovOrgService.java | 9 +++++++++ .../service/govorg/impl/GovOrgServiceImpl.java | 11 +++++++++++ .../resources/mapper/govorg/CustomerAgencyDao.xml | 5 +++++ .../com/epmet/constant/NeighborhoodConstant.java | 5 +++++ .../com/epmet/dto/form/DetailByTypeFormDTO.java | 13 +++++++++++++ 7 files changed, 60 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 7c3bbfd838..3e80bbf9ba 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -26,6 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.LinkedList; import java.util.List; +import java.util.Map; /** * 机关单位信息表 @@ -110,4 +111,12 @@ public interface CustomerAgencyDao extends BaseDao { List getSubAgencyList(@Param("agencyId") String agencyId); List getSubAgencyListByAgency(@Param("customerId") String customerId, @Param("agencyId") String agencyId); + + /** + * @Description 查询员工的证件号和手机号 + * @param registerId + * @Author zxc + * @Date 2022/10/27 14:03 + */ + Map getEmployeeRegisterMobileAndIdCard(@Param("registerId") String registerId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index bbde669a5c..f6de7bd634 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -1095,6 +1095,14 @@ public class EpmetUserServiceImpl implements EpmetUserService { result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); result.setMobile(info.get(NeighborhoodConstant.MOBILE)); msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(核酸检测信息)"); + }else if (formDTO.getType().equals(NeighborhoodConstant.EMPLOYEE_EPIDEMIC_MANAGE_DETAIL)){ + Map info = govOrgService.getEmployeeRegisterMobileAndIdCard(formDTO.getId()); + if (null == info){ + throw new EpmetException("未查询到员工登记信息："+formDTO.getId()); + } + result.setIdCard(info.get(NeighborhoodConstant.ID_CARD)); + result.setMobile(info.get(NeighborhoodConstant.MOBILE)); + msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(员工登记信息)"); } // 发送mq消息 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 8c92a4004e..7464db5e2b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -17,6 +17,7 @@ import com.epmet.dto.IcNeighborHoodDTO; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** * @Author zxc @@ -292,4 +293,12 @@ public interface GovOrgService { ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid); + /** + * @Description 查询员工的证件号和手机号 + * @param registerId + * @Author zxc + * @Date 2022/10/27 14:03 + */ + Map getEmployeeRegisterMobileAndIdCard(String registerId); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 7265e9bcae..196126509c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1523,4 +1523,15 @@ public class GovOrgServiceImpl implements GovOrgService { return resultDTO; } + /** + * @Description 查询员工的证件号和手机号 + * @param registerId + * @Author zxc + * @Date 2022/10/27 14:03 + */ + @Override + public Map getEmployeeRegisterMobileAndIdCard(String registerId) { + return customerAgencyDao.getEmployeeRegisterMobileAndIdCard(registerId); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 9af0849b72..90f40009c2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -326,4 +326,9 @@ AND pid = #{agencyId} + + + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java index 261b951496..9a8a2a145d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java @@ -63,4 +63,9 @@ public interface NeighborhoodConstant { */ String FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY = "focusGroupSpecialAttentionHistory"; + /** + * 员工疫情管理详情 + */ + String EMPLOYEE_EPIDEMIC_MANAGE_DETAIL = "employeeEpidemicManageDetail"; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java index 45fc98f517..8a2d6c0444 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DetailByTypeFormDTO.java @@ -17,6 +17,19 @@ public class DetailByTypeFormDTO implements Serializable { public interface DetailByTypeForm{} + /** + * 房屋：checkHouse + * 居民：checkIcResiUser + * 居民防疫信息：JMFYXX + * 行程随访：routeFollow + * 疫苗接种记录：vaccinationRecord + * 疫苗接种关注名单：vaccineSpecialAttention + * 未做核酸比对：noNatCompare + * 核酸检测记录：natRecord + * 重点人群关注名单【防疫隔离】：focusGroupSpecialAttentionQuarantine + * 重点人群关注名单【历史记录】：focusGroupSpecialAttentionHistory + * 员工疫情管理详情：employeeEpidemicManageDetail + */ @NotBlank(message = "type不能为空",groups = DetailByTypeForm.class) private String type; From 6242f3fd2880fd1139f14ebcbc849de6b7443270 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:13:25 +0800 Subject: [PATCH 374/621] 2 --- .../IcGroupPeopleRegisterController.java | 10 ++++++-- .../service/IcGroupPeopleRegisterService.java | 2 +- .../IcGroupPeopleRegisterServiceImpl.java | 25 ++++++++++++++----- .../mapper/IcEmployeeRegisterDao.xml | 2 +- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index f618805920..01b394c759 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -69,9 +69,15 @@ public class IcGroupPeopleRegisterController { return new Result(); } + /** + * 受众群体管理删除 + * http://yapi.elinkservice.cn/project/102/interface/api/8250 + * @param ids + * @return + */ @PostMapping("delete") - public Result delete(@RequestBody List ids){ - icGroupPeopleRegisterService.delete(ids); + public Result delete(@LoginUser TokenDto tokenDto,@RequestBody List ids){ + icGroupPeopleRegisterService.delete(ids,tokenDto.getUserId()); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java index bf9da45602..9dcad3b267 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -75,7 +75,7 @@ public interface IcGroupPeopleRegisterService extends BaseService ids); + void delete(List ids,String operUserId); /** * @Description 受众群体列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java index abb40f2269..e0ca969f52 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -1,18 +1,19 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +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.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcGroupPeopleRegisterDao; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; -import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import com.epmet.service.IcGroupPeopleRegisterService; @@ -20,11 +21,10 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; 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.Date; import java.util.List; import java.util.Map; @@ -82,11 +82,24 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl ids) { + public void delete(List ids,String operUserId) { if (CollectionUtils.isNotEmpty(ids)){ - baseDao.deleteBatchIds(ids); + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.in(IcGroupPeopleRegisterEntity::getId,ids) + .set(IcGroupPeopleRegisterEntity::getUpdatedBy,operUserId) + .set(IcGroupPeopleRegisterEntity::getUpdatedTime,new Date()) + .set(IcGroupPeopleRegisterEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null,updateWrapper); + // baseDao.deleteBatchIds(ids); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 62e0750a54..fcb029f4e1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -98,6 +98,6 @@ AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - ORDER BY LATEST_NAT_TIME DESC + ORDER BY rd.LATEST_NAT_TIME DESC,rd.CREATED_TIME desc \ No newline at end of file From 1865752ec3dec9e0befd2c9de9d4d2709a5029b8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:31:57 +0800 Subject: [PATCH 375/621] SCALE_TOTAL --- .../gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index bc7c954052..ea64f9507d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -49,6 +49,7 @@ ie.LONGITUDE, ie.LATITUDE, ie.SCALE, + ie.SCALE_TOTAL, ie.PERSON_IN_CHARGE, ie.MOBILE, ie.SOURCE_TYPE, From 93948c6ceae6c6addb9140b1bfb35784f84c6efb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:38:54 +0800 Subject: [PATCH 376/621] employeeRegisterList --- .../resources/mapper/IcEmployeeRegisterDao.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index fcb029f4e1..4d0404334d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -41,7 +41,13 @@ INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 - AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + ORDER BY rd.CREATED_TIME DESC )t where 1=1 @@ -54,6 +60,14 @@ AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natStartDate} + + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natEndDate} + + From 28220074b437770561feb98c2a7af4590f80483e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:47:43 +0800 Subject: [PATCH 377/621] =?UTF-8?q?checkStatus=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEmployeeRegisterDao.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 4d0404334d..dbda4a3d7b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -42,11 +42,13 @@ left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} - - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + ORDER BY rd.CREATED_TIME DESC )t From aa5c2aaccf6786a4ac2b6d5393952e7063439a4d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 15:48:43 +0800 Subject: [PATCH 378/621] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmployeeRegisterListFormDTO.java | 3 + .../result/EmployeeRegisterListResultDTO.java | 3 + .../constant/CustomerAgencyConstant.java | 2 +- .../com/epmet/dao/IcEmployeeRegisterDao.java | 2 + .../impl/IcEmployeeRegisterServiceImpl.java | 18 ++-- .../mapper/IcEmployeeRegisterDao.xml | 87 ++++++++++++------- 6 files changed, 79 insertions(+), 36 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java index 85f2da1d18..7a2fb690e2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EmployeeRegisterListFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; /** * @Author zxc @@ -47,4 +48,6 @@ public class EmployeeRegisterListFormDTO extends PageFormDTO implements Serializ */ @NotBlank(message = "registerId不能为空",groups = RegisterDetailList.class) private String registerId; + + private List registerIds; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java index 047c5374dd..98ddd2ab8c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EmployeeRegisterListResultDTO.java @@ -21,6 +21,8 @@ public class EmployeeRegisterListResultDTO implements Serializable { private String latestNatTime; private String registerId; + private String agencyId; + public EmployeeRegisterListResultDTO() { this.placeOrgName = ""; this.name = ""; @@ -29,5 +31,6 @@ public class EmployeeRegisterListResultDTO implements Serializable { this.ymjzCount = NumConstant.ZERO; this.latestNatTime = ""; this.registerId = ""; + this.agencyId = ""; } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index c41372e2a7..aede67b81e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -90,6 +90,6 @@ public interface CustomerAgencyConstant { String AREA_CODE_SWITCH_OPEN="open"; - String JUMP_URL = "http://192.168.1.140/epmet-oper/#/staffRegister?"; + String JUMP_URL = "http://192.168.1.140/epmet-oper-gov/#/staffRegister?"; // String JUMP_URL = "https://epmet-open.elinkservice.cn/epmet-oper-gov/#/staffRegister?"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java index a0752de3bd..2211398af1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.entity.IcEmployeeRegisterEntity; @@ -41,6 +42,7 @@ public interface IcEmployeeRegisterDao extends BaseDao * @Date 2022/10/27 09:15 */ List employeeRegisterList(EmployeeRegisterListFormDTO formDTO); + List employeeRegisterListNoCheck(EmployeeRegisterListFormDTO formDTO); /** * @Description 员工疫情管理详情列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index d10f34ec98..621e7e29fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 员工登记表 @@ -144,14 +145,21 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl result = new PageData<>(); List list; + // 未核酸检测的查询，根据所有企业下登记过的员工，筛出时间段内已检测的，剩下的就是未检测 if (formDTO.getIsPage()){ - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + PageInfo pageInfo = new PageInfo<>(); + if (formDTO.getCheckStatus().equals(NumConstant.ONE_STR)){ + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); + }else { + // 已检测 + List checked = baseDao.employeeRegisterList(formDTO); + if (CollectionUtils.isNotEmpty(checked)){ + formDTO.setRegisterIds(checked.stream().map(m -> m.getRegisterId()).collect(Collectors.toList())); + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterListNoCheck(formDTO)); + } + } result.setList(pageInfo.getList()); result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); - }else { - list = baseDao.employeeRegisterList(formDTO); - result.setList(list); - result.setTotal(list.size()); } return result; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index dbda4a3d7b..148c22758d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -36,44 +36,22 @@ ier.ID_CARD, ier.ENTERPRISE_ID, ie.PLACE_ORG_NAME, - ie.PLACE_CATEGORY + ie.PLACE_CATEGORY, + ie.AGENCY_ID FROM ic_enterprise ie INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} - - - AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - - ORDER BY rd.CREATED_TIME DESC )t where 1=1 - - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - - - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natStartDate} - - - AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natEndDate} - - - - - - + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + AND PLACE_ORG_NAME LIKE CONCAT('%',#{placeOrgName},'%') @@ -102,6 +80,7 @@ rd.YMJZ_COUNT, rd.LATEST_NAT_TIME, ie.PLACE_ORG_NAME, + ie.AGENCY_ID, ier.ID AS registerId FROM ic_employee_register ier LEFT JOIN ic_enterprise ie ON ie.ID = ier.ENTERPRISE_ID AND ie.DEL_FLAG = 0 @@ -116,4 +95,52 @@ ORDER BY rd.LATEST_NAT_TIME DESC,rd.CREATED_TIME desc + + \ No newline at end of file From 1a74189caa9b9eadbc20ececcbd775cf3673a897 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 16:24:13 +0800 Subject: [PATCH 379/621] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEmployeeRegisterDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 148c22758d..21be167f64 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -120,9 +120,9 @@ ORDER BY rd.CREATED_TIME DESC )t where 1=1 - AND registerId NOT IN ( - - #{id} + AND ( + + registerId != #{id} ) From db7ac81a2eb4fe63d3eb22f1b6c4f955a97ee196 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Oct 2022 17:34:53 +0800 Subject: [PATCH 380/621] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEmployeeRegisterDao.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 21be167f64..5bb4bb0533 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -42,7 +42,13 @@ INNER join ic_employee_register ier ON ier.ENTERPRISE_ID = ie.ID AND ier.DEL_FLAG = 0 left JOIN ic_employee_register_detail rd ON rd.REGISTER_ID = ier.ID AND rd.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 - AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + AND CONCAT(ie.AGENCY_PIDS,':',ie.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') >= #{natStartDate} + + + AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} + ORDER BY rd.CREATED_TIME DESC )t where 1=1 From 92d013f8bff75c2f8bc9570a9d3389a49c44fe02 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 27 Oct 2022 21:56:31 +0800 Subject: [PATCH 381/621] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7bug?= =?UTF-8?q?=20=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/yantai/DataSyncUserAndOrgServiceImpl.java | 7 ++----- .../epmet/service/impl/DataSyncUserDataServiceImpl.java | 9 ++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 16d281ed0c..287ff51e80 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -1,7 +1,6 @@ package com.epmet.controller.yantai; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoDTOCache; @@ -11,7 +10,6 @@ import com.epmet.commons.tools.utils.api.yt.UserData; import com.epmet.commons.tools.utils.api.yt.YantaiApi; import com.epmet.dao.yantai.DataSyncOrgDataDao; import com.epmet.dao.yantai.DataSyncUserDataDao; -import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.yantai.YtUserPageFormDTO; import com.epmet.dto.result.yantai.DataSyncOrgDataDTO; import com.epmet.dto.result.yantai.YtUserPageResDTO; @@ -64,7 +62,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService public Boolean yanTaiSyncUser(String organizationId) { String customerId = YT_CUSTOMER_ID; // 先删除 旧数据 - Integer delSize = NumConstant.ZERO; + Integer delSize = null; do { delSize = dataSyncUserDataService.deleteByCustomerId(customerId); }while (null != delSize && delSize == NumConstant.ONE_THOUSAND); @@ -92,7 +90,6 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService entity.setStatus(NumConstant.ZERO_STR); entity.setStaffId(""); }else { - CustomerStaffInfoCacheResult staffInfo1 = CustomerStaffRedis.getStaffInfo(customerId, staffInfo.getUserId()); entity.setStatus(NumConstant.ONE_STR); entity.setStaffId(staffInfo.getUserId()); } @@ -112,7 +109,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService @Override public Boolean yanTaiSyncOrg(String organizationId) { // 先删除 旧数据 - Integer delSize = NumConstant.ZERO; + Integer delSize = null; do { delSize = dataSyncOrgDataService.deleteByCustomerId(YT_CUSTOMER_ID); }while (null != delSize && delSize == NumConstant.ONE_THOUSAND); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java index 1b77490e52..7149e74507 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java @@ -3,15 +3,14 @@ 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.constant.FieldConstant; 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.yantai.DataSyncUserDataDao; import com.epmet.dto.DataSyncUserDataDTO; import com.epmet.entity.yantai.DataSyncUserDataEntity; import com.epmet.service.DataSyncUserDataService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,7 +19,7 @@ import java.util.List; import java.util.Map; /** - * + * * * @author generator generator@elink-cn.com * @since v1.0.0 2022-10-18 @@ -82,7 +81,7 @@ public class DataSyncUserDataServiceImpl extends BaseServiceImpl Date: Fri, 28 Oct 2022 10:14:25 +0800 Subject: [PATCH 382/621] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E3=80=81=E5=91=98=E5=B7=A5=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E8=A1=A8=E3=80=81=E6=89=8B=E4=B8=AD=E7=BE=A4=E4=BD=93?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.46__ic_employee.sql | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.46__ic_employee.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.46__ic_employee.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.46__ic_employee.sql new file mode 100644 index 0000000000..cb637f8d03 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.46__ic_employee.sql @@ -0,0 +1,48 @@ +CREATE TABLE `ic_employee_register` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `ENTERPRISE_ID` varchar(64) NOT NULL COMMENT '场所id', + `NAME` varchar(64) NOT NULL COMMENT '姓名', + `MOBILE` varchar(32) NOT NULL COMMENT '手机号', + `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号或护照号', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `IDX_ENTERPRISE_ID` (`ENTERPRISE_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='员工登记表'; + +CREATE TABLE `ic_employee_register_detail` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `REGISTER_ID` varchar(64) NOT NULL COMMENT 'ic_employee_register.ID', + `YMJZ_COUNT` int(11) NOT NULL COMMENT '疫苗接种次数：0,1,2,3', + `LATEST_NAT_TIME` date NOT NULL COMMENT '最近一次核酸检测时间：yyyy-MM-dd 日期', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `IDX_REGISTER_ID` (`REGISTER_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='员工登记明细表'; + +CREATE TABLE `ic_group_people_register` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `ENTERPRISE_ID` varchar(64) NOT NULL COMMENT '场所id', + `NAT_TIME` date NOT NULL COMMENT '核酸检测时间：yyyy-MM-dd 日期', + `SZ_TOTAL` int(11) NOT NULL COMMENT '受众人数', + `HSJC_TOTAL` int(11) NOT NULL COMMENT '核酸检测人数', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='受众群体登记表'; \ No newline at end of file From 64258a109119c3abb0dc7f18fcc779e8fbc6b97b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 28 Oct 2022 10:29:31 +0800 Subject: [PATCH 383/621] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcEnterpriseServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index a06d5c9d48..e565219ed6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -598,6 +598,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = list(formDTO).getList(); if (CollectionUtils.isEmpty(list)){ + log.error("根据条件未查询到企事业单位信息，登记码压缩包不能导出！"); return; } response.reset(); From b26072e40ae49fb222c1927f5acaf1cd2f73c917 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 28 Oct 2022 11:43:16 +0800 Subject: [PATCH 384/621] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=9C=BA=E6=89=80?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEnterpriseServiceImpl.java | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index e565219ed6..bb74a15548 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -14,6 +14,7 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.CommonOperateTypeEnum; import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -69,7 +70,6 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import static com.epmet.constant.CustomerAgencyConstant.JUMP_URL; import static com.epmet.service.impl.HouseServiceImpl.bufferedImageToInputStream; /** @@ -590,12 +590,21 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = list(formDTO).getList(); if (CollectionUtils.isEmpty(list)){ log.error("根据条件未查询到企事业单位信息，登记码压缩包不能导出！"); @@ -611,9 +620,31 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl CollectionUtils.isNotEmpty(o.getScopeList())).count(); + if (count < 1) { + log.warn("dataSyncYanTaiParallel scopeList is null"); + return; + } + //没传具体参数 则 按照 + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_THOUSAND; + + List dbResiList = null; + CountDownLatch countDownLatch = new CountDownLatch((int) count); + + do { + for (DataSyncConfigDTO config : configList) {//设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + + //查询正常状态的居民 并回显 残疾状态 + formDTO.setCategoryColumn("IS_CJ"); + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + if (CollectionUtils.isEmpty(dbResiList)) { continue; } - disAllData(config,formDTO); + List finalDbResiList = dbResiList; + switch (anEnum) { + case HE_SUAN: + executorService.submit(() -> { + try { + //查询正常状态的居民 + hsjc(finalDbResiList, config.getCustomerId(), formDTO.getIsSync()); + log.info("======核酸检测信息拉取结束======"); + } catch (Exception e) { + log.error("hsjc thread execute exception", e); + } finally { + countDownLatch.countDown(); + } + }); + + break; + case CAN_JI: + executorService.submit(() -> { + try { + //查询正常状态的居民 + canJi(finalDbResiList); + log.info("======canJi信息拉取结束======"); + } catch (Exception e) { + log.error("hsjc thread execute exception", e); + } finally { + countDownLatch.countDown(); + } + }); + + break; + case SI_WANG: + try { + //查询正常状态的居民 + siWang(finalDbResiList); + log.info("======siWang信息拉取结束======"); + } catch (Exception e) { + log.error("hsjc thread execute exception", e); + } finally { + countDownLatch.countDown(); + } + break; + default: + log.warn("没有要处理的数据"); + } + try { + //等这一批居民 各个方法都执行完后 再继续下一批 + countDownLatch.await(); + } catch (InterruptedException e) { + log.error("dataSyncYanTaiParallel现成被中断"); + } } - } + + pageNo++; + } while (dbResiList != null && dbResiList.size() == pageSize); + } private void disAllData(DataSyncConfigDTO config,DataSyncTaskParam formDTO){ @@ -312,7 +410,6 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(pageNo, pageSize, false) .doSelectPageInfo(() -> baseDao.getIdCardsByScope(formDTO)); - List dbResiList; - dbResiList = pageInfo.getList(); - /* //如果传了身份证号 则按照身份证号查询 并同步记录， userId如果为空则是 手动录入的 此人没有录入居民库 但是也可以同步 - if (CollectionUtils.isNotEmpty(formDTO.getIdCards()) && DataSyncEnum.HE_SUAN.getCode().equals(anEnum.getCode())) { - List collect = formDTO.getIdCards().stream().map(id -> { - NatUserInfoResultDTO e = new NatUserInfoResultDTO(); - e.setIdCard(id); - e.setUserId(""); - return e; - }).collect(Collectors.toList()); - - for (NatUserInfoResultDTO c : collect) { - dbResiList.stream().filter(u -> u.getIdCard().equals(c.getIdCard())).forEach(u -> c.setUserId(u.getUserId())); - } - dbResiList = collect; - }*/ - return dbResiList; + return pageInfo.getList(); } private void canJi(List resiList) { From 39c621a47c8715203adc0cb0a730c0b904a6dbaf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 28 Oct 2022 14:00:29 +0800 Subject: [PATCH 386/621] emm --- .../epmet/dto/result/GroupPeopleRegisterListResultDTO.java | 1 + .../epmet/service/impl/IcEmployeeRegisterServiceImpl.java | 6 +++--- .../src/main/resources/mapper/IcGroupPeopleRegisterDao.xml | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java index 172d875f03..3fcb98125a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GroupPeopleRegisterListResultDTO.java @@ -17,4 +17,5 @@ public class GroupPeopleRegisterListResultDTO implements Serializable { private String szTotal; private String hsjcTotal; private String id; + private String agencyId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 621e7e29fc..1d3f5b0de7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -148,15 +148,15 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(); - if (formDTO.getCheckStatus().equals(NumConstant.ONE_STR)){ - pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); - }else { + if (formDTO.getCheckStatus().equals(NumConstant.ZERO_STR)){ // 已检测 List checked = baseDao.employeeRegisterList(formDTO); if (CollectionUtils.isNotEmpty(checked)){ formDTO.setRegisterIds(checked.stream().map(m -> m.getRegisterId()).collect(Collectors.toList())); pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterListNoCheck(formDTO)); } + }else { + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.employeeRegisterList(formDTO)); } result.setList(pageInfo.getList()); result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml index ea2a031caa..88e9d73f79 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -9,7 +9,8 @@ pr.ID, pr.NAT_TIME, pr.SZ_TOTAL, - pr.HSJC_TOTAL + pr.HSJC_TOTAL, + ie.AGENCY_ID FROM ic_enterprise ie INNER JOIN ic_group_people_register pr ON pr.ENTERPRISE_ID = ie.ID AND pr.DEL_FLAG = 0 WHERE ie.DEL_FLAG = 0 From c5a9affe21470ef5f33403876779d5232db5a4ec Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 28 Oct 2022 14:16:48 +0800 Subject: [PATCH 387/621] emm --- .../com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java | 2 +- .../java/com/epmet/service/impl/IcEnterpriseServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 1d3f5b0de7..ef4b424c63 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -148,7 +148,7 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(); - if (formDTO.getCheckStatus().equals(NumConstant.ZERO_STR)){ + if (StringUtils.isNotBlank(formDTO.getCheckStatus()) && formDTO.getCheckStatus().equals(NumConstant.ZERO_STR)){ // 已检测 List checked = baseDao.employeeRegisterList(formDTO); if (CollectionUtils.isNotEmpty(checked)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index bb74a15548..68f8c03fe2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -57,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.IOException; @@ -608,6 +609,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl list = list(formDTO).getList(); if (CollectionUtils.isEmpty(list)){ log.error("根据条件未查询到企事业单位信息，登记码压缩包不能导出！"); + ServletOutputStream outputStream = response.getOutputStream(); + outputStream.write("{\"code\":9999,\"msg\":\"未查到企事业单位信息\",\"data\":{}}".getBytes()); + outputStream.flush(); return; } response.reset(); From 7c623e48517853ad80a52f165b1ff3a05aef84ca Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 28 Oct 2022 17:15:13 +0800 Subject: [PATCH 388/621] emm --- .../com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index ef4b424c63..daf6e7d1f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -144,7 +144,6 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl result = new PageData<>(); - List list; // 未核酸检测的查询，根据所有企业下登记过的员工，筛出时间段内已检测的，剩下的就是未检测 if (formDTO.getIsPage()){ PageInfo pageInfo = new PageInfo<>(); From df0c2ac88711ab867fc7ed81bf4306c8d954b2fd Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 28 Oct 2022 18:21:42 +0800 Subject: [PATCH 389/621] =?UTF-8?q?excel=E6=A0=B9=E6=8D=AE=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcVaccinePrarmeterServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index e56c8d5a0a..5f2590c1eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -225,11 +225,11 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl errorInfo.size()){ - Map groupByName = list.stream().collect(Collectors.groupingBy(IcVaccinePrarmeterImportExcel::getName, Collectors.counting())); - groupByName.forEach((name,count) -> { + Map groupByIdCard = list.stream().collect(Collectors.groupingBy(IcVaccinePrarmeterImportExcel::getIdCard, Collectors.counting())); + groupByIdCard.forEach((idCard,count) -> { if (Integer.valueOf(count.toString()).compareTo(1) != 0){ for (IcVaccinePrarmeterImportExcel i : list) { - if (name.equals(i.getName()) && !i.getAddStatus()){ + if (idCard.equals(i.getIdCard()) && !i.getAddStatus()){ errorInfo.add(getErrorInfo(i,"数据重复",i.getNum())); i.setAddStatus(true); } From 57bcc893816a2bb30899b5832348d1eed3dc9a40 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 28 Oct 2022 18:48:10 +0800 Subject: [PATCH 390/621] =?UTF-8?q?excel=E6=A0=B9=E6=8D=AE=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8E=BB=E9=87=8D---=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcVaccinePrarmeterDao.java | 3 +++ .../service/impl/IcVaccinePrarmeterServiceImpl.java | 9 +++++++++ .../src/main/resources/mapper/IcVaccinePrarmeterDao.xml | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java index c5bdfcdbf7..a0a579e1cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java @@ -6,6 +6,7 @@ import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.entity.IcVaccinePrarmeterEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -28,4 +29,6 @@ public interface IcVaccinePrarmeterDao extends BaseDao */ List getPhrasePage(Map params); + void deleteByIdCard(@Param("isCardList") List isCardList); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 5f2590c1eb..4c4da7574b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -241,12 +241,21 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl needInsert = groupByStatus.get(false); if (CollectionUtils.isNotEmpty(needInsert)){ List entities = ConvertUtils.sourceToTarget(needInsert, IcVaccinePrarmeterEntity.class); + // 要删除的身份证号 + List isCardList = new ArrayList(); entities.forEach(e -> { // 设置客户ID e.setCustomerId(tokenDto.getCustomerId()); // 设置审核状态为待审核 e.setCheckState("0"); + // 存储删除身份证号 + isCardList.add(e.getIdCard()); }); + + // 先根据身份证号删除 + baseDao.deleteByIdCard(isCardList); + + // 再新增 insertBatch(entities); } if (CollectionUtils.isNotEmpty(errorInfo)){ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index ebbebfe289..0a82a1f665 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -185,5 +185,13 @@ order by CREATED_TIME desc + + update ic_vaccine_prarmeter set DEL_FLAG = '1' , UPDATED_TIME = now() + where ID_CARD IN + + #{idCard} + + + From 98ed4568e8117110c433add24ce1c1f676cfd9fe Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 31 Oct 2022 09:15:40 +0800 Subject: [PATCH 391/621] emm --- .../com/epmet/service/impl/DataSyncConfigServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 632e27828b..625d324151 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -438,7 +438,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Mon, 31 Oct 2022 10:11:50 +0800 Subject: [PATCH 392/621] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/EnterpriseImportExcelDTO.java | 7 +++--- .../IcEnterpriseExcelImportListener.java | 21 +++++++++--------- .../service/impl/IcEnterpriseServiceImpl.java | 6 ++--- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9302 -> 9306 bytes 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 64c847d684..2622dfccda 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -27,7 +27,7 @@ public class EnterpriseImportExcelDTO { * 默认0 */ @NotBlank(message = "场所类别不能为空") - @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + @ExcelProperty(value = "场所类别") private String placeCategoryName; @@ -56,10 +56,11 @@ public class EnterpriseImportExcelDTO { * 2:21-40人 * 3:41-100人 * 4:100人以上】 + * 改为手输数字了 */ @NotBlank(message = "规模不能为空") @ExcelProperty(value = "规模") - private String scaleName; + private Integer scaleTotal; /** * 场所负责人 @@ -108,7 +109,7 @@ public class EnterpriseImportExcelDTO { @ColumnWidth(20) @ExcelProperty(value = "规模") - private String scaleName; + private Integer scaleTotal; @ColumnWidth(20) @ExcelProperty(value = "负责人") diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java index 7ace7c5c5f..5495dd6ff6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java @@ -54,6 +54,12 @@ public class IcEnterpriseExcelImportListener implements ReadListener dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode()); Map placeTypeMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); //2、规模名称 - Result> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode()); - Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); + // Result> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode()); + // Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); + Map scaleMap=new HashMap<>(); //3、当前工作人员所属组织下的网格列表 List gridList = customerGridDao.selectGridList(staffInfo.getAgencyId()); if (CollectionUtils.isEmpty(gridList)) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx index 4be3184e6c178ac5b260efa8ebeef20baada39a5..8a3e054eaa4fec430d85d648d20b8728c9529b0d 100644 GIT binary patch delta 1545 zcmV+k2KM>ZNZLrSlK})zoAJ|BM^HK| zWsH1}AO|EbMJAUqx=v^A1UcF;DOg@gh|vZ#nkL6b5w9pO6KQt{A^(OTYmkV_bk?f*FPzpj-7sv_lHsBdZ6Mw*bL0 z;OutHU;i&F|ye`NdT` zs+-AXR~%3h2~N2JW=fTOy}x~IU+szTpxSIOXWGo|vKJYM(@pZZefoHQiSTd5;@b2b z6NF>)&@TO6xe3qC(-}$v5(F+8yZ$5%0y-)>p@iHujSt>8`MN@}YyTh7CvNDcB%owO z!*D>{1CloP;h#vp0Z>Z=1e2j58nY?`l>rH(?3|g>0{{T^lgI=gf5lcyj~hi0z9aD; zMt$I9&uhK5*VvABy)lVIq=-j2_s+EK(e_MFdfJ}dTR0Fw9R)kkTY{DfgkOJ&F zgkLk`;D15&yfTAf*-Jzp+}+h*Ree=mUE}VBJ(nso!UKnSJ!GglQix|U+wsOd^!|Ip zdK)Q$z@CjM^GFZvf0F=R=)eA2H)MP_m=Gcqu;2wfG!eq@Xj))Rh>HW2`NV^h5#ufv zu;pVd@HxSDqU2J|)b*z3V#hnD0*gIvDmL zxE+T&Vm}EtCq%?cJ7E~Ap&zK0m$4`%$Y^Oq45oo#?lu+}^}ERpT;*E7YderddG!h> zqaNBcI+qLt@&s|sAz@HjD+2GlODM4fv7uCuB1>S0v0Vwg3?g0HP5{y(wuCby143yJ z4c4HFt|vZVe+dq>!b5qTdmAQ2bCoML8R01v14ch^Y%%Gfw%RU_4U|LPVc{j>j3)w^ zHPi-D*i=x*BX5%#p`hPGE$P={6r8}X;ySY4k>cXLG?>(ZX{e3zK#G;5F7uycr%*RD zb%-v^)OB^OJkC@HmWg+mGj*e_wn_uu-WlH4Gj*7AfA5BBmdBau%}gEUT)n9p<#DEZ zD^mxKIr)wMPMwxsKyv%C8v9+&LIqwb+=RTlHRwNS$i;0!<@i`O7^BmM0<$D~6W~&U z6wnDkI_v9QZ3eYuWr(d+gi%EdRuN_uvAv2|t0FG0A{tf1FhxM66inBvh__M%)KGzF zRuS+fe`T~~M5{n(kih&6r5Uv$uh%ejV3ti$vDnm;sf9FEj})=*LrbSlAdrG7W#JaZ z-foiDV8X)7o<9{=ND$yLz$6I}UgVtdiZFfGTPE0--F`~3(SPIml!-T^)34*7K8wGa zFFv_Zi+=wwn%|C29>jO=N6+u3h^|(sbhRqGe^<(O)9h>-dZWGGYOc~={&287I?iY> zp4|EK<8R_0e~wNMGSQ3YpT`G}Ys)Wxjqe@D_ix7Y!`h2KK8=r07f%ltzdX%h_r8th zkKC@Fx#y@smf3hu_uWJI|J1d|z7}ezbga^Z!l6(CiHVH4%m$&F9gxqv+&z zS3 zn4eVP4ioS#OO_M(KS7`$=qi9mjEQ^$tv)>)CPMkeDgLnZ{{oO6v$hDq5DCFR9{BM9 z004KBfEmj`*yWz~?0PzXJ`TAFz0a3#z#%th!_&D9=yETXw>(?15JPm!{1;mmKiRbl zL!xoY^Ub@TPucon{al2cJ}}_yv#1)o1p%d#WFSBU4IBUflRhFAlfEDt0Wp)=Ad>`7 zoZz3%l!9X7P@c;k-cL4wZ6aWAK000000RSKX004@Uw<19S v?34K-Isv(pG$S?v;FD`3Kmo0jtRr3tqwJiS(gOeh^^+4MJqA4>000006j#;! delta 1536 zcmV+b2LJimNY+TOlK}){oZpU@luhjr<9%FW>HJe{J15=wnC^22dTDH|r9FhcH{#s}}4d|jc~w*QY95}%IJkT5!6 z!*Gwd10-$k!#|OH1G5YRvjGVtYO|oR0{{R=lgI=gf3;RkkK05Tz9aD;tT}K>{I%I6 z8X?5(h4(EFc4P zNCdhte|-C`e$4p3m=Yp2kPwIgno1e=3`00m;$xw+kOXiuX57aTwtQlUkQ3}Gl1~lW zG~0%cy#Qqrdi*>x*m&$YWS2RSPXd_<;e=ud_KT?(ibC3fdoFn{$1(U?*i$iaH@hk2 zS*t1ddTQxs@XHC#Qe+0|Nd_M}CAUFi)_B`szL*;H^5Rre& ziQ`z0L!moCZbcvT6ClZqRyI5j0?5hl1=f<$_dJx4l^%^JR0ot~Dmn{V63USLL zv8b#yiT7?2N*qaCC>5loC9ucXehRz-M`kKp0aA(Bk=~5#5K0H=BA~@>r303rz$i6T zf7gY!kt&+&Tyx17M^x@G`l08_=>T>0Zgp&-0&;`Jmx(u-O0cY@w~)pnNxgtvB{M>S zKR}&Sufr%PfnUw{(t1alj}J0uG6lA!x2gkajtX6_Um0K0?VP>=vB>GBzEK@#(!oll z9p;>Fb@fhVz}q`R`({puxzKLuc6FRde{bh>m1=5BjTzLElOt5c z)e%-5v9m72t|NBW5gT>HrFBHBju>SKsFc#u%{t<}3;{J%BHDEXyvfwtDxy;&e+&p< z@rJU9x)9e}n0hd$O;K}L6o6-nM17x|^LgC`#LYM6oq|=XS*8yQ?3LRwt*)*YoA4A2pWG z?*IA8H_4AbEnXhwN3VZ>kQ_a2f2_XxC3$$7Ji43Aj~lQ5_&hm%xqN=S{P}qSd-&~Q z{xrGwIQjKt@!Q9X7hg7#XHS-oziTA-U#-6QzOg*MvwCtj)7dvlBlbO z*9gH72}E$vEe-(y0F{%W8OvQ7Pj=3Ix}hJUT>r_Q#wWYFpX`|Rw0G*0y}g>)bw2Ic z^>qGx9C8zSpD*8lLvGH7r*j+7xaV9UPO8A`lxyaL_Fd0RRA%0RR9L000000000103ZMW0BMuEB0&Mmll>w(0hp6G mBQ^oQlW!wH0jZO)BVGw4YO|oR0{{R=lNTgC200)A0001*ztFk> From 33be9d1dac0ca6004b8d5efc44611c511f42f626 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 10:39:31 +0800 Subject: [PATCH 393/621] =?UTF-8?q?=E8=A7=84=E6=A8=A1=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9306 -> 9242 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx index 8a3e054eaa4fec430d85d648d20b8728c9529b0d..6981727e9b23f266ebb7d0b0eff797a54175ec81 100644 GIT binary patch delta 4127 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 IAOHXW06s+zz5oCK From c4630fed5f16b9663ae4a3f3a1667c5cc2e4f10e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 10:58:29 +0800 Subject: [PATCH 394/621] NotNull --- .../main/java/com/epmet/excel/EnterpriseImportExcelDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 2622dfccda..91dfa20ed9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** @@ -58,7 +59,7 @@ public class EnterpriseImportExcelDTO { * 4:100人以上】 * 改为手输数字了 */ - @NotBlank(message = "规模不能为空") + @NotNull(message = "规模不能为空") @ExcelProperty(value = "规模") private Integer scaleTotal; From 5047e5e2b12ed2c3cadd1a1b90726042e247a16f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 11:17:32 +0800 Subject: [PATCH 395/621] =?UTF-8?q?ic=5Fepidemic=5Fspecial=5Fattention?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E9=95=BF=E5=BA=A6=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.79__epidemic_special_attention_idcard.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__epidemic_special_attention_idcard.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__epidemic_special_attention_idcard.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__epidemic_special_attention_idcard.sql new file mode 100644 index 0000000000..e7d3515689 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__epidemic_special_attention_idcard.sql @@ -0,0 +1 @@ +alter table ic_epidemic_special_attention MODIFY COLUMN ID_CARD VARCHAR(32) not null comment '身份证号'; \ No newline at end of file From 6947799849c956909b1de50d9f5e2283a009ae06 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 13:55:28 +0800 Subject: [PATCH 396/621] log(IcEnterpri --- .../entity/IcEnterpriseChangeRecordEntity.java | 4 ++++ .../service/impl/IcEnterpriseServiceImpl.java | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java index 119362360c..bdeca2e352 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java @@ -76,6 +76,10 @@ public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity { */ private String scale; + /** + * 规模，手输数字 + */ + private Integer scaleTotal; /** * 场所负责人 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 3633b40e6e..124cb7f02b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -1,7 +1,6 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -13,7 +12,6 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.CommonOperateTypeEnum; import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; -import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -534,13 +532,13 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl scaleMap; + /*Map scaleMap; Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); if (!result.success() || null == result.getData()) { throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); } else { scaleMap = result.getData(); - } + }*/ if (formDTO != null) { if (!origin.getPlaceType().equals(formDTO.getPlaceType())) { @@ -562,12 +560,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl").concat(formDTO.getPlaceOrgName())); } - if (!origin.getScale().equals(formDTO.getScale())) { + /*if (!origin.getScale().equals(formDTO.getScale())) { record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); } else { record.setScale(scaleMap.get(origin.getScale())); + }*/ + if (origin.getScaleTotal() != formDTO.getScaleTotal()) { + record.setScale(origin.getScaleTotal().toString().concat("->").concat(formDTO.getScaleTotal().toString())); + } else { + record.setScale(origin.getScaleTotal().toString()); } - if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); } @@ -586,6 +588,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl Date: Mon, 31 Oct 2022 14:31:42 +0800 Subject: [PATCH 397/621] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../epmet/service/impl/IcEmployeeRegisterServiceImpl.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index ec9ee8c209..d7cb3ccd64 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -267,6 +267,7 @@ public enum EpmetErrorCode { NAT_RESULT_IS_NULL_ERROR(8932,"检测结果不能为空"), SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), + ID_CARD_ERROR(8935,"请输入正确的证件号"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index daf6e7d1f5..01f6f90e68 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -7,10 +7,13 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.form.EmployeeRegisterListFormDTO; @@ -22,6 +25,7 @@ import com.epmet.service.IcEmployeeRegisterService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,6 +88,9 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl Date: Mon, 31 Oct 2022 16:38:18 +0800 Subject: [PATCH 398/621] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcDangerAreaDTO.java | 84 +++++++++++++++++++ .../controller/IcDangerAreaController.java | 72 ++++++++++++++++ .../java/com/epmet/dao/IcDangerAreaDao.java | 16 ++++ .../com/epmet/entity/IcDangerAreaEntity.java | 54 ++++++++++++ .../epmet/service/IcDangerAreaService.java | 78 +++++++++++++++++ .../service/impl/IcDangerAreaServiceImpl.java | 83 ++++++++++++++++++ .../main/resources/mapper/IcDangerAreaDao.xml | 6 ++ 7 files changed, 393 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcDangerAreaDao.xml diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java new file mode 100644 index 0000000000..8597671a84 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java @@ -0,0 +1,84 @@ +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-10-31 + */ +@Data +public class IcDangerAreaDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 风险等级 + */ + private String dangerLevel; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String district; + + /** + * 省-市-区 + */ + private String allName; + + /** + * + */ + 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/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java new file mode 100644 index 0000000000..a9281264bd --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -0,0 +1,72 @@ +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.IcDangerAreaDTO; +import com.epmet.service.IcDangerAreaService; +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-10-31 + */ +@RestController +@RequestMapping("icDangerArea") +public class IcDangerAreaController { + + @Autowired + private IcDangerAreaService icDangerAreaService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icDangerAreaService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcDangerAreaDTO data = icDangerAreaService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcDangerAreaDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icDangerAreaService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcDangerAreaDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icDangerAreaService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icDangerAreaService.delete(ids); + return new Result(); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java new file mode 100644 index 0000000000..40e8775635 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcDangerAreaEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 疫情风险地区 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-31 + */ +@Mapper +public interface IcDangerAreaDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java new file mode 100644 index 0000000000..9d895750f9 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java @@ -0,0 +1,54 @@ +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-10-31 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_danger_area") +public class IcDangerAreaEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 风险等级 + */ + private String dangerLevel; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String district; + + /** + * 省-市-区 + */ + private String allName; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java new file mode 100644 index 0000000000..88e680c180 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.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.IcDangerAreaDTO; +import com.epmet.entity.IcDangerAreaEntity; + +import java.util.List; +import java.util.Map; + +/** + * 疫情风险地区 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-31 + */ +public interface IcDangerAreaService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-31 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-31 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcDangerAreaDTO + * @author generator + * @date 2022-10-31 + */ + IcDangerAreaDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-31 + */ + void save(IcDangerAreaDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-31 + */ + void update(IcDangerAreaDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-31 + */ + 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/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java new file mode 100644 index 0000000000..0e7a4d5b2f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -0,0 +1,83 @@ +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.IcDangerAreaDao; +import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.entity.IcDangerAreaEntity; +import com.epmet.service.IcDangerAreaService; +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-10-31 + */ +@Service +public class IcDangerAreaServiceImpl extends BaseServiceImpl implements IcDangerAreaService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcDangerAreaDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcDangerAreaDTO.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 IcDangerAreaDTO get(String id) { + IcDangerAreaEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcDangerAreaDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcDangerAreaDTO dto) { + IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(dto, IcDangerAreaEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcDangerAreaDTO dto) { + IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(dto, IcDangerAreaEntity.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/IcDangerAreaDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcDangerAreaDao.xml new file mode 100644 index 0000000000..65f889179a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcDangerAreaDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 29f3fab75d2c2f2772431e822b269b8616e7b1e6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 31 Oct 2022 16:52:37 +0800 Subject: [PATCH 399/621] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/exception/EpmetErrorCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index d7cb3ccd64..d0ebe0bf6d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -267,7 +267,7 @@ public enum EpmetErrorCode { NAT_RESULT_IS_NULL_ERROR(8932,"检测结果不能为空"), SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), - ID_CARD_ERROR(8935,"请输入正确的证件号"), + ID_CARD_ERROR(8935,"请输入正确的身份证号和护照号"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), From 0b93b6d0dde4dd8b4610683a9dc113e0b06cf18c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 31 Oct 2022 16:53:38 +0800 Subject: [PATCH 400/621] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/exception/EpmetErrorCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index d0ebe0bf6d..0bf690a8ea 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -267,7 +267,7 @@ public enum EpmetErrorCode { NAT_RESULT_IS_NULL_ERROR(8932,"检测结果不能为空"), SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), - ID_CARD_ERROR(8935,"请输入正确的身份证号和护照号"), + ID_CARD_ERROR(8935,"请输入正确的身份证号或护照号"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), From cd6a530ea43bf03fe6e16de9dafcf165430f37dc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 31 Oct 2022 16:55:43 +0800 Subject: [PATCH 401/621] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=97=E5=A2=9E=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A5=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=9A=84=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ChangeDeathDTO.java | 5 ++ .../com/epmet/dto/ChangeRelocationDTO.java | 5 ++ .../dto/result/IcMoveInListResultDTO.java | 6 ++ .../main/resources/mapper/ChangeDeathDao.xml | 1 + .../resources/mapper/ChangeRelocationDao.xml | 3 +- .../resources/mapper/IcMoveInRecordDao.xml | 86 +++++++++---------- 6 files changed, 62 insertions(+), 44 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java index 879732a1b4..f771404184 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java @@ -26,6 +26,11 @@ public class ChangeDeathDTO implements Serializable { */ private String id; + /** + * ic_resi_user主键 + */ + private String icResiUserId; + /** * epmet用户主键 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java index 088f8431d5..dd632ca671 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java @@ -24,6 +24,11 @@ public class ChangeRelocationDTO implements Serializable { */ private String id; + /** + * ic_resi_user主键 + */ + private String icResiUserId; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index 9ec9b5956d..d0be989687 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -18,6 +18,12 @@ public class IcMoveInListResultDTO implements Serializable { * 迁入Id */ private String moveInId; + + /** + * ic_resi_user主键 + */ + private String icResiUserId; + /** * 网格ID */ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml index 36a6f06002..f0e6b117b8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml @@ -28,6 +28,7 @@ SELECT d.id, u.id AS userId, + u.id as icResiUserId, d.GRID_ID, u.`NAME`, d.ID_CARD, diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml index 8bdf2847fe..0018ab91fb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml @@ -64,7 +64,8 @@ r.CREATED_TIME, r.UPDATED_TIME, r.OUT_OF_TIME, - r.IC_USER_ID + r.IC_USER_ID, + r.IC_USER_ID as icResiUserId FROM pli_change_relocation r LEFT JOIN ic_resi_user u ON u.ID_CARD = r.ID_CARD diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index 87e2d5f12b..03065d2e60 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -5,74 +5,74 @@ - \ No newline at end of file + From c62fb6c8d67560b08ce72d385f03bc2be173422a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Oct 2022 17:32:07 +0800 Subject: [PATCH 402/621] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 57 +++++++++++++++++++ .../entity/IcTripReportRecordEntity.java | 57 +++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 9d2ab97099..545019565c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -233,4 +233,61 @@ public class IcTripReportRecordDTO implements Serializable { @ColumnWidth(25) @ExcelProperty("核算检测关注名单") private String heSuanCheckDesc; + + /** + * 交通方式，来源字典表(traffic_type) + */ + private String trafficType; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + private String trafficTypeExplain; + /** + * 来源地详细信息 source_address字段的说明 + */ + private String sourceDetailAddress; + /** + * 疫苗接种针次 (1针 2针 3针)【小寨子】 + */ + private String vaccineNum; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】 + */ + private String isNatRecord; + /** + * 年龄【磐石】 + */ + private String age; + /** + * 来曹事由【磐石】 + */ + private String describe; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】 + */ + private String natOutcome; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + /** + * 隔离状态，字典表(isolate_type)【磐石】 + */ + private String isolateType; + /** + * 是否落实"落地检" 0:否 1:是【磐石】 + */ + private String isArriveCheck; + /** + * 上报时间【磐石】 + */ + private Date reportingTime; + /** + * 管控措施【磐石】 + */ + private String controlMeasures; + /** + * 行程记录类型，字典表(trip_data_type)【磐石】 + */ + private String tripDataType; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 7182332216..3791178961 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -115,4 +115,61 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String remark; + /** + * 交通方式，来源字典表(traffic_type) + */ + private String trafficType; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + private String trafficTypeExplain; + /** + * 来源地详细信息 source_address字段的说明 + */ + private String sourceDetailAddress; + /** + * 疫苗接种针次 (1针 2针 3针)【小寨子】 + */ + private String vaccineNum; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】 + */ + private String isNatRecord; + /** + * 年龄【磐石】 + */ + private String age; + /** + * 来曹事由【磐石】 + */ + private String describe; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】 + */ + private String natOutcome; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + /** + * 隔离状态，字典表(isolate_type)【磐石】 + */ + private String isolateType; + /** + * 是否落实"落地检" 0:否 1:是【磐石】 + */ + private String isArriveCheck; + /** + * 上报时间【磐石】 + */ + private Date reportingTime; + /** + * 管控措施【磐石】 + */ + private String controlMeasures; + /** + * 行程记录类型，字典表(trip_data_type)【磐石】 + */ + private String tripDataType; + } From ffc956afccfab8a60c97e51b20fb45aa8b62a6fb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 17:34:58 +0800 Subject: [PATCH 403/621] placeCategory --- .../src/main/resources/mapper/IcEnterpriseDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml index ea64f9507d..2b14cedbbb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -76,6 +76,9 @@ AND ie.PLACE_TYPE = #{placeType} + + AND ie.PLACE_CATEGORY = #{placeCategory} + AND ie.PLACE_ORG_NAME LIKE concat( '%', #{placeOrgName}, '%' ) From 794dd311e2230eaac378a6885a12cf38413b9513 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 31 Oct 2022 17:43:48 +0800 Subject: [PATCH 404/621] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 2 +- .../epmet/dto/form/IcTripReportFormDTO.java | 57 +++++++++++++++++++ .../entity/IcTripReportRecordEntity.java | 2 +- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 545019565c..50aad8dad1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -257,7 +257,7 @@ public class IcTripReportRecordDTO implements Serializable { /** * 年龄【磐石】 */ - private String age; + private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 5c7a53e335..34d1668c8d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -176,5 +176,62 @@ public class IcTripReportFormDTO implements Serializable { */ private String content = ""; + /** + * 交通方式，来源字典表(traffic_type) + */ + private String trafficType; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + private String trafficTypeExplain; + /** + * 来源地详细信息 source_address字段的说明 + */ + private String sourceDetailAddress; + /** + * 疫苗接种针次 (1针 2针 3针)【小寨子】 + */ + private String vaccineNum; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】 + */ + private String isNatRecord; + /** + * 年龄【磐石】 + */ + private int age; + /** + * 来曹事由【磐石】 + */ + private String describe; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】 + */ + private String natOutcome; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + /** + * 隔离状态，字典表(isolate_type)【磐石】 + */ + private String isolateType; + /** + * 是否落实"落地检" 0:否 1:是【磐石】 + */ + private String isArriveCheck; + /** + * 上报时间【磐石】 + */ + private Date reportingTime; + /** + * 管控措施【磐石】 + */ + private String controlMeasures; + /** + * 行程记录类型，字典表(trip_data_type)【磐石】 + */ + private String tripDataType; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 3791178961..14b22ed70e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -138,7 +138,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { /** * 年龄【磐石】 */ - private String age; + private int age; /** * 来曹事由【磐石】 */ From d52b927efe04d8151f524ebf72e1b4603ff5eb74 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 17:43:57 +0800 Subject: [PATCH 405/621] placeCategory --- .../src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java index 3c6c45d445..15bf7a402a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java @@ -18,7 +18,7 @@ public class EnterprisePageFormDTO implements Serializable { * 场所类型 */ private String placeType; - + private String placeCategory; /** * 场所名称 */ From 88d05d7a3958a20b53d5a634db074a484cbc3903 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Nov 2022 08:59:11 +0800 Subject: [PATCH 406/621] url --- .../java/com/epmet/service/impl/IcEnterpriseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index 124cb7f02b..679dde5615 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -637,7 +637,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 09:51:50 +0800 Subject: [PATCH 407/621] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?sql=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/BirthRecordListFormDTO.java | 80 ++++++++++++++++++ .../java/com/epmet/dao/IcBirthRecordDao.java | 10 ++- .../impl/IcBirthRecordServiceImpl.java | 15 +++- .../resources/mapper/IcBirthRecordDao.xml | 82 ++++++++++++++++++- 4 files changed, 180 insertions(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java new file mode 100644 index 0000000000..207fafd28b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java @@ -0,0 +1,80 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/5/10 10:02 + */ +@NoArgsConstructor +@Data +public class BirthRecordListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 5077167613040462646L; + /** + * 客户ID + */ + private String customerId; + private String staffId; + + private String icResiUserId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + /** + * 小区ID + */ + private String villageId; + /** + * 楼栋ID + */ + private String buildId; + /** + * 单元ID + */ + private String unitId; + /** + * 房屋ID + */ + private String homeId; + /** + * 姓名 + */ + private String name; + /** + * 手机 + */ + private String mobile; + /** + * 身份证 + */ + private String idCard; + /** + * 性别 + */ + private String gender; + /** + * 出生日开始 + */ + private String startTime; + /** + * 出生日期结束 + */ + private String endTime; + /** + * 是否福利 + */ + private String isWelfare; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java index f3cfc215ee..1d35ce2c12 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcBirthRecordDTO; +import com.epmet.dto.form.BirthRecordListFormDTO; import com.epmet.entity.IcBirthRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 出生管理 * @@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcBirthRecordDao extends BaseDao { - -} \ No newline at end of file + + List selectListByEntity(BirthRecordListFormDTO birthRecordListFormDTO); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java index dc737eed05..bceb6c7fd5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.dao.IcResiUserDao; import com.epmet.dto.ChangeWelfareDTO; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; +import com.epmet.dto.form.BirthRecordListFormDTO; import com.epmet.dto.form.BirthRecordUpdateDTO; import com.epmet.dto.form.IcResiUserTransferFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; @@ -79,10 +80,16 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl wrapper = getWrapper(formDTO, staffInfo); - List entityList = baseDao.selectList(wrapper); - PageInfo pageInfo = new PageInfo<>(entityList); - List list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class); +// LambdaQueryWrapper wrapper = getWrapper(formDTO, staffInfo); +// List entityList = baseDao.selectList(wrapper); + + BirthRecordListFormDTO birthRecordListFormDTO = ConvertUtils.sourceToTarget(formDTO, BirthRecordListFormDTO.class); + birthRecordListFormDTO.setAgencyId(staffInfo.getAgencyId()); + List list = baseDao.selectListByEntity(birthRecordListFormDTO); + + + PageInfo pageInfo = new PageInfo<>(list); +// List list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class); if (CollectionUtils.isNotEmpty(list)) { //查询网格名称 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml index 52a3ce76eb..9f6ac1e550 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml @@ -34,6 +34,86 @@ + - \ No newline at end of file + + From 61be4504c878c175dbd60d34feaace73ec5977ca Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 10:07:47 +0800 Subject: [PATCH 408/621] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?sql=E6=9F=A5=E8=AF=A2---=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcBirthRecordDTO.java | 4 +++- .../main/java/com/epmet/dto/form/BirthRecordListFormDTO.java | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java index 46bee9f321..6516b5161c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java @@ -25,6 +25,8 @@ public class IcBirthRecordDTO implements Serializable { */ private String id; + private String icResiUserId; + /** * 客户Id customer.id */ @@ -193,4 +195,4 @@ public class IcBirthRecordDTO implements Serializable { @JsonIgnore private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java index 207fafd28b..0fd1d33d65 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java @@ -22,8 +22,6 @@ public class BirthRecordListFormDTO extends PageFormDTO implements Serializable private String customerId; private String staffId; - private String icResiUserId; - /** * 组织Id */ From e0ec997ccebc80a684cfa600d665ec3fa5eeb22f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 10:51:03 +0800 Subject: [PATCH 409/621] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/DeleteIcBirthRecordFormDTO.java | 25 +++++++++++++++++++ .../controller/IcBirthRecordController.java | 9 +++++++ 2 files changed, 34 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java new file mode 100644 index 0000000000..9cc3dd05fe --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + * @author wgf + * @dscription + */ +@Data +public class DeleteIcBirthRecordFormDTO implements Serializable { + + private static final long serialVersionUID = -5220529162950147825L; + /** + * 主键 + */ + @NotBlank(message = "主键不能为空") + private String id; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index 55e6f4cdc2..b8ba028d4c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; import com.epmet.dto.form.BirthRecordUpdateDTO; +import com.epmet.dto.form.DeleteIcBirthRecordFormDTO; import com.epmet.excel.IcBirthRecordExcel; import com.epmet.service.IcBirthRecordService; import lombok.extern.slf4j.Slf4j; @@ -92,6 +93,14 @@ public class IcBirthRecordController { return new Result(); } + @PostMapping("deleteById") + public Result deleteById(@RequestBody DeleteIcBirthRecordFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icBirthRecordService.deleteById(dto.getId()); + return new Result(); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO, HttpServletResponse response) throws Exception { From e30cdfa10ca0b08912de1ccd6864779922b8a480 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Nov 2022 11:03:27 +0800 Subject: [PATCH 410/621] =?UTF-8?q?=E6=9A=82=E6=8F=90=E4=B8=80=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 2 + .../java/com/epmet/dto/IcDangerAreaDTO.java | 12 +++ .../epmet/dto/form/DangerAreaListFormDTO.java | 19 ++++ .../controller/IcDangerAreaController.java | 102 ++++++++++++++++-- .../com/epmet/entity/IcDangerAreaEntity.java | 2 + .../java/com/epmet/enums/DangerLevelEnum.java | 55 ++++++++++ .../epmet/excel/IcDangerAreaResultExcel.java | 22 ++++ .../epmet/service/IcDangerAreaService.java | 5 +- .../service/impl/IcDangerAreaServiceImpl.java | 65 ++++++++++- .../excel/ic_danger_area_template.xlsx | Bin 0 -> 9140 bytes 10 files changed, 274 insertions(+), 10 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_danger_area_template.xlsx diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index ec9ee8c209..af4142237d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -268,6 +268,8 @@ public enum EpmetErrorCode { SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"), SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"), + + DANGER_AREA_ERROR(8937,"风险地区已存在"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), //通用错误码 start diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java index 8597671a84..3d41095172 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java @@ -2,8 +2,13 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 疫情风险地区 @@ -29,28 +34,35 @@ public class IcDangerAreaDTO implements Serializable { /** * 风险等级 */ +// @NotBlank(message = "dangerLevel不能为空",groups = {AddGroup.class}) private String dangerLevel; /** * 省 */ +// @NotBlank(message = "province不能为空",groups = {AddGroup.class}) private String province; /** * 市 */ +// @NotBlank(message = "city不能为空",groups = {AddGroup.class}) private String city; /** * 区 */ +// @NotBlank(message = "district不能为空",groups = {AddGroup.class}) private String district; /** * 省-市-区 */ + @NotBlank(message = "allName不能为空",groups = {AddGroup.class}) private String allName; + private String allNameCode; + /** * */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java new file mode 100644 index 0000000000..9071a4a1c7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/31 16:59 + */ +@Data +public class DangerAreaListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 8868052895161162655L; + + private String name; + private String dangerLevel; + private String customerId; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java index a9281264bd..4dcfd4bb09 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -1,20 +1,42 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +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.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; 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.IcDangerAreaDTO; +import com.epmet.dto.form.DangerAreaListFormDTO; +import com.epmet.dto.result.NatListCommonExcelResultDTO; +import com.epmet.dto.result.NatListResultDTO; +import com.epmet.enums.DangerLevelEnum; +import com.epmet.excel.IcDangerAreaResultExcel; import com.epmet.service.IcDangerAreaService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; import java.util.List; import java.util.Map; @@ -26,6 +48,7 @@ import java.util.Map; * @since v1.0.0 2022-10-31 */ @RestController +@Slf4j @RequestMapping("icDangerArea") public class IcDangerAreaController { @@ -44,11 +67,18 @@ public class IcDangerAreaController { return new Result().ok(data); } + /** + * @Description 新增 + * @param dto + * @param tokenDto + * @Author zxc + * @Date 2022/11/1 09:09 + */ @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcDangerAreaDTO dto){ - //效验数据 + public Result save(@RequestBody IcDangerAreaDTO dto, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icDangerAreaService.save(dto); return new Result(); } @@ -63,10 +93,70 @@ public class IcDangerAreaController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icDangerAreaService.delete(ids); + public Result delete(@RequestBody List ids,@LoginUser TokenDto tokenDto){ + icDangerAreaService.delete(ids,tokenDto.getUserId()); return new Result(); } + + @RequestMapping("list") + public Result> list(@RequestBody DangerAreaListFormDTO formDTO,@LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icDangerAreaService.list(formDTO)); + } + + @RequestMapping("export") + public void export(@LoginUser TokenDto tokenDto,@RequestBody DangerAreaListFormDTO formDTO,HttpServletResponse response){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ExcelWriter excelWriter = null; + int pageNo = NumConstant.ONE; + formDTO.setPageSize(NumConstant.ONE_THOUSAND); + try { + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("风险地区", response), IcDangerAreaResultExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + Integer size; + do { + PageData list = icDangerAreaService.list(formDTO); + List data = list.getList(); + if (CollectionUtils.isNotEmpty(data)){ + data.forEach(d -> { + d.setDangerLevel(DangerLevelEnum.getNameByCode(d.getDangerLevel())); + }); + } + excelWriter.write(ConvertUtils.sourceToTarget(data,IcDangerAreaResultExcel.class), writeSheet); + formDTO.setPageNo(pageNo++); + size = data.size(); + } while (size == NumConstant.ONE_THOUSAND); + }catch (Exception e){ + log.error("export exception", e); + }finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + /** + * @Description 模板下载 + * @param response + * @Author zxc + * @Date 2022/11/1 09:52 + */ + @PostMapping("downloadTemplate") + public void downloadTemplate(HttpServletResponse response) throws IOException{ + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("风险地区导入模板", "UTF-8") + ".xlsx"); + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ic_danger_area_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java index 9d895750f9..e7a4968bea 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java @@ -51,4 +51,6 @@ public class IcDangerAreaEntity extends BaseEpmetEntity { */ private String allName; + private String allNameCode; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java new file mode 100644 index 0000000000..9c3441043c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java @@ -0,0 +1,55 @@ +package com.epmet.enums; + +/** + * desc:数据同步配置枚举 对应data_sync_config中的DATA_CODE + * @author Administrator + */ + +public enum DangerLevelEnum { + + LOW("0", "低风险"), + MIDDLE("1", "中风险"), + HIGH("2", "高风险"), + OTHER("3", "无风险"), + + ; + + private final String code; + private final String name; + + + + DangerLevelEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public static DangerLevelEnum getEnum(String code) { + DangerLevelEnum[] values = DangerLevelEnum.values(); + for (DangerLevelEnum value : values) { + if (value.getCode().equals(code)) { + return value; + } + } + return DangerLevelEnum.OTHER; + } + + public static String getNameByCode(String code) { + DangerLevelEnum[] values = DangerLevelEnum.values(); + for (DangerLevelEnum value : values) { + if (value.getCode().equals(code)) { + return value.getName(); + } + } + return DangerLevelEnum.OTHER.getName(); + } + + + public String getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java new file mode 100644 index 0000000000..6aa4f89e5b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java @@ -0,0 +1,22 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Author zxc + * @DateTime 2022/11/1 10:26 + */ +@Data +public class IcDangerAreaResultExcel { + + @ColumnWidth(40) + @ExcelProperty(value = "风险地区") + private String allName; + + @ColumnWidth(20) + @ExcelProperty(value = "风险等级") + private String dangerLevel; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java index 88e680c180..9baf3e2b99 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.dto.form.DangerAreaListFormDTO; import com.epmet.entity.IcDangerAreaEntity; import java.util.List; @@ -36,6 +37,8 @@ public interface IcDangerAreaService extends BaseService { */ List list(Map params); + PageData list(DangerAreaListFormDTO formDTO); + /** * 单条查询 * @@ -74,5 +77,5 @@ public interface IcDangerAreaService extends BaseService { * @author generator * @date 2022-10-31 */ - void delete(String[] ids); + void delete(List ids,String staffId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java index 0e7a4d5b2f..498712ae68 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -1,21 +1,30 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; 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.IcDangerAreaDao; import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.dto.form.DangerAreaListFormDTO; import com.epmet.entity.IcDangerAreaEntity; import com.epmet.service.IcDangerAreaService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -44,6 +53,24 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl list(DangerAreaListFormDTO formDTO) { + PageData result = new PageData<>(); + LambdaQueryWrapper qr = new LambdaQueryWrapper<>(); + qr.like(StringUtils.isNotBlank(formDTO.getName()),IcDangerAreaEntity::getAllName,formDTO.getName()) + .eq(StringUtils.isNotBlank(formDTO.getDangerLevel()),IcDangerAreaEntity::getDangerLevel,formDTO.getDangerLevel()); + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectList(qr)); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + result.setList(ConvertUtils.sourceToTarget(pageInfo.getList(),IcDangerAreaDTO.class)); + }else { + List entities = baseDao.selectList(qr); + result.setTotal(entities.size()); + result.setList(ConvertUtils.sourceToTarget(entities,IcDangerAreaDTO.class)); + } + return result; + } + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); @@ -59,10 +86,38 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl qw = new LambdaQueryWrapper<>(); + qw.eq(IcDangerAreaEntity::getAllName,dto.getAllName()); + IcDangerAreaEntity icDangerAreaEntity = baseDao.selectOne(qw); + if (null != icDangerAreaEntity){ + throw new EpmetException(EpmetErrorCode.DANGER_AREA_ERROR.getCode()); + } IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(dto, IcDangerAreaEntity.class); + String[] split = dto.getAllName().split("-"); + for (int i = NumConstant.ZERO; i < split.length; i++) { + switch (i){ + case NumConstant.ZERO: + entity.setProvince(split[i]); + break; + case NumConstant.ONE: + entity.setCity(split[i]); + break; + case NumConstant.TWO: + entity.setDistrict(split[i]); + break; + default: + break; + } + } insert(entity); } @@ -75,9 +130,13 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl ids,String staffId) { + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.in(IcDangerAreaEntity::getId,ids) + .set(IcDangerAreaEntity::getUpdatedBy,staffId) + .set(IcDangerAreaEntity::getUpdatedTime,new Date()) + .set(IcDangerAreaEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null,updateWrapper); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_danger_area_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_danger_area_template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..764d637a6ad1bafcf6d9d86ed0ca59c8ae81a554 GIT binary patch literal 9140 zcmai41yr2Lvc}zALa>40?(XguoZxPQyE_a)f`tGH!7ahv-QC?KXdp}sPrg?_4otaA7Txh zb7f56U|?(zU|?u}7c+ElU~sp!`4HD81Idgfei`_HR&LKqPo}~`9T?6FtL;L>YCqp9 zhY`OsdPC3POnL=tcW$qCi^PgKT2KpgGdS96{tlOEpO#j+8dOc0m*6M?k7p`ttHIr* znE?V(!BfdoTU(Rl>A*QN{J3;qD}jt9fQZ1R+;ooFHH(I>3Y7?Ttdw`AIUtO1Jf}4) zlA-1Lx}OUkWRqqZhQtAv8w}iRMzpj_uew?pA1?$k>N37G+dgR}X4 zZExc~q+*R%5OQuwPwFsem3~-T$$}sLhC^Q5~tCoB!G;~wQQ?JuvwL!XBjiI*wGzesy2d+ zTMCRSJSQq{~I` z64Zy4m=i>VG2K>s$6M)}YrM#<6RDiO=%pjyU3&0|0pIBA7OTbXWk#rShs4quUMj~oCGML{ZN1R=S8_J#tDhSI zZkJsITg(v~ZvloP2r~G3Od`uS-R2iQ-KWAt3lEZ?*#MO!velX_p6uiqVApSd-WqJK z{EoWX07oh1BkD+xsAK+yx{H&uz3mh3IdQ^@K}=XZ$CSRX<6f53*{u+CL7-0e(at(v zYE$xnq)O9zyp{&NZMK(LFV-{ECUnrc<>l;S38VCT}ss76{!;gS|5xSYI4 z<{{oc>t2U^g7u#>3gjcK?lynql7ALJ`6b|H543i&Fg104o_ES-_BeeXt=PbUf#Lm^ z>>n!3Pl2k^Xag;9pf%y{3c`tvsggyM)6JD0k}MC|L9&UDR_>+Jj&XcV%zv9$wV>KU zvNOaT_KC{V3bpCnJ`mzQ3PoDFdL8Q|2gU{z+R@XK+7q{OR$clM z(g8ZG!7zQ#%WDyYHU*oWYk8Zi;;T_j2f_%R@ZXQpwp7-|kRJuw(VnQl40sHaMCG1m zd_I8oj5MDihw>#nO&gOSn#-W%EThUx&E=MY_7H?uZtRDH)mnuMo)Gl2jvUr0L+_74 ztARPVo3|@d8OnAQJ7m`6cL;Fq)H*L_0KtVAX>lGN zGJG*;N8)br4X)BmPs2IxR1S5RNfTvyn}uh2azuSF5pvL4V%{;W1yMS63}1Vlg+_W} z4d_aPZDgQunlWF+#Fz&OfR{e<84I}TjJ&~DHy zDEM$@@o)l*G|Y~Alj6a&dC_vF>l0vpa>tlUeDB-f_u%?)G$ToTf74X;qlKUA0BM_; z2%1L&dd^FDGgO$GOHY(SL@v*@8eM<}10%uzm45#e`$PDT zQ+=ox>`zjRh$#P6K zVA+#u9!APvf81b$L;O9&H6ju4HLc1gtDas`dLskC(fhTH!4u@Vdf$~&=XcMk-3Zz)r3?n2#CR+g)maL~e&6&&YKf!EYfVq(1Ub6cxcY;&Ut zA%LSIrpa?BB2=(OAl?2XTjv&S(G!L*;>yyFnsclS0PyWzso(9qb}dsIRWKCWg3;-) z%X&a)XeUXx+vE0NV|Z0ELwK>Rzh?lMuiJB>b7$6~bu$5m1@&b-J!-Gw>&o&mJ3=vd zzaWqIrFPR{S_tQ@eVOC3b-o{BnQ-014S_Gyt_T)=Bh1!SH$k($y{*duj(!l(+X;E4 z@aSTn{!xmVV$T^_&z7yGA!;h=Eqpetf_sB9ab-2ajx3g%sFt2pB)sfauD0wbWH&6B zl29Z-nxA{*1PWTIMNh0R1@ri=*jKfQETZV>oogkM>CnmO3^=Ynlb)6g(phxbvND6) ztD7#?a2_h8xuv{^i_FD3*t1bwcDcKq&7I>A>qENt2(0d4IK5sHnxbOBX+t+RutDJ`j8 zR1%%#Ld;jLwMPT95Xvb*8tXjuKMK&nir)pa$t8EceRrcn-7rQ^SdmS=V?J`y0+ z(2bR9O?`v8xAbaRfNc0}bnh(9=bSNcX%a>!Tw$py?DyGT%L3V@>X#>9V}g+b@`G;S zRB5AUM&&+rZUKWatYB`@`ewy}Tsr{~2Z->gASP3N!A_A{8#_nMvbb|X65^vu;xP{+ z@;ZQO@`z|>O2oIXmYfpO+wCaQ1n*~KyRc-iJZe&%+hS9iL?_*PA!Rsof4*$fs2{-z zY{*Kd%rOnff5m##yTv|Od_y$62W42oLh>z1{}q5=wedUt@_=j4%0_3M2Z~0gC+3kL z)fhjUtiACp_5uBVlSs>JiwD25(f2>j7G}0`u!3ZYI^OuMPwyO?Y@B+DP!aWWcZG>$ zwnDRIIe-QAD;V%NdJqj5UFEy7$h}!3169WKq}~Siy5nUdDIBvKa7T!(@nGn8LoE_q ze3__epU?t!w%<-`6%`PgF}#H6+j6f`26e;;Z||B}dnC{-Sy#t3pEAHvEpU<=%9$n1 zy1uobhf#lfen$|vP4e;e4-L&qB02`z%P6&yuV7ZD8mqyZZFPkkocnJeBphr-u)=5* zJqmH>ruw|!r!Hg36+sl9sAT8+o8~S=9&~RNOl{@3g5-1n(ZCAn-QL}oltx(VpLnKr zJuDh6OBV(bwa?Y4A~o^Yw38oVy2PE3U5n<0R8^@h_CGk^Zo5LtPzq`FWVRj>2~grs zf|OqAh>^QrV@qY&Uqw;Lc87c;Mc)CR`IJy3ECSemNg>_ydVq04NVSACO~)1yYV8BX z42+h?Ot0|xAz-5q3U*wsf%y~J2S4bLk*fA+sI+@daZbirph# zVF)Et_OfuZ8dtjps6f>K1=SdxnSGFvO^P>}l%O?u?l{NoEo-|(J zif*l5gw7m!`b67m2#?@wi3UBAJkE{`k>y=S$TcD)p&;1lZd=15{yQ>UIOO>|*xyTW z1%#Ueg~tj}L=g-O`PU=E$=Sok)aj|Vo6@z8UC_k82X*>=(QSk6l=B`a;Y}Sk=^mFs z)GiPgflxEWFz=2xMy*yIqSG!IrH71)46awwEa@yS`skenNf%y{WP3TnX1R^&7jT(w zoGA-@VV+y(PEe4*StuEVJw(iHF^-QI_d_#6)fWWeHhi8jL5Y z3CPHe(WN%_;>T2O3okn}1NbK38%flR;K)zPK|WJQyqlo4xiSL*zu;pYi!gLCVp2AG zXXGAzp!v#05SktxIzDDRlK~m^;)->Cwe3prk;T03`iWjLrYmWMzQOSLp>$gX`&Et9 z2~2OMrLLS;5zM+3B6e*uDbr~Rce3M6V?YW8eV5Z(+pbwkGF$UzHG=X|wauBG0Ux+A7Da<34hCcwFH4YiY$X znY?!S*bdb*rLoWT0_y-Sp$ny;Rxdn@)sa7zQady`7h)P7O{BjH0OyT4(@ zlt^5)cQNgt2Bu9((m++YJ||sMGr_ewr5}AW1MBs{X_aAzb)V)dN0*9dec7aUlU592 zGeJd73&o7QVHmnP@AMj~8VGb>Z#J90t_R4}elw80SnHmy>g~B(IE&)r%qq$0U59bM zHUk>ZSy?M!4C%6!hzq=Sn!y;NwZiA(EaOPC^qMYYXj){|D!GYt*wX%36|Cr@PHtgn zhHD*|I{%QSj-Y65NY;cKtT+2c=F-)<@|$9*t-Xf=V`zlj?h$cTi=#t$F1zpxSReNZ zmxZ4JD?e6ksdJ(Y+bW50QY<`GKydUcNnN`IwPoyp0XwDA9=;%fX1c+Np|qRR6F>TEwU=6E;r3VPZst-0Pu^4Z ziaMqlp>veG9C_GoQf*hnk*7>ZfYv{8^g{;Gr}h^Q=A>4$CW{$aG7L3VZ*NMh?9~Se z3?a|k#g(7lSTYmJX^}Z%O(<=nN%;?c)MSZv=KC^gm8@P>S*XrI^I1Vxp}GC9EWkH#g*fAj+EMSzf3*KRMkCt_4xpAO6UThs*| z+mWTqpCDA;Q3bpPqDsG|fLN3{XMugw3UOF`jB3gkD67{rhaIBFS6)H)8JP1|yHL{* z2Da+~i9XG#R;>(8L@-|`B2Eoa*oK=!<98=T3ISBQaugnbHmxo-l`v{)gdFe+rd$d+ zc=IbS(|dLy;asd$F42PR`oK{tja<#uhFcclx0N5$zr3g-Et<`nTJPJ60`K{Nu<5KB zTtDv+2o4>XK-lS?DLRUyFHNLD5LxzFsV7Q}h1>1mi@&}cK=`Y(SnvgyLZ1sLoDUd6 zgpRI@#WPx)a=(=($u*&+MB(DR%4z9n_`Nwx8>mDOa>1Dno27(sjWlD>wLOcwVYsxq9B90Y9RX$MO>ff@48gf47femKD_|XrjkB4wz~=~kAwy?_P;j4vhSPY$}THd);+Kd@0!?h%eyd zecva!Vc?T16h}toFa9EdMZk@vud8<*f<47S7>-r_jUB_7_$TNbN&Mll1laM3?|_KY z4cypJR0Y+D{99H83oQUf30;%$i!nlV!S1fkFrS_344`lmb595#9#6qtOD0n09o@Sq z9$$$7;;R%a+JGnoF>Bc9#m+FdS9=C`r(Gw>EqHf#L28s%{P^g;Nv83Xth%i&(zRLD zQI5=~6VOf-;I)_>MzdNfy#P2S{?2gLzKyS#DduUAt2I*$U$L^bU!+b<*f=#KMUw4xys#+lHGNhOM)VD@E{GBhDR zhP-6vGU45x^VNx42kfOJv7fYMmr~#o0G__k@Rfm5d;}RKy;pXu;;`U#Q2QG+NLY|y z-zMMn`R(T2Sko(|b4lX67z8ZiT)HV{RxpdRHRP8twAacYX-&)~OVDbCR&+Su29Gpb zxB6Mwd~89t(Kjigc&+UMn{e!At2U!NsEW0YpNyG;!D$}%Yp@0GjjLUWNfSQzb64Mr zzW11y33%JzX2R~o>PP!J$>4{hQ^>0XV&$N1z;R3i>dn&Re4rH8lC9ebqxMYN}jXpOf9KAPEA95 zB?}o%EmSI6Jx}P{;hdl<5pkC1>tk0bfae7X1heP(Kh{`k4Y_E;}yqU`N#6hl`hGnHpxCc`v$ilyb6o_Z+AMo zUtg-+f5^Tnfy?L$Xz3?$Cfrwadp~tETxx4GS!rh5!SdluqG@q)j!LIwdl;lQgH&?C zV1jhxSa%><&wc^v z`5*OX#n-alA!RCAdYa+EkqUK|NmeBlsUg{6#lAt=8g&F@$B8N>6)FblL0Rd+z7g3f z^+Gv%jq;j}t#WDx24%4QA=+y7eky9}FXJcsbM zx}e1iBB;CY3koRexNjt2V9ajnB2qnM5c;ljJSeJVC}j|GJW@k)3Wk}QKgc`gevpq? z8tC$2G%xk$G4Ghj(BrtFaOJomaWtvhvF6P@)&?@#AgqF1gl^KRd=KsY~~>UqF@1ti$-#kf~|IoPX5JQg2csJ}3I>dzY4+gm@C<1xze ziXBWyP2{J+ufcoJnV{(S80|9zySgyKS^B=gTJ2!ge!zQoY-En{M%IYhW0Z zXN?!6UgM-!FVBX{u72x_eX&=%rbWe>*nZ2Xxt4a}gQ$_qH==TT^*)Q^D*eoyiK`ll zu%X{m;x!K6UKqO9YSNj1ehpowEymLc>4G3o%I_z4{Vz>%m`6+vfTlLjd);1Ku8j|m z|E)ao5r}`vFg!_?#E-~yGNE-J2OgtsH_N+Wqt7`rl6{jm@$pZQdl;p}jMqABZW30e zo2-Y8O}*ZJzv6AuK)6Jr&zuWt40KTr6teGiZB{<xXoqUpKQsCn z9JI}sIL`ox)ALptWeMY@POu!?Q&SSkBBHzY+ha&b$y#gQ(xM^}M3k|Jy9T4-Wor@bw1Os8@{iYJ)j)4>CPrKfW<$wPqM zKni$9U*z`x_80#N&aIPAc!!TL)<42Y@c8+7w10{HeKY?DU8~0(-F+O?6g1}JI3B|+ z@j<^kYo^2t%$U~C!U$GY=Y36P??J;Z3p(U+Py;&b+awj)H{QQ)9kJ z63^8}ohGu4@l4nm;kmo;2d)+TSQeW9`AR9w@$KeAld*ag%F3soN6aVh;N)ZEcLllo z+yUJjQ@t=aTXNyT24Nn$*r7cN`cAni=OtG|X{U6&?c6@`o;*=HNL^`2c`2YtlCwca z>Np!&9$dVpE61&8P1yWXZ71``bB_Gjh<)O~bVTj#oK5YV4b(gwOr7+e&U;DXfC2dAMytlAyJY zq!622o+>uD&;(cT%vmZnBTh&@%fLz!Dok4 zU7Qwy7M(;Er`qhi@2_G9kFCDVKD+DBX%cjr9qhX8)>?fO^C?1Gm>Gw;2|<>l_6+#K zM@S*Gutgm-dp=Q+Bt(EHi>@|WT`cr206MI}hm z+LpWOcd!wIy2v2=AoWeI2ThpD1}vU^D&xmd{)?!li@0f+`z0Y9eqjaY0{h$>2Fe&uR0&v_l@Z^q)@uL!v)df6o8@ zrT+6VW&EZ7CmZ~4i+*A{e~qU_t3drP@A Date: Tue, 1 Nov 2022 11:04:34 +0800 Subject: [PATCH 411/621] .. --- .../java/com/epmet/commons/tools/enums/DictTypeEnum.java | 4 ++++ .../main/java/com/epmet/constants/ImportTaskConstants.java | 4 ++++ .../src/main/java/com/epmet/dto/IcTripReportRecordDTO.java | 6 +++++- .../main/java/com/epmet/dto/form/IcTripReportFormDTO.java | 6 +++++- .../java/com/epmet/entity/IcTripReportRecordEntity.java | 6 +++++- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index 07d47ba7b0..fcf79a3c89 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -29,6 +29,10 @@ public enum DictTypeEnum { IC_DANGER_TYPE("ic_danger_type","危化品种类",24), POLICY_LEVEL("policy_level","政策级别",25), LOG_TYPE("log_type", "日志类型", 33), + TRAFFIC_TYPE("traffic_type", "日志类型", 36), + SOJOURN_HISTORY("sojourn_history", "日志类型", 37), + ISOLATE_TYPE("isolate_type", "日志类型", 38), + TRIP_DATA_TYPE("trip_data_type", "日志类型", 39), ; private final String code; 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 a8621ce09d..1d9190c9db 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 @@ -41,6 +41,10 @@ public interface ImportTaskConstants { * 行程上报 */ String BIZ_TYPE_IC_TRIP_REPORT = "ic_trip_report"; + /** + * 磐石-行程上报 + */ + String PS_BIZ_TYPE_IC_TRIP_REPORT = "ps_ic_trip_report"; /** * 处理状态：处理中 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 50aad8dad1..63d5d28ffa 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -247,7 +247,7 @@ public class IcTripReportRecordDTO implements Serializable { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -278,6 +278,10 @@ public class IcTripReportRecordDTO implements Serializable { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 34d1668c8d..6160420fee 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -189,7 +189,7 @@ public class IcTripReportFormDTO implements Serializable { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -220,6 +220,10 @@ public class IcTripReportFormDTO implements Serializable { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 14b22ed70e..ffbfa4fe1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -128,7 +128,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -159,6 +159,10 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */ From 88cf31cb0e3559b8e60770c52bbe33d987e5bba7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 1 Nov 2022 11:24:44 +0800 Subject: [PATCH 412/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=85=B0=E5=9B=BE=E8=A7=86=E5=9B=BE=E7=9A=84jdbcTempl?= =?UTF-8?q?ate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/pom.xml | 4 +- .../jdbc/config/JdbcDataSourceConfig.java | 64 +++++++++++++++++++ .../epmet/jdbc/config/JdbcTemplateConfig.java | 30 +++++++++ .../src/main/resources/bootstrap.yml | 16 +++++ 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcDataSourceConfig.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index ba67ff8170..831b99e408 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -28,11 +28,11 @@ epmet-commons-mybatis 2.0.0 - + org.springframework.boot spring-boot-starter-web diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcDataSourceConfig.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcDataSourceConfig.java new file mode 100644 index 0000000000..597ff902a5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcDataSourceConfig.java @@ -0,0 +1,64 @@ +package com.epmet.jdbc.config; + +import com.alibaba.druid.pool.DruidDataSource; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +import javax.sql.DataSource; + +/** + * jdbc连接外部数据源配置 + */ +@Configuration +public class JdbcDataSourceConfig { + + // ----------------对接兰图的数据源------------------- + @Value("${spring.datasource.yantai.lantu.driver-class-name}") + private String yantaiLantuDriverClassName; + @Value("${spring.datasource.yantai.lantu.url}") + private String yantaiLantuUrl; + @Value("${spring.datasource.yantai.lantu.username}") + private String yantaiLantuUsername; + @Value("${spring.datasource.yantai.lantu.password}") + private String yantaiLantuPassword; + + @Value("${spring.datasource.yantai.lantu.initial-size}") + private Integer yantaiLantuInitialSize; + @Value("${spring.datasource.yantai.lantu.max-active}") + private Integer yantaiLantuMacActive; + @Value("${spring.datasource.yantai.lantu.min-idle}") + private Integer yantaiLantuMinIdle; + @Value("${spring.datasource.yantai.lantu.max-wait}") + private Long yantaiLantuMaxWait; + @Value("${spring.datasource.yantai.lantu.pool-prepared-statements}") + private Boolean yantaiLantuPreparedStatements; + @Value("${spring.datasource.yantai.lantu.max-pool-prepared-statement-per-connection-size}") + private Integer yantaiLantuPspcs; + @Value("${spring.datasource.yantai.lantu.time-between-eviction-runs-millis}") + private Long yantaiLantuTberm; + @Value("${spring.datasource.yantai.lantu.min-evictable-idle-time-millis}") + private Long yantaiLantuMeitm; + + // ----------------对接兰图的数据源------------------- + + /** + * 烟台-连接兰图的数据源 + * @return + */ + DataSource createYantaiLantuDataSource() { + DruidDataSource druidDataSource = new DruidDataSource(); + druidDataSource.setDriverClassName(yantaiLantuDriverClassName); + druidDataSource.setUrl(yantaiLantuUrl); + druidDataSource.setUsername(yantaiLantuUsername); + druidDataSource.setPassword(yantaiLantuPassword); + druidDataSource.setInitialSize(yantaiLantuInitialSize); + druidDataSource.setMaxActive(yantaiLantuMacActive); + druidDataSource.setMinIdle(yantaiLantuMinIdle); + druidDataSource.setMaxWait(yantaiLantuMaxWait); + druidDataSource.setPoolPreparedStatements(yantaiLantuPreparedStatements); + druidDataSource.setMaxPoolPreparedStatementPerConnectionSize(yantaiLantuPspcs); + druidDataSource.setTimeBetweenEvictionRunsMillis(yantaiLantuTberm); + druidDataSource.setMinEvictableIdleTimeMillis(yantaiLantuMeitm); + return druidDataSource; + } +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java new file mode 100644 index 0000000000..4f8be141f3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java @@ -0,0 +1,30 @@ +package com.epmet.jdbc.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfigurationPackage; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.core.JdbcTemplate; + +import javax.sql.DataSource; + +/** + * jdbcTemplate配置类 + */ +@Configuration +public class JdbcTemplateConfig { + + @Autowired + private JdbcDataSourceConfig jdbcDataSourceConfig; + + /** + * 烟台-兰图-jdbcTempalte对象 + * @return + */ + @Bean + JdbcTemplate yantaiLantuJdbcTemplate() { + DataSource yantaiLantuDataSource = jdbcDataSourceConfig.createYantaiLantuDataSource(); + return new JdbcTemplate(yantaiLantuDataSource); + } +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 11018f0592..184c73ee7b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -52,6 +52,22 @@ spring: wall: config: multi-statement-allow: true + # 对接兰图数据源 + yantai: + lantu: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: root + password: root + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From d0718826e903559ff84d386ee2c2c698ac40342f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 13:51:46 +0800 Subject: [PATCH 413/621] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partymember/IcPartyMemberDTO.java | 15 +++++++++++++++ .../form/IcPartyMemberFromDTO.java | 4 ++++ .../entity/IcPartyMemberEntity.java | 15 +++++++++++++++ .../excel/IcPartyMemberImportExcel.java | 9 +++++++++ .../main/resources/excel/ic_party_member.xlsx | Bin 12293 -> 12475 bytes .../mapper/partymember/IcPartyMemberDao.xml | 3 +++ .../service/impl/IcResiUserServiceImpl.java | 7 ++++++- .../excel/ic_resi_import_template.xls | Bin 74240 -> 77824 bytes .../ic_resi_info_cid_for_easy_excel.xlsx | Bin 25515 -> 26796 bytes 9 files changed, 52 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java index 9832a35e5e..6dcaf93a75 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java @@ -110,6 +110,21 @@ public class IcPartyMemberDTO implements Serializable { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 是否免学习0否,1是 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java index 5ded6b154c..c31343d3c1 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java @@ -82,4 +82,8 @@ public class IcPartyMemberFromDTO extends PageFormDTO implements Serializable { private String payEndDate; private String year; private String month; + /** + * 是否请长假 + */ + private String isQcj; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java index 1f6a367d80..1133a77bc1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java @@ -98,6 +98,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 是否免学习0否,1是 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java index ac937ae045..eca3bdef44 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java @@ -56,6 +56,15 @@ public class IcPartyMemberImportExcel { @ExcelProperty("文化程度") private String culture; + @ExcelProperty("入党时所在党支部") + private String rdsszzb; + + @ExcelProperty("组织关系转入社区时间") + private String zzgxzrsqsj; + + @ExcelProperty("是否请长假") + private String isQcj; + @ExcelProperty("备注") private String remark; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/excel/ic_party_member.xlsx b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/excel/ic_party_member.xlsx index d663ad01c509d4df88563c6b07ffe92856504cf0..b7643ae3063851f89efb524fc40bef75fecdce6e 100644 GIT binary patch delta 3638 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 AND a.IS_MXX = #{isMxx} + + AND a.IS_QCJ = #{isQcj} + AND a.CULTURE = #{culture} 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 4b7a485d71..5e6d96668a 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 @@ -63,7 +63,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; -import com.epmet.excel.DataSyncRecordDisabilityExcel; import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -373,6 +372,9 @@ public class IcResiUserServiceImpl extends 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 S3~Y^?{)K29XSe_D68L{IYsGW` diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx index 0dfc8ad7f407867700b7df5b350e92406b074fef..7d0305a997a0681c560f643ca140547e2e9cabf9 100644 GIT binary patch literal 26796 zcmeFZWpE_Rk~Ju1W@ct)W~s%j7PHi1W@ct)h8DBbVrFWo#mr1CrmepB&CHvb_jb*8 ze|}qLo{r2@C`z2Mq*-3IqkBEox`$ zY-;PQuj*lM>ZHryZevYU2nIrx4+H|3|Nnpf555AEsS~#SOi1F7DKCf#t?10Nsq>M& zg>j})sxQE{e8d>OW5!f(KKOTvY9&Nq%8d~z%T8BgbcdcyUuiPvdJC9%NOPLxP-feA zL=;$WnLRA;r2}&DDoHZo+gMp`Omh}Na(JE%{@Xy(wHwtlSGT3;ya|=9q>DCwooH-qFlDP z{c~1OBf6qoFMz&JN(91N5DV{If&RkDfPfHRa^M;MmZD?gqeSlQtIZG-e%@Y%3m-gU zx8Z3`IOy~3CkAWMmP*?dBCu)L-Rjd)645gM#IIfyk=e!e9pSPk$^I zN%f&X{&pQpF3l82tgpXi5G%=bQV#G#w{R4v*oLO1pm?1?3k9A!pF24?1BOP#_>D zKoCR(%y746bhC4`GP1L?`V;Yr)pf1b)Umn=&jrJsYL5pRbfTzC>rpY5B{Y9L3@gUQ z#TJQ@;a?n6xl(~+rq27U|2C>B#wU;OV~}X=XTXU2bV;PNNJZue|&kaDfo$Pa11BT5{wp~L4?kb>Y<4Y1I;T!p#lzcYQaStmN{w` ztPh#9Z#xHpv}sHlXI@HP2n@as>?LAm*CZ4pF{?L3^SrEH#vKb(EDKzg03%-tI-;== z(;;9Dc=Qrmt%P#hd|+#~fZ3e4Z+>2#m^6^GlXMB_YgWA8yxno8p$@FD9XAB0Xak!t zqGs+uVoIH0e2T8oiiSbx$D9R(=J)GJ(7soprf*|YVz_7c7_(leXEa=~J^hBc6+qO$ z^82YHWcNC%LBv<{-y>+0#c=FO>HO6izh$`;+a$YgqBHrg`(a4YkkDBMNupG7lzh~; z(A41yK%&y>|Flz~pvuOtLmCahK!t2g(xvkuM-Pa~l#hyq5Y&5!V^o-)*6*~P<0@7r z2Uh5^6qGAZKdWR4-dmRevpgvK4vu@Rij>)85jUI9Zm!+wE%6cNz&y5BDqKb3N%20^ z7C^T%IoVDd0`i`7h#8;H`vf!(UV2?x<^g$Ys7fFv#x)!i7ITqVgKMTzz1T`qsm6Kw zZKH})bzpscwTitmb)!lUgt^}pYNXZthTILpJ z=E`c3j=kR9CG)CW4PO#s%BBy7N9S2#WOY#afTL!8ufvAXjlf+oVkv8+B!yF+O3M+b z@j$uij<75lZ@!xYu9+jW+4N8Gr6+dEx0W5{yF(m7n^*%Ss{jiJjlx~;?7Z#?UmO#= z*kM2Z2|f5>#!oDGh2gl*$<2>!{C8J}Ti%7&PBF|CAmaY9M@-(_gztHh_;7xd;?-b~*%t_%H|0>KvcQSw`$?C1QlbKbkYg5yP_ zZ2wA(yqX!V^#k(1b1S2j>g5!UP*PQ}Ib;h2ZJSwRz~OyCM9S4*cSO z6v+gLdE}5lKsZ29zyJsSJM8_l8~;ZL1O~8Iz})|{KbmJ>)QuQ#F=6SmUU;bjU@;|gSt7HI<9C6s{c*jX91QFU4*Yao-b^BcoYkm@F9sI$@$e^oRXb?r4lhgc8zoI%CMd@7Z1 zKc&AERJb$VMOFDzDkVGKX$P62PHn3~naP7M3L^5WeQ0Z^nI;V=9bMs5d6j{EE*u83 z`;#kK($od&w#LV0*hmdVZ-r@jhH7;faO4_tFr;&3BtckN=DRnCt|HmFv9Gw!O~Ty8 zl}cy-a_=r%22b(~mCl(SY~+Z+|C%Yklon%rUfJ_tJ-liO5wrPBky8Q<$H_PxANReH zUp*IJs~vB}BXs4x_j>Fo)dvt3{&&ETL+&F9g#`kl<^%%50z63n2pCQlrl!tLjDI!E ze=RjCbVcT~66G|cYy=5VG&PP&)vUJ{XYWJk5z(e<(=uwp5(oyPQ}=6} z6FKt=W}pV7Cgrjc9KU`=kuiINCT3_ZD(=V^G?`$0p1K%)gQt5W(xN!AVEaObif)O8 z@q&k-h88%Gv#SlAVk5gc)<6WEb>6i^){xlTzH+5m>C*`8=*nN0am4YIMb_H|^_97(1)$XB^ z-gKn2rqzkITMC^++9B#a`L~&hAOcZiT+@Dpwo*9rh{nmxf7^bB@kZr+VjC^I>?sE$A3pz zxxta%nP!V+S$l1>NGJ z2kZ##xfAiq4j3~*Oj<*+S}|ks<^%*XXu}Qr7j!>TX8K=!$-^CPbUCDlFz%Jbc~pQ> z@>b&<-YpD*PZo>Y^N*_W@LiCP2nopF5Sv|5WVA?!YK3xQi&0QOhDY7O*uaBdMDHx* zZ@dkHIvI>LOoQ>6{mZfdj=@Xim^ww$Tnd7C##({7sL5^D{YfO&L!TNz5-~84+pne6pX030e2Y`qkqEZUFQIA_@Y=#KV@A zf5m0yBpl?EaH?{9OgYcWM&+-U-L<{FiMNjfU*q@Zlf06nEr~@7%bTV5IPu5E+Mi4M z&VpLl^!#sK?jA4Q_rKrXKMtmTSHJ3SJlUP|eLRnRpZD3`s%-ardU^G`8yOndi<8%W zR&Fkexer@fRO#6@XN??8C?qZgQpP)xe}W&V z>{LbZp7mvcn;NrNC(%)SoSmApcsXK@|)7yJ%oc1+%zZOcsTTaR?4$Dl_SDbo%Q2w`G#(3g*(`bR6Sv|G878s8Xpj zuxa`&s>1NDK}1~>+Le*E3LMp1UHurAVzdjLAP8E-HgXmRs#(NB6Iz&d65}UU1q~V` zYT~Su?$VAdq3DpgydJ9~7GN8n-ATl4F6=lRxStI^#tob3gh6(6F8B5FQs|jv!H3rw z`P9|J1G(~7x9pn2R)}7Yh?{BVej*k%tMXy7bz+0~I0rRv@p)o{kw4`)s7?+IqRDSMFT5@%Wd^BsvV+KED`i`$cJc%H_YA`csT0sGZ$~`{wc^)7 zNp;6c2--P#(dyulqDD?lXpX#nE(sOTECojqNQ!0eL{VNQV6ri8f^`3ueG5cce`Uv2 zNQ(0uNCSiZ7Iz8=imJ9q=^%6sZp*q|8Y+7APO=i~M?e!ynO?U`uFw~Z&WH?K23w=5 zjHwRz0#cbFuVp(X<# z?NP5gA;x}Ulg${#^LYs00xq-)I@ye3JRh_0tv6VOf~ec)ga+?X6?|*g$F(MHA}bmh zC52S?Kv;8jD3Qli(0&d=;^Vy>&icb}Ui$^R{;l}+Kv3-xBU9&j0t>0B{5S=*cCmF* zgXlN|wO8?ZlB3W#F|}kd-sAW;+jnT{vMZTK<4rJi!$%%e45|6{y53S}V!AqVT^Lwv zDUE)RwYlcHUNdJ>x;pd?K$n=C>SVGeOKNuOeA<35_*evNA}J=BIfE2}ZhUqJ5x1+b z<7MFfHu%^WY+?~6nHeLqcSTt(4B@$Dl(K?GvS()D!cWwa+*GQ2XVstC5eq+&bbTI+ z1~)h^TO3+re%P$r?AhYFt+lNUZ?tr;xu|^vPW-pAEH~cV>L$^QKh62A?MP#a?&gJi zOT)wu{26uE`wd?~ZAeJ<$KSU*H)0$7eN}^>0)F0IzU{3?Ii38qJ8F`e*BcW54;D(V z;@yIb;oS_drW5)NUAjky$T$uoZ0|;7463V&Iw6mlVDND-20Fz}Si^u@y@rygf$NiV z8ISzlrEyU7ZY6^9>*`yfh^yqVP_gk~zanTgwTFm^HM8Yk8DyENT^VO3u%Ko?VY4q3`JGlEH?1#EXty393}IXz9E zadvY#Se(PJLKMDXt*HOi84YTz0&NR$kv@0?6V*W6sx}#WfY>fD`DW2h74U?<+-FHyYya+i2$7O08r%^680VO!E`H z|F6*DoT{y|Dug%GGcLcWtrb1cMmn7>#vqK`>A$O8Ny{`$2VdXv^Th2cpq{Ix%md2A zuddbUgVO8w`S*4OAEl}(A9w0A*9D&F*f`gz(%ZNTs`h4v_KmoQ4|3MT3^F$|w?v%; z9cf27NBXf~6OyrH6Phvju^6%=xwPyrEF{>{EM|7b(hO1zWbI__$z*$68DyY|0c2%l zWr^7d+0raz*fNeHjwI4y#iY_{#kA6K#gx){#kEjoa*!wZ>j@TD{$0YcN%3Tf#bg!P zee5F%z5~HxFYqcTC!Fi?QawAVV!sfNIi-3GWl7#cVFA55iGbcnv0r#$2}Oz^6+q=c z#US}0@i6`{LNxZ@a-4r>xXjOpo)u@!R43g}UZnh3YnFd$GtY5$*y1_andH$L0zET< zAKp;aZiH5+#Q-Pzk0W)sbk=nwUVswp~U2B9nn=sgKNLLu3wD z3jaHM1-DqnU{&Z8tQ6jPmC1p)83YycD?J56v0&d|h%;4sTRZ{y7SAk0vn}0YhHXM& zKq0Z3A8<}U1ev#zQ46`(Rqgv;(IQE5x87zP?H$%QkC%ny)aZhsdN+OwG5i6iesx;G z`tf`G(lZ-l>YK^L<)nd!$y2zj9@-8&_3dp1{>o?-<_>jmO#v)0L?!qYlWxNLJaqbs6|rVZvD z`GSl4rmybPTc1XjJ|P#;rH`{;bET~{F%YYnXi7v9hkfEVj zXCiySKu9?XypbGoP1I;1p6e{exaABfmm8s2p?6L^y{I8zCb!Dhj8a}sq8yTH*!NJO zmRllU@F7DTpH&*b9$>#Td3y;-M3bd0a>NC4THg28`XJE>PR_|-IO~ZBl@*zK>}Rhl zi`+^@$;fTr&9#1$XjsXZv`Le9CHZo*Rn9Mg6oFf)B({Ei>fZO=lp=qihNjpfcNdZD znSXfa+sXT#%5{(jyJTuj&rKrhgm937iQ0R{(L+F*X{2CZ;N98RifU1T0bXP&tT=m= zWUcz6sWqaYNkYa|s!;Q>#fCh$TZPRXeYSCTdAAZD#RJBK6_TMS|3Q`YYCpBGI2~&k z*k?JA$6hbWG5NT4CMMQ>wD=0zgbI{pLowyHT9iqtH~|72Ge^wHEB}CtXtjnEQu-!f z;ZHs&BiKl3CZ`4sA;oq`;q&CfAekf#uzJv#pn!8Cct)`L0i7A^Um!#eB%q7y%~;|1 zp-(YA4WQRQ?jnRcwan*?h+Na9f4g+kWtk;$+wJ#dL9J*vefUmVx4ndS ziLEeh-`V|Qh*1I40%xnGF%BnA&@fx5fWvNWbS4C@GOVh{>pKcj(4Us}sml8R&wdynFFsYgv=ZM`CnK&wT-4j&s2Nt67 zobK`XcM2%?K|CqVZ|@D^LySCK_a^G~Syp z<2}tEo%1F4OGug2N{!Cs)zR+U(BPJ^^T@@tQVQ|iM4-Ztuq zmp;AS^U~To;ciuy9t^bQ4tq0ZN#x;WP*@;k=FJe2iwE$iq|>++6A7I1$$Solq#-5) zjs#5*_W6teMj?;ym|HA=Blm5I_=wtx=m;BN+-r#Yod#z@(_apSrfFRnM?I$SMm>^v zVsTPCf2+}*rOL$b0?q*IXF#*9U$^gH8JNHBu=Bi^*T=G$kdi zho+}hOK_40%?hW9hO2Io=;`V+QP>`i>!a8{;Zs?O20E*jf+7~;Fh~JBopj4~*k{sh z9QUKRI3UUHff0Y>G)e!22}*y|v=RUMi86ncv>70ChCI+|-CQ6F27Mp~oo+Cl4sY-_ zM-Q0vmd*BG9$e*)%JXPhlvA$7vJLRrqX2&)C-#r@r^uXDutCr(x$pmlL9Z%^}mYkuA47zsCuak9Q@Dx8{J|?`VU`z zPw!3F__BJq5wQJ?yIBOgc$4`i__LcGorl)?T>0|6_F&_&Bm0D8f{`<{l4AuHTQux} zCC!M|#i`@$p1;Qp`<t7(9 ztZTQ*gcf>5c_FCTO&R*v5M52Ehu}pzJltzp#<7YqeRoxRAuru%|*Tc}ykBGhKrxH~Q;LE6Dh? z+SwJu5O#&4{GVTC*t^THJz%GyT30wgE#-p3Q|4(p#i__8%qCoHax^WgUVBGG5`zY= zko<}SWIO%P$EZ%KT1}@T>N{D9WS2K5VTrJcy-i%l(0+(3&~!$@y|`L#Jz)T^UiAlJ1wbc)&_6uxTX@-QyU4u(zkLne5@9p1GJ53-#8S zd#fI&gvryd*pn>N4W4SZ39>bbYXXB*LCWgC%!2|_TuX}Fk+65F2uCC-c?g7kDg_ds z5K9LnGTi_cUZ$W`@F@nTM;gl2DGXQ7Ws|N%`Q;=L)CPAH-7M)UmfEWn4`=9mEsGlH z8qR8d==_C8r6MCoeQt3kmo*}X>3B3Xu?k7)plk*!x#4&q^_SAB^aiu>P-@E}XX9Hb z%9e2AoMqxrXQMc*1~`2AuH|;EZp$eV8^dqim4# zS}hQ6JRq^8y*B|P-atnQ3VDR|oOxF(et+GQf1u)=Z6FgG#I}Z|=hgl!_FhChRbin~ zs;>JM02N!R7TQf$e$*lrIh{?5!|LPSwubE}9m|Rp(pfdAQCfn)#IfP&WmwcB9^+hN zTRi^1M8&QRC$1_-@(}74h0OC5wlRi$0rJBl6yOvZEk{^H{4Mec;fvEsrS4>LiZK258Vt3R+9Za644Ihve+J-|&0O$r-I zO==Z77OHexbECT4l($*J*bzBe!xR}ZYWdVDwzE^d!RJJ*cov2Sj&E_;uSOg*1BBGMe9@UL@fIR|F4*=-omdW zIRKM=LjJcP$@UK>8@UExvW&k8qc@GUr%h2&&8cxyFSV&J9<&k;G{qWpq}!EVuJFgw zz?66EhUaAI08BR1m@!X584R)%UPCR^9;?V-P4%F2)$I5vZfOn=d^nMYQbdhT)ZA?L z?)0wgK?ni9%LqZEo> zK`8NJoPBxWc5*fP#uxRKP%&0vx&=EKy{uTddC6n4xgS3Kg)+Z{>URRy8Y#sCici*B zlrycte*5&JiUcKv@&;_RCEd)}C6kqX#a3HJN-rusTzkNrBOz%r@3{CR#^H-#6u$Q*nH_O)=3F?WqcGzy8bcTwQ8CRQJND-~n2Q2LmolYRcJ(=0Slqo5SY zOSlrOZU9H>Qjg~vhx^&xI{ik4%MS#igHwG>9pT4UFQn*^AflFhurO9iFGw)sYohR+ zd2dC_`9LDqd_kPMEFaq2|#4c z=A%DikwOtIS=FQ%>H<>jufU~v7OXX^oItymfoDReLEK#JrOgX1pSFa>Hyi&}g8xR< z)D_!6gFmQx4b)IsT|lO`{&=6OsO+U=Gr0P2@k$Hx0l-wo++u#WT5gE7Cw5oQuVgG$cs^-FfEC2vvRN3lIV- zdFIKb1NqKWLeF^v`bdZU2aJdPhmvTGx4;j03~rnJtE{?N3noJv zkj9m%XbY-B8rn7Jn#YECzQd=U>C|#Pyo=_%Z+qsA=>2+qu*qsKY<~GDE@4a#Pz)8phBl>3maZv3DlD$qJDcD#g-bRc#(AtH_jLQGAtCJ9_&yc zWChsah^B@uz9^J*ox7)rv)l5RJ&@Nm+Z7?qiVj%+3NVskAzK@O;R8$;VEp~=@!EOJ z@oWCf_ItQ25Z(mL0Aq#l&fSlGDWGS)?>(Z<0u`89#=G{I#=7OgpAei5fZ&D;qnqxZFk;qPe~77@J~716ube21ZjOCB z#DSvO3Mg?URg>@X^I&L~Cl<>rb4G--kiGD;mxP3%u|8o6K$HxKz@ljiz-0_^K&1ak zO1pt{+V~)%b^n8uKI7P5+=4M#c6xOk&DBjNqfu-LST<Lknv^Fb03aA0_1{7;`#%zaajQ&7-n9##NY6QB2*i-cJE|Ke z3o81Rr=C6>vB0prr7h3Oi=Ug#sGuk`!k7VW5$vo#Hkp5p1fk8vS`MhG5aX3m8NsWu z+ohtvJU_5t6^&}nFNl?gsvVEQd1m{3ux-$GanKH1gTcjA%mSEQ23crLIvIsJ?yufy z5ld;hw}pv8Yc|qmNa+L<%dcdK*AUHcCEa17^cdL<=Hji1>@DPTvPiJ^S?F8oy%Z<> z&WXqOuB`bow*E%b;H{DhktEU+OQuC^8L-E%{!SuAL7@r|TZZvBSG9kEaC03q6Q#}6 z(uG2zw8(M9Nyq083;SG)mOWd4^U8B$@}0Q|THYjhK`Hg@(RGIt$B8qTcj+JIK*&GH z@r&EF8FG6pII6j2mtD{;TgqoKb-EFiSh74nJDplMF+KLrxir3AaOeqBfI|#`6-{Fy z2hIo-V%l5Qw=!mnArInAQ6BuQ^k0t+#-N6`-eIxxG08V24XR_($ew(4K_+Ca3bPE z81)+XU31CYgbL5Y_uPoUcA3-`FpR*`X~KD(}l zR@j#>?P{h&geM2TIb`+pSqiHe%W#IKj;@%b_x8)R+V|Zn@dsCu%dDe6^2_Mn_tP@LxyZ3EWWJAgIz?(@`~DOHPNh&={pMdA6HZ(3j#m=X&=yGSPNw9Rm6AwC(v4?5$?C15z-|G9}uZszQXUr?$2c1sD zWw#sP?cSjy@?_1b?Y;)g5b0nMz9J zQ~E)*W-Ui|o6UH^4!OMa^@P;DamMT0{kr9PsrqV=TY2Qgd*Ka@UbRK{V$ouwqGwkM z-sH+ukHvCAQ=e|WF&ZPt7ctdrLyzGmt-*uH}?Tt z`e=?nvZ}~MxTMA-Hg>%*?BGZts*6Kg+u@RgXn{jA#Yrx--V|M9VYp+5eKL8K>U6ty z#b6CfK8i>grA(S-ATkoiC3teZf7X;5%Wu9)t`_o&a;zm-_h8--9wUbvKZPji{4l6DHMEj=woiYLR~ra*k1Dyd3Vn zgr!D_^dh{fiHD|fzlb#083(6DDGK(0ZLLK)>`ypU-~UqR^p^txn;5^$Kv*CDP-m+d0{iE=zEA@k$}c_4wv9msb9$ug>Cm80H;dE$~|G*6p< zg>J978i`aaz zbcXqJWK{2kD`aw67Sz~5fUZs*mHPcMmQPu72 z^gMd@*vdh6Jpw=e?cpVBv7>S(ImY@$8b{+onDIh7;uh3&4qxtu9)D<>J|?FUAT2n^ znE)frh_U!TQ8b7l!jw@ofhby#SoufGkwK0Qig5rLewxC@kMfy@ZAQSm$6;~ofEq1_ z$MK7jyPwZz)h*F@T2$e!GB2LYQ6sw0JSmi|CY8r+kana_i8mlgQzVv1sgr0$kztNW zkZC8Ji#1@536qToFhfksC=;1kMAU;2R`tSLe_csZZ-sQZMHEkWtVSN_l7Pd+WnQ-) z1e3KMv~NTnSd@Ts!)4a79kl-ejOy?MdEi0-Q6w{q7wW)59~G{plST)6FxS{ox(=_WBWQ zZ^(>F@50fS-jW#&f7-lS;3a_>pvGT6mb?hyzl+csPD~{c^Hy7T#8^m0yqAlKrNlOS zqLwl=e`9c+p!Yj$aBfVpO45n5O@m5P&Z9{D-gQPy?oyyoQ5nmD>N4f@c*06CY~d7C zYZEsDXDoptVHQ1!&44A1t;I5lMScYlR}%G%o&A09uns#=e%30K@P2Xs@&o2l{zAlL zeZPb^1daEx4BYLVfV^}vY9eY;4fnUW_IJb!W8x?EbTcknJ?2c*8pc2Lk9D;;_6H!CZ<1bF{W zef>>V`=pCiiFw32ajP;`?h)v6;|dWTWGxx8@OGFafUU~u+#AQ{W(aGGuwj~r<%GYj z)Zyi%OUz8n>k7uD$CzbJdvpKKyo5qH|$Inxi~2F-mzQ#U>ztRLK(h#xr&@p2p-8^+s@6c zj0Tn2WrI^O+7a3v=PqJluWCk6?;aWJb32T~I8D zGQr5p7Sg>yMnD}UH@7_zcI7F^UUye1d-dS-B`P&4a3I)5 zBf!WswtM^BC$R9K|M@7VF{pbS)M}(TS^LKg1Pe2hg*xlE7-S?UuNEVhoT5cAy!SN+ z5t!h)j2oWE^V;d&Emg(3#Pe^BiT8|p=`@meNR%r3d46eOwb6DopmuX)O}NuIS`MCu znSUt;3e`j@>;TCC%2xl6WYFP${6{kI0!RiwB_j0@9%m82_8f@9`KkI0znNb78^9re z&CyOlq-?k0K@~#A3KsIcsA(;Cl;6C zT+~Avyd%0Qhn@&)oloxl076EPf)M4wxgCXX&*O}-yw*ptDfaWaCnz%8{PVw(AWf-b zj;nvAxlR%5%$OL2Q-uA~r`pQU)Uw6Tlf|u%u6{PGCcbR^xaqGdAJ~cTRYAp!^YE2p zSejt+_3%CGgi9{t8OobbDcIV0?mp$ygB*9W<7<7NSAJ-16Zn+B(--_A8sx^0z5Bw{zZ|& zdOrL0#KLkYM5sh6M65*A@!av?@#OL7@$B(2+$Ys)c5^3dUn|exO(0DW_ks4I_QCdL zeT`#)EmXjqNiKtXTv`|7yqn5 z^o$v*?M3|2AdFl|A9K`+j3#7qv{SoYBbj+xFLj!(Q{sF0F9?ID#i+&`C~#epDe`9v zf<96rFn;*g0IB3x_gwC+x;-J;KkZ*5Z;u`j8yw#c#DD8ntZ^eYUKkHu! zvm<|}G)5py27M5QzY=B&KC&~L9rvcQwSVMbj+xB!WVRcQ|CEDO|CWQfujx7Y4onTr zX(_GNWP)GNdGUC>DCzNhWp_z{z6pM&noShBqGdcyCz zmV8VyQOhWycGSi=j^)B7co=9GV%u%&#XobU_kF440WIa(u3p+f8IUv+N$>mDNi!U} zN`W;1i)HxtNi(j0=)wO{*&yVLXy7PG{GH~z+G9y&rCu(+aUgnh#f6T#+Gm$>kZ5r^ z@mDcE)GDXx=%e1#6S~Un(d5I1X(R+=w7Sgk?4=)Y?@u2rU-N}V+%PE*or-&hu`$7?pU^?(^nYtKduvfo1%DD(@3|~t1FFhDZuPBvR zEzW)vpa=7R@kFZPppP&@XIAWC@F?QX%8#3cE_?_x6DzUsH=3Ze-Nd7Y0h7~rYgRSU z7Tz-FBWB~GZ9{#E>5BI9Eh6JmQ=aG#?!{|n-)iZJPDL)jEM5B`EbL2?swZs)J+DZ7 zObIT-tSP3%?MbqBC2kxknFpO={Y`mUgDhs9=8iUV;pp-%ex^2U*x&M9sGdYL&;G?U zy6}Gd`H0e-(kBJ-SFASmqw5~JiIKrO9)4E2zVC`E;brRa z<1ovH@L;Ws`0g>;x_r%(?gR{ny+VkqQgdTF2&;hxdXx$y*VKi)42na)NW)@-|8W4u=GA;sx)(J)^& zxDH(KP?-uK${Cf%j_h~Vj%Hhb&^7>v7m*?hwZ#qsA@d~W$8@G3lmOj2lYx#ZOFH`V zok;;B-7=C3>HVfg=Rsv|lYnz@kHRu?U}b*PpnmeU*9JdIC5WAG^yK2-OZUGaZ~PoE zqDm+j3{Aw6`9_sdupg?7C1XjIQm_!(z@B_qxxOfN&CQ(I3gSMoxWTtP=`dMx*lGkL z57H(KCv5oIV`IKKHfxTT<7mSLreb$&ymGcB;?g z-0+jR@#C)l7V_;ne{}3T8cTuZqDUW!YaJHx4AyKbLs&t!=BDA^l}OHKYz!#*Ncdw>JH zi|E@=UGLV8*Ph@XH96rr>4lEERPAnpH13fQ$?26;wUALRl)urdhm2e4OO~a7ZW4eE z5JlH8N0(<2u6{;VN3v#$s>oQ5{JnVipUZlZpPgnp0KRMV?@PV7{{Z4tzDfl&INSGge-<=;+U)K1fwtm)Q)&z`{9}#(0%3lC3(Oh$ore%AhP+1_{(} zkz&5usMwxJNm3e5;r|=og^vZtm~78FEiXw<*xj1zRNE@=eYBBm-K(nchz8GKQ6e4 z!TXOV-E+JiG|ac{Xs9%$U7NMWUN9MD0gL+ZBmda9|Kz(#|BLVbUDkyZ`ls$7d~~-!I0=Tz z@%9=bG;uZR8|gxe-Ih3g9qXsuPfx?qqoeS$*O(n(IPcQX9e)X0R< zh7t8qrt!|W*S%wLntH353@|#0giH>oc@nC3Ar}(dk9M&HCX>`i6~aE1fl5xOsqz=O zBnKH6t3@gL6vN3T3UlTXN3e8ob=t2>Dxr^PvL(CAy$VgBC;h>|yhviLz6(@6s5Eox zrhmHDqm$~gQW4+s)IPyYNrXlpO#U0EV-_umPbh#tvHwGO<3hB+i_k^3|{<^Jov1pME%vQ5j7&fskjs~=|qH9ld8z+rI+e`HqzkWdCd?o5{e zSb`xBNM1((JiEgig3HMR4(o?E0+-t}i2cqj`S$z)w86altLtZwZw58BY`4!ZliK14 zH{g3}X2KGva@B%FI}wfc#QUMkwjEr(eb*L8tK5r?ca$CRg6X2biJ%L5a<$UwdO8IP zWVIoc*ArNYue3g4wQ^TsaH0|<5){$0*wcVpmcc5ErNtc08J*}BQ?_3E{+nU3p-~@E zZ^ElGjPPD<#O`z44$-cWOsA}!UzYgcLGm|22fmDRuG!L`eA(4M=gVT3?%pn&J$1j; zDrJ0PoS~VQAgWOWV|)M07w1kXX7VNgh|Gcg=l@0idU4L#!qmo;@vrS)@64TRDa7Hj zqxF#9;7d4_NxR;aX|Zcx94cUTtf_A_l}nlrXE^L($61@Vwii5v2M1Gy!=i8^K$S1Z z=!}xp!cPJ$a+&e-XczY@rU zVkEMiKDQ1RAu_z=##6x~n^Ips!_vJ?tX=iELEDUBQ7(f%t6CT25`M|BS^P%gZ%D>a z2Um7&JMJDx#&=te;phzKiTZV|d}*y2EMehMIoW^p>?bvJT~C)PZ*e|viU>SdG9gWg zJ33$`4?~PmsL<{fY%vptE#k^I{8)UYL`K$m{Ot06W3`s{&Eh*!p<_%HG3R`qNDUH{ zIj*NXf!w%s)|7f!dLKLKnH^O9gsPF zW&{1WFPs|Io0b)|Axrr>eoo+mIQM-~71WpN5O8|Q%dGVih2b^xZ~%_DzaKMO9x*AFIfaY{6Un-q)*4h zL(8cA-!4dHD6-vO$s$WKA#4myI%mQ_>RF1-ev9==Q+RzyVh7?YS^C`k4#QL+^kU2v z;A#Kd-~X7QL?p;w|D;|rg}y9cV*$_edwka4^4@)aep)+1>~Y=;iTJ!2QSf^|faOGb zP%@ostR;B=*atL%uY0dy2u}!-sHg%I&={NS-sc-8&{cB0!!39UPv51Zjm7Ao(SmHl zP79*xx0}HW8P*wEa@?{&L)!c`4&CUr5sd}X2AS^`x$6BPqvv#oa}e4p4_Wy5a?29D z90fQXIFWfAr#2)j&{uc(KrhJ{Qr@w&%{KF?QmFc=Q*%8>%&>UX-NKM2Y9YzCW$P+_ zUn1FIBA0y`HZdYsCU25N37_aUB??}>o$9l(OH*2^gnSy6=noZIFnq&OnTXMt)hQe- zag0X!#^X&mwrsk;69`FROGPHe)1T}yfCRgf*gkF8B{5qI;?p+ZD})&lv!6Jr!}Ex2 zOySsT_KroK@zX4EnBqZ{IS5UB6P`l%8r19x=^oBO=w#J?i((n(aYf7?HvK1Cg$&ZY z*))EAXJAGbA*OR=of$TfYg8?2Vy^V&m4%nqlq;8mZElx}Nf*K+Vev6=W*H~bdE_F> zeQd!NbJJ&!`LT=F^P5L|p^?GK>0tHD*4XOaW3r+r6(-shtPcpLqJKX!-03f&$1qdg z)S>G}u5<0Sa8mj`2MR$77J+Cbh_c5}TRu{y^4Q=sW?608rKMlpqxuKMvC`o^h zPY*@b3`9oBytAlIP^H!Y{Twgvg&qrXQk$`3zq2J+r4Vx{-%aLxm^iN7&bBIE;!euM zRt)aG}m#+kyF*o znV~yElNN=02%e2SBd~PSVaCp`W!sikNNXlfZnJc+&#S;rSV@d)?BC7pav z1R*}$Da>kqY=wvz#VIba_~`pV+KQ0M6!B`yFa%P+wv`U1#eoegLZB@qwn7^!r`5I&H^W2RN=^G9{7Xac&N5r%l%C_=yjP?G4+G3 zihkAE8V~w%Cn`cowkRbfC0Ul4olLPWPQO*UEp!ih15#nnj|!3GNz@EJT^9L&sM5}0 z7i%rbMyaVTIwzfE(cXrtsUbI4jaO*5!WZs#Tqd3oDdni`MpwR~fcG&~XHK%nX?4mB zL^eh#tu;CEAz|fO)ZS=ok!I(*Z;T^4mNlxQhaa>n+kw81gghgHX03zYV)g1?X3HdO zZEgl><8l2yXze4nv6#E~*MCg&5joj948Z<9W*{IyJ=>p`rk$KUtWBN%Q1E^2FLApP zNZpd-es$jFZ@nB?hUydkB`F-r#TioV9HsEp_n^<FX?e>ksLK3EIscR@Nq5a|d=FVZ_Cgb=#)CPjL$A|fC~kS+oO0!ouAy?2nRfCPk_?YZ}| zcaG;jIC=6s$xQOSKdj6(=2~-(@y$sT^g?=$o zqFWtEs=fTly_-_zfy#RcLTxye01VUXA|v9dT=HOwjhs*x`$d7E7DBHsg*Z|9A=eN2 zePR~o7mR5!X;hK;A3ud*hE;(0jPP3Kn~lhIL~sGys=^5z6(TX)BhgTHl9p5-`Q>5p zD1T3EMC#;eRAdJ4qOK_Deha7;z zH4`8H$O)su7D}a7X3Tigl2zi*Zn$8a881&-J{n$k%Bxo{9?X`^Glsq>K{!} zRKZmkLYy~5NLfukk4cS2Xf`{Wyqg=>E#&zM)5fF+SU4FgLA;*vU*JXs*h@RyAR^GI z<1H(jQ8b~-Mp852cmVF^e?;KzSy(HGkRfCHj3s(w#23; zZdMlwUSsN{wDuFy3!Fv*B|CS)GmFPz(=XU!gq;guM>NMR)*vhl%YCgNAODn_7Gsnh zW^qL1ww(pFiw4**LYw2{GDl=-pr%d%15=Ep&{0xf1RX zq{F-4EBy0q|8WS%DU4VemVREA-|P;1&to2)RzUmKi%d_U2h?{RP{)kdEWxO|txmwwud@$+8L9H#<1_DI%g&Qt{U6|dI@&s5)`BFD^ zrt~Ss>KTba?Y1t$w{W-}>KE+Q^n_>{hV5X$_x813v+6mHT8X>b&eN&++H z`x=Er1gL{5cMn6@=$&6^)Is^Vonk2ug1|M+6DusTKxsh$e=sHmw6#-!8Cu!7U`xoY znA=9vOAoW|Z|A=tc9j`TbYBd741A04%+@H0|7NG%c+PKN&Dmq(E>)R6(PUp2(R3cu zu~Z#(9ad@`oi$yUcm7VRON!B#CgK$7*?T$KBf+XKjORV1M!(``MHyclt$7;V<#$?K za#rD}&BjUZOE}$h6OL`yK%-WQ*R>`5(M0fdG ztgRyUM4vRQV|Zk@#qgb(g8x{V`cU}5;T(g&m^!_{V&Ivr{n_o+egR1ZKAXX%!qHvAgjHACz`^QW{>6 zpF7Z0_3UaW4ZaEN(0NNB$5o>(n_QfMOB$DB-nNmNmc_=M;?s0nonfSi^XHl~8AS?0 z)Xips{#p0^h8lV<+qur+5@7~|ce_h1;K41ZV)lJMaZ=EGw&~YDpQ^@p{D`K$A^v=O z$sd@SeZa@Z<+i%e-5DoytJ$}#jIf!n@Yz5bgiwiZv=RGWWySXPul?}o3xlzh7)IiI zrQvozk^rwy9N8md-w^ravr^sSvhPX)c#i?xqB zPGf@CLQJ!K#(+XYEfC{Fd$x?CJY9lAp(5=X*Gb6bz3<@>?6^-S3lO|-B z`rWT4xHz4!=>C!GcW4;s%f#@7;HIdtfT@EMT{K%#T12a^Xr^QJWHx>dd5bWc{Fo+CV!}< z(aK&qLoSm=&tfS~#Pzz~ls6WD=SD?~CG?yHCf)Z8Jm9K)M>@BRtTo$mCY~F#a*nh5 z`;*gTYUtKBQFyezq%;t38kX4g(<_B_ZWaT;_-l*Ls;#>4%6aX#`X-Q*Y4D?m^p7`q z2OvAmjJ3tt<%o}#Yd*(o&IvlNY3W3btx{#=H_TKdxR*2Z`AVdOjRVqUrj`)U^^`(j zLCyO;T->UJzJB8~m{MG8(DVM}E(F}OYqlqI#AA}H)fTwi>VLOAuVn+Qq_e&u6y5kls_c~9r%zrR!!tWF_Vsb1L)i<`QBW227wl- zJKjAtqc0HCFR`%9mAU$aXMN8#Zj$Uu|22MH)YP;ep^o`rhztuse$}J14!p(h5hCBh z^!+=yLA*hkgoKCs63Zbk!ASKf^HtG9>pIapFX#rBZ%hbTb#xVP&+_-BisxpJB1Nf& zwlU_!&7<>~THWP^Y5NI;gQ~?$OE9x&@L)jK58v=jiKp^0aBbUq;S0=gcd!lNtGJCS z?^B<|3cbU2rzS_ycQJjXT`C@z6|LXn)~b@_r}EF}J2{S}Ol47jI=z1`$FP2CD#z4( z^E8fqYPC9T4YIqj^(5F@hIiDvQdCIW#5d$4$J%CiK#uj!Z1o#G^Qz+;_2&8{Kn-R)N6Bv|fR8Ozhh|1KxOef6>wVvY5nv22FDX34X|3m(TS<+~q9f6ZM;6}M zQcttzrzr^hWcE0@C%=;6G|zM}Gf(nl=sxEen)mD4hjwnvdJZtQQj%M>w4Xpv*F2x# z#bc3HuZFt71+(Rgy#?~?Vmpe(Z%g zM1jFOLh@1K#-#0RBnIx1pCi+%GV>Dy0ru8ekHO|f zVaT-C%WAw0PdC0IhYgNru;0p~^4KLC%xE{9Kj&(57Tn`|q*o?ux$Qa5SvT|$oBW2B zy_?Z?^m7kyW$Lk@zEH4} zw_r@oYuB>z#j5}7L(-S__Ds7o`dpiG_iOZ$Y=Jo8HnA7$zGp%`wWLG|XH6WRd}rWxD0J zuZldW_xy=hTI@mA*|)G1tMS1*JL6E4WCa53p23W5z@>IAL_KMUPPAhq3zWML}rI$)TJ|LVkt!OGRf1A*p#zKw=oylW)n2WsaPj~X!H7rcy&{?&>dLp zxujcgUVaEJ52vTE;!qm`vbqbc!HkDCZVT3lLmU*dUvH~_-VA<09SSw}c_hW%$@OR- z3E!)OKTmHX@!}5`I^F_;O>X)Yy|O2TeDd{@Y;*ZB4>zwXlFrF+ab|GDBeJIhHXxqP zjWEO2B0uoaqZ&A~BXUhep`L10@o+WjXoOnTGf%b1PkdkQP4m$|I*{D9B;-=Zpx3T- z@KSCi#_*nnm&J}N5^kwt@~KnZp5B=Pwv zgPo9vLY~^PK(9-k-p{Y#2XtIzsoU6T=H1ZO12g29CFVs;A7I^Fi^V$qn#E7^A7aSn z0s|yL7l=m}h>;7-bIyPct=qEgqFMP5No2p=L%rZi{<<+mjrhKAUEx_QlF=*A8o(5D ze3<*_PTqUa#LZtqKe4%}?n$TlX7tVv5_Y>TBG0Y6WjZ=t2-2_IV&sNtqxR->4uquspr8)up1D3+P@`K%6JB-5Yu2?9g&^x0Kn}0PxvCvo4 zbLzskz7aFdzeciNc@(5u|Y<7(WZJD@A4B7ew^ zArBwxzI}u+KgOu3)vG22b$8s1byC3rHjAtntE?EiTa!vcHzQawQBgqMJu1T!Yed~$ zrTR7|^$I09l(#zOQTh+2;r#F+WlYX=Ojp8vyPI1|H;7ddaki77A0BWKSk6wo!nP{C zeS!UJk0fX-IPB1#316(Od*g8R=FdKVLL#kgz7s}GwdZpIUq#!50RmjYQLQ|ux1g_* zGAl1BW5!1ke7v#q4A^xbrK|B98EM^DzFQ@FjLzdxNZOkYqn*TAD(CsV)v_fI!Z zdu;)ISuzE#^58KlY04hu&`W}HE3|R7)`Gjj+y$&%;kJKGhM;_U|7%i+I&@Ex7F0V0 z$-DPK3k9pK8lz1G1-l1C&2T1h?f3Yfrzl-Uk`$U{V!h1#)_8Ei5suB{gbzMx44&qi zx4J7!&XuruV_4gk3M;&z20i!TdTD062^GTE)V81>4WTHCAb_;La13~oauj_u^5Gd5 zkKn_Qo6;&Ky=4Ryxn-Q)X>a6&Xni72mfwm*O9bBKF%`P}s2`Lpo@W7y!(FF_23d}i z4HI&C$Cu}63u70DYcWK`eQsQe~9?+ebN#J`)`*- z^~L{vJ2uOw*0`YCbTM_c^yQ^jL~)PNmBl)B<}8oebBMjd5x^f4h&ojF|U zH`b*(W_5`r?i^XD64-(kTj`z`+Uk~EIT(qA#Ja? z&L<<)&Kf>3mw}I{;#DVjL^x;2UQSFC;!T<&m>vk2{{;L(^Jtdbe!5M|HDdccS)j}# zj?TtY$2;I>M6D&mCgT##!L5^F+lcXDH-0?SF+@GdOM)AuJ(vFPOacI2CO%d} zh4+Yk(AE9V{#m?^?`&)7cY5x<*MjY}zTDDxNE&%L%6#c1j35+vKit>p=RN4|ojhK) z9a=~Su}9$9F=GXfb%^B77ccrW2jdeP8tlBNB45X^QHqPLVj>LZrzaitS6Z*kGT&!gHRtLd!1p zUNfVM9yP1@0eHr1@7O`EY&^Y5mRKrX_~M;4bnxB{VgW&R2`oddpiYr|`;XgJDO-?#vJggN3Sra0pUs|fuXb#;~9qL-l=l`(`H~1Dn*OM|J zVb8`xWg8}z(?e3GO!1}gE}L7*m0f7%T|37A?_wB0KGYoApSS6_KBE76_lHe8wAB6y z_~#}8e+P7;rt z7MA{#8812o-3aWOvVyXl`2*#*Ef_il-Kpl9@|59^l;6HJ=oEA-higg&>mMn(QhwJaqf^j};jSsC{C}kUE{#K{px2sQQ|5*LNcmlPf=)qCX}+ekNc@rV zJHZ*9f}RI>O&J9Lk@7n$5S@aayK+sjQ20$j&tyRdpf7-4158za1Fn}t(WU59>DN*X zt$#_;C)Uvk|GeqA)&l^xCIG;{-GZRY|9O4*clp`lzsdjiY7t%i&q49;YI)1QsjdHi Zh}2R8p~A^uBPbc*5OqmfWc^p`e*iA>7DWI6 literal 25515 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�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 From 3f5a2163814ef2188af4801abbe473acf067a115 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 14:31:39 +0800 Subject: [PATCH 414/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/DictTypeEnum.java | 8 +- .../IcTripReportRecordController.java | 71 ++++- .../excel/IcPsTripReportRecordExcel.java | 109 ++++++++ .../error/IcPsTripReportRecordErrorExcel.java | 32 +++ .../service/IcTripReportRecordService.java | 5 + .../impl/IcTripReportRecordServiceImpl.java | 249 +++++++++++++++++- 6 files changed, 465 insertions(+), 9 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index fcf79a3c89..57b2461c1e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -29,10 +29,10 @@ public enum DictTypeEnum { IC_DANGER_TYPE("ic_danger_type","危化品种类",24), POLICY_LEVEL("policy_level","政策级别",25), LOG_TYPE("log_type", "日志类型", 33), - TRAFFIC_TYPE("traffic_type", "日志类型", 36), - SOJOURN_HISTORY("sojourn_history", "日志类型", 37), - ISOLATE_TYPE("isolate_type", "日志类型", 38), - TRIP_DATA_TYPE("trip_data_type", "日志类型", 39), + TRAFFIC_TYPE("traffic_type", "交通方式", 36), + SOJOURN_HISTORY("sojourn_history", "7天内旅居史情况", 37), + ISOLATE_TYPE("isolate_type", "隔离状态", 38), + TRIP_DATA_TYPE("trip_data_type", "行程记录类型", 39), ; private final String code; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index aea630040c..74139ac33d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -31,11 +32,13 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -246,7 +249,6 @@ public class IcTripReportRecordController implements ResultDataResolver { } } - /** * 导入excel * @return @@ -300,4 +302,71 @@ public class IcTripReportRecordController implements ResultDataResolver { icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); return new Result(); } + + /** + * pc:磐石-行程上报-下载模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "psdownloadtemplate", method = {RequestMethod.GET, RequestMethod.POST}) + public void psDownloadTemplate(HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + //response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("行程上报导入模板", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ps_trip_report_import_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + /** + * 磐石-导入excel + * @return + */ + @PostMapping("psimport") + @Transactional(rollbackFor = Exception.class) + public Result psImportExcel(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws Exception { + if (file.isEmpty()) { + throw new RenException("请上传文件"); + } + + // 校验文件类型 + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + if (!"xls".equals(extension) && !"xlsx".equals(extension)) { + throw new RenException("文件类型不匹配"); + } + //1.查询当前工作人员是否有再导入的党员先锋数据,有则不允许导入，没有则进行新的导入 + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOriginFileName(file.getOriginalFilename()); + importTaskForm.setOperatorId(tokenDto.getUserId()); + importTaskForm.setBizType(ImportTaskConstants.PS_BIZ_TYPE_IC_TRIP_REPORT); + Result result = commonServiceOpenFeignClient.createImportTask(importTaskForm); + if (!result.success()) { + throw new RenException(result.getInternalMsg()); + } + 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("读取文件失败"); + } + //2.执行导入程序 + icTripReportRecordService.psExecAsyncExcelImport(tokenDto, response, inputStream, result.getData().getTaskId()); + + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java new file mode 100644 index 0000000000..011757b7d6 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -0,0 +1,109 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import com.epmet.commons.tools.utils.ExcelVerifyInfo; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * 磐石-行程上报信息 + * + */ +@Data +public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { + + @Excel(name = "姓名", needMerge = true) + @NotBlank(message = "不能为空") + private String name; + + @Excel(name = "年龄", needMerge = true) + //@NotNull(message = "不能为空") + private Integer age; + + @Excel(name = "证件号", needMerge = true) + @NotBlank(message = "不能为空") + private Integer idCard; + + @Excel(name = "户籍地（省市县区）", needMerge = true) + @NotBlank(message = "不能为空") + private String presentAddress; + + @Excel(name = "手机号", needMerge = true) + @NotBlank(message = "不能为空") + private String mobile; + + @ExcelCollection(name = "来源地") + private List source; + + @Excel(name = "来曹事由（100字以内）", needMerge = true) + @NotBlank(message = "不能为空") + private String describe; + + @Excel(name = "48小时核酸检测", needMerge = true) + @NotBlank(message = "不能为空") + private String natOutcome; + + @Excel(name = "来到本地时间（2022-01-01）", needMerge = true) + @NotBlank(message = "不能为空") + private String arriveDate; + + @ExcelCollection(name = "在曹居住地点") + private List present; + + @ExcelCollection(name = "返回方式") + private List traffic; + + @Excel(name = "7天内旅居史情况", needMerge = true) + private String sojournHistory; + + @Excel(name = "隔离状态", needMerge = true) + private String isolateType; + + @Excel(name = "备注（500字以内）", needMerge = true) + private String remark; + + @Excel(name = "是否落实“落地检”", needMerge = true) + private String isArriveCheck; + + @Excel(name = "是否达到曹县", needMerge = true) + private String isArrive; + + @Excel(name = "上报时间（2022-01-01）", needMerge = true) + private String reportingTime; + + @Excel(name = "管控措施（500字以内）", needMerge = true) + private String controlMeasures; + + @Excel(name = "类型（省内、省外、市内、县内）", needMerge = true) + private String tripDataType; + + + @Data + public class Source { + @Excel(name = "社区（省-市-区-街道-社区）") + @NotBlank(message = "不能为空") + private String sourceAddress; + @Excel(name = "详细地址", width = 20) + private String sourceDetailAddress; + } + @Data + public class Present { + @Excel(name = "村/居") + @NotBlank(message = "不能为空") + private String presentAddress; + @Excel(name = "详细地址", width = 20) + private String detailAddress; + } + @Data + public class Traffic { + @Excel(name = "返回方式") + @NotBlank(message = "不能为空") + private String trafficType; + @Excel(name = "其他返回方式", width = 20) + private String trafficTypeExplain; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java new file mode 100644 index 0000000000..a330e40462 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java @@ -0,0 +1,32 @@ +package com.epmet.excel.error; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Date; + +/** + * 磐石-行程上报信息 + * + */ +@Data +public class IcPsTripReportRecordErrorExcel { + + @Excel(name = "姓名", width = 20) + private String name; + + @Excel(name = "证件号", width = 25) + private Integer idCard; + + @Excel(name = "户籍地（省市县区）", width = 40) + private String presentAddress; + + @Excel(name = "手机号", width = 20) + private String mobile; + + @Excel(name = "社会自组织名称", width = 40) + private String errorInfo; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index 32447f2d74..998e942b3d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -2,6 +2,7 @@ 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.IcTripReportRecordDTO; import com.epmet.dto.form.IcTripReportFormDTO; import com.epmet.dto.form.MyReportedTripFormDTO; @@ -9,6 +10,8 @@ import com.epmet.dto.form.PageTripReportFormDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.entity.IcTripReportRecordEntity; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -102,4 +105,6 @@ public interface IcTripReportRecordService extends BaseService fileList = new ArrayList<>(); + IcPsTripReportRecordErrorExcel excel = null; + //1.读取Excel数据 + ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 3, IcPsTripReportRecordExcel.class); + //2.存在错误行数据时存入错误数据集合中 + if (CollectionUtils.isNotEmpty(testExcelImportResult.getFailList())) { + for (IcPsTripReportRecordExcel entity : testExcelImportResult.getFailList()) { + //打印失败的行 和失败的信息 + log.warn("第{}行,{}", entity.getRowNum(), entity.getErrorMsg()); + excel = new IcPsTripReportRecordErrorExcel(); + excel.setName(entity.getName()); + excel.setIdCard(entity.getIdCard()); + excel.setPresentAddress(entity.getPresentAddress()); + excel.setMobile(entity.getMobile()); + excel.setErrorInfo(entity.getErrorMsg()); + fileList.add(excel); + } + } + //3.正确行数据集合 + List list = testExcelImportResult.getList(); + if (CollectionUtils.isNotEmpty(list)) { + //3-1.校验数据值，把填写不对的数据剔除 + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + AtomicBoolean bl = new AtomicBoolean(false); + StringBuffer errMsg = new StringBuffer(""); + IcPsTripReportRecordExcel obj = iterator.next(); + //返回方式为其他时需要填写"其他返回方式" + if (CollectionUtils.isEmpty(obj.getTraffic()) || + ("其他".equals(obj.getTraffic().get(0).getTrafficType()) && StringUtils.isBlank(obj.getTraffic().get(0).getTrafficTypeExplain()))) { + errMsg.append("返回方式为其他时，请补充“其他返回方式”;"); + bl.set(true); + } + if (bl.get()) { + excel = new IcPsTripReportRecordErrorExcel(); + excel.setName(obj.getName()); + excel.setIdCard(obj.getIdCard()); + excel.setPresentAddress(obj.getPresentAddress()); + excel.setMobile(obj.getMobile()); + excel.setErrorInfo(errMsg.toString()); + fileList.add(excel); + iterator.remove(); + } + } + //3-2.获取需要的字典表数据 + //交通方式 + Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + //获取当前登录用户所属组织id + CustomerStaffInfoCacheResult staffInfo = queryCurrentStaff(tokenDto.getCustomerId(), tokenDto.getUserId()); + //风险地区数据 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcDangerAreaEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); + List areaList = icDangerAreaDao.selectList(wrapper); + Map map1 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getDistrict, IcDangerAreaEntity::getDangerLevel)); + Map map2 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getCity, IcDangerAreaEntity::getDangerLevel)); + Map map3 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getProvince, IcDangerAreaEntity::getDangerLevel)); + + list.forEach(l -> { + //3-3.数据赋值 + AtomicBoolean bl = new AtomicBoolean(false); + StringBuffer errMsg = new StringBuffer(""); + IcTripReportRecordEntity e = ConvertUtils.sourceToTarget(l, IcTripReportRecordEntity.class); + e.setCustomerId(tokenDto.getCustomerId()); + e.setAgencyId(staffInfo.getAgencyId()); + e.setPids(staffInfo.getAgencyPIds()); + e.setUserType(IcResiUserConstant.USER_TYPE_IMPORT); + if (!CollectionUtils.isEmpty(l.getSource())) { + e.setSourceAddress(l.getSource().get(0).getSourceAddress()); + e.setSourceDetailAddress(l.getSource().get(0).getSourceDetailAddress()); + } + if (!CollectionUtils.isEmpty(l.getPresent())) { + e.setPresentAddress(l.getPresent().get(0).getPresentAddress()); + e.setDetailAddress(l.getPresent().get(0).getDetailAddress()); + } + if (!CollectionUtils.isEmpty(l.getTraffic()) && trafficTypeMap.getData().containsKey(l.getTraffic().get(0).getTrafficType())) { + e.setTrafficType(trafficTypeMap.getData().get(l.getTraffic().get(0).getTrafficType())); + e.setTrafficTypeExplain(l.getTraffic().get(0).getTrafficTypeExplain()); + } + if (StringUtils.isNotBlank(l.getSojournHistory())) { + e.setSojournHistory(sojournHistoryMap.getData().get(l.getSojournHistory())); + } else { + String[] str = e.getSourceAddress().split("-"); + if (str.length < 3) { + bl.set(true); + errMsg.append("数据不完整，‘来源地’信息填写格式错误;"); + } + e.setSojournHistory("4"); + if (map1.containsKey(str[2])) { + e.setSojournHistory(map1.get(str[2]).equals("2") ? "1" : ("1".equals(map1.get(str[2])) ? "2" : ("0".equals(map1.get(str[2])) ? "3" : "4"))); + } + if (map2.containsKey(str[1])) { + e.setSojournHistory(map2.get(str[1]).equals("2") ? "1" : ("1".equals(map2.get(str[1])) ? "2" : ("0".equals(map2.get(str[1])) ? "3" : "4"))); + } + if (map3.containsKey(str[0])) { + e.setSojournHistory(map3.get(str[0]).equals("2") ? "1" : ("1".equals(map3.get(str[0])) ? "2" : ("0".equals(map3.get(str[0])) ? "3" : "4"))); + } + } + if (StringUtils.isNotBlank(l.getIsolateType())) { + e.setIsolateType(isolateTypeMap.getData().get(l.getIsolateType())); + } + if (StringUtils.isNotBlank(l.getTripDataType())) { + e.setTripDataType(tripDataTypeMap.getData().get(l.getTripDataType())); + } + e.setIsArriveCheck("是".equals(l.getIsArriveCheck()) ? "1" : "0"); + e.setIsArrive("是".equals(l.getIsArrive()) ? "1" : "0"); + //必要字段没值的 + if (StringUtils.isEmpty(e.getSourceAddress()) || StringUtils.isEmpty(e.getPresentAddress()) + || StringUtils.isEmpty(e.getTrafficType())) { + errMsg.append("数据不完整，请检查‘来源地’、‘在曹居住地点’、‘返回方式’信息是否填写完整;"); + bl.set(true); + } + if (bl.get()) { + IcPsTripReportRecordErrorExcel el = new IcPsTripReportRecordErrorExcel(); + el.setName(l.getName()); + el.setIdCard(l.getIdCard()); + el.setPresentAddress(l.getPresentAddress()); + el.setMobile(l.getMobile()); + el.setErrorInfo(errMsg.toString()); + fileList.add(el); + return; + } + //3-4.保存数据 + baseDao.insert(e); + }); + } + + //4.错误数据生成文件，修改导入任务状态 + String url = erroeImport(fileList); + upImportTask(url, taskId, tokenDto.getUserId(), true); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【行程上报数据导入】程序错误:{}", errorMsg); + upImportTask(null, taskId, tokenDto.getUserId(), false); + } + } + + /** + * @Author sun + * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束 + **/ + private String erroeImport(List fileList) throws IOException { + String url = ""; + //1.有错误数据则生成错误数据存放文件传到阿里云服务 + if (!org.springframework.util.CollectionUtils.isEmpty(fileList)) { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表", "导入失败的数据列表"), + IcPsTripReportRecordErrorExcel.class, fileList); + + // 文件名 + String resultDescFileName = UUID.randomUUID().toString().concat(".xlsx"); + 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上传结果描述文件失败"); + } + url = uploadResult.getData().getUrl(); + } + return url; + } + + /** + * @Author sun + * @Description 行程上报数据导入修改导入任务状态 + **/ + private void upImportTask(String url, String importTaskId, String staffId, Boolean status) { + //2.更新导入任务数据 + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOperatorId(staffId); + importTaskForm.setBizType(ImportTaskConstants.PS_BIZ_TYPE_IC_TRIP_REPORT); + importTaskForm.setTaskId(importTaskId); + importTaskForm.setResultDescFilePath(url); + if (status && StringUtils.isBlank(url)) { + importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); + } else { + importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importTaskForm.setResultDesc("行程上报数据导入存在程序错误"); + } + Result result = commonServiceOpenFeignClient.finishImportTask(importTaskForm); + if (!result.success()) { + throw new RenException(result.getInternalMsg()); + } + } + + } From ac570f2d15d7efc812befaafd96c0f2bc1b3b683 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 15:02:35 +0800 Subject: [PATCH 415/621] =?UTF-8?q?=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=B1=85=E6=B0=91=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=B0=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=88=A0=E9=99=A4=E8=AF=A5=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=9A=84=E8=BF=81=E5=87=BA=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=EF=BC=9B?= =?UTF-8?q?=E5=BD=93=E8=BF=81=E5=87=BA=E7=9A=84=E5=B1=85=E6=B0=91=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E8=A2=AB=E8=BF=81=E5=85=A5=EF=BC=8C=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/ChangeRelocationDTO.java | 5 +++ ...hRecordFormDTO.java => OnlyIdFormDTO.java} | 2 +- .../ChangeRelocationController.java | 15 +++++++ .../controller/IcBirthRecordController.java | 4 +- .../controller/IcMoveInRecordController.java | 9 +++++ .../service/ChangeRelocationService.java | 10 +++++ .../impl/ChangeRelocationServiceImpl.java | 40 +++++++++++++++++++ .../resources/mapper/ChangeRelocationDao.xml | 1 + 8 files changed, 83 insertions(+), 3 deletions(-) rename epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/{DeleteIcBirthRecordFormDTO.java => OnlyIdFormDTO.java} (86%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java index dd632ca671..7db30e392b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java @@ -29,6 +29,11 @@ public class ChangeRelocationDTO implements Serializable { */ private String icResiUserId; + /** + * ic_resi_user 用户状态 + */ + private String status; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java similarity index 86% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java index 9cc3dd05fe..3e2501850d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java @@ -13,7 +13,7 @@ import java.util.List; * @dscription */ @Data -public class DeleteIcBirthRecordFormDTO implements Serializable { +public class OnlyIdFormDTO implements Serializable { private static final long serialVersionUID = -5220529162950147825L; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index 1b84302742..6ac14fec7c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -13,6 +13,7 @@ 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.dto.ChangeRelocationDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.ChangeRelocationExcel; import com.epmet.service.ChangeRelocationService; import org.apache.commons.collections4.CollectionUtils; @@ -144,4 +145,18 @@ public class ChangeRelocationController { return new Result(); } + /** + * 恢复迁出人员 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("recovery") + public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + changeRelocationService.recovery(tokenDto,dto); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index b8ba028d4c..b9229eea74 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -24,7 +24,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; import com.epmet.dto.form.BirthRecordUpdateDTO; -import com.epmet.dto.form.DeleteIcBirthRecordFormDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.IcBirthRecordExcel; import com.epmet.service.IcBirthRecordService; import lombok.extern.slf4j.Slf4j; @@ -94,7 +94,7 @@ public class IcBirthRecordController { } @PostMapping("deleteById") - public Result deleteById(@RequestBody DeleteIcBirthRecordFormDTO dto) { + public Result deleteById(@RequestBody OnlyIdFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icBirthRecordService.deleteById(dto.getId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index 18c40e286e..b11e6e369c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -23,6 +23,7 @@ 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.dto.IcMoveInRecordDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.dto.form.IcMoveInAddEditFormDTO; import com.epmet.dto.form.IcMoveInListFormDTO; import com.epmet.dto.result.IcMoveInListResultDTO; @@ -95,6 +96,14 @@ public class IcMoveInRecordController { return new Result(); } + @PostMapping("deleteById") + public Result deleteById(@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icMoveInRecordService.deleteById(dto.getId()); + return new Result(); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws IOException { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java index 150fc05fa0..fb87579a59 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java @@ -2,8 +2,10 @@ 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.ChangeRelocationDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.entity.ChangeRelocationEntity; import java.util.List; @@ -105,4 +107,12 @@ public interface ChangeRelocationService extends BaseService page(Map params) { @@ -342,6 +352,36 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 15:04:26 +0800 Subject: [PATCH 416/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=98=E5=8C=96=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 4 +++ .../epmet/dto/form/IcTripReportFormDTO.java | 4 +++ .../entity/IcTripReportRecordEntity.java | 4 +++ .../excel/IcPsTripReportRecordExcel.java | 29 ++++++++++++++----- .../impl/IcTripReportRecordServiceImpl.java | 19 ++++-------- 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 63d5d28ffa..21b26ce7be 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -254,6 +254,10 @@ public class IcTripReportRecordDTO implements Serializable { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 6160420fee..aae545ab01 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -196,6 +196,10 @@ public class IcTripReportFormDTO implements Serializable { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index ffbfa4fe1f..5feb599051 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -135,6 +135,10 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 户籍地 【磐石】 + */ + private String registeredResidence; /** * 年龄【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 011757b7d6..1f4bd6814d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -29,14 +29,19 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @Excel(name = "户籍地（省市县区）", needMerge = true) @NotBlank(message = "不能为空") - private String presentAddress; + private String registeredResidence; @Excel(name = "手机号", needMerge = true) @NotBlank(message = "不能为空") private String mobile; - @ExcelCollection(name = "来源地") - private List source; + /* @ExcelCollection(name = "来源地") + private List source;*/ + @Excel(name = "来自地区（格式：省-市-区-街道-社区）") + @NotBlank(message = "不能为空") + private String sourceAddress; + @Excel(name = "来自地区详细地址") + private String sourceDetailAddress; @Excel(name = "来曹事由（100字以内）", needMerge = true) @NotBlank(message = "不能为空") @@ -50,11 +55,21 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @NotBlank(message = "不能为空") private String arriveDate; - @ExcelCollection(name = "在曹居住地点") - private List present; + /*@ExcelCollection(name = "在曹居住地点") + private List present;*/ + @Excel(name = "现居地") + @NotBlank(message = "不能为空") + private String presentAddress; + @Excel(name = "现居地详细地址") + private String detailAddress; - @ExcelCollection(name = "返回方式") - private List traffic; + /*@ExcelCollection(name = "返回方式") + private List traffic;*/ + @Excel(name = "返回方式") + @NotBlank(message = "不能为空") + private String trafficType; + @Excel(name = "其他返回方式") + private String trafficTypeExplain; @Excel(name = "7天内旅居史情况", needMerge = true) private String sojournHistory; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 37e6df0dad..0b97b0d90d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -497,7 +497,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl fileList = new ArrayList<>(); IcPsTripReportRecordErrorExcel excel = null; //1.读取Excel数据 - ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 3, IcPsTripReportRecordExcel.class); + ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 2, IcPsTripReportRecordExcel.class); //2.存在错误行数据时存入错误数据集合中 if (CollectionUtils.isNotEmpty(testExcelImportResult.getFailList())) { for (IcPsTripReportRecordExcel entity : testExcelImportResult.getFailList()) { @@ -522,8 +522,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 15:07:28 +0800 Subject: [PATCH 417/621] =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/DictTypeEnum.java | 2 + .../epmet/constants/ImportTaskConstants.java | 1 + .../controller/IcDangerAreaController.java | 70 +++++++++- .../epmet/excel/IcDangerAreaImportExcel.java | 34 +++++ .../IcDangerAreaExcelImportListener.java | 130 ++++++++++++++++++ .../epmet/service/IcDangerAreaService.java | 3 + .../service/impl/IcDangerAreaServiceImpl.java | 123 ++++++++++++++++- 7 files changed, 354 insertions(+), 9 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index 57b2461c1e..d38442798e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -29,6 +29,8 @@ public enum DictTypeEnum { IC_DANGER_TYPE("ic_danger_type","危化品种类",24), POLICY_LEVEL("policy_level","政策级别",25), LOG_TYPE("log_type", "日志类型", 33), + + DANGER_AREA_LEVEL_TYPE("dangerAreaLevel", "风险地区等级", 34), TRAFFIC_TYPE("traffic_type", "交通方式", 36), SOJOURN_HISTORY("sojourn_history", "7天内旅居史情况", 37), ISOLATE_TYPE("isolate_type", "隔离状态", 38), 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 1d9190c9db..204845c1fb 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 @@ -21,6 +21,7 @@ public interface ImportTaskConstants { String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member"; String BIZ_TYPE_IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals"; String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise"; + String BIZ_TYPE_IC_DANGER_AREA="ic_danger_area"; String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring"; String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation"; // 新冠病毒疫苗接种人员信息台账 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java index 4dcfd4bb09..ea4ebcc55b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -5,25 +5,32 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.exception.EpmetErrorCode; +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.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; -import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.feign.*; 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.IcDangerAreaDTO; import com.epmet.dto.form.DangerAreaListFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.NatListCommonExcelResultDTO; import com.epmet.dto.result.NatListResultDTO; import com.epmet.enums.DangerLevelEnum; import com.epmet.excel.IcDangerAreaResultExcel; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcDangerAreaService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -31,14 +38,18 @@ import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.List; import java.util.Map; +import java.util.UUID; /** @@ -50,10 +61,12 @@ import java.util.Map; @RestController @Slf4j @RequestMapping("icDangerArea") -public class IcDangerAreaController { +public class IcDangerAreaController implements ResultDataResolver{ @Autowired private IcDangerAreaService icDangerAreaService; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @RequestMapping("page") public Result> page(@RequestParam Map params){ @@ -159,4 +172,51 @@ public class IcDangerAreaController { } } + @PostMapping("import") + public Result importExcel(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) { + String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_danger_area", "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【风险地区】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); + } + + InputStream is = null; + FileOutputStream os = null; + + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error("method exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); + importTaskForm.setOperatorId(userId); + importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_DANGER_AREA); + importTaskForm.setOriginFileName(originalFilename); + + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "excel导入风险地区错误", + "风险地区导入失败"); + + // 3.执行导入 + icDangerAreaService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java new file mode 100644 index 0000000000..7358f3ee39 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java @@ -0,0 +1,34 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author zxc + * @DateTime 2022/11/1 11:18 + */ +@Data +public class IcDangerAreaImportExcel { + + @NotBlank(message = "风险地区为必填项") + @ExcelProperty("风险地区") + private String allName; + + @NotBlank(message = "风险等级为必填项") + @ExcelProperty("风险等级") + private String dangerLevel; + + @Data + public static class IcDangerAreaError{ + @ExcelProperty("风险地区") + private String name; + + @ExcelProperty("风险等级") + private String dangerLevel; + + @ExcelProperty("错误信息") + private String errorInfo; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java new file mode 100644 index 0000000000..5e09a8d102 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -0,0 +1,130 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dao.IcDangerAreaDao; +import com.epmet.entity.IcDangerAreaEntity; +import com.epmet.entity.IcNatEntity; +import com.epmet.enums.DangerLevelEnum; +import com.epmet.excel.IcDangerAreaImportExcel; +import com.epmet.excel.data.IcNatImportExcelData; +import com.epmet.service.IcDangerAreaService; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * 核酸检测excel导入监听器 + */ +@Data +@Slf4j +public class IcDangerAreaExcelImportListener implements ReadListener { + + public static final int MAX_THRESHOLD = 200; + private String customerId = ""; + private Map dangerLevelMap = null; + private List datas = new ArrayList<>(); + private List errorRows = new ArrayList<>(); + + @Autowired + private IcDangerAreaService icDangerAreaService; + @Autowired + private IcDangerAreaDao icDangerAreaDao; + + public IcDangerAreaExcelImportListener(Map dangerLevelMap, String customerId, IcDangerAreaService icDangerAreaService, IcDangerAreaDao icDangerAreaDao) { + this.dangerLevelMap = dangerLevelMap; + this.customerId = customerId; + this.icDangerAreaService = icDangerAreaService; + this.icDangerAreaDao = icDangerAreaDao; + } + + @Override + public void invoke(IcDangerAreaImportExcel data, AnalysisContext context) { + try { + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(IcDangerAreaEntity::getAllName,data.getAllName()); + IcDangerAreaEntity icDangerAreaEntity = icDangerAreaDao.selectOne(qw); + if (null != icDangerAreaEntity){ + throw new EpmetException(EpmetErrorCode.DANGER_AREA_ERROR.getCode()); + } + ValidatorUtils.validateEntity(data); + IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(data, IcDangerAreaEntity.class); + String[] split = data.getAllName().split("-"); + for (int i = NumConstant.ZERO; i < split.length; i++) { + switch (i){ + case NumConstant.ZERO: + entity.setProvince(split[i]); + break; + case NumConstant.ONE: + entity.setCity(split[i]); + break; + case NumConstant.TWO: + entity.setDistrict(split[i]); + break; + default: + break; + } + } + entity.setDangerLevel(dangerLevelMap.get(entity.getDangerLevel())); + entity.setCustomerId(customerId); + datas.add(entity); + if (datas.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + } else { + log.error("【风险地区信息导入】出错:{}", e.getStackTrace()); + errorMsg = ((EpmetException)e).getInternalMsg(); + log.error("【风险地区信息导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + IcDangerAreaImportExcel.IcDangerAreaError errorRow = new IcDangerAreaImportExcel.IcDangerAreaError(); + errorRow.setName(data.getAllName()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(datas)){ + icDangerAreaService.insertBatch(datas); + } + } finally { + datas.clear(); + } + } + + /** + * 获取错误行 + * @return + */ + public List getErrorRows() { + return errorRows; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java index 9baf3e2b99..18a98985fb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcDangerAreaService.java @@ -6,6 +6,7 @@ import com.epmet.dto.IcDangerAreaDTO; import com.epmet.dto.form.DangerAreaListFormDTO; import com.epmet.entity.IcDangerAreaEntity; +import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -78,4 +79,6 @@ public interface IcDangerAreaService extends BaseService { * @date 2022-10-31 */ void delete(List ids,String staffId); + + void execAsyncExcelImport(Path fileSavePath, String taskId, String customerId, String userId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java index 498712ae68..0c56f212f7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -1,32 +1,58 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; 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.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.FileUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcDangerAreaDao; import com.epmet.dto.IcDangerAreaDTO; +import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.DangerAreaListFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerAreaEntity; +import com.epmet.excel.IcDangerAreaImportExcel; +import com.epmet.excel.handler.IcDangerAreaExcelImportListener; +import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.IcDangerAreaService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +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.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.Date; -import java.util.List; -import java.util.Map; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.*; +import java.util.stream.Collectors; /** * 疫情风险地区 @@ -35,8 +61,16 @@ import java.util.Map; * @since v1.0.0 2022-10-31 */ @Service +@Slf4j public class IcDangerAreaServiceImpl extends BaseServiceImpl implements IcDangerAreaService { + @Autowired + private EpmetAdminOpenFeignClient adminOpenFeignClient; + @Autowired + private OssFeignClient ossFeignClient; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -139,4 +173,85 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.DANGER_AREA_LEVEL_TYPE.getCode()); + Map dangerLevelMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); + + IcDangerAreaExcelImportListener dangerAreaExcelImportListener = new IcDangerAreaExcelImportListener(dangerLevelMap, customerId,this ,baseDao); + EasyExcel.read(fileSavePath.toFile(), IcDangerAreaImportExcel.class, dangerAreaExcelImportListener).headRowNumber(1).sheet(0).doRead(); + + Path errorDescFile = null; + String errorDesFileUrl = null; + List errorRows = dangerAreaExcelImportListener.getErrorRows(); + boolean failed = CollectionUtils.isNotEmpty(errorRows); + if (failed) { + // 生成并上传错误文件 + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_danger_area", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + errorDescFile = errorDescDir.resolve(fileName); + + FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile()); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName); + OutputStream os = fileItem.getOutputStream(); + EasyExcel.write(os, IcDangerAreaImportExcel.IcDangerAreaError.class).sheet("导入失败列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + } finally { + if (Files.exists(errorDescFile)) { + Files.delete(errorDescFile); + } + } + } + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(taskId); + importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc(""); + importFinishTaskForm.setResultDescFilePath(errorDesFileUrl); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【风险地区导入】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【风险地区导入】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(taskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc("导入失败"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【风险地区导入】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(fileSavePath)) { + try { + Files.delete(fileSavePath); + } catch (IOException e) { + log.error("method exception", e); + } + } + } + } + } \ No newline at end of file From a48159740979c403ffe32ab5912c62035ffac987 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 15:16:11 +0800 Subject: [PATCH 418/621] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcEpidemicSpecialAttentionDTO.java | 62 +++++++++++++++- .../dto/result/VaccinationListResultDTO.java | 36 ++++++++++ .../IcEpidemicSpecialAttentionEntity.java | 72 +++++++++++++++++-- ...__ic_epidemic_special_attention_panshi.sql | 20 ++++++ .../mapper/IcEpidemicSpecialAttentionDao.xml | 66 ++++++++++++----- 5 files changed, 232 insertions(+), 24 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java index 5d880153a6..b2b8a7b95d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java @@ -95,7 +95,7 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { private String idCard; /** - * 原因 + * 关注原因；后磐石改名为隔离原因 */ @Length(max = 500,message = "原因限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private String reason; @@ -106,6 +106,66 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { @Length(max = 500,message = "备注限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private String remark; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + private String volunteerMobile; + /** * */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index 7099e1650b..3faf74d3d3 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -127,6 +127,42 @@ public class VaccinationListResultDTO implements Serializable { @JsonIgnore private String customerId; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + * gkStartTime-gkEndTime + */ + private String gkTime; + + /** + * 镇（街）干部名称联系方式,需求来源于磐石 + * gbName+gbMobile + */ + private String gb; + + /** + * 村（社区）网格管理员gridManager,需求来源于磐石 + * gridManager+gridManagerMobile + */ + private String gridManager; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + * healthWorker+healthWorkerMobile + */ + private String healthWorker; + + /** + * 民警联系方式,需求来源于磐石 + * policeName+policeMobile + */ + private String police; + + /** + * 志愿者+联系方式,需求来源于磐石 + */ + private String volunteer; + + public VaccinationListResultDTO() { this.vaccinationCount = NumConstant.ZERO; this.name = ""; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java index a22f3f3537..aa4e6052fd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java @@ -73,14 +73,74 @@ public class IcEpidemicSpecialAttentionEntity extends BaseEpmetEntity { */ private String idCard; - /** - * 原因 - */ + /** + * 关注原因；后磐石改名为隔离原因 + */ private String reason; - /** - * 备注 - */ + /** + * 备注 + */ private String remark; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + private String volunteerMobile; + } diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql new file mode 100644 index 0000000000..936a358868 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql @@ -0,0 +1,20 @@ +-- 禅道需求713 +alter table ic_epidemic_special_attention MODIFY COLUMN `reason` varchar(500) DEFAULT NULL comment '关注原因；后磐石改名为隔离原因'; +alter table ic_epidemic_special_attention MODIFY COLUMN `remark` varchar(500) DEFAULT NULL comment '备注'; + +alter table ic_epidemic_special_attention ADD column GK_START_TIME varchar(32) DEFAULT '' COMMENT '管控开始时间yyyy-MM-dd,需求来源于磐石' AFTER remark; +alter table ic_epidemic_special_attention ADD column GK_END_TIME varchar(32) DEFAULT '' COMMENT '管控结束时间yyyy-MM-dd,需求来源于磐石' AFTER GK_START_TIME; + +alter table ic_epidemic_special_attention ADD column GB_NAME VARCHAR(32) DEFAULT '' COMMENT '镇（街）干部名称,需求来源于磐石' AFTER GK_END_TIME; +alter table ic_epidemic_special_attention ADD column GB_MOBILE VARCHAR(32) DEFAULT '' COMMENT '镇（街）干部联系方式,需求来源于磐石' AFTER GB_NAME; + +alter table ic_epidemic_special_attention ADD column GRID_MANAGER VARCHAR(32) DEFAULT '' COMMENT '村（社区）网格管理员,需求来源于磐石' AFTER GB_MOBILE; +alter table ic_epidemic_special_attention ADD column GRID_MANAGER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '村（社区）网格管理员联系方式,需求来源于磐石' AFTER GRID_MANAGER; +alter table ic_epidemic_special_attention ADD column HEALTH_WORKER VARCHAR(32) DEFAULT '' COMMENT '基层医务工作者,需求来源于磐石' AFTER GRID_MANAGER_MOBILE; +alter table ic_epidemic_special_attention ADD column HEALTH_WORKER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '基层医务工作者联系方式,需求来源于磐石' AFTER HEALTH_WORKER; + +alter table ic_epidemic_special_attention ADD column POLICE_NAME VARCHAR(32) DEFAULT '' COMMENT '民警,需求来源于磐石' AFTER HEALTH_WORKER_MOBILE; +alter table ic_epidemic_special_attention ADD column POLICE_MOBILE VARCHAR(32) DEFAULT '' COMMENT '民警联系方式,需求来源于磐石' AFTER POLICE_NAME; + +alter table ic_epidemic_special_attention ADD column VOLUNTEER_NAME VARCHAR(32) DEFAULT '' COMMENT '志愿者,需求来源于磐石' AFTER POLICE_MOBILE; +alter table ic_epidemic_special_attention ADD column VOLUNTEER_MOBILE VARCHAR(32) DEFAULT '' COMMENT '志愿者联系方式,需求来源于磐石' AFTER VOLUNTEER_NAME; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 5db13945cb..7f3c64b11f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -81,7 +81,23 @@ b.UNIT_ID, b.HOME_ID, IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime, - IFNULL(v.vaccinationCount,0) AS vaccinationCount + IFNULL(v.vaccinationCount,0) AS vaccinationCount, + ( + case when a.GK_START_TIME is not null + and a.GK_START_TIME !='' + and a.GK_END_TIME is not null + and a.GK_END_TIME !='' + then concat(a.GK_START_TIME,'-',a.GK_END_TIME) + when a.GK_START_TIME is not null and (a.GK_END_TIME is null or a.GK_END_TIME='') then a.GK_START_TIME + when (a.GK_START_TIME is null or a.GK_START_TIME ='' ) and a.GK_END_TIME is not null and a.GK_END_TIME !='' then a.GK_END_TIME + else '' + end + )as gkTime, + concat(a.GB_NAME,a.GB_MOBILE) as gb, + concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManager, + concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorker, + concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as police, + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteer FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount, CREATED_TIME FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID) @@ -125,22 +141,38 @@ From f7b587539513cae6381c256dcc7daa4f131fb8ef Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 15:41:10 +0800 Subject: [PATCH 422/621] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/service/impl/IcPartyMemberServiceImpl.java | 3 +-- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 9685adfdd6..11066c8b70 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -13,7 +13,6 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; -import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.IcFormCodeEnum; import com.epmet.commons.tools.enums.PartyPostEnum; @@ -691,7 +690,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 15:52:12 +0800 Subject: [PATCH 423/621] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmphasisTripListFormDTO.java | 22 +++++++++++++++++++ .../dto/result/EmphasisTripListResultDTO.java | 16 ++++++++++++++ .../controller/IcDangerAreaController.java | 2 +- .../IcTripReportRecordController.java | 21 ++++++++++++++---- .../service/IcTripReportRecordService.java | 11 ++++++++++ .../impl/IcTripReportRecordServiceImpl.java | 14 ++++++++++++ 6 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java new file mode 100644 index 0000000000..8c2eab988f --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:39 + */ +@Data +public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 5850717233738956442L; + + private String code; + + private String dangerLevel; + + private String staffId; + private String customerId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java new file mode 100644 index 0000000000..85d78ff9cb --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:38 + */ +@Data +public class EmphasisTripListResultDTO implements Serializable { + private static final long serialVersionUID = -1646171374911115465L; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java index ea4ebcc55b..3d3fbd1cc7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -88,7 +88,7 @@ public class IcDangerAreaController implements ResultDataResolver{ * @Date 2022/11/1 09:09 */ @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@RequestBody IcDangerAreaDTO dto, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); dto.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 74139ac33d..f51061dac1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -23,10 +23,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IcResiUserConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcTripReportRecordDTO; -import com.epmet.dto.form.IcTripReportFormDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.MyReportedTripFormDTO; -import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; @@ -369,4 +367,19 @@ public class IcTripReportRecordController implements ResultDataResolver { return new Result(); } + /** + * @Description 【重点行程名单】列表 + * @param tokenDto + * @param formDTO + * @Author zxc + * @Date 2022/11/1 15:43 + */ + @PostMapping("list") + public Result> emphasisTripList(@LoginUser TokenDto tokenDto, @RequestBody EmphasisTripListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icTripReportRecordService.emphasisTripList(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index 998e942b3d..b95800b56a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -4,9 +4,11 @@ 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.IcTripReportRecordDTO; +import com.epmet.dto.form.EmphasisTripListFormDTO; import com.epmet.dto.form.IcTripReportFormDTO; import com.epmet.dto.form.MyReportedTripFormDTO; import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.entity.IcTripReportRecordEntity; @@ -107,4 +109,13 @@ public interface IcTripReportRecordService extends BaseService emphasisTripList(EmphasisTripListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 0b97b0d90d..b1f57db163 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -33,6 +33,7 @@ import com.epmet.dao.UserBaseInfoDao; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerAreaEntity; @@ -628,6 +629,19 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripList(EmphasisTripListFormDTO formDTO) { + PageData result = new PageData<>(); + + return result; + } + /** * @Author sun * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束 From 35dda6b988b2697076a4b90a57df5208ff13d6d4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 16:07:55 +0800 Subject: [PATCH 424/621] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.12__edit_partymember.sql | 4 ++++ .../main/resources/db/migration/V0.0.80__edit_partymember.sql | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql new file mode 100644 index 0000000000..b6e7cccd0c --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql @@ -0,0 +1,4 @@ +ALTER TABLE `ic_party_member` + ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, + ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, + ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql new file mode 100644 index 0000000000..b6e7cccd0c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql @@ -0,0 +1,4 @@ +ALTER TABLE `ic_party_member` + ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, + ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, + ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; \ No newline at end of file From 1ea38545ada3d66ffc9a4fca9616e16653d8fda1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Nov 2022 16:10:43 +0800 Subject: [PATCH 425/621] zanti --- .../dto/form/EmphasisTripDetailFormDTO.java | 20 ++++++++++++++ .../form/EmphasisTripPieDetailFormDTO.java | 20 ++++++++++++++ .../EmphasisTripPieDetailResultDTO.java | 18 +++++++++++++ .../IcTripReportRecordController.java | 27 ++++++++++++++++++- .../service/IcTripReportRecordService.java | 21 ++++++++++++--- .../impl/IcTripReportRecordServiceImpl.java | 23 ++++++++++++++++ 6 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java new file mode 100644 index 0000000000..b36ab7db3c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:58 + */ +@Data +public class EmphasisTripDetailFormDTO implements Serializable { + private static final long serialVersionUID = 4725053371888196275L; + + public interface EmphasisTripDetailForm{} + + @NotBlank(message = "id不能为空",groups = {EmphasisTripDetailForm.class}) + private String id; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java new file mode 100644 index 0000000000..ee0e6b5681 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 16:08 + */ +@Data +public class EmphasisTripPieDetailFormDTO implements Serializable { + private static final long serialVersionUID = 8822391154779579664L; + + public interface EmphasisTripPieDetailForm{} + + @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) + private String code; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java new file mode 100644 index 0000000000..4ebb22d6f0 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 16:06 + */ +@Data +public class EmphasisTripPieDetailResultDTO implements Serializable { + private static final long serialVersionUID = -7654816048391073022L; + + private String dangerLevelName; + private String dangerLevel; + private Integer total; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index f51061dac1..316610e690 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -25,6 +25,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; @@ -380,6 +381,30 @@ public class IcTripReportRecordController implements ResultDataResolver { formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icTripReportRecordService.emphasisTripList(formDTO)); - } + } + + /** + * @Description 重点行程详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:05 + */ + @PostMapping("emphasisTripDetail") + public Result emphasisTripDetail(@RequestBody EmphasisTripDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, EmphasisTripDetailFormDTO.EmphasisTripDetailForm.class); + return new Result().ok(icTripReportRecordService.emphasisTripDetail(formDTO)); + } + + /** + * @Description 【重点行程名单】饼图详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:09 + */ + @PostMapping("emphasisTripPieDetail") + public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class); + return new Result>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index b95800b56a..5d971a0719 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -4,11 +4,9 @@ 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.IcTripReportRecordDTO; -import com.epmet.dto.form.EmphasisTripListFormDTO; -import com.epmet.dto.form.IcTripReportFormDTO; -import com.epmet.dto.form.MyReportedTripFormDTO; -import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.entity.IcTripReportRecordEntity; @@ -118,4 +116,19 @@ public interface IcTripReportRecordService extends BaseService emphasisTripList(EmphasisTripListFormDTO formDTO); + /** + * @Description 重点行程详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:05 + */ + EmphasisTripListResultDTO emphasisTripDetail(EmphasisTripDetailFormDTO formDTO); + + /** + * @Description 【重点行程名单】饼图详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:09 + */ + List emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index b1f57db163..9b21c1c212 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -34,6 +34,7 @@ import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerAreaEntity; @@ -642,6 +643,28 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO) { + return null; + } + /** * @Author sun * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束 From 8b7bf3238a081dc7be206949b691cafeef443e7f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 16:14:45 +0800 Subject: [PATCH 426/621] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=88=97=E8=A1=A8m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 57ee4bfd58..1c53a83ed9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -96,7 +96,7 @@ concat(a.GB_NAME,a.GB_MOBILE) as gb, concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, - concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as policeShow, + concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID @@ -171,7 +171,7 @@ concat(a.GB_NAME,a.GB_MOBILE) as gb, concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, - concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as policeShow, + concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID From 2d9112ad08f4b656d69141176e322eedb1d1c987 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 16:26:13 +0800 Subject: [PATCH 427/621] Merge branch 'dev_tripreport' of E:\work\workSpace\epmet-cloud with conflicts. --- .../com/epmet/dto/IcTripReportRecordDTO.java | 53 ++++++++++++++++-- .../IcTripReportRecordController.java | 37 ++++++++++++ .../entity/IcTripReportRecordEntity.java | 2 +- .../excel/data/IcTripReportExcelData.java | 4 +- .../impl/IcTripReportRecordServiceImpl.java | 27 +++++++++ .../excel/trip_report_import_template.xlsx | Bin 9824 -> 9855 bytes 6 files changed, 116 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 21b26ce7be..b3d8819d76 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -85,7 +85,7 @@ public class IcTripReportRecordDTO implements Serializable { * 身份证号 */ @ColumnWidth(22) - @ExcelProperty("身份证号") + @ExcelProperty("证件号") private String idCard; /** @@ -128,7 +128,7 @@ public class IcTripReportRecordDTO implements Serializable { * 详细地址 */ @ColumnWidth(35) - @ExcelProperty("详细地址") + @ExcelProperty("现居地详细地址") private String detailAddress; /** @@ -238,22 +238,42 @@ public class IcTripReportRecordDTO implements Serializable { * 交通方式，来源字典表(traffic_type) */ private String trafficType; + /** + * 交通方式-中国字 + */ + @ColumnWidth(50) + @ExcelProperty("返回方式") + private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ + @ColumnWidth(50) + @ExcelProperty("其他返回方式") private String trafficTypeExplain; /** * 来源地详细信息 source_address字段的说明 */ private String sourceDetailAddress; /** - * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0 1 2 3)【小寨子】 */ private String vaccineNum; + /** + * 疫苗接种针次 -中国字(0针 1针 2针 3针) + */ + @ColumnWidth(50) + @ExcelProperty("疫苗接种针次") + private String vaccineNumName; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ private String isNatRecord; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 + */ + @ColumnWidth(50) + @ExcelProperty("48小时核酸检测") + private String isNatRecordName; /** * 户籍地 【磐石】 */ @@ -267,28 +287,49 @@ public class IcTripReportRecordDTO implements Serializable { */ private String describe; /** - * 48小时核算检查结果(阴性 阳性)【磐石】 + * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ private String natOutcome; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】-中国字 + */ + private String natOutcomeName; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】 */ private String sojournHistory; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 + */ + private String sojournHistoryName; /** * 隔离状态，字典表(isolate_type)【磐石】 */ private String isolateType; + /** + * 隔离状态，字典表(isolate_type)【磐石】-中国字 + */ + private String isolateTypeName; /** * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否落实"落地检" 0:否 1:是【磐石】-中国字 + */ + private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】 */ private String isArrive; + /** + * 是否达到曹县 0:否 1:是【磐石】-中国字 + */ + private String isArriveName; /** * 上报时间【磐石】 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date reportingTime; /** * 管控措施【磐石】 @@ -298,4 +339,8 @@ public class IcTripReportRecordDTO implements Serializable { * 行程记录类型，字典表(trip_data_type)【磐石】 */ private String tripDataType; + /** + * 行程记录类型，字典表(trip_data_type)【磐石】-中国字 + */ + private String tripDataTypeName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 316610e690..185189cfb7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -368,6 +368,43 @@ public class IcTripReportRecordController implements ResultDataResolver { return new Result(); } + /** + * pc:磐石-行程上报-导出 + */ + @NoRepeatSubmit + @PostMapping("psexport") + public void psEexport(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7"); + formDTO.setIsPage(false); + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + int pageNo = formDTO.getPageNo(); + try { + // 这里 需要指定写用哪个class去写 + String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); + String fileName = "行程上报信息".concat(today); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + do { + data = icTripReportRecordService.page(formDTO); + formDTO.setPageNo(++pageNo); + excelWriter.write(data.getList(), writeSheet); + } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + + } catch (Exception e) { + log.error("export exception", e); + } finally { + // 千万别忘记finish 会帮忙关闭流 + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + /** * @Description 【重点行程名单】列表 * @param tokenDto diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 5feb599051..35bde836c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -148,7 +148,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String describe; /** - * 48小时核算检查结果(阴性 阳性)【磐石】 + * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ private String natOutcome; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java index af4c6aae75..89afb8d7f1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java @@ -19,8 +19,8 @@ public class IcTripReportExcelData { @ExcelProperty("姓名") private String name; - @NotBlank(message = "身份证号为必填项") - @ExcelProperty("身份证号") + @NotBlank(message = "证件号为必填项") + @ExcelProperty("证件号") private String idCard; @NotBlank(message = "手机号为必填项") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 9b21c1c212..67f2e06383 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -75,6 +75,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collector; import java.util.stream.Collectors; /** @@ -117,6 +118,22 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) .doSelectPageInfo(() -> baseDao.pageList(formDTO)); List list = data.getList(); + if(CollectionUtils.isEmpty(list)){ + return new PageData(list, data.getTotal()); + } + //获取需要的字典表数据 + //交通方式 + Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //3.查询最近一次通知时间、核算检测关注名单 if (CollectionUtils.isNotEmpty(list)) { Map latestNotice = new HashMap<>(); @@ -141,6 +158,16 @@ public class IcTripReportRecordServiceImpl extends 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 delta 2712 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 SCOrWnlT#)p28km80001G@9B#G From 2f90938258e9aa1f0c1819080f4cf664a36fd02f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 16:26:48 +0800 Subject: [PATCH 428/621] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=B1=85=E6=B0=91=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=B0=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=88=A0=E9=99=A4=E8=AF=A5=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=9A=84=E8=BF=81=E5=87=BA=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChangeDeathController.java | 15 ++++++ .../com/epmet/service/ChangeDeathService.java | 10 ++++ .../service/impl/ChangeDeathServiceImpl.java | 47 +++++++++++++++++-- 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java index 963d2369d0..92cdab0235 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java @@ -13,6 +13,7 @@ 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.dto.ChangeDeathDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.ChangeDeathExcel; import com.epmet.service.ChangeDeathService; import org.apache.commons.collections4.CollectionUtils; @@ -94,6 +95,20 @@ public class ChangeDeathController { ExcelUtils.exportEpmetExcel(response, null, list, ChangeDeathExcel.class); } + /** + * 恢复死亡人员 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("recovery") + public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + changeDeathService.recovery(tokenDto,dto); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java index 7be06b1436..09af4e2bdc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java @@ -2,8 +2,10 @@ 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.ChangeDeathDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.entity.ChangeDeathEntity; import java.util.List; @@ -76,4 +78,12 @@ public interface ChangeDeathService extends BaseService { * @date 2022-05-05 */ void delete(String[] ids); + + /** + * 恢复迁出人员 + * @return + */ + void recovery(TokenDto tokenDto, OnlyIdFormDTO dto); + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java index 04690ad68a..452fd90f53 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; @@ -17,18 +20,19 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.constant.IcResiUserConstant; import com.epmet.dao.ChangeDeathDao; +import com.epmet.dao.IcResiUserDao; import com.epmet.dto.ChangeDeathDTO; import com.epmet.dto.ChangeWelfareDTO; import com.epmet.dto.form.IcResiUserTransferFormDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.dto.form.RentTenantDataFormDTO; import com.epmet.dto.result.RentTenantDataResultDTO; import com.epmet.entity.ChangeDeathEntity; +import com.epmet.entity.ChangeRelocationEntity; import com.epmet.entity.IcResiUserEntity; +import com.epmet.entity.IcUserChangeRecordEntity; import com.epmet.redis.ChangeDeathRedis; -import com.epmet.service.ChangeDeathService; -import com.epmet.service.ChangeWelfareService; -import com.epmet.service.IcResiUserService; -import com.epmet.service.IcUserTransferRecordService; +import com.epmet.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +69,11 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); @@ -201,4 +210,34 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 16:29:42 +0800 Subject: [PATCH 429/621] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/VaccinationExportExcel.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java index 34c11ea835..b3dd1195c7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java @@ -41,4 +41,45 @@ public class VaccinationExportExcel { @Excel(name = "所属房屋",width = 40) private String allName; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + * gkStartTime-gkEndTime + */ + @Excel(name = "管控时间",width = 35) + private String gkTime; + + /** + * 镇（街）干部名称联系方式,需求来源于磐石 + * gbName+gbMobile + */ + @Excel(name = "镇（街）干部及联系方式",width = 35) + private String gb; + + + /** + * 村（社区）网格管理员gridManager,需求来源于磐石 + * gridManager+gridManagerMobile + */ + @Excel(name = "村（社区）网格管理员及联系方式",width = 35) + private String gridManagerShow; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + * healthWorker+healthWorkerMobile + */ + @Excel(name = "基层医务工作者及联系方式",width = 35) + private String healthWorkerShow; + + /** + * 民警联系方式,需求来源于磐石 + * policeName+policeMobile + */ + @Excel(name = "民警及联系方式",width = 35) + private String policeShow; + /** + * 志愿者+联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者及联系方式",width = 35) + private String volunteerShow; + } From 7741245cf6f219c55967dd9d1b2b925f7400d4d8 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 17:04:09 +0800 Subject: [PATCH 430/621] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E5=B1=85=E6=B0=91=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.80__edit_partymember.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql index b6e7cccd0c..f4986b14d1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql @@ -1,4 +1,8 @@ ALTER TABLE `ic_party_member` ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, - ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; \ No newline at end of file + ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; + +alter table ic_user_change_record modify column TYPE varchar(64) NOT NULL COMMENT '操作类型【add:新增 category:类别 transfer:调动;logout注销；recovery_moveout恢复迁出；recovery_death恢复死亡】'; +alter table ic_user_change_record modify column TYPE_NAME varchar(64) NOT NULL COMMENT '操作类型名称【add:新增 category:类别 transfer:调动;logout注销;recovery_moveout恢复迁出；recovery_death恢复死亡】'; +alter table ic_resi_user modify column SUB_STATUS varchar(10) DEFAULT '01' COMMENT '用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡;51迁出恢复；52死亡恢复'; From 4388526aba592d82eba04593f010bd9c65023c1a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 17:09:37 +0800 Subject: [PATCH 431/621] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E3=80=81=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ImportEpidemicSpecialAttention.java | 71 ++++++++++++++++++ .../excel/attention_nat_template.xlsx | Bin 8897 -> 9319 bytes 2 files changed, 71 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java index c31e0f0cd0..b2ce2de153 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java @@ -66,4 +66,75 @@ public class ImportEpidemicSpecialAttention extends ExcelVerifyInfo { @ExcelIgnore private Integer num; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控开始时间") + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控结束时间") + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + @Excel(name = "镇（街）干部名称") + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + @Excel(name = "镇（街）干部联系方式") + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员") + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员联系方式") + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + @Excel(name = "基层医务工作者") + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + @Excel(name = "基层医务工作者联系方式") + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + @Excel(name = "民警") + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + @Excel(name = "民警联系方式") + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + @Excel(name = "志愿者") + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者联系方式") + private String volunteerMobile; } diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx index de79811f246d04ead8001250cda7a0a01ea40f6b..a12e8bd8591d9e3378252c4cb3d405f478759fba 100644 GIT binary patch delta 5401 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 P>8~g0^)KFV{gwU){MQv8 From d88e1dbc22a511d9b01da1a7c88dec713f1dc3ea Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 17:17:56 +0800 Subject: [PATCH 432/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 32 ++-- .../IcTripReportRecordController.java | 8 +- .../IcPsTripReportRecordExportExcel.java | 157 ++++++++++++++++++ 3 files changed, 178 insertions(+), 19 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index b3d8819d76..09134872c2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -66,14 +66,14 @@ public class IcTripReportRecordDTO implements Serializable { * 姓名 */ @ColumnWidth(15) - @ExcelProperty("姓名") + @ExcelProperty(value = "姓名", order = 1) private String name; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty("手机号") + @ExcelProperty(value = "手机号",order = 3) private String mobile; /** @@ -85,7 +85,7 @@ public class IcTripReportRecordDTO implements Serializable { * 身份证号 */ @ColumnWidth(22) - @ExcelProperty("证件号") + @ExcelProperty(value = "证件号",order = 2) private String idCard; /** @@ -121,14 +121,14 @@ public class IcTripReportRecordDTO implements Serializable { * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ @ColumnWidth(50) - @ExcelProperty("现居地") + @ExcelProperty(value = "现居地",order = 4) private String presentAddress; /** * 详细地址 */ @ColumnWidth(35) - @ExcelProperty("现居地详细地址") + @ExcelProperty(value = "现居地详细地址",order = 5) private String detailAddress; /** @@ -147,14 +147,14 @@ public class IcTripReportRecordDTO implements Serializable { * 来源地区地址 */ @ColumnWidth(50) - @ExcelProperty("来自地区") + @ExcelProperty(value = "来自地区",order = 6) private String sourceAddress; /** * 到达日期 */ @ColumnWidth(25) - @ExcelProperty("来到本地时间") + @ExcelProperty(value = "来到本地时间",order = 8) @JsonFormat(pattern = "yyyy-MM-dd") private Date arriveDate; @@ -162,7 +162,7 @@ public class IcTripReportRecordDTO implements Serializable { * 离开日期 */ @ColumnWidth(25) - @ExcelProperty("离开本地时间") + @ExcelProperty(value = "离开本地时间",order = 13) @JsonFormat(pattern = "yyyy-MM-dd") private Date leaveDate; @@ -170,7 +170,7 @@ public class IcTripReportRecordDTO implements Serializable { * pc行程上报-列表返参：最近一次通知时间 */ @ColumnWidth(25) - @ExcelProperty("最近一次通知时间") + //@ExcelProperty("最近一次通知时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date latestNoticeTime; @@ -178,7 +178,7 @@ public class IcTripReportRecordDTO implements Serializable { * 备注信息 */ @ColumnWidth(100) - @ExcelProperty("备注") + @ExcelProperty(value = "备注",order = 14) private String remark; /** @@ -242,17 +242,19 @@ public class IcTripReportRecordDTO implements Serializable { * 交通方式-中国字 */ @ColumnWidth(50) - @ExcelProperty("返回方式") + @ExcelProperty(value = "返回方式",order = 9) private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ @ColumnWidth(50) - @ExcelProperty("其他返回方式") + @ExcelProperty(value = "其他返回方式",order = 10) private String trafficTypeExplain; /** - * 来源地详细信息 source_address字段的说明 + * 来自地区详细地址 source_address字段的说明 */ + @ColumnWidth(25) + @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** * 疫苗接种针次 (0 1 2 3)【小寨子】 @@ -262,7 +264,7 @@ public class IcTripReportRecordDTO implements Serializable { * 疫苗接种针次 -中国字(0针 1针 2针 3针) */ @ColumnWidth(50) - @ExcelProperty("疫苗接种针次") + @ExcelProperty(value = "疫苗接种针次",order = 12) private String vaccineNumName; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 @@ -272,7 +274,7 @@ public class IcTripReportRecordDTO implements Serializable { * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 */ @ColumnWidth(50) - @ExcelProperty("48小时核酸检测") + @ExcelProperty(value = "48小时核酸检测",order = 11) private String isNatRecordName; /** * 户籍地 【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 185189cfb7..daa1b388b2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -27,6 +27,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.excel.IcPsTripReportRecordExportExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; import lombok.extern.slf4j.Slf4j; @@ -376,8 +377,6 @@ public class IcTripReportRecordController implements ResultDataResolver { public void psEexport(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); - // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7"); formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageSize(NumConstant.TEN_THOUSAND); @@ -389,16 +388,17 @@ public class IcTripReportRecordController implements ResultDataResolver { excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; + List list = null; do { data = icTripReportRecordService.page(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcPsTripReportRecordExportExcel.class); formDTO.setPageNo(++pageNo); - excelWriter.write(data.getList(), writeSheet); + excelWriter.write(list, writeSheet); } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); } catch (Exception e) { log.error("export exception", e); } finally { - // 千万别忘记finish 会帮忙关闭流 if (excelWriter != null) { excelWriter.finish(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java new file mode 100644 index 0000000000..bf9c9455d1 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -0,0 +1,157 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 磐石-行程上报信息-导出 + * + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class IcPsTripReportRecordExportExcel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 姓名 + */ + @ColumnWidth(15) + @ExcelProperty(value = "姓名", order = 1) + private String name; + /** + * 年龄【磐石】 + */ + @ColumnWidth(15) + @ExcelProperty(value = "年龄",order = 2) + private int age; + /** + * 证件号 + */ + @ColumnWidth(20) + @ExcelProperty(value = "证件号",order = 3) + private String idCard; + /** + * 户籍地 【磐石】 + */ + @ColumnWidth(40) + @ExcelProperty(value = "户籍地（省市县区）",order = 4) + private String registeredResidence; + /** + * 手机号 + */ + @ColumnWidth(25) + @ExcelProperty(value = "手机号",order = 5) + private String mobile; + /** + * 来自地区（格式：省-市-区-街道-社区） + */ + @ColumnWidth(40) + @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 6) + private String sourceAddress; + /** + * 来自地区详细地址 source_address字段的说明 + */ + @ColumnWidth(40) + @ExcelProperty(value = "来自地区详细地址",order = 7) + private String sourceDetailAddress; + /** + * 来曹事由（100字以内）【磐石】 + */ + @ColumnWidth(40) + @ExcelProperty(value = "来曹事由（100字以内）",order = 8) + private String describe; + /** + * 48小时核酸检测 0:阴性 1:阳性 -中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "48小时核酸检测",order = 9) + private String isNatRecordName; + /** + * 来到本地时间（2022-01-01） + */ + @ColumnWidth(30) + @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 10) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date arriveDate; + /** + * 现居地 + */ + @ColumnWidth(40) + @ExcelProperty(value = "现居地",order = 11) + private String presentAddress; + /** + * 现居地详细地址 + */ + @ColumnWidth(40) + @ExcelProperty(value = "现居地详细地址",order = 12) + private String detailAddress; + /** + * 交通方式-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "返回方式",order = 13) + private String trafficTypeName; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + @ColumnWidth(30) + @ExcelProperty(value = "其他返回方式",order = 14) + private String trafficTypeExplain; + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "7天内旅居史情况",order = 15) + private String sojournHistoryName; + /** + * 隔离状态，字典表(isolate_type)【磐石】-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "隔离状态",order = 16) + private String isolateTypeName; + /** + * 备注（500字以内） + */ + @ColumnWidth(50) + @ExcelProperty(value = "备注（500字以内）",order = 17) + private String remark; + /** + * 是否落实"落地检" 0:否 1:是【磐石】-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "是否落实“落地检”",order = 18) + private String isArriveCheckName; + /** + * 是否达到曹县 0:否 1:是【磐石】-中国字 + */ + @ColumnWidth(30) + @ExcelProperty(value = "是否达到曹县",order = 19) + private String isArriveName; + /** + * 上报时间（2022-01-01）【磐石】 + */ + @ColumnWidth(30) + @ExcelProperty(value = "上报时间（2022-01-01）",order = 20) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date reportingTime; + /** + * 管控措施（500字以内）【磐石】 + */ + @ColumnWidth(35) + @ExcelProperty(value = "管控措施（500字以内）",order = 21) + private String controlMeasures; + /** + * 类型（省内、省外、市内、县内），字典表(trip_data_type)【磐石】-中国字 + */ + @ColumnWidth(35) + @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 22) + private String tripDataTypeName; +} From 5a75290aa9d2b69d1d088155e59bd7f1c262d803 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 1 Nov 2022 17:25:41 +0800 Subject: [PATCH 433/621] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E5=80=BC?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcTripReportRecordServiceImpl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 67f2e06383..57363b1bdb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -607,15 +607,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Tue, 1 Nov 2022 17:46:16 +0800 Subject: [PATCH 434/621] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/NatExportExcel.java | 71 +++++++++++++++++++ .../epmet/excel/NatHistoryExportExcel.java | 71 +++++++++++++++++++ .../epmet/excel/VaccinationExportExcel.java | 41 ----------- 3 files changed, 142 insertions(+), 41 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java index fd404ca278..4ff6036ea9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java @@ -34,5 +34,76 @@ public class NatExportExcel { @Excel(name = "隔离状态",width = 20) private String isolatedState; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控开始时间",width = 30) + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控结束时间",width = 30) + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + @Excel(name = "镇（街）干部名称",width = 30) + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + @Excel(name = "镇（街）干部联系方式",width = 30) + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员",width = 30) + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员联系方式",width = 30) + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + @Excel(name = "基层医务工作者",width = 30) + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + @Excel(name = "基层医务工作者联系方式",width = 30) + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + @Excel(name = "民警",width = 30) + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + @Excel(name = "民警联系方式",width = 30) + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + @Excel(name = "志愿者",width = 30) + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者联系方式",width = 30) + private String volunteerMobile; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java index 74bbd41676..76e4733310 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java @@ -36,5 +36,76 @@ public class NatHistoryExportExcel { @Excel(name = "隔离状态",width = 20) private String isolatedState; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控开始时间",width = 30) + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控结束时间",width = 30) + private String gkEndTime; + + /** + * 镇（街）干部名称,需求来源于磐石 + */ + @Excel(name = "镇（街）干部名称",width = 30) + private String gbName; + + /** + * 镇（街）干部联系方式,需求来源于磐石 + */ + @Excel(name = "镇（街）干部联系方式",width = 30) + private String gbMobile; + + /** + * 村（社区）网格管理员,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员",width = 30) + private String gridManager; + + /** + * 村（社区）网格管理员联系方式,需求来源于磐石 + */ + @Excel(name = "村（社区）网格管理员联系方式",width = 30) + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + @Excel(name = "基层医务工作者",width = 30) + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + @Excel(name = "基层医务工作者联系方式",width = 30) + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + @Excel(name = "民警",width = 30) + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + @Excel(name = "民警联系方式",width = 30) + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + @Excel(name = "志愿者",width = 30) + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者联系方式",width = 30) + private String volunteerMobile; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java index b3dd1195c7..34c11ea835 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java @@ -41,45 +41,4 @@ public class VaccinationExportExcel { @Excel(name = "所属房屋",width = 40) private String allName; - /** - * 管控开始时间yyyy-MM-dd,需求来源于磐石 - * gkStartTime-gkEndTime - */ - @Excel(name = "管控时间",width = 35) - private String gkTime; - - /** - * 镇（街）干部名称联系方式,需求来源于磐石 - * gbName+gbMobile - */ - @Excel(name = "镇（街）干部及联系方式",width = 35) - private String gb; - - - /** - * 村（社区）网格管理员gridManager,需求来源于磐石 - * gridManager+gridManagerMobile - */ - @Excel(name = "村（社区）网格管理员及联系方式",width = 35) - private String gridManagerShow; - - /** - * 基层医务工作者联系方式,需求来源于磐石 - * healthWorker+healthWorkerMobile - */ - @Excel(name = "基层医务工作者及联系方式",width = 35) - private String healthWorkerShow; - - /** - * 民警联系方式,需求来源于磐石 - * policeName+policeMobile - */ - @Excel(name = "民警及联系方式",width = 35) - private String policeShow; - /** - * 志愿者+联系方式,需求来源于磐石 - */ - @Excel(name = "志愿者及联系方式",width = 35) - private String volunteerShow; - } From bf1f2b6258e16a450a80e83c5e4913dd2284fa33 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 17:53:35 +0800 Subject: [PATCH 435/621] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/processor/MaskProcessor.java | 5 +++-- .../service/impl/IcPartyMemberServiceImpl.java | 4 ++++ .../epmet/service/impl/IcResiUserServiceImpl.java | 14 +++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index a3169a2ec6..6692b792d5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -15,7 +15,6 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /** * desc:脱敏处理器 @@ -209,7 +208,9 @@ public class MaskProcessor { } String maskStr = StrUtil.repeatByLength("*", length - 7); - + if (length != 11) { + return StringUtils.leftPad(StringUtils.right(originString, 4), length, "*"); + } return originString.replaceAll("^(1\\d{2})\\d*(\\d{4})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 11066c8b70..d9d43ea387 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -398,6 +398,9 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl partyWrapper = new LambdaQueryWrapper<>(); partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser()); IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper); From ca5bd3b1881498a7659c4236aeb2b82f48afba81 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 18:01:15 +0800 Subject: [PATCH 436/621] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=87=BA111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcEpidemicSpecialAttentionDao.xml | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 1c53a83ed9..9c9dcb6965 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -97,7 +97,19 @@ concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, - concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow, + a.GK_START_TIME, + a.GK_END_TIME, + a.GB_NAME, + a.GB_MOBILE, + a.GRID_MANAGER, + a.GRID_MANAGER_MOBILE, + a.HEALTH_WORKER, + a.HEALTH_WORKER_MOBILE, + a.POLICE_NAME, + a.POLICE_MOBILE, + a.VOLUNTEER_NAME, + a.VOLUNTEER_MOBILE FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount, CREATED_TIME FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID) @@ -172,7 +184,19 @@ concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, - concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow + concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow, + a.GK_START_TIME, + a.GK_END_TIME, + a.GB_NAME, + a.GB_MOBILE, + a.GRID_MANAGER, + a.GRID_MANAGER_MOBILE, + a.HEALTH_WORKER, + a.HEALTH_WORKER_MOBILE, + a.POLICE_NAME, + a.POLICE_MOBILE, + a.VOLUNTEER_NAME, + a.VOLUNTEER_MOBILE FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0 From 039720b74279fc93dd360e6796a163e125d44105 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 09:11:40 +0800 Subject: [PATCH 437/621] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/PageTripReportFormDTO.java | 6 ++++++ .../src/main/resources/mapper/IcTripReportRecordDao.xml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java index 45f9152909..4c2e07b48d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java @@ -54,4 +54,10 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable { * 查看详情时此列有值 */ private String id; + + /** + * 7天内旅居史情况，字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index b3e00357ac..4a94d37ddc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -62,6 +62,9 @@ AND r.id=#{id} + + AND r.sojourn_history = #{sojournHistory} + ORDER BY r.ARRIVE_DATE DESC From 874d28b14cf02ec9a60db878351d324024a5fa99 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 09:17:29 +0800 Subject: [PATCH 438/621] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcTripReportRecordServiceImpl.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 57363b1bdb..8618d0186a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -353,6 +353,36 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectMyReported(formDTO.getUserId(), formDTO.getCustomerId(),idCard)); + + if(CollectionUtils.isEmpty(result.getList())){ + return new ArrayList<>(); + } + //获取需要的字典表数据 + //交通方式 + Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + for (IcTripReportRecordDTO dto : result.getList()) { + //字典表字段、是否字段赋值对应中国字 + dto.setTrafficTypeName(tMap.containsKey(dto.getTrafficType()) ? tMap.get(dto.getTrafficType()) : "无"); + dto.setVaccineNumName(StringUtils.isNotBlank(dto.getVaccineNum()) ? dto.getVaccineNum().concat("针") : ""); + dto.setIsNatRecordName("1".equals(dto.getIsNatRecord()) ? "是" : "否"); + dto.setNatOutcomeName("1".equals(dto.getIsNatRecord()) ? "阳性" : "阴性"); + dto.setSojournHistoryName(sMap.containsKey(dto.getSojournHistory()) ? sMap.get(dto.getSojournHistory()) : "无"); + dto.setIsolateTypeName(iMap.containsKey(dto.getIsolateType()) ? iMap.get(dto.getIsolateType()) : "无"); + dto.setIsArriveCheckName("1".equals(dto.getIsArriveCheck()) ? "是" : "否"); + dto.setIsArriveName("1".equals(dto.getIsArrive()) ? "是" : "否"); + dto.setTripDataTypeName(tdMap.containsKey(dto.getTripDataType()) ? tdMap.get(dto.getTripDataType()) : "无"); + } + return result.getList(); } From 80c271e5afbcda579b1fb3f94fe7d0faa3553ae3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 2 Nov 2022 09:34:18 +0800 Subject: [PATCH 439/621] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcEpidemicSpecialAttentionDao.xml | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 9c9dcb6965..6484609fba 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -54,6 +54,67 @@ when id_card = #{item.idCard} then #{item.isolatedState} + + + + when id_card = #{item.idCard} then #{item.gkStartTime} + + + + + when id_card = #{item.idCard} then #{item.gkEndTime} + + + + + when id_card = #{item.idCard} then #{item.gbName} + + + + + when id_card = #{item.idCard} then #{item.gbMobile} + + + + + when id_card = #{item.idCard} then #{item.gridManager} + + + + + when id_card = #{item.idCard} then #{item.gridManagerMobile} + + + + + when id_card = #{item.idCard} then #{item.healthWorker} + + + + + when id_card = #{item.idCard} then #{item.healthWorkerMobile} + + + + + when id_card = #{item.idCard} then #{item.policeName} + + + + + when id_card = #{item.idCard} then #{item.policeMobile} + + + + + when id_card = #{item.idCard} then #{item.volunteerName} + + + + + when id_card = #{item.idCard} then #{item.volunteerMobile} + + updated_time = now() WHERE del_flag = 0 From 81cfbc25336ba9eca83247c3ae538bf3ef3df932 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Nov 2022 09:53:13 +0800 Subject: [PATCH 440/621] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E6=B8=85=E9=99=A4=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 37f4cc13be..da40690ee6 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 @@ -2475,7 +2475,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 10:02:42 +0800 Subject: [PATCH 441/621] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmphasisTripListFormDTO.java | 2 + .../dto/result/EmphasisTripListResultDTO.java | 38 +++++++++++++++++++ .../com/epmet/dao/IcTripReportRecordDao.java | 11 ++++++ .../impl/IcTripReportRecordServiceImpl.java | 29 +++++++++++++- .../mapper/IcTripReportRecordDao.xml | 32 ++++++++++++++++ 5 files changed, 111 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java index 8c2eab988f..4f957a0109 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -19,4 +19,6 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable private String staffId; private String customerId; + + private String agencyId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java index 85d78ff9cb..cb37e7b6f8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -12,5 +12,43 @@ import java.io.Serializable; public class EmphasisTripListResultDTO implements Serializable { private static final long serialVersionUID = -1646171374911115465L; + private String id; + private String agencyId; + private String name; + private String mobile; + private String idCard; + + /** + * 来源地 + */ + private String sourceAddress; + + /** + * 来曹事由 + */ + private String describe; + + /** + * 核酸检测结果 + */ + private String natOutcome; + private String natOutComeName; + + /** + * 7天旅居史 + */ + private String sojournHistory; + private String sojournHistoryName; + + /** + * 隔离状态 + */ + private String isolateType; + private String isolateTypeName; + + /** + * 来曹时间 + */ + private String arriveDate; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java index 6d98de7a80..dc49d7d584 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java @@ -2,7 +2,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcTripReportRecordDTO; +import com.epmet.dto.form.EmphasisTripListFormDTO; import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.entity.IcTripReportRecordEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -42,4 +44,13 @@ public interface IcTripReportRecordDao extends BaseDao * @return */ int batchDel(@Param("userId")String userId,@Param("agencyId")String agencyId, @Param("ids")String[] ids); + + /** + * @Description 【重点行程名单】列表 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:18 + */ + List emphasisTripList(EmphasisTripListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 8618d0186a..9cee1de2aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -32,6 +32,7 @@ import com.epmet.dao.IcTripReportRecordDao; import com.epmet.dao.UserBaseInfoDao; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.IcTripReportRecordDTO; +import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; @@ -693,8 +694,34 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripList(EmphasisTripListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); PageData result = new PageData<>(); - + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.emphasisTripList(formDTO)); + result.setList(CollectionUtils.isEmpty(pageInfo.getList()) ? new ArrayList<>() : pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + List list = baseDao.emphasisTripList(formDTO); + result.setList(list); + result.setTotal(list.size()); + } + // 7天旅居史字典 + Result> sojournMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + + // 隔离状态字典 + Result> isolateMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.ISOLATE_TYPE.getCode()); + Map isolateMap = isolateMapRes.success() && CollectionUtils.isNotEmpty(isolateMapRes.getData()) ? isolateMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + if (CollectionUtils.isNotEmpty(result.getList())){ + result.getList().forEach(l -> { + l.setIsolateTypeName(isolateMap.get(l.getIsolateType())); + l.setSojournHistoryName(sojournMap.get(l.getSojournHistory())); + }); + } return result; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 4a94d37ddc..547a444904 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -69,6 +69,38 @@ r.ARRIVE_DATE DESC + + + update ic_trip_report_record set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=NOW() WHERE AGENCY_ID=#{agencyId} From 653f1d0771aa39731b7e4fac6df77b887106e9f8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 2 Nov 2022 10:10:05 +0800 Subject: [PATCH 442/621] ic_enterprise_change_record --- .../java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java index bdeca2e352..119362360c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java @@ -76,10 +76,6 @@ public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity { */ private String scale; - /** - * 规模，手输数字 - */ - private Integer scaleTotal; /** * 场所负责人 */ From 91a4daf31409dff714c07d6b9d84d4e3f6c9cc7e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Nov 2022 10:51:48 +0800 Subject: [PATCH 443/621] =?UTF-8?q?=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EmphasisTripPieDetailFormDTO.java | 6 ++++ .../EmphasisTripPieDetailResultDTO.java | 3 +- .../IcTripReportRecordController.java | 4 ++- .../com/epmet/dao/IcTripReportRecordDao.java | 10 ++++++ .../impl/IcTripReportRecordServiceImpl.java | 31 ++++++++++++++++++- .../mapper/IcTripReportRecordDao.xml | 16 ++++++++++ 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java index ee0e6b5681..53afd8c1e9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -17,4 +17,10 @@ public class EmphasisTripPieDetailFormDTO implements Serializable { @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) private String code; + + private String customerId; + + private String staffId; + + private String agencyId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java index 4ebb22d6f0..cab03e4b11 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -14,5 +15,5 @@ public class EmphasisTripPieDetailResultDTO implements Serializable { private String dangerLevelName; private String dangerLevel; - private Integer total; + private Integer total = NumConstant.ZERO; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index daa1b388b2..5814ae7a18 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -439,8 +439,10 @@ public class IcTripReportRecordController implements ResultDataResolver { * @Date 2022/11/1 16:09 */ @PostMapping("emphasisTripPieDetail") - public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO){ + public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java index dc49d7d584..fc7a3ce96e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java @@ -3,8 +3,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.EmphasisTripListFormDTO; +import com.epmet.dto.form.EmphasisTripPieDetailFormDTO; import com.epmet.dto.form.PageTripReportFormDTO; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.entity.IcTripReportRecordEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -53,4 +55,12 @@ public interface IcTripReportRecordDao extends BaseDao */ List emphasisTripList(EmphasisTripListFormDTO formDTO); + /** + * @Description 【重点行程名单】饼图详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/2 10:07 + */ + List emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 9cee1de2aa..d114a75190 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -744,7 +744,36 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO) { - return null; + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + List pieDetailResult = baseDao.emphasisTripPieDetail(formDTO); + // 7天旅居史字典 + Result> sojournMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + List result = constituteResult(sojournMap); + if (CollectionUtils.isNotEmpty(pieDetailResult)){ + result.forEach(r -> pieDetailResult.stream().filter(p -> p.getDangerLevel().equals(r.getDangerLevel())).forEach(p -> r.setTotal(p.getTotal()))); + } + return result.stream().sorted(Comparator.comparing(EmphasisTripPieDetailResultDTO::getTotal).reversed()).collect(Collectors.toList()); + } + + private List constituteResult(Map sojournMap){ + if (sojournMap.isEmpty()){ + return new ArrayList<>(); + } + List result = new ArrayList<>(); + sojournMap.forEach((k,v) -> { + EmphasisTripPieDetailResultDTO dto = new EmphasisTripPieDetailResultDTO(); + dto.setDangerLevel(k); + dto.setDangerLevelName(v); + if (!k.equals(NumConstant.THREE_STR)){ + result.add(dto); + } + }); + return result; } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 547a444904..554a1055e6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -101,6 +101,22 @@ ORDER BY ARRIVE_DATE DESC,CREATED_TIME DESC + + + update ic_trip_report_record set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=NOW() WHERE AGENCY_ID=#{agencyId} From c749b03ea3b7812c3f15e6c30093692a6297c861 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Nov 2022 11:11:44 +0800 Subject: [PATCH 444/621] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmphasisTripListFormDTO.java | 5 +++++ .../dto/result/EmphasisTripListResultDTO.java | 17 +++++++++++++++++ .../impl/IcTripReportRecordServiceImpl.java | 18 +++++++++++++----- .../resources/mapper/IcTripReportRecordDao.xml | 10 ++++++++-- 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java index 4f957a0109..3539affe85 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -21,4 +21,9 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable private String customerId; private String agencyId; + + /** + * ic_trip_report_record.id + */ + private String id; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java index cb37e7b6f8..578709a489 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -51,4 +51,21 @@ public class EmphasisTripListResultDTO implements Serializable { */ private String arriveDate; + /** + * 离开时间 + */ + private String leaveDate; + + /** + * 现居地 + */ + private String presentAddress; + + /** + * 详细地址 + */ + private String detailAddress; + + private String remark; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index d114a75190..6858b79366 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -694,11 +694,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripList(EmphasisTripListFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null == staffInfo){ - throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + if (StringUtils.isBlank(formDTO.getId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); } - formDTO.setAgencyId(staffInfo.getAgencyId()); PageData result = new PageData<>(); if (formDTO.getIsPage()){ PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.emphasisTripList(formDTO)); @@ -733,7 +735,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl pageData = emphasisTripList(emphasisTripListFormDTO); + if (CollectionUtils.isEmpty(pageData.getList())){ + throw new EpmetException("未查询到行程信息："+formDTO.getId()); + } + return pageData.getList().get(NumConstant.ZERO); } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 554a1055e6..c752a0d8da 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -78,15 +78,21 @@ ID, AGENCY_ID, SOURCE_ADDRESS, - `describe`, + IFNULL(`describe`,'') as `describe`, ifnull(sojourn_history,'3') as sojournHistory, IFNULL(isolate_type,'4') as isolateType, ARRIVE_DATE, + LEAVE_DATE, + PRESENT_ADDRESS, + DETAIL_ADDRESS, + REMARK, IFNULL(nat_outcome,'0') as natOutcome, (case when nat_outcome = '1' then '阳性' when nat_outcome = '0' then '阴性' else '阴性' end) as natOutComeName FROM ic_trip_report_record WHERE DEL_FLAG = '0' - AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + + AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') + AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') From 6dea7ca5ae5f28208199e989d102d6e5cd0d6fd7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 2 Nov 2022 14:25:40 +0800 Subject: [PATCH 445/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=9F=A5=E8=AF=A2=E6=A0=B8=E9=85=B8=E9=87=87=E6=A0=B7?= =?UTF-8?q?-=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataSyncConfigServiceImpl.java | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index bb72f987a6..a72a56edeb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import com.epmet.commons.tools.enums.GenderEnum; 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.bean.AgencyInfoCache; @@ -39,12 +40,15 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -72,6 +76,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl resiInfos, String customerId, String isSync) { + List> resiInfobatchs = ListUtils.partition(resiInfos, 50); + for (List resibatch : resiInfobatchs) { + // 50个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 + yantaiHsjcByDbViewBatch(resibatch, customerId, isSync); + } + } + + /** + * 50个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 + * @param resiInfos + * @param customerId + * @param isSync + */ + public void yantaiHsjcByDbViewBatch(List resiInfos, String customerId, String isSync) { + // 将居民信息转化为的map + Map idCardAndResiInfo = resiInfos.stream().collect(Collectors.toMap(resi -> resi.getIdCard(), Function.identity())); + Set idCards = idCardAndResiInfo.keySet();//resiInfos.stream().map(resi -> resi.getIdCard()).collect(Collectors.toList()); + // String idCardsStr = "''" + String.join("','", idCards) + "''"; + // 1.获取核酸采样信息 + String sql = "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idCards) order by create_time desc"; + HashMap args = new HashMap<>(); + args.put("idCards", idCards); + // 这一批居民的核酸采样列表 + List> hscyList = yantaiJdbcTemplate.queryForList(sql, args); + if (CollectionUtils.isNotEmpty(hscyList)) { + List entities = new ArrayList<>(); + hscyList.forEach(sampleInfo -> { + // 从视图中获取到的核酸采样相关信息 + String name = (String) sampleInfo.get("name"); + String cardNo = (String) sampleInfo.get("card_no"); + Date createTime = (Date) sampleInfo.get("create_time"); + + // 本地数据库中，居民信息 + NatUserInfoResultDTO currentResiInfo = idCardAndResiInfo.get(cardNo); + + IcNatEntity e = new IcNatEntity(); + e.setCustomerId(customerId); + e.setIsResiUser(StringUtils.isBlank(currentResiInfo.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + e.setUserId(currentResiInfo.getUserId()); + e.setMobile(""); + e.setUserType(isSync.equals(NumConstant.ONE_STR) ? "manualSync" : "sync"); + e.setName(StringUtils.isNotBlank(name) ? name : ""); + e.setIdCard(StringUtils.isNotBlank(cardNo) ? cardNo : ""); + e.setSampleTime(createTime); + // e.setSampleTime(DateUtils.parseDate(createTime, DateUtils.DATE_TIME_PATTERN)); + e.setAgencyId(currentResiInfo.getAgencyId()); + e.setPids(currentResiInfo.getPids()); + e.setAttachmentType(""); + e.setAttachmentUrl(""); + entities.add(e); + }); + if (CollectionUtils.isNotEmpty(entities)){ + List existSampleInfo = icNatDao.getExistNatInfo(entities); + sampleAndNat(existSampleInfo,entities,NumConstant.ONE_STR,customerId,isSync); + } + } + } } From 85544c6823778b42e03639c3b52f6e88354013c4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Nov 2022 14:47:35 +0800 Subject: [PATCH 446/621] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/entity/IcPartyMemberEntity.java | 15 +++++++++++++++ .../epmet/service/impl/IcResiUserServiceImpl.java | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java index 10add799d0..07ca2844b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java @@ -85,6 +85,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 预留字段1 */ 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 da40690ee6..53207c7750 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 @@ -342,6 +342,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 15:20:01 +0800 Subject: [PATCH 447/621] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 2 +- .../IcTripReportRecordController.java | 32 +- .../entity/IcTripReportRecordEntity.java | 2 +- .../excel/IcPsTripReportRecordExcel.java | 120 +++----- .../excel/data/IcTripReportExcelData.java | 5 +- .../error/IcPsTripReportRecordErrorExcel.java | 19 +- .../IcPsTripReportExcelImportListener.java | 177 +++++++++++ .../IcTripReportExcelImportListener.java | 30 +- .../service/IcTripReportRecordService.java | 2 +- .../impl/IcTripReportRecordServiceImpl.java | 290 ++++++------------ 10 files changed, 396 insertions(+), 283 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 09134872c2..ed73892942 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -287,7 +287,7 @@ public class IcTripReportRecordDTO implements Serializable { /** * 来曹事由【磐石】 */ - private String describe; + private String describeContent; /** * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 5814ae7a18..ba74631d37 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -337,13 +337,37 @@ public class IcTripReportRecordController implements ResultDataResolver { if (file.isEmpty()) { throw new RenException("请上传文件"); } + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_trip_preport", "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【行程上报导入】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); + } + InputStream is = null; + FileOutputStream os = null; + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error("method exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } - // 校验文件类型 + //校验文件类型 String extension = FilenameUtils.getExtension(file.getOriginalFilename()); if (!"xls".equals(extension) && !"xlsx".equals(extension)) { throw new RenException("文件类型不匹配"); } - //1.查询当前工作人员是否有再导入的党员先锋数据,有则不允许导入，没有则进行新的导入 + //2.查询当前工作人员是否有再导入的党员先锋数据,有则不允许导入，没有则进行新的导入 ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); importTaskForm.setOriginFileName(file.getOriginalFilename()); importTaskForm.setOperatorId(tokenDto.getUserId()); @@ -363,8 +387,8 @@ public class IcTripReportRecordController implements ResultDataResolver { commonServiceOpenFeignClient.finishImportTask(input); log.error("读取文件失败"); } - //2.执行导入程序 - icTripReportRecordService.psExecAsyncExcelImport(tokenDto, response, inputStream, result.getData().getTaskId()); + //3.执行导入程序 + icTripReportRecordService.psExecAsyncExcelImport(fileSavePath, result.getData().getTaskId(),tokenDto); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 35bde836c4..c261c5acd9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -146,7 +146,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { /** * 来曹事由【磐石】 */ - private String describe; + private String describeContent; /** * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 1f4bd6814d..0e1b7a1769 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -1,12 +1,13 @@ package com.epmet.excel; -import cn.afterturn.easypoi.excel.annotation.Excel; -import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import com.alibaba.excel.annotation.ExcelProperty; import com.epmet.commons.tools.utils.ExcelVerifyInfo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; -import java.util.List; +import java.util.Date; /** * 磐石-行程上报信息 @@ -15,110 +16,87 @@ import java.util.List; @Data public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { - @Excel(name = "姓名", needMerge = true) - @NotBlank(message = "不能为空") + @ExcelProperty("姓名") + @NotBlank(message = "姓名不能为空") private String name; - @Excel(name = "年龄", needMerge = true) - //@NotNull(message = "不能为空") + @ExcelProperty("年龄") + //@NotNull(message = "年龄不能为空") private Integer age; - @Excel(name = "证件号", needMerge = true) - @NotBlank(message = "不能为空") - private Integer idCard; + @ExcelProperty("证件号") + @NotBlank(message = "证件号不能为空") + private String idCard; - @Excel(name = "户籍地（省市县区）", needMerge = true) - @NotBlank(message = "不能为空") + @ExcelProperty("户籍地（省市县区）") + @NotBlank(message = "户籍地不能为空") private String registeredResidence; - @Excel(name = "手机号", needMerge = true) - @NotBlank(message = "不能为空") + @ExcelProperty("手机号") + @NotBlank(message = "手机号不能为空") private String mobile; - /* @ExcelCollection(name = "来源地") - private List source;*/ - @Excel(name = "来自地区（格式：省-市-区-街道-社区）") - @NotBlank(message = "不能为空") + @ExcelProperty("来自地区（格式：省-市-区-街道-社区）") + @NotBlank(message = "来自地区不能为空") private String sourceAddress; - @Excel(name = "来自地区详细地址") + @ExcelProperty("来自地区详细地址") + @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @Excel(name = "来曹事由（100字以内）", needMerge = true) - @NotBlank(message = "不能为空") - private String describe; + @ExcelProperty("来曹事由（100字以内）") + @NotBlank(message = "来曹事由不能为空") + private String describeContent; - @Excel(name = "48小时核酸检测", needMerge = true) - @NotBlank(message = "不能为空") + @ExcelProperty("48小时核酸检测") + @NotBlank(message = "48小时核酸检测不能为空") private String natOutcome; - @Excel(name = "来到本地时间（2022-01-01）", needMerge = true) - @NotBlank(message = "不能为空") - private String arriveDate; + @ExcelProperty("来到本地时间\n" + + "（2022-01-01）") + //@NotBlank(message = "来到本地时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date arriveDate; - /*@ExcelCollection(name = "在曹居住地点") - private List present;*/ - @Excel(name = "现居地") - @NotBlank(message = "不能为空") + @ExcelProperty("现居地") + @NotBlank(message = "现居地不能为空") private String presentAddress; - @Excel(name = "现居地详细地址") + @ExcelProperty("现居地详细地址") + @NotBlank(message = "现居地详细地址不能为空") private String detailAddress; - /*@ExcelCollection(name = "返回方式") - private List traffic;*/ - @Excel(name = "返回方式") - @NotBlank(message = "不能为空") + @ExcelProperty("返回方式") + @NotBlank(message = "返回方式不能为空") private String trafficType; - @Excel(name = "其他返回方式") + @ExcelProperty("其他返回方式") private String trafficTypeExplain; - @Excel(name = "7天内旅居史情况", needMerge = true) + @ExcelProperty("7天内旅居史情况") private String sojournHistory; - @Excel(name = "隔离状态", needMerge = true) + @ExcelProperty("隔离状态") private String isolateType; - @Excel(name = "备注（500字以内）", needMerge = true) + @ExcelProperty("备注（500字以内）") private String remark; - @Excel(name = "是否落实“落地检”", needMerge = true) + @ExcelProperty("是否落实“落地检”") private String isArriveCheck; - @Excel(name = "是否达到曹县", needMerge = true) + @ExcelProperty("是否达到曹县") private String isArrive; - @Excel(name = "上报时间（2022-01-01）", needMerge = true) - private String reportingTime; + @ExcelProperty("上报时间\n" + + "（2022-01-01）") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date reportingTime; - @Excel(name = "管控措施（500字以内）", needMerge = true) + @ExcelProperty("管控措施\n" + + "（500字以内）") private String controlMeasures; - @Excel(name = "类型（省内、省外、市内、县内）", needMerge = true) + @ExcelProperty("类型\n" + + "（省内、省外、市内、县内）") private String tripDataType; - @Data - public class Source { - @Excel(name = "社区（省-市-区-街道-社区）") - @NotBlank(message = "不能为空") - private String sourceAddress; - @Excel(name = "详细地址", width = 20) - private String sourceDetailAddress; - } - @Data - public class Present { - @Excel(name = "村/居") - @NotBlank(message = "不能为空") - private String presentAddress; - @Excel(name = "详细地址", width = 20) - private String detailAddress; - } - @Data - public class Traffic { - @Excel(name = "返回方式") - @NotBlank(message = "不能为空") - private String trafficType; - @Excel(name = "其他返回方式", width = 20) - private String trafficTypeExplain; - } - } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java index 89afb8d7f1..083cc5ac3d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java @@ -2,6 +2,7 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -45,6 +46,7 @@ public class IcTripReportExcelData { @NotNull(message = "来到本地时间为必填项") @ExcelProperty("来到本地时间（格式：2022-01-01）") + @JsonFormat(pattern = "yyyy-MM-dd") private Date arriveDate; @ExcelProperty("返回方式") @@ -63,6 +65,7 @@ public class IcTripReportExcelData { private String vaccineNum; @ExcelProperty("离开本地时间（格式：2022-01-01）") + @JsonFormat(pattern = "yyyy-MM-dd") private Date leaveDate; /** @@ -80,7 +83,7 @@ public class IcTripReportExcelData { private String name; @ColumnWidth(20) - @ExcelProperty("身份证号") + @ExcelProperty("证件号") private String idCard; @ExcelProperty("手机号") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java index a330e40462..4f569fd9c0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcPsTripReportRecordErrorExcel.java @@ -1,6 +1,8 @@ package com.epmet.excel.error; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,19 +15,20 @@ import java.util.Date; @Data public class IcPsTripReportRecordErrorExcel { - @Excel(name = "姓名", width = 20) + @ExcelProperty("姓名") + @ColumnWidth(20) private String name; - @Excel(name = "证件号", width = 25) - private Integer idCard; + @ColumnWidth(20) + @ExcelProperty("证件号") + private String idCard; - @Excel(name = "户籍地（省市县区）", width = 40) - private String presentAddress; - - @Excel(name = "手机号", width = 20) + @ExcelProperty("手机号") + @ColumnWidth(20) private String mobile; - @Excel(name = "社会自组织名称", width = 40) + @ColumnWidth(60) + @ExcelProperty("错误信息") private String errorInfo; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java new file mode 100644 index 0000000000..b25d41af4d --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java @@ -0,0 +1,177 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.IcResiUserConstant; +import com.epmet.entity.IcTripReportRecordEntity; +import com.epmet.excel.IcPsTripReportRecordExcel; +import com.epmet.excel.data.IcTripReportExcelData; +import com.epmet.excel.error.IcPsTripReportRecordErrorExcel; +import com.epmet.service.impl.IcTripReportRecordServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + + +/** + * 磐石-行程上报excel导入监听器 + */ +@Slf4j +public class IcPsTripReportExcelImportListener implements ReadListener { + + /** + * 最大条数阈值 + */ + public static final int MAX_THRESHOLD = 200; + /** + * 当前操作用户 + */ + private CustomerStaffInfoCacheResult staffInfo; + private String customerId; + //字典表数据 + private Map trafficTypeMap; + private Map sojournHistoryMap; + private Map isolateTypeMap; + private Map tripDataTypeMap; + private Map areaMap; + + /** + * 数据 + */ + private List datas = new ArrayList<>(); + + /** + * 错误项列表 + */ + private List errorRows = new ArrayList<>(); + + private IcTripReportRecordServiceImpl tripReportRecordService; + + public IcPsTripReportExcelImportListener(String customerId, CustomerStaffInfoCacheResult staffInfo, IcTripReportRecordServiceImpl tripReportRecordService, + Map trafficTypeMap, Map sojournHistoryMap, Map isolateTypeMap, Map tripDataTypeMap, Map areaMap) { + this.customerId=customerId; + this.staffInfo = staffInfo; + this.tripReportRecordService = tripReportRecordService; + this.trafficTypeMap = trafficTypeMap; + this.sojournHistoryMap = sojournHistoryMap; + this.isolateTypeMap = isolateTypeMap; + this.tripDataTypeMap = tripDataTypeMap; + this.areaMap = areaMap; + } + + @Override + public void invoke(IcPsTripReportRecordExcel data, AnalysisContext context) { + + try { + // 先校验数据 + ValidatorUtils.validateEntity(data); + + AtomicBoolean bl = new AtomicBoolean(false); + StringBuffer errMsg = new StringBuffer(""); + IcTripReportRecordEntity e = ConvertUtils.sourceToTarget(data, IcTripReportRecordEntity.class); + e.setCustomerId(customerId); + e.setAgencyId(staffInfo.getAgencyId()); + e.setPids(staffInfo.getAgencyPIds()); + e.setUserType(IcResiUserConstant.USER_TYPE_IMPORT); + if (trafficTypeMap.containsKey(data.getTrafficType())) { + e.setTrafficType(trafficTypeMap.get(data.getTrafficType())); + } + if ("其他".equals(data.getTrafficType()) && StringUtils.isBlank(data.getTrafficTypeExplain())) { + errMsg.append("返回方式为其他时，请补充“其他返回方式”;"); + bl.set(true); + } + if (StringUtils.isNotBlank(data.getSojournHistory())) { + e.setSojournHistory(sojournHistoryMap.get(data.getSojournHistory())); + } else { + String[] str = e.getSourceAddress().split("-"); + if (str.length < 3) { + errMsg.append("数据不完整，‘来源地’信息填写格式错误;"); + bl.set(true); + } + e.setSojournHistory("3");//无风险 + if (areaMap.containsKey(str[2])) { + e.setSojournHistory(areaMap.get(str[2])); + } + } + if (StringUtils.isNotBlank(data.getIsolateType())) { + e.setIsolateType(isolateTypeMap.get(data.getIsolateType())); + } + if (StringUtils.isNotBlank(data.getTripDataType())) { + e.setTripDataType(tripDataTypeMap.get(data.getTripDataType())); + } + e.setIsArriveCheck("是".equals(data.getIsArriveCheck()) ? "1" : "0"); + e.setIsArrive("是".equals(data.getIsArrive()) ? "1" : "0"); + //必要字段没值的 + if (StringUtils.isEmpty(e.getSourceAddress()) || StringUtils.isEmpty(e.getPresentAddress()) + || StringUtils.isEmpty(e.getTrafficType())) { + errMsg.append("数据不完整，请检查‘来源地’、‘在曹居住地点’、‘返回方式’信息是否填写完整;"); + bl.set(true); + } + if (bl.get()) { + IcPsTripReportRecordErrorExcel errorRow = new IcPsTripReportRecordErrorExcel(); + errorRow.setName(data.getName()); + errorRow.setMobile(data.getMobile()); + errorRow.setIdCard(data.getIdCard()); + errorRow.setErrorInfo(errMsg.toString()); + errorRows.add(errorRow); + return; + } + datas.add(e); + + if (datas.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + } else { + errorMsg = "未知错误"; + log.error("【行程上报导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + + IcPsTripReportRecordErrorExcel errorRow = new IcPsTripReportRecordErrorExcel(); + errorRow.setName(data.getName()); + errorRow.setMobile(data.getMobile()); + errorRow.setIdCard(data.getIdCard()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (datas != null && datas.size() > 0) { + tripReportRecordService.batchPersist(datas); + } + } finally { + datas.clear(); + } + } + + /** + * 获取错误行 + * @return + */ + public List getErrorRows() { + return errorRows; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java index a9e1a102d7..c20465d1e2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java @@ -10,11 +10,15 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IcResiUserConstant; import com.epmet.entity.IcTripReportRecordEntity; import com.epmet.excel.data.IcTripReportExcelData; +import com.epmet.excel.error.IcPsTripReportRecordErrorExcel; import com.epmet.service.impl.IcTripReportRecordServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; /** @@ -33,6 +37,8 @@ public class IcTripReportExcelImportListener implements ReadListener trafficTypeMap; /** * 数据 @@ -46,10 +52,11 @@ public class IcTripReportExcelImportListener implements ReadListener trafficTypeMap) { this.customerId=customerId; this.staffInfo = staffInfo; this.tripReportRecordService = tripReportRecordService; + this.trafficTypeMap = trafficTypeMap; } @Override @@ -59,12 +66,33 @@ public class IcTripReportExcelImportListener implements ReadListener> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - IcTripReportExcelImportListener listener = new IcTripReportExcelImportListener(customerId,staffInfo, this); + IcTripReportExcelImportListener listener = new IcTripReportExcelImportListener(customerId,staffInfo, this, tMap); EasyExcel.read(filePath.toFile(), IcTripReportExcelData.class, listener).headRowNumber(2).sheet(0).doRead(); @@ -550,139 +553,105 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl fileList = new ArrayList<>(); - IcPsTripReportRecordErrorExcel excel = null; - //1.读取Excel数据 - ExcelImportResult testExcelImportResult = ExcelPoiUtils.importExcel1(inputStream, 0, 2, IcPsTripReportRecordExcel.class); - //2.存在错误行数据时存入错误数据集合中 - if (CollectionUtils.isNotEmpty(testExcelImportResult.getFailList())) { - for (IcPsTripReportRecordExcel entity : testExcelImportResult.getFailList()) { - //打印失败的行 和失败的信息 - log.warn("第{}行,{}", entity.getRowNum(), entity.getErrorMsg()); - excel = new IcPsTripReportRecordErrorExcel(); - excel.setName(entity.getName()); - excel.setIdCard(entity.getIdCard()); - excel.setPresentAddress(entity.getPresentAddress()); - excel.setMobile(entity.getMobile()); - excel.setErrorInfo(entity.getErrorMsg()); - fileList.add(excel); + //获取当前登录用户所属组织id + CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(tokenDto.getCustomerId(), tokenDto.getUserId()); + //获取需要的字典表数据 + //交通方式 + Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //风险地区数据 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcDangerAreaEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); + List areaList = icDangerAreaDao.selectList(wrapper); + Map areaMap = new HashMap<>(); + areaList.forEach(a->{ + if(StringUtils.isNotBlank(a.getDistrict())){ + areaMap.put(a.getDistrict(), a.getDangerLevel()); } - } - //3.正确行数据集合 - List list = testExcelImportResult.getList(); - if (CollectionUtils.isNotEmpty(list)) { - //3-1.校验数据值，把填写不对的数据剔除 - Iterator iterator = list.iterator(); - while (iterator.hasNext()) { - AtomicBoolean bl = new AtomicBoolean(false); - StringBuffer errMsg = new StringBuffer(""); - IcPsTripReportRecordExcel obj = iterator.next(); - //返回方式为其他时需要填写"其他返回方式" - if ("其他".equals(obj.getTrafficType()) && StringUtils.isBlank(obj.getTrafficTypeExplain())) { - errMsg.append("返回方式为其他时，请补充“其他返回方式”;"); - bl.set(true); + }); + + IcPsTripReportExcelImportListener listener = new IcPsTripReportExcelImportListener(tokenDto.getCustomerId(), staffInfo, this, + tMap, sMap, iMap, tdMap, areaMap); + + EasyExcel.read(filePath.toFile(), IcPsTripReportRecordExcel.class, listener).headRowNumber(2).sheet(0).doRead(); + + Path errorDescFile = null; + String errorDesFileUrl = null; + List errorRows = listener.getErrorRows(); + + boolean failed = errorRows.size() > 0; + if (failed) { + // 生成并上传错误文件 + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_trip_preport", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + errorDescFile = errorDescDir.resolve(fileName); + + FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile()); + FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName); + OutputStream os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcPsTripReportRecordErrorExcel.class).sheet("导入失败列表").doWrite(errorRows); + + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); } - if (bl.get()) { - excel = new IcPsTripReportRecordErrorExcel(); - excel.setName(obj.getName()); - excel.setIdCard(obj.getIdCard()); - excel.setPresentAddress(obj.getPresentAddress()); - excel.setMobile(obj.getMobile()); - excel.setErrorInfo(errMsg.toString()); - fileList.add(excel); - iterator.remove(); + } finally { + if (Files.exists(errorDescFile)) { + Files.delete(errorDescFile); } } - //3-2.获取需要的字典表数据 - //交通方式 - Result> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); - //7天内旅居史情况 - Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - //行程记录类型 - Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); - //获取当前登录用户所属组织id - CustomerStaffInfoCacheResult staffInfo = queryCurrentStaff(tokenDto.getCustomerId(), tokenDto.getUserId()); - //风险地区数据 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcDangerAreaEntity::getCustomerId, tokenDto.getCustomerId()); - wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); - List areaList = icDangerAreaDao.selectList(wrapper); - Map map1 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getDistrict, IcDangerAreaEntity::getDangerLevel)); - Map map2 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getCity, IcDangerAreaEntity::getDangerLevel)); - Map map3 = areaList.stream().collect(Collectors.toMap(IcDangerAreaEntity::getProvince, IcDangerAreaEntity::getDangerLevel)); - - list.forEach(l -> { - //3-3.数据赋值 - AtomicBoolean bl = new AtomicBoolean(false); - StringBuffer errMsg = new StringBuffer(""); - IcTripReportRecordEntity e = ConvertUtils.sourceToTarget(l, IcTripReportRecordEntity.class); - e.setCustomerId(tokenDto.getCustomerId()); - e.setAgencyId(staffInfo.getAgencyId()); - e.setPids(staffInfo.getAgencyPIds()); - e.setUserType(IcResiUserConstant.USER_TYPE_IMPORT); - if (trafficTypeMap.getData().containsKey(l.getTrafficType())) { - e.setTrafficType(trafficTypeMap.getData().get(l.getTrafficType())); - e.setTrafficTypeExplain(l.getTrafficTypeExplain()); - } - if (StringUtils.isNotBlank(l.getSojournHistory())) { - e.setSojournHistory(sojournHistoryMap.getData().get(l.getSojournHistory())); - } else { - String[] str = e.getSourceAddress().split("-"); - if (str.length < 3) { - bl.set(true); - errMsg.append("数据不完整，‘来源地’信息填写格式错误;"); - } - e.setSojournHistory("3");//无风险 - if (map1.containsKey(str[2])) {//高风险 - e.setSojournHistory(map1.get(str[2])); - } else if (map2.containsKey(str[1])) {//中风险 - e.setSojournHistory(map2.get(str[1])); - } else if (map3.containsKey(str[0])) {//低风险 - e.setSojournHistory(map3.get(str[0])); - } - } - if (StringUtils.isNotBlank(l.getIsolateType())) { - e.setIsolateType(isolateTypeMap.getData().get(l.getIsolateType())); - } - if (StringUtils.isNotBlank(l.getTripDataType())) { - e.setTripDataType(tripDataTypeMap.getData().get(l.getTripDataType())); - } - e.setIsArriveCheck("是".equals(l.getIsArriveCheck()) ? "1" : "0"); - e.setIsArrive("是".equals(l.getIsArrive()) ? "1" : "0"); - //必要字段没值的 - if (StringUtils.isEmpty(e.getSourceAddress()) || StringUtils.isEmpty(e.getPresentAddress()) - || StringUtils.isEmpty(e.getTrafficType())) { - errMsg.append("数据不完整，请检查‘来源地’、‘在曹居住地点’、‘返回方式’信息是否填写完整;"); - bl.set(true); - } - if (bl.get()) { - IcPsTripReportRecordErrorExcel el = new IcPsTripReportRecordErrorExcel(); - el.setName(l.getName()); - el.setIdCard(l.getIdCard()); - el.setPresentAddress(l.getPresentAddress()); - el.setMobile(l.getMobile()); - el.setErrorInfo(errMsg.toString()); - fileList.add(el); - return; - } - //3-4.保存数据 - baseDao.insert(e); - }); } - //4.错误数据生成文件，修改导入任务状态 - String url = erroeImport(fileList); - upImportTask(url, taskId, tokenDto.getUserId(), true); + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); + importFinishTaskForm.setOperatorId(tokenDto.getCustomerId()); + importFinishTaskForm.setResultDesc(""); + importFinishTaskForm.setResultDescFilePath(errorDesFileUrl); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【行程上报导入】finishImportTask失败"); + } } catch (Exception e) { String errorMsg = ExceptionUtils.getErrorStackTrace(e); - log.error("【行程上报数据导入】程序错误:{}", errorMsg); - upImportTask(null, taskId, tokenDto.getUserId(), false); + log.error("【行程上报导入】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(tokenDto.getCustomerId()); + importFinishTaskForm.setResultDesc("导入失败"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【行程上报导入】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + log.error("method exception", e); + } + } } } @@ -784,74 +753,5 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl fileList) throws IOException { - String url = ""; - //1.有错误数据则生成错误数据存放文件传到阿里云服务 - if (!org.springframework.util.CollectionUtils.isEmpty(fileList)) { - Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表", "导入失败的数据列表"), - IcPsTripReportRecordErrorExcel.class, fileList); - - // 文件名 - String resultDescFileName = UUID.randomUUID().toString().concat(".xlsx"); - 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上传结果描述文件失败"); - } - url = uploadResult.getData().getUrl(); - } - return url; - } - - /** - * @Author sun - * @Description 行程上报数据导入修改导入任务状态 - **/ - private void upImportTask(String url, String importTaskId, String staffId, Boolean status) { - //2.更新导入任务数据 - ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); - importTaskForm.setOperatorId(staffId); - importTaskForm.setBizType(ImportTaskConstants.PS_BIZ_TYPE_IC_TRIP_REPORT); - importTaskForm.setTaskId(importTaskId); - importTaskForm.setResultDescFilePath(url); - if (status && StringUtils.isBlank(url)) { - importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); - } else { - importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); - importTaskForm.setResultDesc("行程上报数据导入存在程序错误"); - } - Result result = commonServiceOpenFeignClient.finishImportTask(importTaskForm); - if (!result.success()) { - throw new RenException(result.getInternalMsg()); - } - } - } From a8487d66a4fbe83067304673ff4d74c950d25561 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Nov 2022 16:01:47 +0800 Subject: [PATCH 448/621] =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java | 2 +- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java index 53afd8c1e9..96a5ed7399 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -15,7 +15,7 @@ public class EmphasisTripPieDetailFormDTO implements Serializable { public interface EmphasisTripPieDetailForm{} - @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) +// @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) private String code; private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index ba74631d37..b29697f1ce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -464,7 +464,6 @@ public class IcTripReportRecordController implements ResultDataResolver { */ @PostMapping("emphasisTripPieDetail") public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO, @LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class); formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO)); From 53cae0981ab742527a9423ead274a9bd74669c33 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 16:02:34 +0800 Subject: [PATCH 449/621] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E5=80=BC?= =?UTF-8?q?=E7=BF=BB=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcPsTripReportExcelImportListener.java | 1 + .../impl/IcTripReportRecordServiceImpl.java | 32 +++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java index b25d41af4d..8fc2a65e39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java @@ -82,6 +82,7 @@ public class IcPsTripReportExcelImportListener implements ReadListener> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); - Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //7天内旅居史情况 Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //隔离状态 Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); - Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //3.查询最近一次通知时间、核算检测关注名单 if (CollectionUtils.isNotEmpty(list)) { Map latestNotice = new HashMap<>(); @@ -160,15 +160,15 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); - Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map tMap = trafficTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //7天内旅居史情况 Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //隔离状态 Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); - Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); for (IcTripReportRecordDTO dto : result.getList()) { //字典表字段、是否字段赋值对应中国字 - dto.setTrafficTypeName(tMap.containsKey(dto.getTrafficType()) ? tMap.get(dto.getTrafficType()) : "无"); + dto.setTrafficTypeName(trafficTypeMap.getData().containsKey(dto.getTrafficType()) ? trafficTypeMap.getData().get(dto.getTrafficType()) : "无"); dto.setVaccineNumName(StringUtils.isNotBlank(dto.getVaccineNum()) ? dto.getVaccineNum().concat("针") : ""); dto.setIsNatRecordName("1".equals(dto.getIsNatRecord()) ? "是" : "否"); dto.setNatOutcomeName("1".equals(dto.getIsNatRecord()) ? "阳性" : "阴性"); - dto.setSojournHistoryName(sMap.containsKey(dto.getSojournHistory()) ? sMap.get(dto.getSojournHistory()) : "无"); - dto.setIsolateTypeName(iMap.containsKey(dto.getIsolateType()) ? iMap.get(dto.getIsolateType()) : "无"); + dto.setSojournHistoryName(sojournHistoryMap.getData().containsKey(dto.getSojournHistory()) ? sojournHistoryMap.getData().get(dto.getSojournHistory()) : "无"); + dto.setIsolateTypeName(isolateTypeMap.getData().containsKey(dto.getIsolateType()) ? isolateTypeMap.getData().get(dto.getIsolateType()) : "无"); dto.setIsArriveCheckName("1".equals(dto.getIsArriveCheck()) ? "是" : "否"); dto.setIsArriveName("1".equals(dto.getIsArrive()) ? "是" : "否"); - dto.setTripDataTypeName(tdMap.containsKey(dto.getTripDataType()) ? tdMap.get(dto.getTripDataType()) : "无"); + dto.setTripDataTypeName(tripDataTypeMap.getData().containsKey(dto.getTripDataType()) ? tripDataTypeMap.getData().get(dto.getTripDataType()) : "无"); } return result.getList(); From b14b677b6fc4b02dec84e160f9795eaf83670bde Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Nov 2022 16:06:56 +0800 Subject: [PATCH 450/621] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/EmphasisTripListResultDTO.java | 2 +- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java index 578709a489..f44bf4e952 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -26,7 +26,7 @@ public class EmphasisTripListResultDTO implements Serializable { /** * 来曹事由 */ - private String describe; + private String describeContent; /** * 核酸检测结果 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index c752a0d8da..212ab88ca6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -78,7 +78,7 @@ ID, AGENCY_ID, SOURCE_ADDRESS, - IFNULL(`describe`,'') as `describe`, + IFNULL(`describe_content`,'') as describeContent, ifnull(sojourn_history,'3') as sojournHistory, IFNULL(isolate_type,'4') as isolateType, ARRIVE_DATE, From 86fa1f40e05b341f0a0c1e25c9525a280b4238e4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Nov 2022 16:10:06 +0800 Subject: [PATCH 451/621] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 53207c7750..73888d2edb 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 @@ -2401,6 +2401,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 16:13:07 +0800 Subject: [PATCH 452/621] =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E7=AE=A1=E6=8E=A7=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8D=95=E5=85=83=E6=A0=BC=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=9C=AC=E6=96=87=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/attention_nat_template.xlsx | Bin 9319 -> 9373 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx index a12e8bd8591d9e3378252c4cb3d405f478759fba..e0d2c01236a25cd065c368a98bbee606d94caf06 100644 GIT binary patch delta 4222 zcmV-^5P|RKNS#TrlK}-aeUDK~lb8V>e?d;eFc3xeNZcXvKCzubsiGv60ChzrB!WQf zEPL8U#ExYf(z4r)yaS&tPm>s|?YIpa2xFMX8n< zx-Dkm1O?VHC0JD}$j}BXn&!txDc1?F4P2XAgK;I;z>}0sxX#eZIh|l^`3fYnf01`6 zFD_~$ne(MtV$Jv?TLO*=8Dj~K3Fa7XfuSCVXp0nlKlR$ZM5HM8+V^AcrOm_wJir@(=<^t>SFl(6yMLUZn{;&Qnk0@fbvxEgd1S4 zHu=k%r+BY!Z&xwv=Kjo!62$o?OaJwt4{|&HKO&_ei3{R!XNSZcAn$S?{)YS;vIDaL30bJ+ z+MELb0Ev^l1R;OVZ`(E$z7OdCAP~h)seah;&q^-ZBwn&DYnHaznUQFl2qmf{Z6(JZ zx*c{Ju+uuAr|q@^EzqV&|D8HT|BF3}mSb63X9Kn=@_XNV@8jd6{Cnpyvt~p{%98+j zwu>y1ggm0jI6zMx5ASr5B^6F0%y>cqbU`G#H@NkcpK*V2CMSd_3m6g^povmx-*IF( zAu*OVPe}qRBQ9dB;8BbnnF@lV+$d&F!*$zEjA?=lLtkvd!ABz+l3gB7W0ELCA_&6@ z;+GSe%7X1Y+K4X_ID=e^cveE(H7iR#Z@Us-OhdsXA1OQJv13B3X4!Lkr99)XLR2GG zjK$eBy#s&5DI|AF8C4f~xU_M8jP?E`&v8C|oBf?0iNCc&VEL{SpoS$jn0Zh4?I|pb+ z94a~^JA||a}KwFt&-6*}j*M*Z3>e>5xIzW&*RI7y9*}(Ok8JvW0fp}0wcxA*+ z711aocB_bH8L?MIY?l$kDxy_Jd}9!x+%kWcb{UbkfdH){I%ULx;eef3a&*gxZ>xx2 z8Sz~e;jM}KeGOzy)x#Rdnyf$6K-P49SOZxT_NWH3rtFV3kTq$KYaln;I#7f~cQsWR zL2aI3M&V!IoL0!EiEfxsg5@PkU8K+l8I=lIm@%F`U^qE51wG-}L6T0@A(0Y~O}l@T zFu5lL7o|zl{D;u|;k#)517E)#Od0kDUq794b@%g&pFh6;=kp)GfBO5w*8KJJ`Kx!O zhxxO==2w@WUi^0b_SdcX<(v60S7!bC&zFY5cb1gCQ%(f(FHgXYkV4RhSd1wsz{m&$ zaP1BhpD@>lc~CsfvpwYs?$CTVf%hR80>{_2Tb|c-Tg3-@=7@7uzXTVDu^Z+Pef2G0 zq6Ys0kRG#n2qOl6eRnv9ZVCVZzEA)F4FCWDcx*3oba`xLb1ryoY}H)tZ`;Nh|2|;< z1EFC1FwB-nQ7=p_XR&Mo1=^uNGGM?q1hPcg1SrxYsle_qAZ?nu>yQCMx@9X0tZR{F z9~N)xhArrt^q+|o`&0jgJ@-Q1opcl#+oY%nh$)iKJ#W8%=jDz^ZCpDXIm&Iz4{Xov zRMhoaMX}tzH?ZBkPUS~8&9!z#3BsN`=sBKibt*?zP`S4G?Qd-a;gMtA*te`ufg#+W zQ`ry0gR9kQ(BHR4yYR&4XXS7h^8G7UYPXcv(D6^#_;26+`Pd6z zTO)t)9Y46GRH_jxeq3#KTtf8C*N?~n&t~ot&vou1Igv?-`m7L?>w0ZQKXyVG{o1v~ zO6s%Y&k2jI7mYr5mFk&zeSt7l>fOzaq31FuYc=qHGCH%l5xlM3?m2)z4SA^VIi9bC z03-0Sihb4_S>%q%$**5Ldw}oS@A(0sj}X>%bPi*W-Z`>e&qpV#gvSggJnlI-)y~hy z-`nj}OtTK3Ruc{5rm1ytW=6LLVU{;D>MJbnWhpgA{)}+Jd5c;R)T){0Wh$1!uni2` zm#X1^Zi0r?n)OV|sTV;$wWVnyYi44X5s`vwZ8WkFYL~2-t&7$ zs)ln%HiE!&>;aNuugmvG(AR}F>X~cnxCPp!mu+`o9a_*fH}UBzCw5j56F4>*$ChCj zZME5Mw++3n=FLB@R^6^)AWIjjYXfvO>TRQ`fyy=PxE%R2U0dCq!gZ~Ks;x$&-B1mG zO;_`_b*!stcDu#s+F%$iR#%#Zxu{(V|JJhfk9@6}@X6WNl-KnJ`sB=u`qf}|EjBk& z{&}lOP11_9RpTg$`7cF(uKFxR z|7J1CuvHYB<$9B=rAzT9US7$u6{SIc!{x>$sTsR@DJ@gpT`)B>*Fh}B%pCssq|j$ODq8j@=QcMSYZ$^r&bRmW(cjQJK+`%e480K?4D8;X=k^>ptVR^k zUqlH{rr;q|rxNbthe%{qtTzrl`q-d~Zla^7-iu|xBBb65Vn$M?-b<7@r!KUA1!4=B zsT$2wr06wIkfz-{#bxNYrJ)b17+H1XD6;9u5oFYnqsXcwC?G>~gp-jqu*V~a00P#y zAtMk+xKD@5Ia$Q%Q%9>ddP}dh^oG_XHqWYFq=yi46cKD`II9aeifk_A2r{~mqj*&v z2i|zsv0`6k(lV81Ue8n#iKeN4G+A{`!IGShX~M%Wyl@U_`8=4FqDY8^be)CU7l}bj z2UMcI`>q>KqUR)c(iNzCf?-11SnQUWLPRAtgA5@;XJmVT*e&i zrsGW(E8$|YnPw$Km7@{n(9F|t%K}dqi$=7OhoTXll$1zD9d9vOHJ781qUMB&c8Sc% z!4j|-$p~k&%4mXGg{Dk@nA)Wmwz3rAWh^|VIIDuQS4?7*5GYbt#Ky3Av~nVIEwo@|h{6TY zCL%fCd;r^SAXKr@%KNjlvq?3n|AlU2fh7yA z9!aelv=?O&k?YNnMOl=T36QYSE-u4rX(zi}JEIEon=+Y_kL}V zw&L(Yu0qABm$u^YmRx$psq#9S zGmsF0oj$V!r~iIDdHT*zYCnr;P`YI_c>ne+jaK`PvZhSF`ttN2cc;HUo;-PY_Sq+= zzxqOf1VdndgG|B(sgt+Aqn$TY)YIn=Cifmi6eu?_3YZHe${JBXX5%REYZJ4APVV1* z@$CNOgZIxq{)kf%^^1%b-U&ZTsi&%l`Z+d89d8Yu9cA+0lSo?BS+UzSsa<(-BRbUV zFgo()_lzN%sj{MGgbkw0jr*T_XAhoFe-nEIudy?KDya`&{_#0jcl!5_B5_p_KKNav zd8>SJdh+$z!;_aEzjr#vRfLYztkZw}_3Ze=n576E5L*JBL>mD+0$IFB$<(b&VKM#m z`0TSkC;&Z5BtnV2CONC`>65=qe)}N=%Jh@J#e^b!z-$ts3AdO;gb=LyN=Qy0e-5UZ z-g!KK!%l=zLy9A+T%7ySS`-HxSTvI`q(re9@hS#0BdlRbh!VXK^Tz88Y#8XTB*ReN zEbEBafu$)4Q6lfyshS8V*wG~!24%0~FC*XJc`_3hq?eJL{Q2d{!8D@Cv?6*yU@CSkRq7vF42nVo9tb@lKo}pn~!Pz(z{R0EzZs!-)8V-NBM!679i;5itvU{3OFj z)QQoGb_H^YUY8m)Q4ThYh*@1~*2MJ7h7mEVOG8kiPMp>t+5~l^v6H9{8%9KHL+a#2 zb=WW>S{vBOY$6P;eb|Fn4Dg=xxVHy?d=0E&Z|sCOF zr^1fkK(ADhvTYrPZv^lj6#P}jzTK((VrQ#mZ10%bTD!K@UeoJVW6fx6ZLc--?$-9U zY1Fh@_m_~*&=31vJyi9%ANL#CecubbVYuFhH?_Rs(C%CFKksK$jpzsdV34aIfdhB> zR9Pzg4R)?m;l2>@5tyqWHu)bbQ4QiB9^CvtvkVz%2Lb4lbs#_lP#gdNlTRWRlg}U; z0d$k|(eUDK~lY${s0{;S&*dad$R|Eh6cx*3|&m$a@fE@&rJ|YSMoRdi+HUYzv zfFef$LX*fMCmVftIEHQt006#F000dD0000000031AOHXWsgnvLIstZ*MI$x=os)bc zKmqWRy(2sUc$4}gAskt#<=UJB004;z000;O0000000031AOHXWqy&?}1R54lO9ci1 U0000H01*HO1ONblAOHXW06L1~L;wH) delta 4150 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 AaR2}S From f4f694ed21d00f517c480df911425b5979673a12 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 16:21:19 +0800 Subject: [PATCH 453/621] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/StrConstant.java | 2 ++ .../epmet/dto/form/IcTripReportFormDTO.java | 3 ++ .../impl/IcTripReportRecordServiceImpl.java | 29 +++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index 1dd825b18e..fb294721f8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -99,6 +99,8 @@ public interface StrConstant { String PY_CUSTOMER = "6f203e30de1a65aab7e69c058826cd80"; //平音客户跟组织Id String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135"; + //磐石街道客户Id + String PS_CUSTOMER_ID = "1580460084738760705"; /** * 单位积分,积分上限，积分说明，积分事件 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index aae545ab01..54d6dedc26 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -179,6 +179,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 交通方式，来源字典表(traffic_type) */ + @NotBlank(message = "返回方式不能为空", groups = {ResiUserRequired.class}) private String trafficType; /** * 其他返回方式，交通方式为其他时此列需要有值 @@ -187,6 +188,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 来源地详细信息 source_address字段的说明 */ + @NotBlank(message = "来自地区不能为空", groups = {ResiUserRequired.class}) private String sourceDetailAddress; /** * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 @@ -199,6 +201,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 户籍地 【磐石】 */ + @NotBlank(message = "户籍地不能为空", groups = {ResiUserRequired.class}) private String registeredResidence; /** * 年龄【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 8698e35be1..bd627a273c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.commons.mybatis.enums.DelFlagEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -205,6 +206,20 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 16:50:42 +0800 Subject: [PATCH 454/621] =?UTF-8?q?=E5=85=B3=E4=BA=8Eexcel=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E5=88=97=E5=80=BC=E6=8E=A5=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/IcPsTripReportRecordExcel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 0e1b7a1769..04a8a16900 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -1,10 +1,9 @@ package com.epmet.excel; import com.alibaba.excel.annotation.ExcelProperty; -import com.epmet.commons.tools.utils.ExcelVerifyInfo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.util.Date; @@ -14,7 +13,7 @@ import java.util.Date; * */ @Data -public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { +public class IcPsTripReportRecordExcel { @ExcelProperty("姓名") @NotBlank(message = "姓名不能为空") @@ -45,6 +44,7 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @ExcelProperty("来曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") + @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; @ExcelProperty("48小时核酸检测") @@ -77,6 +77,7 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { private String isolateType; @ExcelProperty("备注（500字以内）") + @Length(max = 500,message = "备注不能超过500字") private String remark; @ExcelProperty("是否落实“落地检”") @@ -92,6 +93,7 @@ public class IcPsTripReportRecordExcel extends ExcelVerifyInfo { @ExcelProperty("管控措施\n" + "（500字以内）") + @Length(max = 500,message = "管控措施不能超过500字") private String controlMeasures; @ExcelProperty("类型\n" + From 405b03b50f0930a10dd78780a3fdec1277ec1bcd Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 2 Nov 2022 17:16:50 +0800 Subject: [PATCH 455/621] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcUserChangeRecordDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml index 4b7203f075..c5717beea3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml @@ -25,7 +25,7 @@ WHERE del_flag = '0' AND ic_user_id = #{icUserId} - ORDER BY change_time DESC, type ASC + ORDER BY CREATED_TIME DESC, type ASC @@ -81,4 +81,4 @@ where IC_USER_ID = #{icResiUserId} - \ No newline at end of file + From fcefb9e355f41f30ca86e2c09e4fbaa54d706cf3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Nov 2022 17:40:10 +0800 Subject: [PATCH 456/621] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 6 +- .../IcTripReportRecordController.java | 9 +- .../IcPsTripReportRecordExportExcel.java | 43 +++--- .../excel/IcTripReportRecordExportExcel.java | 123 ++++++++++++++++++ 4 files changed, 154 insertions(+), 27 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index ed73892942..a53882076c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -156,7 +156,7 @@ public class IcTripReportRecordDTO implements Serializable { @ColumnWidth(25) @ExcelProperty(value = "来到本地时间",order = 8) @JsonFormat(pattern = "yyyy-MM-dd") - private Date arriveDate; + private String arriveDate; /** * 离开日期 @@ -164,7 +164,7 @@ public class IcTripReportRecordDTO implements Serializable { @ColumnWidth(25) @ExcelProperty(value = "离开本地时间",order = 13) @JsonFormat(pattern = "yyyy-MM-dd") - private Date leaveDate; + private String leaveDate; /** * pc行程上报-列表返参：最近一次通知时间 @@ -332,7 +332,7 @@ public class IcTripReportRecordDTO implements Serializable { * 上报时间【磐石】 */ @JsonFormat(pattern = "yyyy-MM-dd") - private Date reportingTime; + private String reportingTime; /** * 管控措施【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index b29697f1ce..1133cf4688 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -28,6 +28,7 @@ import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPsTripReportRecordExportExcel; +import com.epmet.excel.IcTripReportRecordExportExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; import lombok.extern.slf4j.Slf4j; @@ -230,13 +231,15 @@ public class IcTripReportRecordController implements ResultDataResolver { // 这里 需要指定写用哪个class去写 String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); String fileName = "行程上报信息".concat(today); - excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordExportExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; + List list = null; do { data = icTripReportRecordService.page(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcTripReportRecordExportExcel.class); formDTO.setPageNo(++pageNo); - excelWriter.write(data.getList(), writeSheet); + excelWriter.write(list, writeSheet); } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); } catch (Exception e) { @@ -409,7 +412,7 @@ public class IcTripReportRecordController implements ResultDataResolver { // 这里 需要指定写用哪个class去写 String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); String fileName = "行程上报信息".concat(today); - excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPsTripReportRecordExportExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; List list = null; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index bf9c9455d1..a701be4c74 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -41,107 +42,107 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 户籍地 【磐石】 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "户籍地（省市县区）",order = 4) private String registeredResidence; /** * 手机号 */ - @ColumnWidth(25) + @ColumnWidth(15) @ExcelProperty(value = "手机号",order = 5) private String mobile; /** * 来自地区（格式：省-市-区-街道-社区） */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 6) private String sourceAddress; /** * 来自地区详细地址 source_address字段的说明 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** * 来曹事由（100字以内）【磐石】 */ - @ColumnWidth(40) + @ColumnWidth(25) @ExcelProperty(value = "来曹事由（100字以内）",order = 8) - private String describe; + private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "48小时核酸检测",order = 9) private String isNatRecordName; /** * 来到本地时间（2022-01-01） */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 10) @JsonFormat(pattern = "yyyy-MM-dd") - private Date arriveDate; + private String arriveDate; /** * 现居地 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "现居地",order = 11) private String presentAddress; /** * 现居地详细地址 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "现居地详细地址",order = 12) private String detailAddress; /** * 交通方式-中国字 */ - @ColumnWidth(30) + @ColumnWidth(15) @ExcelProperty(value = "返回方式",order = 13) private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "其他返回方式",order = 14) private String trafficTypeExplain; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "7天内旅居史情况",order = 15) private String sojournHistoryName; /** * 隔离状态，字典表(isolate_type)【磐石】-中国字 */ - @ColumnWidth(30) + @ColumnWidth(15) @ExcelProperty(value = "隔离状态",order = 16) private String isolateTypeName; /** * 备注（500字以内） */ - @ColumnWidth(50) + @ColumnWidth(35) @ExcelProperty(value = "备注（500字以内）",order = 17) private String remark; /** * 是否落实"落地检" 0:否 1:是【磐石】-中国字 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "是否落实“落地检”",order = 18) private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】-中国字 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "是否达到曹县",order = 19) private String isArriveName; /** * 上报时间（2022-01-01）【磐石】 */ - @ColumnWidth(30) + @ColumnWidth(20) @ExcelProperty(value = "上报时间（2022-01-01）",order = 20) @JsonFormat(pattern = "yyyy-MM-dd") - private Date reportingTime; + private String reportingTime; /** * 管控措施（500字以内）【磐石】 */ @@ -151,7 +152,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 类型（省内、省外、市内、县内），字典表(trip_data_type)【磐石】-中国字 */ - @ColumnWidth(35) + @ColumnWidth(25) @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 22) private String tripDataTypeName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java new file mode 100644 index 0000000000..5b2bfbc0d9 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java @@ -0,0 +1,123 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 行程上报信息 + * + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class IcTripReportRecordExportExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 姓名 + */ + @ColumnWidth(15) + @ExcelProperty(value = "姓名", order = 1) + private String name; + + /** + * 证件号 + */ + @ColumnWidth(20) + @ExcelProperty(value = "证件号",order = 2) + private String idCard; + + /** + * 手机号 + */ + @ColumnWidth(15) + @ExcelProperty(value = "手机号",order = 3) + private String mobile; + + /** + * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 + */ + @ColumnWidth(30) + @ExcelProperty(value = "现居地",order = 4) + private String presentAddress; + + /** + * 详细地址 + */ + @ColumnWidth(30) + @ExcelProperty(value = "现居地详细地址",order = 5) + private String detailAddress; + + /** + * 来源地区地址 + */ + @ColumnWidth(30) + @ExcelProperty(value = "来自地区",order = 6) + private String sourceAddress; + + /** + * 来自地区详细地址 source_address字段的说明 + */ + @ColumnWidth(30) + @ExcelProperty(value = "来自地区详细地址",order = 7) + private String sourceDetailAddress; + + /** + * 到达日期 + */ + @ColumnWidth(20) + @ExcelProperty(value = "来到本地时间",order = 8) + @JsonFormat(pattern = "yyyy-MM-dd") + private String arriveDate; + + /** + * 交通方式-中国字 + */ + @ColumnWidth(15) + @ExcelProperty(value = "返回方式",order = 9) + private String trafficTypeName; + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + @ColumnWidth(20) + @ExcelProperty(value = "其他返回方式",order = 10) + private String trafficTypeExplain; + + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 + */ + @ColumnWidth(20) + @ExcelProperty(value = "48小时核酸检测",order = 11) + private String isNatRecordName; + + /** + * 疫苗接种针次 -中国字(0针 1针 2针 3针) + */ + @ColumnWidth(20) + @ExcelProperty(value = "疫苗接种针次",order = 12) + private String vaccineNumName; + + /** + * 离开日期 + */ + @ColumnWidth(20) + @ExcelProperty(value = "离开本地时间",order = 13) + @JsonFormat(pattern = "yyyy-MM-dd") + private String leaveDate; + + /** + * 备注信息 + */ + @ColumnWidth(40) + @ExcelProperty(value = "备注",order = 14) + private String remark; +} From 7e23b0862c65a36810a0d2bf0fdd52c057c1326e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 09:11:08 +0800 Subject: [PATCH 457/621] =?UTF-8?q?=E5=8A=A0=E4=B8=8A**?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 1133cf4688..50728a1db7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -440,6 +440,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @Date 2022/11/1 15:43 */ @PostMapping("list") + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) public Result> emphasisTripList(@LoginUser TokenDto tokenDto, @RequestBody EmphasisTripListFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); formDTO.setStaffId(tokenDto.getUserId()); From 8e4ba0710ba35120dd6a2650bcc98b0819cc9513 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 09:47:01 +0800 Subject: [PATCH 458/621] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 53 ++++++++++++------- .../IcTripReportRecordController.java | 2 - .../IcPsTripReportRecordExportExcel.java | 12 ++--- .../excel/IcTripReportRecordExportExcel.java | 8 +-- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index a53882076c..f40344f6cb 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -66,14 +66,14 @@ public class IcTripReportRecordDTO implements Serializable { * 姓名 */ @ColumnWidth(15) - @ExcelProperty(value = "姓名", order = 1) + @ExcelProperty(value = "姓名") private String name; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号",order = 3) + @ExcelProperty(value = "手机号") private String mobile; /** @@ -85,7 +85,7 @@ public class IcTripReportRecordDTO implements Serializable { * 身份证号 */ @ColumnWidth(22) - @ExcelProperty(value = "证件号",order = 2) + @ExcelProperty(value = "证件号") private String idCard; /** @@ -121,14 +121,14 @@ public class IcTripReportRecordDTO implements Serializable { * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ @ColumnWidth(50) - @ExcelProperty(value = "现居地",order = 4) + @ExcelProperty(value = "现居地") private String presentAddress; /** * 详细地址 */ @ColumnWidth(35) - @ExcelProperty(value = "现居地详细地址",order = 5) + @ExcelProperty(value = "现居地详细地址") private String detailAddress; /** @@ -147,14 +147,14 @@ public class IcTripReportRecordDTO implements Serializable { * 来源地区地址 */ @ColumnWidth(50) - @ExcelProperty(value = "来自地区",order = 6) + @ExcelProperty(value = "来自地区") private String sourceAddress; /** * 到达日期 */ @ColumnWidth(25) - @ExcelProperty(value = "来到本地时间",order = 8) + @ExcelProperty(value = "来到本地时间") @JsonFormat(pattern = "yyyy-MM-dd") private String arriveDate; @@ -162,7 +162,7 @@ public class IcTripReportRecordDTO implements Serializable { * 离开日期 */ @ColumnWidth(25) - @ExcelProperty(value = "离开本地时间",order = 13) + @ExcelProperty(value = "离开本地时间") @JsonFormat(pattern = "yyyy-MM-dd") private String leaveDate; @@ -178,7 +178,7 @@ public class IcTripReportRecordDTO implements Serializable { * 备注信息 */ @ColumnWidth(100) - @ExcelProperty(value = "备注",order = 14) + @ExcelProperty(value = "备注") private String remark; /** @@ -237,112 +237,127 @@ public class IcTripReportRecordDTO implements Serializable { /** * 交通方式，来源字典表(traffic_type) */ + @ExcelIgnore private String trafficType; /** * 交通方式-中国字 */ - @ColumnWidth(50) - @ExcelProperty(value = "返回方式",order = 9) + @ExcelIgnore private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ - @ColumnWidth(50) - @ExcelProperty(value = "其他返回方式",order = 10) + @ExcelIgnore private String trafficTypeExplain; /** * 来自地区详细地址 source_address字段的说明 */ - @ColumnWidth(25) - @ExcelProperty(value = "来自地区详细地址",order = 7) + @ExcelIgnore private String sourceDetailAddress; /** * 疫苗接种针次 (0 1 2 3)【小寨子】 */ + @ExcelIgnore private String vaccineNum; /** * 疫苗接种针次 -中国字(0针 1针 2针 3针) */ - @ColumnWidth(50) - @ExcelProperty(value = "疫苗接种针次",order = 12) + @ExcelIgnore private String vaccineNumName; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ + @ExcelIgnore private String isNatRecord; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 */ - @ColumnWidth(50) - @ExcelProperty(value = "48小时核酸检测",order = 11) + @ExcelIgnore private String isNatRecordName; /** * 户籍地 【磐石】 */ + @ExcelIgnore private String registeredResidence; /** * 年龄【磐石】 */ + @ExcelIgnore private int age; /** * 来曹事由【磐石】 */ + @ExcelIgnore private String describeContent; /** * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ + @ExcelIgnore private String natOutcome; /** * 48小时核算检查结果(阴性 阳性)【磐石】-中国字 */ + @ExcelIgnore private String natOutcomeName; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】 */ + @ExcelIgnore private String sojournHistory; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 */ + @ExcelIgnore private String sojournHistoryName; /** * 隔离状态，字典表(isolate_type)【磐石】 */ + @ExcelIgnore private String isolateType; /** * 隔离状态，字典表(isolate_type)【磐石】-中国字 */ + @ExcelIgnore private String isolateTypeName; /** * 是否落实"落地检" 0:否 1:是【磐石】 */ + @ExcelIgnore private String isArriveCheck; /** * 是否落实"落地检" 0:否 1:是【磐石】-中国字 */ + @ExcelIgnore private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】 */ + @ExcelIgnore private String isArrive; /** * 是否达到曹县 0:否 1:是【磐石】-中国字 */ + @ExcelIgnore private String isArriveName; /** * 上报时间【磐石】 */ + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd") private String reportingTime; /** * 管控措施【磐石】 */ + @ExcelIgnore private String controlMeasures; /** * 行程记录类型，字典表(trip_data_type)【磐石】 */ + @ExcelIgnore private String tripDataType; /** * 行程记录类型，字典表(trip_data_type)【磐石】-中国字 */ + @ExcelIgnore private String tripDataTypeName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 50728a1db7..5444efca73 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -221,8 +221,6 @@ public class IcTripReportRecordController implements ResultDataResolver { public void export(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); - // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7"); formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageSize(NumConstant.TEN_THOUSAND); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index a701be4c74..150dfd684d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -24,13 +24,13 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 姓名 */ - @ColumnWidth(15) + @ColumnWidth(12) @ExcelProperty(value = "姓名", order = 1) private String name; /** * 年龄【磐石】 */ - @ColumnWidth(15) + @ColumnWidth(10) @ExcelProperty(value = "年龄",order = 2) private int age; /** @@ -42,7 +42,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 户籍地 【磐石】 */ - @ColumnWidth(30) + @ColumnWidth(28) @ExcelProperty(value = "户籍地（省市县区）",order = 4) private String registeredResidence; /** @@ -103,7 +103,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 其他返回方式，交通方式为其他时此列需要有值 */ - @ColumnWidth(20) + @ColumnWidth(18) @ExcelProperty(value = "其他返回方式",order = 14) private String trafficTypeExplain; /** @@ -121,7 +121,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 备注（500字以内） */ - @ColumnWidth(35) + @ColumnWidth(30) @ExcelProperty(value = "备注（500字以内）",order = 17) private String remark; /** @@ -146,7 +146,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 管控措施（500字以内）【磐石】 */ - @ColumnWidth(35) + @ColumnWidth(30) @ExcelProperty(value = "管控措施（500字以内）",order = 21) private String controlMeasures; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java index 5b2bfbc0d9..77754cdefd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java @@ -25,7 +25,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 姓名 */ - @ColumnWidth(15) + @ColumnWidth(12) @ExcelProperty(value = "姓名", order = 1) private String name; @@ -88,7 +88,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 其他返回方式，交通方式为其他时此列需要有值 */ - @ColumnWidth(20) + @ColumnWidth(18) @ExcelProperty(value = "其他返回方式",order = 10) private String trafficTypeExplain; @@ -109,7 +109,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 离开日期 */ - @ColumnWidth(20) + @ColumnWidth(15) @ExcelProperty(value = "离开本地时间",order = 13) @JsonFormat(pattern = "yyyy-MM-dd") private String leaveDate; @@ -117,7 +117,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 备注信息 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "备注",order = 14) private String remark; } From 83aac2dc0ac1110a906bd90b05f53908447001dd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 10:17:17 +0800 Subject: [PATCH 459/621] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 10 ++++++---- .../src/main/resources/mapper/IcResiUserDao.xml | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) 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 4b7a485d71..e77dc98b27 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 @@ -63,7 +63,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; -import com.epmet.excel.DataSyncRecordDisabilityExcel; import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -1693,9 +1692,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl epidemicPreventionList(EpidemicPreventionFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null != staffInfo) { - formDTO.setAgencyId(staffInfo.getAgencyId()); + if(StringUtils.isBlank(formDTO.getAgencyId())){ + //没有指定查询某个组织时，默认查询当前用户所属组织及下级 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null != staffInfo) { + formDTO.setAgencyId(staffInfo.getAgencyId()); + } } List list = new ArrayList<>(); if (formDTO.getIsPage()){ 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 497d96a25b..9c48f39c2f 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 @@ -879,13 +879,13 @@ AND a.CUSTOMER_ID = #{customerId} - AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' )) + AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' )) AND ID = #{id} - AND GRID_ID = #{gridId} + AND GRID_ID = #{gridId} AND VILLAGE_ID = #{neighborId} From 35a3c587e6f2fe9ffc2588d549a6f26d8b6ad3b6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 10:25:19 +0800 Subject: [PATCH 460/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E7=A3=90?= =?UTF-8?q?=E7=9F=B37=E5=A4=A9=E6=97=85=E5=B1=85=E5=8F=B2=E8=B5=8B?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcTripReportRecordServiceImpl.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index bd627a273c..b663a0ea1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -215,6 +215,29 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcDangerAreaEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); + List areaList = icDangerAreaDao.selectList(wrapper); + Map areaMap = new HashMap<>(); + areaList.forEach(a -> { + if (StringUtils.isNotBlank(a.getDistrict())) { + areaMap.put(a.getDistrict(), a.getDangerLevel()); + } + }); + String[] str = formDTO.getSourceAddress().split("-"); + if (str.length < 3) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "‘来源地’信息填写格式错误", "‘来源地’信息填写格式错误"); + } + if (areaMap.containsKey(str[2])) { + formDTO.setSojournHistory(areaMap.get(str[2])); + } else { + formDTO.setSojournHistory("3");//无风险 + } + } }else {//其他客户 if(StringUtils.isEmpty(formDTO.getVaccineNum())||StringUtils.isEmpty(formDTO.getIsNatRecord())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "疫苗接种针次和48小时核算记录为必填", "疫苗接种针次和48小时核算记录为必填"); @@ -350,6 +373,29 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcDangerAreaEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(IcDangerAreaEntity::getDelFlag, DelFlagEnum.NORMAL.value()); + List areaList = icDangerAreaDao.selectList(wrapper); + Map areaMap = new HashMap<>(); + areaList.forEach(a -> { + if (StringUtils.isNotBlank(a.getDistrict())) { + areaMap.put(a.getDistrict(), a.getDangerLevel()); + } + }); + String[] str = formDTO.getSourceAddress().split("-"); + if (str.length < 3) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "‘来源地’信息填写格式错误", "‘来源地’信息填写格式错误"); + } + if (areaMap.containsKey(str[2])) { + formDTO.setSojournHistory(areaMap.get(str[2])); + } else { + formDTO.setSojournHistory("3");//无风险 + } + } }else {//其他客户 if(StringUtils.isEmpty(formDTO.getVaccineNum())||StringUtils.isEmpty(formDTO.getIsNatRecord())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "疫苗接种针次和48小时核算记录为必填", "疫苗接种针次和48小时核算记录为必填"); From fc5d2680c8962aa05daecc686a0f42bc4a823436 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 10:50:34 +0800 Subject: [PATCH 461/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 54d6dedc26..7476636916 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -234,6 +234,8 @@ public class IcTripReportFormDTO implements Serializable { /** * 上报时间【磐石】 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date reportingTime; /** * 管控措施【磐石】 From 188816c1d55043fdcb989806a64ebf8c8e2a47d8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 11:06:40 +0800 Subject: [PATCH 462/621] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcDangerAreaServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java index 0c56f212f7..ab3cd225a4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -92,7 +93,8 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl result = new PageData<>(); LambdaQueryWrapper qr = new LambdaQueryWrapper<>(); qr.like(StringUtils.isNotBlank(formDTO.getName()),IcDangerAreaEntity::getAllName,formDTO.getName()) - .eq(StringUtils.isNotBlank(formDTO.getDangerLevel()),IcDangerAreaEntity::getDangerLevel,formDTO.getDangerLevel()); + .eq(StringUtils.isNotBlank(formDTO.getDangerLevel()),IcDangerAreaEntity::getDangerLevel,formDTO.getDangerLevel()) + .orderByDesc(BaseEpmetEntity::getCreatedTime); if (formDTO.getIsPage()){ PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectList(qr)); result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); From d4d9bd6f3a81b676fb09d09e7a54c0cfc3cdf4a2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 11:08:42 +0800 Subject: [PATCH 463/621] =?UTF-8?q?/heart/icpartyunit/list=20=E8=81=94?= =?UTF-8?q?=E5=BB=BA=E5=8D=95=E4=BD=8D=E5=88=97=E8=A1=A8=E6=9C=AC=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=8F=8A=E4=B8=8B=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/PartyUnitFormDTO.java | 5 +++ .../controller/IcPartyUnitController.java | 18 +++++++---- .../java/com/epmet/dao/IcPartyUnitDao.java | 8 +++++ .../service/impl/IcPartyUnitServiceImpl.java | 11 +++++-- .../main/resources/mapper/IcPartyUnitDao.xml | 31 +++++++++++++++++++ 5 files changed, 64 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java index cf7841d93e..ec4a1751dd 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java @@ -24,4 +24,9 @@ public class PartyUnitFormDTO implements Serializable { private String contactMobile; private Integer pageNo; private Integer pageSize; + + /** + * 工作端当前登录人员 + */ + private String currentStaffId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 95093177cb..8a0ba036ff 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -3,6 +3,7 @@ package com.epmet.controller; import com.epmet.commons.rocketmq.messages.ServerSatisfactionCalFormDTO; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; @@ -16,10 +17,6 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcPartyUnitDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.PartyActivityFormDTO; -import com.epmet.dto.form.PartyUnitFormDTO; -import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.*; @@ -37,12 +34,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -70,9 +65,20 @@ public class IcPartyUnitController { private Path IC_PARTY_UNIT_UPLOAD_DIR; + /** + * 联建单位-列表查询 + * 本组织及下级数据 + * @param tokenDto + * @param formDTO + * @return + */ @PostMapping("list") public Result> search(@LoginUser TokenDto tokenDto, @RequestBody PartyUnitFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); + //工作端调用的话，赋值当前登录用户id + if(AppClientConstant.APP_GOV.equals(tokenDto.getApp())){ + formDTO.setCurrentStaffId(tokenDto.getUserId()); + } PageData page = icPartyUnitService.search(formDTO); return new Result>().ok(page); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java index 0c02e737b7..e0cb649327 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.dto.form.PartyUnitFormDTO; import com.epmet.dto.form.PartyUnitListbriefFormDTO; import com.epmet.dto.result.PartyTypepercentResultDTO; import com.epmet.dto.result.PartyUnitDistributionResultDTO; @@ -116,4 +117,11 @@ public interface IcPartyUnitDao extends BaseDao { @Param("customerId") String customerId); List selectByIds(@Param("partyUnitIds") List partyUnitIds); + + /** + * 联建单位-分页列表查询 + * @param formDTO + * @return + */ + List pageList(PartyUnitFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 304705ac2d..71711ea98e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -77,7 +77,6 @@ import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; @@ -119,7 +118,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl search(PartyUnitFormDTO formDTO) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + /*LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId()); wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName()); wrapper.like(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter()); @@ -127,7 +126,13 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); + List list = baseDao.selectList(wrapper);*/ + //本组织及下级 + if(StringUtils.isNotBlank(formDTO.getCurrentStaffId())&&StringUtils.isBlank(formDTO.getAgencyId())){ + CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getCurrentStaffId()); + formDTO.setAgencyId(staffInfo.getAgencyId()); + } + List list = baseDao.pageList(formDTO); PageInfo pageInfo = new PageInfo<>(list); List dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class); Result> unitTypeMap = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml index c1800190cb..e57c6d2419 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml @@ -193,4 +193,35 @@ ) + + \ No newline at end of file From c96b063dd7541fce9d68e9733d94b2e8a51614e3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 11:11:17 +0800 Subject: [PATCH 464/621] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.26__alter_dict.sql | 35 +++++++++++++++++++ .../V0.0.81__alter_ic_trip_report.sql | 19 ++++++++++ 2 files changed, 54 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql new file mode 100644 index 0000000000..f01ae19551 --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql @@ -0,0 +1,35 @@ + +-- 相成的 +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017193115787265', 'dangerAreaLevel', '风险地区级别', '', 0, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:42:39', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:42:39'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017335055228929', 1587017193115787265, '低风险', '0', '0', '', 0, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:13', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:13'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017381859467265', 1587017193115787265, '中风险', '1', '0', '', 1, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:24', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:24'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017428642734082', 1587017193115787265, '高风险', '2', '0', '', 2, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:35'); + + + + + +-- 字典表新增数据【自己的】 +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000001', 'traffic_type', '交通方式', '交通方式【行程上报】', '36', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000002', 'sojourn_history', '7天内旅居史情况', '7天内旅居史情况【行程上报】', '37', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000003', 'isolate_type', '隔离状态', '隔离状态【行程上报】', '38', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000004', 'trip_data_type', '行程记录类型', '行程记录类型【行程上报】', '39', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); + + +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000001', '2100000000000000001', '飞机', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000002', '2100000000000000001', '动车', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000003', '2100000000000000001', '火车', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000004', '2100000000000000001', '自驾', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000005', '2100000000000000001', '其他', '5', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000001', '2100000000000000002', '高风险', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000002', '2100000000000000002', '中风险', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000003', '2100000000000000002', '低风险', '0', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000004', '2100000000000000002', '无风险', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000001', '2100000000000000003', '集中隔离', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000002', '2100000000000000003', '居家隔离', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000003', '2100000000000000003', '居家健康检测', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000004', '2100000000000000003', '不需要隔离', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000001', '2100000000000000004', '省内', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000002', '2100000000000000004', '省外', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000003', '2100000000000000004', '市内', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000004', '2100000000000000004', '县内', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql new file mode 100644 index 0000000000..8d7d62ce97 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql @@ -0,0 +1,19 @@ +ALTER TABLE `ic_trip_report_record` +ADD COLUMN `traffic_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交通方式，来源字典表(traffic_type)' AFTER `UPDATED_TIME`, +ADD COLUMN `traffic_type_explain` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其他返回方式，交通方式为其他时此列需要有值' AFTER `traffic_type`, +ADD COLUMN `source_detail_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源地详细信息(source_address字段的说明)' AFTER `traffic_type_explain`, +ADD COLUMN `vaccine_num` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '疫苗接种针次 (0针 1针 2针 3针)【小寨子】' AFTER `source_detail_address`, +ADD COLUMN `is_nat_record` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否有48小时核算记录 0:否 1:是 【小寨子】' AFTER `vaccine_num`, +ADD COLUMN `registered_residence` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '户籍地 【磐石】' AFTER `is_nat_record`, +ADD COLUMN `age` int(11) NULL DEFAULT NULL COMMENT '年龄【磐石】' AFTER `registered_residence`, +ADD COLUMN `describe_content` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来曹事由【磐石】' AFTER `age`, +ADD COLUMN `nat_outcome` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '48小时核算检查结果(0:阴性 1:阳性)【磐石】' AFTER `describe_content`, +ADD COLUMN `sojourn_history` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '7天内旅居史情况，字典表(sojourn_history)【磐石】' AFTER `nat_outcome`, +ADD COLUMN `isolate_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '隔离状态，字典表(isolate_type)【磐石】' AFTER `sojourn_history`, +ADD COLUMN `is_arrive_check` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否落实\"落地检\" 0:否 1:是【磐石】' AFTER `isolate_type`, +ADD COLUMN `is_arrive` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否达到曹县 0:否 1:是 【磐石】' AFTER `is_arrive_check`, +ADD COLUMN `reporting_time` date NULL DEFAULT NULL COMMENT '上报时间【磐石】' AFTER `is_arrive`, +ADD COLUMN `control_measures` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '管控措施【磐石】' AFTER `reporting_time`, +ADD COLUMN `trip_data_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行程记录类型，字典表(trip_data_type)【磐石】' AFTER `control_measures`; + + From 9b11a0123e04cc305399010bc2b10e29007ece40 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 11:18:06 +0800 Subject: [PATCH 465/621] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcTripReportRecordServiceImpl.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index b663a0ea1f..cee2d141ab 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -607,6 +607,16 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); + //7天内旅居史情况 + Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); + //隔离状态 + Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + //行程记录类型 + Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); + for (IcTripReportRecordDTO dto : list) { //默认未加入 dto.setHeSuanCheck(false); @@ -618,6 +628,16 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 11:22:32 +0800 Subject: [PATCH 466/621] =?UTF-8?q?/icpartyactivity/search=E8=81=94?= =?UTF-8?q?=E5=BB=BA=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PartyActivityFormDTO.java | 1 + .../controller/IcPartyActivityController.java | 8 ++++- .../resources/mapper/IcPartyActivityDao.xml | 36 +++++++++++-------- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java index 0481b07fc4..fb67921cd8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java @@ -29,4 +29,5 @@ public class PartyActivityFormDTO implements Serializable { private String serviceMatter; private Integer pageNo; private Integer pageSize; + private String customerId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 2ff977b4db..67b3c5da5a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -71,8 +71,14 @@ public class IcPartyActivityController { @Resource private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + /** + * 联建活动-列表 + * @param formDTO + * @return + */ @PostMapping("search") - public Result> page(@RequestBody PartyActivityFormDTO formDTO){ + public Result> page(@LoginUser TokenDto tokenDto,@RequestBody PartyActivityFormDTO formDTO){ + formDTO.setCustomerId(formDTO.getCustomerId()); PageData page = icPartyActivityService.search(formDTO); return new Result>().ok(page); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 0c5c86d30d..bf3af69b84 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -66,37 +66,43 @@ ic_party_activity a INNER JOIN ( SELECT - ACTIVITY_ID, - GROUP_CONCAT( UNIT_ID ) AS unitId + ur.ACTIVITY_ID, + GROUP_CONCAT( ur.UNIT_ID ) AS unitId FROM - ic_activity_unit_relation + ic_activity_unit_relation ur WHERE - DEL_FLAG = '0' - AND AGENCY_ID = #{agencyId} + ur.DEL_FLAG = '0' + + AND (ur.AGENCY_ID = #{agencyId} or ur.PIDS like concat('%',#{agencyId},'%')) + - AND UNIT_ID = #{unitId} + AND ur.UNIT_ID = #{unitId} GROUP BY - ACTIVITY_ID + ur.ACTIVITY_ID ) b ON a.ID = b.ACTIVITY_ID INNER JOIN ( SELECT - ACTIVITY_ID, - GROUP_CONCAT( SERVICE_MATTER ) AS serviceMatter + sr.ACTIVITY_ID, + GROUP_CONCAT( sr.SERVICE_MATTER ) AS serviceMatter FROM - ic_activity_service_relation + ic_activity_service_relation sr WHERE - DEL_FLAG = '0' - AND AGENCY_ID = #{agencyId} + sr.DEL_FLAG = '0' + + AND (sr.AGENCY_ID = #{agencyId} or sr.PIDS like concat('%',#{agencyId},'%')) + - AND SERVICE_MATTER = #{serviceMatter} + AND sr.SERVICE_MATTER = #{serviceMatter} GROUP BY - ACTIVITY_ID + sr.ACTIVITY_ID ) c ON a.ID = c.ACTIVITY_ID WHERE a.DEL_FLAG = '0' - AND a.AGENCY_ID = #{agencyId} + + AND (a.AGENCY_ID = #{agencyId} or a.PIDS like concat('%',#{agencyId},'%')) + AND a.GRID_ID = #{gridId} From 9bef7ca1460578d22cbab50d1235bdb6f7233017 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 12:30:54 +0800 Subject: [PATCH 467/621] ZUZHIid --- .../src/main/java/com/epmet/dto/IcPartyActivityDTO.java | 6 +++++- .../src/main/java/com/epmet/dto/IcPartyUnitDTO.java | 1 + .../com/epmet/service/impl/IcPartyActivityServiceImpl.java | 3 ++- .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java | 2 ++ .../src/main/resources/mapper/IcPartyActivityDao.xml | 3 ++- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index b0367639ed..0115706902 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -55,8 +55,12 @@ public class IcPartyActivityDTO implements Serializable { /** * 组织ID */ - @JsonIgnore + // @JsonIgnore private String agencyId; + /** + * 组织名称 + */ + private String agencyName; private String gridId; private String gridName; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java index 5935d564de..1aed3be19f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java @@ -51,6 +51,7 @@ public class IcPartyUnitDTO implements Serializable { * 组织ID */ private String agencyId; + private String agencyName; /** * diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index c645ffbc55..e7b3fbc4e5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -128,7 +128,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl(dtoList, pageInfo.getTotal()); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index bf3af69b84..b02c91bfd5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -61,7 +61,8 @@ ADDRESS, LONGITUDE, LATITUDE, - RESULT + RESULT, + a.AGENCY_ID FROM ic_party_activity a INNER JOIN ( From 89cd99e66dd9c8788749df8668da7c86ff693380 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 13:27:58 +0800 Subject: [PATCH 468/621] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/handler/IcDangerAreaExcelImportListener.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index 5e09a8d102..0227d89e1b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -79,6 +79,15 @@ public class IcDangerAreaExcelImportListener implements ReadListener Date: Thu, 3 Nov 2022 13:36:02 +0800 Subject: [PATCH 469/621] =?UTF-8?q?=E6=88=B7=E7=B1=8D=E5=9C=B0=E5=8F=AA?= =?UTF-8?q?=E8=A6=81=E7=A3=90=E7=9F=B3=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcTripReportFormDTO.java | 1 - .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 7476636916..6be4201a24 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -201,7 +201,6 @@ public class IcTripReportFormDTO implements Serializable { /** * 户籍地 【磐石】 */ - @NotBlank(message = "户籍地不能为空", groups = {ResiUserRequired.class}) private String registeredResidence; /** * 年龄【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index cee2d141ab..87d6efeb14 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -212,6 +212,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 13:42:25 +0800 Subject: [PATCH 470/621] =?UTF-8?q?=E8=B0=83=E4=BA=86=E8=B0=83=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E5=8A=A0=E4=BA=86=E4=B8=AA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/IcDangerAreaImportExcel.java | 10 +++++++--- .../IcDangerAreaExcelImportListener.java | 1 + .../excel/ic_danger_area_template.xlsx | Bin 9140 -> 9172 bytes 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java index 7358f3ee39..afee6099db 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java @@ -1,6 +1,7 @@ package com.epmet.excel; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -22,13 +23,16 @@ public class IcDangerAreaImportExcel { @Data public static class IcDangerAreaError{ - @ExcelProperty("风险地区") + @ColumnWidth(30) + @ExcelProperty(value = "风险地区") private String name; - @ExcelProperty("风险等级") + @ColumnWidth(20) + @ExcelProperty(value = "风险等级") private String dangerLevel; - @ExcelProperty("错误信息") + @ColumnWidth(40) + @ExcelProperty(value = "错误信息") private String errorInfo; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index 0227d89e1b..9ab01d6a9d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -105,6 +105,7 @@ public class IcDangerAreaExcelImportListener implements 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 From c2f14b032a42b7c995387d513b14f837eedc30e7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 14:00:14 +0800 Subject: [PATCH 471/621] =?UTF-8?q?=E4=B8=8D=E7=94=A8=E6=89=93=E5=8D=B0err?= =?UTF-8?q?or,=20=E5=B7=B2=E7=BB=8F=E5=9C=A8excel=E9=87=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/handler/IcDangerAreaExcelImportListener.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index 9ab01d6a9d..e8258c17ff 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -12,10 +12,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dao.IcDangerAreaDao; import com.epmet.entity.IcDangerAreaEntity; -import com.epmet.entity.IcNatEntity; -import com.epmet.enums.DangerLevelEnum; import com.epmet.excel.IcDangerAreaImportExcel; -import com.epmet.excel.data.IcNatImportExcelData; import com.epmet.service.IcDangerAreaService; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -99,9 +96,9 @@ public class IcDangerAreaExcelImportListener implements ReadListener Date: Thu, 3 Nov 2022 14:01:10 +0800 Subject: [PATCH 472/621] =?UTF-8?q?=E5=92=B1=E6=98=AF=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E6=B5=8B=E7=A3=90=E7=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 87d6efeb14..b8d994c851 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -211,7 +211,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 14:11:43 +0800 Subject: [PATCH 473/621] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcDangerAreaDao.java | 5 ++++- .../com/epmet/service/impl/IcDangerAreaServiceImpl.java | 4 ++++ .../src/main/resources/mapper/IcDangerAreaDao.xml | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java index 40e8775635..e009c7e52e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcDangerAreaEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 疫情风险地区 @@ -12,5 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcDangerAreaDao extends BaseDao { - + + Integer delAllDangerArea(@Param("customerId")String customerId); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java index ab3cd225a4..b330196a1b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcDangerAreaServiceImpl.java @@ -178,6 +178,10 @@ public class IcDangerAreaServiceImpl extends BaseServiceImpl + + update ic_danger_area + set del_flag = 1, + updated_time = now() + where customer_id = #{customerId} + limit 1000 + \ No newline at end of file From 0bb12740584c154e2146f2450e9ed78e870b05f6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 3 Nov 2022 14:29:42 +0800 Subject: [PATCH 474/621] =?UTF-8?q?=E5=85=A8=E5=88=A0=20=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/handler/IcDangerAreaExcelImportListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java index e8258c17ff..03dcc4e1ae 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcDangerAreaExcelImportListener.java @@ -52,12 +52,12 @@ public class IcDangerAreaExcelImportListener implements ReadListener qw = new LambdaQueryWrapper<>(); + /*LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); qw.eq(IcDangerAreaEntity::getAllName,data.getAllName()); IcDangerAreaEntity icDangerAreaEntity = icDangerAreaDao.selectOne(qw); if (null != icDangerAreaEntity){ throw new EpmetException(EpmetErrorCode.DANGER_AREA_ERROR.getCode()); - } + }*/ ValidatorUtils.validateEntity(data); IcDangerAreaEntity entity = ConvertUtils.sourceToTarget(data, IcDangerAreaEntity.class); String[] split = data.getAllName().split("-"); From afa5738b9b397e9e9fb2896b4dd82d71c5a94024 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 14:31:51 +0800 Subject: [PATCH 475/621] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcTripReportFormDTO.java | 15 ++++++++-- .../IcTripReportRecordController.java | 20 +++++++++++++ .../impl/IcTripReportRecordServiceImpl.java | 28 ------------------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 6be4201a24..b088332acf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -33,6 +33,10 @@ public class IcTripReportFormDTO implements Serializable { public interface PcUpdateRequired extends CustomerClientShowGroup { } + public interface PsAdd extends CustomerClientShowGroup { + } + public interface XzzAdd extends CustomerClientShowGroup { + } @NotBlank(message = "主键不能为空", groups = {PcUpdateRequired.class}) private String id; @@ -179,7 +183,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 交通方式，来源字典表(traffic_type) */ - @NotBlank(message = "返回方式不能为空", groups = {ResiUserRequired.class}) + @NotBlank(message = "返回方式不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) private String trafficType; /** * 其他返回方式，交通方式为其他时此列需要有值 @@ -188,19 +192,22 @@ public class IcTripReportFormDTO implements Serializable { /** * 来源地详细信息 source_address字段的说明 */ - @NotBlank(message = "来自地区不能为空", groups = {ResiUserRequired.class}) + @NotBlank(message = "来自地区不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) private String sourceDetailAddress; /** * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ + @NotBlank(message = "疫苗接种针次不能为空", groups = {XzzAdd.class}) private String vaccineNum; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ + @NotBlank(message = "48小时核算记录不能为空", groups = {XzzAdd.class}) private String isNatRecord; /** * 户籍地 【磐石】 */ + @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; /** * 年龄【磐石】 @@ -209,10 +216,12 @@ public class IcTripReportFormDTO implements Serializable { /** * 来曹事由【磐石】 */ - private String describe; + @NotBlank(message = "来曹事由不能为空", groups = {PsAdd.class}) + private String describeContent; /** * 48小时核算检查结果(阴性 阳性)【磐石】 */ + @NotBlank(message = "48小时核算检测不能为空", groups = {PsAdd.class}) private String natOutcome; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 5444efca73..dece4ce2c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -116,6 +116,16 @@ public class IcTripReportRecordController implements ResultDataResolver { if(IcResiUserConstant.USER_TYPE_IC_RESI.equals(formDTO.getUserType())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.IcResiInternalGroup.class); } + //磐石客户 + if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); + }else { + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); + } + //校验参数 + if ("5".equals(formDTO.getTrafficType()) && StringUtils.isBlank(formDTO.getTrafficTypeExplain())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "返回方式为其他时，“其他返回方式”为必填", "返回方式为其他时，“其他返回方式”为必填"); + } String id=icTripReportRecordService.save(formDTO); return new Result().ok(id); } @@ -170,6 +180,16 @@ public class IcTripReportRecordController implements ResultDataResolver { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"请输入正确的证件号","请输入正确的证件号"); } } + //磐石客户 + if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); + }else { + ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); + } + //校验参数 + if ("5".equals(formDTO.getTrafficType()) && StringUtils.isBlank(formDTO.getTrafficTypeExplain())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "返回方式为其他时，“其他返回方式”为必填", "返回方式为其他时，“其他返回方式”为必填"); + } return new Result().ok(icTripReportRecordService.resiSave(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index b8d994c851..9b27816145 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -206,19 +206,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 14:43:55 +0800 Subject: [PATCH 476/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=B9=B4=E9=BE=84=E5=AD=97=E6=AE=B5=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 5 ----- .../epmet/dto/form/IcTripReportFormDTO.java | 4 ---- .../entity/IcTripReportRecordEntity.java | 4 ---- .../excel/IcPsTripReportRecordExcel.java | 4 ---- .../IcPsTripReportRecordExportExcel.java | 16 ++++------------ .../V0.0.81__alter_ic_trip_report.sql | 3 +++ .../excel/ps_trip_report_import_template.xlsx | Bin 11236 -> 11192 bytes 7 files changed, 7 insertions(+), 29 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index f40344f6cb..79824e838a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -279,11 +279,6 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String registeredResidence; - /** - * 年龄【磐石】 - */ - @ExcelIgnore - private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index b088332acf..1f2cf09949 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -209,10 +209,6 @@ public class IcTripReportFormDTO implements Serializable { */ @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; - /** - * 年龄【磐石】 - */ - private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index c261c5acd9..497e0707c6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -139,10 +139,6 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 户籍地 【磐石】 */ private String registeredResidence; - /** - * 年龄【磐石】 - */ - private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 04a8a16900..4410c61293 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -19,10 +19,6 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "姓名不能为空") private String name; - @ExcelProperty("年龄") - //@NotNull(message = "年龄不能为空") - private Integer age; - @ExcelProperty("证件号") @NotBlank(message = "证件号不能为空") private String idCard; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 150dfd684d..73af0b78d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -6,10 +6,8 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; /** @@ -25,31 +23,25 @@ public class IcPsTripReportRecordExportExcel implements Serializable { * 姓名 */ @ColumnWidth(12) - @ExcelProperty(value = "姓名", order = 1) + @ExcelProperty(value = "姓名") private String name; - /** - * 年龄【磐石】 - */ - @ColumnWidth(10) - @ExcelProperty(value = "年龄",order = 2) - private int age; /** * 证件号 */ @ColumnWidth(20) - @ExcelProperty(value = "证件号",order = 3) + @ExcelProperty(value = "证件号") private String idCard; /** * 户籍地 【磐石】 */ @ColumnWidth(28) - @ExcelProperty(value = "户籍地（省市县区）",order = 4) + @ExcelProperty(value = "户籍地（省市县区）") private String registeredResidence; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号",order = 5) + @ExcelProperty(value = "手机号") private String mobile; /** * 来自地区（格式：省-市-区-街道-社区） diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql index 8d7d62ce97..847f53f326 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql @@ -17,3 +17,6 @@ ADD COLUMN `control_measures` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb ADD COLUMN `trip_data_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行程记录类型，字典表(trip_data_type)【磐石】' AFTER `control_measures`; +ALTER TABLE `ic_trip_report_record` +DROP COLUMN `age`; + diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 5566dc466db856edb40bf99499b2940f50295831..186dee0bf753fba81f65cebf36e84a3ef9374e85 100644 GIT binary patch delta 5091 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 delta 5192 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 From 24f1d574e39d9247a0b8388b67f6fd6a7fd140f3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:05:07 +0800 Subject: [PATCH 477/621] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=A0=B8=E9=85=B8?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E3=80=81=E9=87=87=E6=A0=B7=E6=97=B6=E9=97=B4=E3=80=82=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=8B=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=BF=98=E6=9C=89=E5=AF=BC=E5=87=BAsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcNatCompareRecordDTO.java | 8 +++ .../yqfk/IcNatCompareRecordPageFormDTO.java | 4 ++ .../entity/IcNatCompareRecordEntity.java | 10 ++- ...IcNatCompareRecordExcelImportListener.java | 66 +++++++++++++------ .../mapper/IcNatCompareRecordDao.xml | 4 ++ 5 files changed, 72 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java index b422af6b61..be20e5fa68 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java @@ -82,6 +82,14 @@ public class IcNatCompareRecordDTO implements Serializable { @ExcelIgnore private String icResiUserId; + /*** + * 采样时间 + */ + @ColumnWidth(30) + @ExcelProperty("最近一次采样时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date latestCyTime; + /** * 最近一次核酸时间:接口填入 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java index c5f6ddd53e..ac323d4b8f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java @@ -38,5 +38,9 @@ public class IcNatCompareRecordPageFormDTO extends PageFormDTO { private String customerId; private String userId; private String agencyId; + /** + * 采样日期：yyyyMMdd + */ + private String cyDate; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java index 0110312ed9..75b18618fe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java @@ -45,7 +45,10 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity { * 是否客户下居民，ic_resi_user.id */ private String icResiUserId; - + /** + * 最近一次采样时间:接口填入 + */ + private Date latestCyTime; /** * 最近一次核酸时间:接口填入 */ @@ -68,4 +71,9 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity { * 最新一次导入时间，对应ic_nat_compare_rec_relation.IMPORT_TIME */ private Date latestImportTime; + + /** + * 备注；系统内部使用，方便看看错误 + */ + private String internalRemark; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java index 03c01a2f37..44ed565c6e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java @@ -5,6 +5,7 @@ import com.alibaba.excel.read.listener.ReadListener; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDetailDTO; import com.epmet.commons.tools.enums.EnvEnum; @@ -84,27 +85,54 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener AND (r.AGENCY_ID = #{agencyId} or r.pids like concat('%',#{agencyId},'%') ) + + and DATE_FORMAT(c.LATEST_CY_TIME,'%Y%m%d') = #{cyDate} + ORDER BY r.IMPORT_TIME DESC,r.AGENCY_ID desc From dc49dcef0051b6cb93681c8cb6d7d335ffb70ede Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:06:07 +0800 Subject: [PATCH 478/621] =?UTF-8?q?=E7=AD=89=E4=BC=9A=E5=9B=9E=E6=9D=A5?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=84=9A=E6=9C=AC=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.77__data_compare_d_c - 副本.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql new file mode 100644 index 0000000000..f19afc8b27 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql @@ -0,0 +1,2 @@ +alter table ic_nat_compare_record add COLUMN `LATEST_CY_TIME` datetime DEFAULT NULL COMMENT '最近一次采样时间:接口填入' after IC_RESI_USER_ID; +ALTER TABLE ic_nat_compare_record ADD COLUMN INTERNAL_REMARK VARCHAR ( 128 ) DEFAULT '' COMMENT '备注；系统内部使用，方便看看错误' AFTER LATEST_IMPORT_TIME; \ No newline at end of file From b9834e88ee4bc69c51315f220e14ff2d98299b70 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:09:21 +0800 Subject: [PATCH 479/621] user80 --- ...nshi.sql => V0.0.80__ic_epidemic_special_attention_panshi.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.79__ic_epidemic_special_attention_panshi.sql => V0.0.80__ic_epidemic_special_attention_panshi.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__ic_epidemic_special_attention_panshi.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.79__ic_epidemic_special_attention_panshi.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__ic_epidemic_special_attention_panshi.sql From 24320e97ebf4b36ed5473af61abcd61633bbfee5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:12:54 +0800 Subject: [PATCH 480/621] 80 --- ....77__data_compare_d_c - 副本.sql => V0.0.80__natcompare.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.77__data_compare_d_c - 副本.sql => V0.0.80__natcompare.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__natcompare.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.77__data_compare_d_c - 副本.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__natcompare.sql From 5f6d9fdabda9955ff316b19a7c5f113eb63704f0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 3 Nov 2022 15:25:21 +0800 Subject: [PATCH 481/621] =?UTF-8?q?81,82,=E7=94=9F=E4=BA=A780=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=8F=91=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nshi.sql => V0.0.81__ic_epidemic_special_attention_panshi.sql} | 0 ...alter_ic_trip_report.sql => V0.0.82__alter_ic_trip_report.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.80__ic_epidemic_special_attention_panshi.sql => V0.0.81__ic_epidemic_special_attention_panshi.sql} (100%) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.81__alter_ic_trip_report.sql => V0.0.82__alter_ic_trip_report.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__ic_epidemic_special_attention_panshi.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__ic_epidemic_special_attention_panshi.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__ic_epidemic_special_attention_panshi.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__alter_ic_trip_report.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__alter_ic_trip_report.sql From 2d4caaef63813345c1da7eadaa078acb27efc3e6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 15:52:25 +0800 Subject: [PATCH 482/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E9=98=B4=E9=98=B3?= =?UTF-8?q?=E6=80=A7=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 9b27816145..5db0b44648 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -164,7 +164,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 3 Nov 2022 17:16:02 +0800 Subject: [PATCH 483/621] id --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 212ab88ca6..759764368f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -90,6 +90,9 @@ (case when nat_outcome = '1' then '阳性' when nat_outcome = '0' then '阴性' else '阴性' end) as natOutComeName FROM ic_trip_report_record WHERE DEL_FLAG = '0' + + AND id = #{id} + AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') From ca3842b0022ea568da8a282a57116a96873267ff Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 17:22:19 +0800 Subject: [PATCH 484/621] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.26__alter_dict.sql | 5 --- .../commons/tools/enums/DictTypeEnum.java | 1 - .../impl/IcTripReportRecordServiceImpl.java | 34 +++++++++--------- .../excel/ps_trip_report_import_template.xlsx | Bin 11192 -> 11209 bytes 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql index f01ae19551..10b2bf3ea5 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql @@ -12,7 +12,6 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` -- 字典表新增数据【自己的】 INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000001', 'traffic_type', '交通方式', '交通方式【行程上报】', '36', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000002', 'sojourn_history', '7天内旅居史情况', '7天内旅居史情况【行程上报】', '37', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000003', 'isolate_type', '隔离状态', '隔离状态【行程上报】', '38', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000004', 'trip_data_type', '行程记录类型', '行程记录类型【行程上报】', '39', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); @@ -25,10 +24,6 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000002', '2100000000000000002', '中风险', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000003', '2100000000000000002', '低风险', '0', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000004', '2100000000000000002', '无风险', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000001', '2100000000000000003', '集中隔离', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000002', '2100000000000000003', '居家隔离', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000003', '2100000000000000003', '居家健康检测', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000004', '2100000000000000003', '不需要隔离', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000001', '2100000000000000004', '省内', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000002', '2100000000000000004', '省外', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000003', '2100000000000000004', '市内', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index d38442798e..a07838684d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -33,7 +33,6 @@ public enum DictTypeEnum { DANGER_AREA_LEVEL_TYPE("dangerAreaLevel", "风险地区等级", 34), TRAFFIC_TYPE("traffic_type", "交通方式", 36), SOJOURN_HISTORY("sojourn_history", "7天内旅居史情况", 37), - ISOLATE_TYPE("isolate_type", "隔离状态", 38), TRIP_DATA_TYPE("trip_data_type", "行程记录类型", 39), ; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 5db0b44648..a5e811f000 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -130,9 +130,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -166,7 +166,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -433,7 +433,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); //7天内旅居史情况 Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); @@ -614,7 +615,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map iMap = new HashMap<>(); + iMap.put("集中隔离", "0");iMap.put("居家隔离", "1");iMap.put("居家健康监测", "2");iMap.put("已出隔离期", "3");iMap.put("不需要隔离", "4"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -760,8 +761,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); // 隔离状态字典 - Result> isolateMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map isolateMap = isolateMapRes.success() && CollectionUtils.isNotEmpty(isolateMapRes.getData()) ? isolateMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + Map isolateMap = new HashMap<>(); + isolateMap.put("0", "集中隔离");isolateMap.put("1", "居家隔离");isolateMap.put("2", "居家健康监测");isolateMap.put("3", "已出隔离期");isolateMap.put("4", "不需要隔离"); + if (CollectionUtils.isNotEmpty(result.getList())){ result.getList().forEach(l -> { l.setIsolateTypeName(isolateMap.get(l.getIsolateType())); diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 186dee0bf753fba81f65cebf36e84a3ef9374e85..88ee9650a459b7e69e8589f4117a4da20d13ce2f 100644 GIT binary patch delta 2843 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 From 39e1436ca4383418a041b1d1f96e20b61e29b1bc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 17:23:49 +0800 Subject: [PATCH 485/621] . --- .../excel/ps_trip_report_import_template.xlsx | Bin 11209 -> 11193 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 88ee9650a459b7e69e8589f4117a4da20d13ce2f..c5a91432ad7f868b9f7287e8fa95804b4746186e 100644 GIT binary patch delta 2487 zcmV;o2}t(ISGiZP*%uCq*(4h@2><{?D*yl(0F&D)8h^xEZExGw75+Y8|AFO#BEdLG zB;_~Gc45nwCEJp1$<{tIGGz;)L{*~WWS^P>>3|IjT43n1H5dkT%hna!Fl_6J7Tx|# z<;4G@&n05krw^~w>9(CMuYJ*T z`hM8S&~a@a^B8z<6x_{MLQ1k1n!N{$yb2*y0SA6?^({Y`) z@0`K_s`69M>owc93$e=!6F=)ri5r4U{C&@Rz&fjz6$DC*4#3d`(?ZIo9wlD^B<9++R}-GlvK3q6ZF=~!0Z?5O&Z46#8Hm*@)-4MnOrG;ZHM)akGzL?XEc}GKF2czN2M>BJC zw}v}{*0}Q4!AgltI?YBp)>zP%-Eb=v=6@er=iX#DeDEc~P*W#>FbF4*#Dl(c3)AU5 zO4tpbfqn}GJWTW?PV{2VoIA{P9xCjHPvBN2;K8HghIgRn7U%ZAj;IT5I1zs4Z93rb zr%wc6@fJ4Z5vWgu;KD6zXz(y(H{1j(x9Nb#p^*xsxlL%qQM70-CxHMt@m9n3%YSey z3wF&d+qc(Ohu)=vX9Y$d4Q%%0(JeLuwjUO86?a2ygN(kx_~2qt5ZPnm;d)^;|B#Ik zQ8pt=G1x&_qY^>32(nF(GC_6-QXxo{AiD(FBgj5MY6PhhiPibq*YGj=FrDb1+RQI^w;YRJIaibq*VGj>A;dnUycU05J{ zbSAoB)_n;@uxl-(q>ZAmDC|F$`W?bZ6Sv9Pj$2ec`$%A7SZmf+yY;(z1daaNO11Sixvg(c1GX?DPYiOC6GIh0TYdmnKM@3tWV zO%XT_fvILW5gWB8fK*sx<4A?|%?BYK!K?)iZb<}(081VdHwiIQia3jLt1W_T6QoR# z9fDK{QYFYPLG}o;Pmmfx>JgHx-h&V^QXwiVhQpY{eSAca20@wxIe#X|2|-#BVlX?W z{0#5h&d-~y1rmhB(WMAkNt{TKZGw~uvO|yxL8=7VCCDB@_6brWNIgW5r*n54L`Zmc zXKVYAAV&mg5Tr?vV}hIz1l1H~XCugyLzjhBjW9p&Im5G{`Y}@4-bEiP%tW>wqe)RF zC>;p+X3>IN=oIjSVt-V`$;badfn#uvqLkllqhQkU`aUbgute(d0CkPNSMvH%Wh*e8 z*FWvDGLh|u4?iC@E?%42(3K6-+9)a;hJ~yS8%L*c;W|-Q&LdQ=My#TQBFv)>8-|@Y z2E(p5?D~&cPP)F@LFwkgwbwW5TX#zbC-viM`R*Ovx}$3w`hUG2a^we%?ebf4oUzpIvn(*PNu(BZv zlOj|YXc-Et7#6bEIkX|SO|-F~yjfa>NRuK|8fY0xs~Hw@;n~ty5g?IPWc5gywlMl? zM4J?$+Ca-t8-H@|IfS7)G9hfb(~gKRDME#TmZ31580HX${5cV3uH4|Ua0h7+VN!$& z11&>gO~b-DW)5xGgeSBuPu12W+N22823m&NaQK=-7@mBIFjOz)%Pe%-2@xhms4&nn z6owPy9Kw)=O$eL5%vwa46rsXE%TU;+X>BqO%z9L_l7C;K%~+b^G(+1o#YdVHq1r&p zP+Q5ga6q0zTPh7P7N=?}5p7b0Y6C4pZ8+A?AuN@Lpr(BDN;9-=B20=_fx5Os(km%K1%HB;p+LO4nyo9HexQNu)ETD3+eDTW zp|U{BP*%%S8m5Am2D8PbQV{c|Gc{9ZXk`+WQiQ4lEkkvCrnQf#G%XbJXA4ZFBB%)8 z>^?)=BLbxe6$skx1fJq8f6I2exT4|~7ZF)*oBmf+opZY*UsY_^^)5GEyZ<0~MLat9 zE`O{2!G&K#;m$roJrLex;P!Cn4O3wFbyh=HnmR(mYUqXH^1{-h(lo7Rbe~v8Ustc5 z|6Ln@_)?7vb26!gsXNuQ2v7<1Z>(8HGfBNkDH=k+We)(5^_sz5D?&{aS5AWXC zbdieGWM;hn^mkV;zS71&|MTl_UTUwNe1Fa^uYdNJ>(BnHjh}w;?bjc_u_;%P?@Fiq z{9jk^{Ykri{!d)q*z8)S)soHb)r%+N51wl5@`sPL@t5zjU*l*0!{v?5^-#ACWplm$ z@%k?Tgfp@smG}zxvOsPd>W(_b(9Fzr23&-s_i7LdtY8!az!7 zFA1>xYxeN0i@n5kI(Q#Z$gwZYhT%7q;Sb*%1Y5*?&&Riv!R z4dyI+N&x@>U;+RD5dZ)H0000000000001?UAS*rrwv%5gJpp`^ohv2=;wS(B004FF Bs8|31 delta 2502 zcmV;%2|4z;SIJkf*%uB>+-6fn2><|8D*yl(0F%oq8h^xEZExdP75a@`~afsdN44-yZnneOJ0tqbxJ3>ec1Ir2!0+!XT7XHj; zX8JGoxwfwz-*cO!lF@vrou|)zdCoca`rKo$z5A%|Di58J-}46Rs$N)76=%@#&U%CM zb@lY5@_+pmRq+FRaAv#Sz*$!xJHGnv#<#z*0S)kTP<*>*}U%wSO1Y;>KDya=YhT`4jg_VBc>!uG0ye zGZ;Ws0&jTWbc3?vy6b8Mz>htz-|E;d)UPZ~{A@63;4qL`rk4HF?jcSPAWSG*Zr-u6^kSWzYR#?<}}jS65YzHNC5< z(|a3&&;#j%KMF!q}0tXso4}zMRsR3c4}x zXo&Q1G+g;;W?}Bua7Wl0SKc~YILMFXgr9kv4tV_O69HJdg$;QG>JuTjcncdEJPg?lH^J&{I^c0=WWs1}6B=1-KMc7bjKf45}5~N0uJ%a2L@lM;$9ERcOV6J0RtfrKL1wH{G2z7Y)DkWd869!8W&MY>?xBYz1+ur%xK$`-q!dVm35xl%Bp$J~C zN+^PtYZ8j!<-Lf)60^k1rhnk&ecFvFIQc+ANqrnX&gv41;DiRJu%wwi%?>#*F*(62 z;cTN=R;z>>$* zO+w6+W6o02YMUTC1gQ{YmmpPw)CjUikbQz25Ts6!MvSDZ_b@_?On-<9i{U8Ya33EN zq)Ct#K~4yAN|1Jp7|hNYKf^n>^Ya#KfdnCSbU8*=QzsH+haeS#>=L9(kQzbu2(nL* z1A^2E(ufe`>D(QMF%q5K+1frL$T2~h1ZffEgdnE`L3xGQ*$DI7$YoJgBg)VF&geX> ze)vkqyBuJJnaH*iG=Htqgrx%k-zr&<3!MUfSc!+ zh60a#nMF=JCBmc#6$V<4!f;}oLm0BK31QQhS(^xxB7amEXgLboGOaDt zX@<5#gh>%94741Dq0BIcuuKwyBj_|?yF{22p~67RQCQWqQ2dy!Et7;GL!KtBN~B2< zDh;$8rGKGfGh0_C2buPyHncq=ONvlgpyep5Zdxe+%vP33Lhw%O29Fum9Yd=VX;Oqr z11(2ss6Wltl}SKQ5V%1Xj%S8;Oms;RstdFnb)jlDTURFkFs6rMi|CRfR2OJD>O%2v zwysS2F)gh!v=bsricndg zvvpXXSI-_)Whscs5R2FDC%4(ZR(^T-%V79nS3S!=Lre^94twN$wicoc+<*07o zvGUGHkkwFeKvSH%8>cU2n+x=2OpGBaL({C~SwFTT*mKmGHYuU=}epM1(LZ+`NZ>reix zjh}w@^_L&MwJFz-?@Fiq{9mu$`;&J4{GYhIwb`{zt1X+|>laVPA3W9Ayd69$>w_f(FZJAfBUP~FTd2r|9Cq7+h>^{<0pR{fAOE!AN}&xzfgaM zxc>R|i}&8Vd=gQnixE~Ldr5%hU$;l+J?teeKJ~=sng#Zy*(mykGWvnfK*KHKz8BzI z%JB9AU#~iNwX(oIVC;Hcz<;n8Rmu0T8{d|}8vq&LV0tEq=(>$BAr6URl z2~6B(Q$+~?092E>Dm@$0{>|}80RRAC0ssIJ00000000000000007jD#D?S0nlTRx> Q0gRK4D<%f=C;$Ke0MTr;`v3p{ From 5360a09b924bf645463673ebde2a07c270e933bd Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 3 Nov 2022 17:28:50 +0800 Subject: [PATCH 486/621] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.12__edit_partymember.sql | 8 +++++++- .../resources/db/migration/V0.0.80__edit_partymember.sql | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql index b6e7cccd0c..cd551d050f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql @@ -1,4 +1,10 @@ ALTER TABLE `ic_party_member` ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, - ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; \ No newline at end of file + ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; + + +UPDATE ic_party_member +SET IS_QCJ = '0' +WHERE + IS_QCJ IS NULL; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql index f4986b14d1..0bf4647c5f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql @@ -6,3 +6,8 @@ ALTER TABLE `ic_party_member` alter table ic_user_change_record modify column TYPE varchar(64) NOT NULL COMMENT '操作类型【add:新增 category:类别 transfer:调动;logout注销；recovery_moveout恢复迁出；recovery_death恢复死亡】'; alter table ic_user_change_record modify column TYPE_NAME varchar(64) NOT NULL COMMENT '操作类型名称【add:新增 category:类别 transfer:调动;logout注销;recovery_moveout恢复迁出；recovery_death恢复死亡】'; alter table ic_resi_user modify column SUB_STATUS varchar(10) DEFAULT '01' COMMENT '用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡;51迁出恢复；52死亡恢复'; + +UPDATE ic_party_member +SET IS_QCJ = '0' +WHERE + IS_QCJ IS NULL; \ No newline at end of file From 433e27026e1f1f787f8fad027148c1642c8f2702 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 4 Nov 2022 10:28:12 +0800 Subject: [PATCH 487/621] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.83__ic_danger_area.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql new file mode 100644 index 0000000000..e264168061 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql @@ -0,0 +1,18 @@ +CREATE TABLE `ic_danger_area` +( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `DANGER_LEVEL` varchar(10) NOT NULL COMMENT '风险等级；字典表key【dangerAreaLevel】\n0：低风险；\n1：中风险；\n2：高风险；', + `PROVINCE` varchar(255) NOT NULL COMMENT '省', + `CITY` varchar(255) DEFAULT NULL COMMENT '市', + `DISTRICT` varchar(255) DEFAULT NULL COMMENT '区', + `ALL_NAME` varchar(255) NOT NULL COMMENT '省-市-区', + `ALL_NAME_CODE` varchar(255) DEFAULT NULL, + `DEL_FLAG` int(11) NOT NULL, + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疫情风险地区'; \ No newline at end of file From c30fde5c62aac39e93b9c2ebae1743bf8f02e0a2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 11:13:07 +0800 Subject: [PATCH 488/621] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95=E6=97=B6?= =?UTF-8?q?=E9=9A=94=E7=A6=BB=E7=8A=B6=E6=80=81=E5=8E=BB=E5=BD=A2=E6=88=90?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcTripReportRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index a5e811f000..789e4219f3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -296,7 +296,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 11:23:43 +0800 Subject: [PATCH 489/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=88=96=E8=80=85=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E5=90=AB*=E5=8F=B7=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcFollowUpRecordServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java index 0999660b0e..451271fd6a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java @@ -83,7 +83,9 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 11:28:24 +0800 Subject: [PATCH 490/621] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=88=96=E8=80=85=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E5=90=AB*=E5=8F=B7=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE1=C2=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcFollowUpRecordServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java index 0999660b0e..451271fd6a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java @@ -83,7 +83,9 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 13:46:03 +0800 Subject: [PATCH 491/621] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9C=8980=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=3D=E3=80=8B81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0.0.80__edit_partymember.sql => V0.0.81__edit_partymember.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.80__edit_partymember.sql => V0.0.81__edit_partymember.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__edit_partymember.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__edit_partymember.sql From 9b8c610a26b3d253769d78050a2a31892d2a707f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 4 Nov 2022 14:14:17 +0800 Subject: [PATCH 492/621] resi --- .../main/java/com/epmet/service/impl/IcNoticeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1d2af49a28..bacf657789 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 @@ -178,7 +178,7 @@ public class IcNoticeServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 14:16:02 +0800 Subject: [PATCH 493/621] =?UTF-8?q?=E6=9D=A5=E6=9B=B9=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=9C=A8=E6=9B=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/IcPsTripReportRecordExcel.java | 2 +- .../IcPsTripReportRecordExportExcel.java | 4 ++-- .../excel/ps_trip_report_import_template.xlsx | Bin 11193 -> 11235 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 4410c61293..c0841b4a29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -38,7 +38,7 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @ExcelProperty("来曹事由（100字以内）") + @ExcelProperty("在曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 73af0b78d0..bfdd634a1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -56,10 +56,10 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** - * 来曹事由（100字以内）【磐石】 + * 在曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "来曹事由（100字以内）",order = 8) + @ExcelProperty(value = "在曹事由（100字以内）",order = 8) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index c5a91432ad7f868b9f7287e8fa95804b4746186e..6b325c4fe83ba70e3adaaa9b4593131be1ee0543 100644 GIT binary patch delta 2795 zcmVikp1@?lt8k2~qO$e($Qlb8d2-6Ujx- zSCbQ{JqP1(P=5@I z9-HR$R1>rmlz@vp0WVdBZVeR5Fnfy{#|41W*1Fl381tZZ0%8ixDOL&T%i+D_I_7>x zKkVw;Z74@^4AeH^uVd8XEW?2FoYt))J)16J{sQbC8oPI(QGSq%)&d<-Req35xa5d> ze{UUS;TE|9XK3m++^+xk0XHfzb$66s<*nJoER`IU&fT*a@1PXvS?x1 zbP%!3YTGI39cb#9g{S8khjWHqSU_H2os4644sQyyTAEr!8=0lA;Id$Cgr1!oa_zHJ z>WORFeMqK2G6x#bq2I?c2N*IkQf1K(1?xQ)B)5bn_&XI()9!BGw7nTHmH2z6?G)8GO z+dY2(009600{~D<0|XQR29v!b2eJ*>3I*F^!vi<7-WON{e@uZ=4JlY$@i5EjPIf~E zdnm<}l{96K&O{g1(7uEsSiTlgQoa#PUzbn>+aH9KNkO_`{6h&vu>O%`Ai?|%2}Lk& zQ$i7}dmK`9Tw?3$f_YCQ97C{gOU6kIoLWuT>crKA*5Qf~R?|Yf%#t*cZ=9@~HFYW8 z6oZtO0f`brfAC+4x0#>_{@apJ1pjSw3frsoWn*Dw0S{dDID~A$_ z;FTjz;oUYwpeX{!Au!b}Ct{=41ds}AY#gbuzWE@;ebX*kZppL39>_w3PGv_*(JyxLG}q!BS<|$lGS?5NSy?0Unl|Cr^Z>#H4oMYzDhD~@vf7|j@ZB3$0icoE!WvC5@uQ`O_$(IO2^-{jf zLZ_V&VN!$&11&>gI5Ey43|ZKOu<6UJMTAKaDh#v?g>9PFCiB3oM>Q+?CEARoDNZxA zO;dcNNfD|Iv<$VCObZ9(IkctH5Myzwwi3}MMW{B=GSr4+{T#wlc?fFCH?K59f7>R) zqzDxTT86?Sa{1YTVE;#DNYlpYda*pk|IEecxfN82pxsX3Dc$4Oe?`?fw>$Dx#dclq za?`c@4}w?3qjT@F+8j&O$Kfchu$y+hF@njbfu{yG^~bRC@wE7EhiOTb@rN(ff4DHGqac@_+5dH>c#RV~3e&m%{Q32#&#r&-nfC3Mf8}@I zJd5tGe*OFK?u|_ssYp#`#_LaiclF{cZT#~;zy9W>_Ug&!?DG0&f4TnbzuNfe7vFyU z@f(|R75T1o%Fq9G_1>Sf>*xQ(<&Dj*Wm+xS>|VWiGXCJH#x8&Oe^?uT`9AwKe)d0H z-q>6Zb?Zlg36 ze)%M%Ocx`pMD~&Z%fDt1&$`%4T&IKg5rrK4(rg%hLmB??y+N==-1mHZOBvjr<6~6^ zuT~1|1ICW$`TPfa2T>J&{<{7hldmHc1fP1vq_amMGy#94n?pm};Rm~NAXrhn3(46Q zY|@fMyZw99cB>rt04g#mn6SWoZHr1|cyjDkS8?ap zVapo@^6pUFO0A4?-gfy6{|*FPZ$B_WM!|;-_NO<>>+JraT%jT*X&O@!lSN5p?CORQ z^4`6F*5COJ7y4-NFOkM%UXlf)b2g_F;t5dn-sgX!_y)7EBS8iVcZl)?^a20?8U~a5 zDN+I%4UU;+RD5dZ)H0000000000003W;5Gy_b;FC`)JprbZjVmSw3@HEr005S&64n3! delta 2756 zcmYjTc{CJ?7akgn-7t2NeHm-<7-by^g)w0m%Sg5viA3d*$;2p<(FobcmY#hKdLmgS zCP`tkm0c8LO_rDD=l$M!=e+yZJ?DPsyZ3(gkMGW-{zTPt@bTFRt-B6z0sw1VWPUzb zd}f&Q1On1Kowp}%H$B?Cr|%8GXpgIpnFBsJ*_WB1vspe*G)q9w8Fv`nDtFSwIyK!b z_jPNRnr|1#SYe`WQE7iM!-Js<}z<=h$6Lp-FJD0^^&*TH`YBmv=8nGsn*2S=S`8?0%3a)$?qrHZhiG{CC7Y?f zF5s9pSV&R1oqCyi%o2-ZeK(==SLV-P?QI*-cD_G+{Fie6(mbrM2{*nk*Su6rwU3vd zmk#cAP7l!Y+kHRQeiyxI_0Ef5&c!pH#D8PK@^^fA+R2-#$Ei@m=sf%t6g&1+lc>F1 zMvtcb^p0<@1)3=vrt$iBhkiPEu|=*~;<2Hw_QhSLtfq4ZKvSMv(}2CNlGVdT-2;QA zk|vTX`2~#%d@_QL1M{{)vrz9Z)oB~!jN;y+$3xEOmB{aO!=6(J{@w6iM4(=>t*ut_ zXu9iZxt@*$YG*^f&z1AuqiGZGHwIS4GtyTl3hA(iUx*s$s?fxXrITNmxLFTabZyDa zyO*Y!XZmv&6Za1TG%`{{zQs&G{~;G8u2C>vnk&x(LjDXvPeI|t4UMHRWXGU;c?&`H_ zG$GW3`do>*z^t;2xcPw3)z8jvR!Ei61ac5cd-%GZ$qNV|JIr2#z;1>mv6u(chI;B9 z9-3zTn|vdKteHi5-m@E#XRX0)-j5MLy>%iaD~Im;8<*bthpQJl8Gng7%+1eSb0;H! z>Laiu)qz#)jaLcx8N9x*Oaw4i;Tqq1vm&P>*hDDdSr7~?+oX2K)#LKKUDD0~kK*x8 zd^MNQReNAE;QVnhV_t)cDJH4cs&oif#L6y^aK_Z zQc+8r*qzgTJI;p0ZIugzsrB(%p~3$8r=R{5SpW2HFt3_RG_mJHImpvK-;NYU$mFHM zNqkm+0LNAPj$8fUMJn5w*^r)IzbR*fx4U&CIP@>liE}`#NSQt9G9h0C$bxzWUl zh`n66RAJnGeOJB3e(k6UUa;EPO8xgIAw;oxxh_(YBPj3XTeM9Mgwl1?b*us#c2fB5 z@2-uHFeL*XxpRi_NkjU%+<#{BV$dQi3*lZ`f(8;#aZqp=G7)#wJj~?dprZEU6B zZHH5|FeUtj6vUAL(L`NZ6-jfwSHhmD0HwDKvEoXO zDG2NlSWrA~ycG%Sqp3GhSfZZD#5bHea8ILQ>;2$ns;emBCffMc+xj&rblSi2!4I*` zwXU25!Yjenh%={X$|dJh5I)6$m3V%)#v`u%WCJruo=rA{(t5O-WD349x_l@di+xOy z7yFn0G%?a&i-(xhBG9-~jwH<)CbTxghoG9)T!bu&Wm{`*4YVM>IAL`}x}tm1CJREL z9#OgXyUJ7$vbh`S}xgF^yEA0re0I8q}zwgTUjUTLTU*$U>rP_9%7nqD=B zPbzbkgTz4-EMVcB4!-}!i{~YC5|Uugt9idrt_9a$C}Z5NjPB?f`@CSExOMi7>8@_o zVP_HsKKsrbZYDAnF!Li~S@5FYUbH(Lm1}C!P zJ!BgHb-XEG-$ZV-pira7VPbna9>T%R&sjNCO&(;5i=jm?p{nA*g>=i1zvCewQx+L zrsI%Vm5m9V$DfgBvr zaxK-ZOmqD03_!sz+Odt-6b(7>G&+UC+PLcj6RFmiN?N$W{~Ok>g zmhVC0taF_w1pu7}hQ*e#$-^pi3r}J9KP_a5Z?vD4S>)&syWD&y5vT3+wViyiex9o+#Hs?-8L{lvLlQzPR$Gv0vl>CVR_>x8S^djXGzW{wQSOfK>N zJS`G&_plEL=29@7DAF>n+dqW2Tf5m(wVmuQNEk7`G6hu^+VSk_j$K*3kq>hie;IO{ znz3O&_GJ#(`3`QwoGr#Q{>NX}ly$iO`$MW~Avw1M$T3 Date: Fri, 4 Nov 2022 14:41:07 +0800 Subject: [PATCH 494/621] =?UTF-8?q?/epmetuser/tripreport/emphasisTripDetai?= =?UTF-8?q?l=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=AF=81=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 4f6d71eacb..b6b2ad9856 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -473,6 +473,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @Author zxc * @Date 2022/11/1 16:05 */ + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("emphasisTripDetail") public Result emphasisTripDetail(@RequestBody EmphasisTripDetailFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, EmphasisTripDetailFormDTO.EmphasisTripDetailForm.class); From 1c1751dcdbeb0405f9862f57771043f0a51c8324 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 4 Nov 2022 15:17:14 +0800 Subject: [PATCH 495/621] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E6=9C=8981=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nshi.sql => V0.0.82__ic_epidemic_special_attention_panshi.sql} | 0 ...alter_ic_trip_report.sql => V0.0.83__alter_ic_trip_report.sql} | 0 .../{V0.0.83__ic_danger_area.sql => V0.0.84__ic_danger_area.sql} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.81__ic_epidemic_special_attention_panshi.sql => V0.0.82__ic_epidemic_special_attention_panshi.sql} (100%) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.82__alter_ic_trip_report.sql => V0.0.83__alter_ic_trip_report.sql} (100%) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.83__ic_danger_area.sql => V0.0.84__ic_danger_area.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__ic_epidemic_special_attention_panshi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__ic_epidemic_special_attention_panshi.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__ic_epidemic_special_attention_panshi.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__ic_epidemic_special_attention_panshi.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__alter_ic_trip_report.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.82__alter_ic_trip_report.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__alter_ic_trip_report.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.83__ic_danger_area.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql From 5788cf56c6ea4607659e00db47920b7cf6377451 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 15:46:27 +0800 Subject: [PATCH 496/621] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E9=87=8C=E8=BE=B9=E5=85=88=E6=8C=89=E5=88=B0=E8=BE=BE=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E5=8F=99=E5=86=8D=E6=8C=89=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 759764368f..e39f594606 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -66,7 +66,7 @@ AND r.sojourn_history = #{sojournHistory} ORDER BY - r.ARRIVE_DATE DESC + r.ARRIVE_DATE DESC, r.CREATED_TIME DESC From ec06dd0ae33aad9b6279db161134eaf1decdee3c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 15:49:14 +0800 Subject: [PATCH 497/621] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ps_trip_report_import_template.xlsx | Bin 11235 -> 10357 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 6b325c4fe83ba70e3adaaa9b4593131be1ee0543..d483cdfc8a6d6a2d3df39875a11d1f5612ad134c 100644 GIT binary patch delta 3977 zcmY+HXFMAU7seAaV$TqJ=bE*}ti4rgmX=l%I5=^4|A+cs~6#~F1O~b*f1(T z)D^?(yb;WhUTUmp$U^@K5M(2m_Ije@W1GCSKC>Sdh}Fgdt`_wD5<%rFgFlyBZ-vL? zk;#=6It5HE<{zo!LdM#0A-S{#FC+(yWTdDlmJJ%M=}i2(>`9cTNXXgM5{jt9^6uMO zSU!8?=G|{l@pRgK0uAOp%#>o_@Lkfe+3hWMizH`l$Z@>2Zu~mFNhCUok0!i-w3!q9 zgs)(0Q}vGzx(l2`meiWSe37m`3EB3MZFsuF206c7`(P2?vLny6cQ0enxMJ<1B|Iy( zZhpH^7T#4`xK;Y+Wzp;?`fS9+%tze&MI11X&GcTf17qNXWgo_K=ChDzn-bNlhxU#N zk>KPwXLCt?t8)d@<)XbYJ>Mx}q{{k-ajs!R^)|P7??g({+9lskDIYqd*9a&`>1HbX zIC(^-)Yi8^5Ytyw!0WzLPO#6YG5M%!B^=Wv-L;~epPkNd{Xn9H0X!ec ziisC$a6fE9&|zp%=KhY2kvU)r2Ld0jERwP<_E0ppJ+`lg!q}r?>7!XZ+(y$7LHU?n zA!hn)b-6}k$k|bS%hO3(%BWh)W~mpKQaE%cR_Fbl7ANu^Ioq#`T=VepKp(5_r?QZb z^v&f$E29RI8%*dBRI5COzOr6u`h;V-@-i@L7n!RufFZEvwr{%(Yu}#9xo4C3E3HhX zn8*)z^{M3g@ut!R+vcR0l6T#BrPL&7A<8Osz+2Ct+%TWpBvv5 z{-hEBad6XWc0Ff#d?%6j0YW_xEuyKF7wP+EEUBF{ljS8~w_@mXF2V%5l48VjRz9!A z3!2^0iz&V;OhRpofwFjo7gPBS8`wxa^sHuNvfV%0jnz$zQG#zich$p4{lS)#{q4s6 z_0O*+0PyT_#B!*j;8sCv-X_JD;y>anVx=Fw(aSw=U5N->7N|CpHGykZ5N$_y z9J12~AExs=8`=9MgpYozSWYeQJbFFj8;iY*cG&gFoT){FO@u_j7tgnHNfoK)e?TVb zI@~5gw>zCYN+-)G8>GKvN?ep-B15Sq_CF`Ik#T=_-LLCIbyo;{%xDnpcZ_{-WBdT= zfD$@mQnQ@kla^nFP%h_lFExII3nF}(rhX2TY%RV|E6On(RZ*0J{1&Cs8` z)tUV@f3GU^ZoD-g7M`Hj>|3$%=f@iZt*Lv|Qv9@B{Zz7n_S|-#;(luyVp!;#)1S&K zxk$^Os&hCdu|eeqS@CjFWlm!-oST>k)d)~<(z-M5iQ8H>$Kd|cjNxmX z#p!YgOz4%O)d4AxxPd?KVwB8=^%=Yyto8`IG$+3MD;)?Yg`Fa9TlG&UWz9ZKhE#hu zm}<^7N#+k9rOtw_T>(Aw*0`>j>=x#C-HG^(s^`>Q&&lsDPxDw$#%%2z9u8-vDCMqm zA+1`!*~>o3k$Q}Y7z=V<68}`g@S8iSu2D^5lo!qw=MKUNkTjeg)kp@yl$H}4B(axDUE7h z>G@HaF=-4IW$A|KBuk`68-Dw%^Y$v$#wZI6Zbet}=z$mTsv1g*sKNHP@sNL6B}{_s zrCqvyYXkq;Z|oZhrlvz?1}d=r8=1i@DgeL$f(3K(V;p>a7xXzXDFcBw+;sCmCSyKV z(~8-X&3BrVJ+fNYTC!9Vl!hT*Z63ibLf*y#VyWXWFJ0rPzBd5D`{r+{TwFj$lFqbWZTF+}cdHYEstM@zM?d!ps(rJF&yv0?W{)-A;r|)C(YWMNQ zQoY{3Fp%istsc0-Cf+6^$pKVNj03EF03wc@JMbr6@}z2R5V(K?s~J6IM!o z-Gd4?@alf7+-+&;oXS-bdtMbgw;u$*gIF*0e>nToFKdD+ZL*i6KH8-MmHvTv+kS-_ z(d@ycsUrw zrS%cY$`E(9nKcw*->(~I+d)NIW$Eq2ERt`9LHpJUVl(qjB$3}Hn?j=thc22P^>=0D zIxD(Ph;WN(^uu?|DFx`u$<{+}W^>(*!#KQ7rJn+Px(_sCRUBhg8y_%NfNdZ{@`RN3|8xB90VJQ;`BW#`tMEEgJ`DI{g!TpA?+~ zpG1*j&U}n%s)2`+x+TR8ad)K>mr1+70zV;_rjC*r_RUDOfNh^!;=X((%=E_ExtO@j zgV=E@ny#Cq2ucb70p%)NaM%1hGmY@bBuH0X2yVj$8zn;;6lPEmk&%rORz$Lm#G7|m zVY_6dLROVzNWDTYa7GnbshCwO1+n$!95d{vi78nh*8tlK*2F((IFn#uO1~+zr{_+| z*shb_S*Yr0nNx84<2jg3IT0lw3=@mUOQ@k#lEz>C@$AfLU|~}>pf@Zvok3V8Dc+p3 zLBbRPmqUUhomt}vvDtTvKrkGjfyuBsAyJ?<`cGkj+;vGd7BKzhnI}c`lS`@?^Z6*% z6<@=fs&#jhnFfM!9Kf|j96N9=x6?xKTQYAD#D9M&p%<2m*+sl*h|2c~H9o zw%7Ycp94G-lSFi*h)yEfQa$iOX*@_0_p16^bOT!dg%jCaaQ-;y)F%%-9&cVDo==Gs zm-3lDw@mQ5f^0&Z*@dW|UJ-@#Mi@&j?cB^@Z>x5P2v1 zRRZsndZA<6{l6Akjzfz&H0&3@RQP0>J%OY?2M&U_zAn5xbn`AfHdNfGY5gUWXsgn? zNpv#XjoF#!;pqzUm&2>}vk%)7aTW#+6sGGSd4=Y8?&E1LK3q?;8jwei#N5E=qGWd4 zC}&c@R3R$aBI-;`Efm7$>S%C7I$bD-s(#KK)t85>brP$#GSF#%uhUI(DNbxMpT&wU zHTq!)lY6^YF%x^M;dA?YXm*%kH+?39zsLZFeHd>UZ;YFnw(+JF-E68bcdQirlF}V{ zcu1J2YrsDq4zPLvl8~(abY02&^iV*xaE!DzLAu&ovuAX@*1F2x%U|N#v+TKey+3Ag z&$yR3lKr6j0P`f^z{HF6Bjs}e@318!fBMFmkv2X51uyqv=<&gn`es?cof%@91pg(* zKVUuX3u!CRVa%elqjILWS-m?@^}{m-!`BD<15_#6BDbOzu6qM~I(&q@6-;N>mYhVK za93ZCPd&Uy3!m_^DY}eN{Rh;yuGG5E&jh-JNh{p4-wkL;=&C|8Tt0lyw{+-C#$GR++OddC%KQM$stWsOv5nWNMOP$dC-+M z;2-Crl$+=CG;0bF6bE8Z{Q_*U2h`_`_;Y>i^LyeZM6InEa1_$(yXA3nrh)Lz>ywqw zCEl+a@x5=?gTq2K-pD?$eAUydHn&AqN~6Q<8jQ$ zg1}WWR5SXWWXYOFcr#qv@dMvm9LImR&+GOr)Lk@kBTtO++Lj5_qlty1Qn`# z74RDUyf>7|nR(M*Fd83u?D7ey#zNWL5BzdUPQ`ce62CShdlXD1wttCrZI`RN(T2M- zZ0BM1>b)0A@{XZ+?LptF;mxaxhUukh)k1klZUF5^mDcLuS4K#cjvP1+Z0&5u6nK7U z2dgMOY8~A?4b&G{MW2(i>a&Gz;jgBH^A@#j%xv65M!#kZJhDrp>Fy|s?h5=>kauvw zz`f)CLsl-C&@43jRE-g(uK^@3pI_X{Sov>HoA!mJss0^yMI}_Z|Cay&0D8c`ivb%X zp+-i@j3qI%V+j&WJpcP4007Q^lK^1|mVpzBWt3#%`S09-0Komf^EC7SK_p(Rx}+vq WfB+UPsX?YHjQt=fN|i7A5Az>C;YL0H delta 4908 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 From 2880d512da33db5c634c160b2fa483a2db756bbb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 16:05:13 +0800 Subject: [PATCH 498/621] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E6=B3=A8=E6=97=B6=E6=B2=A1=E6=9C=89=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E7=8A=B6=E6=80=81=E7=9A=84=E8=AE=BE=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E2=80=9C=E5=B1=85=E5=AE=B6=E9=9A=94=E7=A6=BB=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcTripReportRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index fa84cee2a4..4debd80010 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -296,7 +296,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Fri, 4 Nov 2022 16:13:31 +0800 Subject: [PATCH 499/621] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B5=8B=E5=B0=8F?= =?UTF-8?q?=E5=AF=A8=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcTripReportRecordController.java | 5 +++-- .../excel/IcPsTripReportRecordExcel.java | 2 +- .../IcPsTripReportRecordExportExcel.java | 4 ++-- .../impl/IcTripReportRecordServiceImpl.java | 6 ++---- .../excel/ps_trip_report_import_template.xlsx | Bin 10357 -> 10352 bytes 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index b6b2ad9856..354c3be87c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -118,7 +119,7 @@ public class IcTripReportRecordController implements ResultDataResolver { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.IcResiInternalGroup.class); } //磐石客户 - if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); }else { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); @@ -182,7 +183,7 @@ public class IcTripReportRecordController implements ResultDataResolver { } } //磐石客户 - if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); }else { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index c0841b4a29..4410c61293 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -38,7 +38,7 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @ExcelProperty("在曹事由（100字以内）") + @ExcelProperty("来曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index bfdd634a1f..73af0b78d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -56,10 +56,10 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** - * 在曹事由（100字以内）【磐石】 + * 来曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "在曹事由（100字以内）",order = 8) + @ExcelProperty(value = "来曹事由（100字以内）",order = 8) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 4debd80010..00d805abad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -207,8 +207,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl!zh*l-nU_5N#Lb7 zJ{M^x327|^^O+YG1%5csNqRUJX&Bb-zW}oc4Jir*iU4Y`l#@0WHh+`UB$?8GYt|<1 zk~X~d5+||d_=4>=Ew5Ij4GF{q5*md~2x(9l6CebPY181#kaqnRJm>Q{@txNt(oo;z z&QE^#{C^(bn+XTi7-V^1k89 zmx`~ymLFi}y4y7jPk#aqwp)<9p4Zn>DYw}*db*p$eZz)-+Suvo9y~gol-qXtHctE5{dEGFuqQh zmEl+#q`E#6B2{mC=B}}5Sb$ztz<=-idcYQxNQGLA@0ms`zPmOZsb#eF9m`w9)_Z2l z>lWmBnbB%^uxgl{u2+y1H3=FwcU%wm7!46AO>6;6_?3DliK{I2^gY1K(ja8#di%sk z-!&mp4Un(~NPi`r%w@q5Av};5=*7fQL9@YeSlMxuob)i@d@W%O4kLw=O--Y+G66h0 zf@hLQnN%7iwl57X>xpN5s4_A4cD=~+HPP-FgCvSD6IPc9m88GmA_LN-i+sa(L42f>ChK*`L+ z@kfw#)Q4l~r%uCwi zH%bIBCu}vOU(#0Qcg-c;(~Efr4r2q3g0l0%CEWl5kc3zQXsa#^6P3Y4-yxgt>31j@QVsR)#+K-mx| zn*!ykK&c6ox!RuSTEXhdP&>hvI)xv3A=CoV9;$P$H%-(n1ei{DZVgp1!YgOFB@a?0HN9K4_T#9m>jF?F~o zUygxrQC^LKa8WMDK)5Jhp%8Mf3!|)XQC<_-s9ccOV<4j#`){*K41^0pl|jgznFMZw z5k|_XTvRq=AY4?gG6-W^;|X=1utf=Hx_@PxKLjINn0GX->EuN306oL$_!E{ZHSvxO z-bV0752>TU&mT`x;U6#*^}8_0dS(-btTwhiGQN@KyWfXd$i|D<4yIu`M%gWsjF!4Z zE5?Jln9Xw~B$ZTYTa`8xt)WOIMS~U!zHZlcEF)lO?7__Il35hSx4kwI26puw6Ms9V zw@BUlYX=ZU_ySi0gnYnUi&>M0I0prd(fG zFICrO;NZoJ`4r;}R~%m{|27q45h#sg$js1+qCrP~xn}uzw$U0~O`t z!(S7_&yM71hvnR~Yp7ZyPP>zP2Y=cel>(l+CCJ-vI2Wb4;o zoE$w(41c>h{N+*PVR-QU@X22%cRxS=^ApJHPfzdNcz$$1A!i%IRU&!iL&;Zkr(;6@ zu#7g`7Sc)bt;wNZQR#z+`+i%vhCTS2>TkR7x!Qo6Q<{9jY-8-P2O;uZBK!be{0{&C z|NjF3P)h>@6aWSQ2mk;8Appk_Z{bO^10E*tv$~lqLj4pm`&t-WKSkTE*8W za-M0y>PAC>4&czTyu8S{p}ev1WE%t4OK?#jX-By!(9U~9F?M_hin$~tbSQ2btC$Z* zf4jwo@ej5IoDs6X3Op0cGu#1VGZN7eDfoyqpSJD+f@7#bf%XokNs5269;|YIHuRNA zQb~U>VWy+*lr8vB9MgLz$6(vGNjvK`f`5wN){oEqsIk=Dt~j7F7o2hn%r~~Id5$N? zZgn+tejT>Fks$64<*iUsOXqEu&++d-LcsO*0~16PeCS|*s=UtbAF359Gm>R-N@B98 z$c$dyP(t3j_s{w}zu`h1E&e5@F_~B7nx+|@Pl+c$*?XV=iSiq>Y#>1f1Zy=#8I!Rl zx&?{=YOs`(a3?_<#}RMgNdW)=U;+RD5dZ)H0000000000008Zi%qKnpZIcTqJpnV5 NNhl@;nI!-K008mN0YCr% delta 2182 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 IB>(^b04j+Ly8r+H From ca8aa294607459b15081a0cd15a840828b9a48f5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 4 Nov 2022 16:25:54 +0800 Subject: [PATCH 500/621] =?UTF-8?q?dangerLevel=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index e39f594606..7bff317ba3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -101,7 +101,7 @@ - AND sojourn_history != #{dangerLevel} + AND sojourn_history = #{dangerLevel} AND sojourn_history != '3' From d327852db6f15baac5379573e0235fc6d9a390ad Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 4 Nov 2022 16:39:53 +0800 Subject: [PATCH 501/621] =?UTF-8?q?sql=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?Name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/govorg/CustomerAgencyDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 90f40009c2..262b5435d9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -328,7 +328,7 @@ From 908f2a41f02c654da58f899cdd99e3ea54985ea6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 4 Nov 2022 16:51:12 +0800 Subject: [PATCH 502/621] =?UTF-8?q?=E5=AE=A2=E6=88=B7ID=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcBirthRecordDao.xml | 3 +++ .../src/main/resources/mapper/IcMoveInRecordDao.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml index 9f6ac1e550..b4b8b4894b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml @@ -68,6 +68,9 @@ ibr.UPDATED_TIME from ic_birth_record ibr left join ic_resi_user iru on iru.ID_CARD = ibr.ID_CARD and iru.DEL_FLAG = 0 + + and iru.CUSTOMER_ID=#{customerId} + where ibr.DEL_FLAG = 0 AND ibr.CUSTOMER_ID = #{customerId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index 03065d2e60..9aa41b001d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -30,7 +30,7 @@ mir.householder_name householderName, mir.householder_relation householderRelation FROM ic_move_in_record mir - left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0 + left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0 and iru.CUSTOMER_ID=#{customerId} WHERE mir.del_flag = '0' AND mir.customer_id=#{customerId} From a454096f6a4a51dbf05c3a25773f94e63bb43b45 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 4 Nov 2022 16:59:44 +0800 Subject: [PATCH 503/621] name --- .../src/main/resources/mapper/govorg/CustomerAgencyDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 90f40009c2..262b5435d9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -328,7 +328,7 @@ From 4db3ec588931ba21861e8433458441d70d7bcd6e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 17:14:23 +0800 Subject: [PATCH 504/621] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/excel/data/IcTripReportExcelData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java index 083cc5ac3d..9981c1d03f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java @@ -50,7 +50,7 @@ public class IcTripReportExcelData { private Date arriveDate; @ExcelProperty("返回方式") - @NotBlank(message = "不能为空") + @NotBlank(message = "返回方式不能为空") private String trafficType; @ExcelProperty("其他返回方式") From 23f663498d94ad944111b9792574fee5abe0e1fc Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 5 Nov 2022 23:03:30 +0800 Subject: [PATCH 505/621] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B0=83=E7=94=A8=E5=85=B0?= =?UTF-8?q?=E5=9B=BE=E8=A7=86=E5=9B=BE=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BD=86=E6=98=AF=E8=BF=98?= =?UTF-8?q?=E6=B2=A1=E5=90=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/jdbc/config/JdbcTemplateConfig.java | 6 ++ .../impl/DataSyncConfigServiceImpl.java | 92 +++++++++++++++---- .../src/main/resources/bootstrap.yml | 6 +- 3 files changed, 85 insertions(+), 19 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java index 4f8be141f3..1c26f1d808 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/jdbc/config/JdbcTemplateConfig.java @@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.AutoConfigurationPackage; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import javax.sql.DataSource; @@ -27,4 +28,9 @@ public class JdbcTemplateConfig { DataSource yantaiLantuDataSource = jdbcDataSourceConfig.createYantaiLantuDataSource(); return new JdbcTemplate(yantaiLantuDataSource); } + + @Bean + NamedParameterJdbcTemplate yantaiNamedParamLantuJdbcTemplate() { + return new NamedParameterJdbcTemplate(yantaiLantuJdbcTemplate()); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 6d4c42690d..e771aa4968 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -41,6 +41,7 @@ import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -76,6 +77,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl resiInfos, String customerId, String isSync) { List> resiInfobatchs = ListUtils.partition(resiInfos, 50); for (List resibatch : resiInfobatchs) { - // 50个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 - yantaiHsjcByDbViewBatch(resibatch, customerId, isSync); + // n个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 + try { + yantaiHsjcByDbViewPartition(resibatch, customerId, isSync); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【更新核酸检测信息(from 兰图)】失败，信息:{}", errorMsg); + } } } /** - * 50个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 + * n个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 * @param resiInfos * @param customerId * @param isSync */ - public void yantaiHsjcByDbViewBatch(List resiInfos, String customerId, String isSync) { + public void yantaiHsjcByDbViewPartition(List resiInfos, String customerId, String isSync) { // 将居民信息转化为的map Map idCardAndResiInfo = resiInfos.stream().collect(Collectors.toMap(resi -> resi.getIdCard(), Function.identity())); - Set idCards = idCardAndResiInfo.keySet();//resiInfos.stream().map(resi -> resi.getIdCard()).collect(Collectors.toList()); - // String idCardsStr = "''" + String.join("','", idCards) + "''"; + List idCards = new ArrayList<>(idCardAndResiInfo.keySet()); // 1.获取核酸采样信息 - String sql = "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idCards) order by create_time desc"; - HashMap args = new HashMap<>(); - args.put("idCards", idCards); + Map args = new HashMap<>(); + args.put("idcards", idCards); + + log.info("【更新核酸检测信息(from 兰图)】本批次身份证号为:{}", String.join(",", idCards)); + + // 2.=====================核酸采样========================= // 这一批居民的核酸采样列表 - List> hscyList = yantaiJdbcTemplate.queryForList(sql, args); + List> hscyList = yantaiNamedParamLantuJdbcTemplate.queryForList( + "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idcards) order by create_time desc", args); if (CollectionUtils.isNotEmpty(hscyList)) { List entities = new ArrayList<>(); - hscyList.forEach(sampleInfo -> { + hscyList.forEach(resiHscyInfo -> { // 从视图中获取到的核酸采样相关信息 - String name = (String) sampleInfo.get("name"); - String cardNo = (String) sampleInfo.get("card_no"); - Date createTime = (Date) sampleInfo.get("create_time"); + String name = (String) resiHscyInfo.get("name"); + String cardNo = (String) resiHscyInfo.get("card_no"); + String createTime = (String) resiHscyInfo.get("create_time"); // 本地数据库中，居民信息 NatUserInfoResultDTO currentResiInfo = idCardAndResiInfo.get(cardNo); @@ -827,8 +839,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl> hsjcResultList = yantaiNamedParamLantuJdbcTemplate.queryForList( + "select name, telephone, card_no, test_time, SAMPLE_TIME, SAMPLE_RESULT_PCR, SAMPLING_ORG_PCR from hsjcxxb where card_no in (:idcards)", args); + if (CollectionUtils.isNotEmpty(hsjcResultList)) { + List entities = new ArrayList<>(); + hsjcResultList.forEach(natResult -> { + // 从视图中获取到的核酸采样相关信息 + String name = (String) natResult.get("name"); + String cardNo = (String) natResult.get("card_no"); + String testTime = (String) natResult.get("test_time"); + String telephone = (String) natResult.get("telephone"); + String sampleTime = (String) natResult.get("SAMPLE_TIME"); + String sampleResultPcr = (String) natResult.get("SAMPLE_RESULT_PCR"); + String samplingOrgPcr = (String) natResult.get("SAMPLING_ORG_PCR"); + + // 本地数据库中，居民信息 + NatUserInfoResultDTO currentResiInfo = idCardAndResiInfo.get(cardNo); + + IcNatEntity e = new IcNatEntity(); + e.setCustomerId(customerId); + e.setIsResiUser(StringUtils.isBlank(currentResiInfo.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + e.setUserId(currentResiInfo.getUserId()); + e.setUserType(isSync.equals(NumConstant.ONE_STR) ? "manualSync" : "sync"); + e.setName(StringUtils.isNotBlank(name) ? name : ""); + e.setMobile(StringUtils.isNotBlank(telephone) ? telephone : ""); + e.setIdCard(StringUtils.isNotBlank(cardNo) ? cardNo : ""); + e.setNatTime(DateUtils.parseDate(testTime, DateUtils.DATE_TIME_PATTERN)); + e.setSampleTime(DateUtils.parseDate(sampleTime, DateUtils.DATE_TIME_PATTERN)); + String resultPcr = sampleResultPcr; + //检测结果 转换 我们 0:阴性 1:阳性, 他们 ：1:阳性,2:阴性 + e.setNatResult(NumConstant.ZERO_STR); + if (NumConstant.ONE_STR.equals(resultPcr)) { + e.setNatResult(NumConstant.ONE_STR); + } + e.setNatAddress(samplingOrgPcr); + e.setAgencyId(currentResiInfo.getAgencyId()); + e.setPids(currentResiInfo.getPids()); + e.setAttachmentType(""); + e.setAttachmentUrl(""); + entities.add(e); + }); + if (CollectionUtils.isNotEmpty(entities)) { + List existNatInfos = icNatDao.getExistNatInfo(entities); + sampleAndNat(existNatInfos,entities,NumConstant.TWO_STR,customerId,isSync); + } + } } } diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 184c73ee7b..0f824c7155 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -56,9 +56,9 @@ spring: yantai: lantu: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: root + url: jdbc:mysql://10.2.2.61:3367/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: yilian + password: 1qaz2wsx initial-size: 10 max-active: 100 min-idle: 10 From 5939b0054b6c9ab846c9ab1bc37729e8bc694d18 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 5 Nov 2022 23:06:51 +0800 Subject: [PATCH 506/621] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 0f824c7155..a9ff79fb01 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -56,7 +56,7 @@ spring: yantai: lantu: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://10.2.2.61:3367/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://10.2.2.61:3367/sjzt?allowPublicKeyRetrieval=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: yilian password: 1qaz2wsx initial-size: 10 From 62f5a02f17b34bb96cc8d85a5c982cec8ec93c67 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 13:49:02 +0800 Subject: [PATCH 507/621] =?UTF-8?q?ic=5Fparty=5Forg.PARTY=5FORG=5FNAME?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.13__partyorgnamelength.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql new file mode 100644 index 0000000000..bb4ecd63dc --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql @@ -0,0 +1 @@ +alter table ic_party_org MODIFY COLUMN `PARTY_ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称'; \ No newline at end of file From d8627ec90bd8cd7f6bebd7871b448d542c45da12 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 13:54:05 +0800 Subject: [PATCH 508/621] ic_vaccine_prarmeter.ID_CARD chagndu tiaozhegn --- .../main/resources/db/migration/V0.0.84__ic_danger_area.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql index e264168061..5fd0915a68 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__ic_danger_area.sql @@ -15,4 +15,6 @@ CREATE TABLE `ic_danger_area` `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疫情风险地区'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疫情风险地区'; + +alter table ic_vaccine_prarmeter MODIFY COLUMN `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号'; \ No newline at end of file From e4f710913fb6e4d21183aae65a5ef912b3548103 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 14:03:03 +0800 Subject: [PATCH 509/621] /resi/partymember/icPartyOrg/ --- .../partyOrg/service/impl/IcPartyOrgServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 8862404285..0b18281ce5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -101,24 +101,24 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl Date: Mon, 7 Nov 2022 14:15:58 +0800 Subject: [PATCH 510/621] - --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index e771aa4968..56ef6451eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -819,7 +819,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl> hscyList = yantaiNamedParamLantuJdbcTemplate.queryForList( - "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idcards) order by create_time desc", args); + "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idcards)", args); if (CollectionUtils.isNotEmpty(hscyList)) { List entities = new ArrayList<>(); hscyList.forEach(resiHscyInfo -> { From 655affcabb368689e88354fdf7d6d82e55583ee0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 7 Nov 2022 15:51:08 +0800 Subject: [PATCH 511/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ps_trip_report_import_template.xlsx | Bin 10352 -> 10373 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 191e4581f8d62536fb39c6e749d15fa132f6bb21..7c0894d75e0dd7c6692baa24cb3ca93f004aafd3 100644 GIT binary patch delta 2595 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 Date: Mon, 7 Nov 2022 16:08:25 +0800 Subject: [PATCH 512/621] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=8B=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9B=B8=E5=90=8C=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E7=9A=84=E6=A8=A1=E6=9D=BF!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcExportTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 8151e9c0b2..4c30471bc4 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -124,7 +124,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl { if (formDTO.getName().equals(t.getName())) { - throw new EpmetException(9999, "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!"); } }); sort = templist.get(NumConstant.ZERO).getSort() + NumConstant.ONE; From b95631c2bc82e9befd8bb1e863ca955afdd24720 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 16:16:48 +0800 Subject: [PATCH 513/621] epmetuser/icEpidemicSpecialAttention/vaccination-update --- .../IcEpidemicSpecialAttentionServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 0a76221ff0..31acd1ec00 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -349,6 +350,19 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl Date: Mon, 7 Nov 2022 17:12:21 +0800 Subject: [PATCH 514/621] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=93=9D=E5=9B=BE?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=9F=A5=E8=AF=A2=E6=A0=B8=E9=85=B8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 56ef6451eb..815c36d9cf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -259,7 +259,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl { try { //查询正常状态的居民 - hsjc(finalDbResiList, config.getCustomerId(), formDTO.getIsSync()); + //hsjc(finalDbResiList, config.getCustomerId(), formDTO.getIsSync()); + yantaiHsjcByDbView(finalDbResiList, config.getCustomerId(), formDTO.getIsSync()); log.info("======核酸检测信息拉取结束======"); } catch (Exception e) { log.error("hsjc thread execute exception", e); From a1d9897e8a7c3da5c1420189646dddfccbcddfd8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 7 Nov 2022 17:50:15 +0800 Subject: [PATCH 515/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/excel/IcPsTripReportRecordExcel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 4410c61293..743aa60438 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -6,6 +6,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -51,6 +52,7 @@ public class IcPsTripReportRecordExcel { "（2022-01-01）") //@NotBlank(message = "来到本地时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd") + @NotNull(message = "来到本地时间为必填项") private Date arriveDate; @ExcelProperty("现居地") From 610bfdf7b4feddb8285a7047e1ca49fd8e6e4580 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 7 Nov 2022 17:55:18 +0800 Subject: [PATCH 516/621] . --- .../IcPsTripReportRecordExportExcel.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 73af0b78d0..fd9c52e04a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -23,128 +23,128 @@ public class IcPsTripReportRecordExportExcel implements Serializable { * 姓名 */ @ColumnWidth(12) - @ExcelProperty(value = "姓名") + @ExcelProperty(value = "姓名", order = 1) private String name; /** * 证件号 */ @ColumnWidth(20) - @ExcelProperty(value = "证件号") + @ExcelProperty(value = "证件号", order = 2) private String idCard; /** * 户籍地 【磐石】 */ @ColumnWidth(28) - @ExcelProperty(value = "户籍地（省市县区）") + @ExcelProperty(value = "户籍地（省市县区）", order = 3) private String registeredResidence; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号") + @ExcelProperty(value = "手机号", order = 4) private String mobile; /** * 来自地区（格式：省-市-区-街道-社区） */ @ColumnWidth(30) - @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 6) + @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 5) private String sourceAddress; /** * 来自地区详细地址 source_address字段的说明 */ @ColumnWidth(30) - @ExcelProperty(value = "来自地区详细地址",order = 7) + @ExcelProperty(value = "来自地区详细地址",order = 6) private String sourceDetailAddress; /** * 来曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "来曹事由（100字以内）",order = 8) + @ExcelProperty(value = "来曹事由（100字以内）",order = 7) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 */ @ColumnWidth(20) - @ExcelProperty(value = "48小时核酸检测",order = 9) + @ExcelProperty(value = "48小时核酸检测",order = 8) private String isNatRecordName; /** * 来到本地时间（2022-01-01） */ @ColumnWidth(20) - @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 10) + @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 9) @JsonFormat(pattern = "yyyy-MM-dd") private String arriveDate; /** * 现居地 */ @ColumnWidth(30) - @ExcelProperty(value = "现居地",order = 11) + @ExcelProperty(value = "现居地",order = 10) private String presentAddress; /** * 现居地详细地址 */ @ColumnWidth(30) - @ExcelProperty(value = "现居地详细地址",order = 12) + @ExcelProperty(value = "现居地详细地址",order = 11) private String detailAddress; /** * 交通方式-中国字 */ @ColumnWidth(15) - @ExcelProperty(value = "返回方式",order = 13) + @ExcelProperty(value = "返回方式",order = 12) private String trafficTypeName; /** * 其他返回方式，交通方式为其他时此列需要有值 */ @ColumnWidth(18) - @ExcelProperty(value = "其他返回方式",order = 14) + @ExcelProperty(value = "其他返回方式",order = 13) private String trafficTypeExplain; /** * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字 */ @ColumnWidth(20) - @ExcelProperty(value = "7天内旅居史情况",order = 15) + @ExcelProperty(value = "7天内旅居史情况",order = 14) private String sojournHistoryName; /** * 隔离状态，字典表(isolate_type)【磐石】-中国字 */ @ColumnWidth(15) - @ExcelProperty(value = "隔离状态",order = 16) + @ExcelProperty(value = "隔离状态",order = 17) private String isolateTypeName; /** * 备注（500字以内） */ @ColumnWidth(30) - @ExcelProperty(value = "备注（500字以内）",order = 17) + @ExcelProperty(value = "备注（500字以内）",order = 16) private String remark; /** * 是否落实"落地检" 0:否 1:是【磐石】-中国字 */ @ColumnWidth(20) - @ExcelProperty(value = "是否落实“落地检”",order = 18) + @ExcelProperty(value = "是否落实“落地检”",order = 17) private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】-中国字 */ @ColumnWidth(20) - @ExcelProperty(value = "是否达到曹县",order = 19) + @ExcelProperty(value = "是否达到曹县",order = 18) private String isArriveName; /** * 上报时间（2022-01-01）【磐石】 */ @ColumnWidth(20) - @ExcelProperty(value = "上报时间（2022-01-01）",order = 20) + @ExcelProperty(value = "上报时间（2022-01-01）",order = 19) @JsonFormat(pattern = "yyyy-MM-dd") private String reportingTime; /** * 管控措施（500字以内）【磐石】 */ @ColumnWidth(30) - @ExcelProperty(value = "管控措施（500字以内）",order = 21) + @ExcelProperty(value = "管控措施（500字以内）",order = 20) private String controlMeasures; /** * 类型（省内、省外、市内、县内），字典表(trip_data_type)【磐石】-中国字 */ @ColumnWidth(25) - @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 22) + @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 21) private String tripDataTypeName; } From 92c4adea66d29429f1d1f87aeca205e6cb27270c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 7 Nov 2022 18:21:28 +0800 Subject: [PATCH 517/621] =?UTF-8?q?=E4=B8=A4=E6=9D=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 7bff317ba3..490810a020 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -31,7 +31,9 @@ r.ID_CARD as realIdCard, r.MOBILE as realMobile FROM ic_trip_report_record r - LEFT JOIN ic_epidemic_special_attention a ON (a.ID_CARD = r.ID_CARD AND a.DEL_FLAG = 0 AND a.IS_ATTENTION = 1 AND a.ATTENTION_TYPE = 2) + LEFT JOIN ( + select * from ic_epidemic_special_attention GROUP BY id_card ORDER BY created_time DESC + ) a ON (a.ID_CARD = r.ID_CARD AND a.DEL_FLAG = 0 AND a.IS_ATTENTION = 1 AND a.ATTENTION_TYPE = 2) WHERE r.DEL_FLAG = '0' AND r.CUSTOMER_ID = #{customerId} From 50d79f46b3ebfc24f736ba28095a5e88fe8ef5b0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Nov 2022 19:28:24 +0800 Subject: [PATCH 518/621] list.add(dto); --- ...IcEpidemicSpecialAttentionServiceImpl.java | 30 +++++++++++-------- .../impl/IcTripReportRecordServiceImpl.java | 18 +++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 31acd1ec00..317a04fe33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -290,6 +291,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl idCards = entities.stream().map(m -> m.getIdCard()).collect(Collectors.toList()); Integer attentionType = entities.get(NumConstant.ZERO).getAttentionType(); List existList = baseDao.getExistList(attentionType, idCards); + log.info("ic_epidemic_special_attention是否存在记录？attentionType="+attentionType+";idCards="+JSON.toJSONString(idCards)+";existList="+ JSON.toJSONString(existList)); List existsEntities = new ArrayList<>(); if (CollectionUtils.isNotEmpty(existList)){ for (String s : existList) { @@ -303,19 +305,21 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl { - e.setIsAttention(NumConstant.ONE); - e.setOrgId(agencyInfo.getId()); - e.setPid(agencyInfo.getPid()); - e.setPids(agencyInfo.getPids()); - e.setCustomerId(formDTO.getCustomerId()); - e.setIsHistory(NumConstant.ZERO_STR); - if(StringUtils.isBlank(e.getIsolatedState())){ - //从行程上报界面，点击加入重点人群关注，默认隔离状态是居家隔离 - e.setIsolatedState(NumConstant.ONE_STR); - } - }); - insertBatch(entities); + if(CollectionUtils.isNotEmpty(entities)){ + entities.forEach(e -> { + e.setIsAttention(NumConstant.ONE); + e.setOrgId(agencyInfo.getId()); + e.setPid(agencyInfo.getPid()); + e.setPids(agencyInfo.getPids()); + e.setCustomerId(formDTO.getCustomerId()); + e.setIsHistory(NumConstant.ZERO_STR); + if(StringUtils.isBlank(e.getIsolatedState())){ + //从行程上报界面，点击加入重点人群关注，默认隔离状态是居家隔离 + e.setIsolatedState(NumConstant.ONE_STR); + } + }); + insertBatch(entities); + } //新增通知表信息 List needSedNotice = formDTO.getList().stream().filter(l -> CollectionUtils.isNotEmpty(l.getChannel())).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(needSedNotice)) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 00d805abad..c7e37d77dd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -1,8 +1,5 @@ package com.epmet.service.impl; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,7 +14,6 @@ import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; 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.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -25,7 +21,10 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.FileUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.constant.IcResiUserConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcDangerAreaDao; @@ -63,21 +62,17 @@ 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 javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; /** @@ -292,12 +287,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Tue, 8 Nov 2022 09:27:18 +0800 Subject: [PATCH 519/621] =?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 --- .../main/java/com/epmet/dto/IcSyncJobDTO.java | 89 +++++++++++++++++++ .../controller/DataSyncConfigController.java | 12 +++ .../main/java/com/epmet/dao/IcSyncJobDao.java | 16 ++++ .../com/epmet/entity/IcSyncJobEntity.java | 59 ++++++++++++ .../epmet/service/DataSyncConfigService.java | 5 ++ .../com/epmet/service/IcSyncJobService.java | 78 ++++++++++++++++ .../impl/DataSyncConfigServiceImpl.java | 22 +++++ .../service/impl/IcSyncJobServiceImpl.java | 83 +++++++++++++++++ .../main/resources/mapper/IcSyncJobDao.xml | 6 ++ 9 files changed, 370 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSyncJobDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSyncJobEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcSyncJobService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcSyncJobServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSyncJobDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSyncJobDTO.java new file mode 100644 index 0000000000..320acd13b9 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSyncJobDTO.java @@ -0,0 +1,89 @@ +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-11-08 + */ +@Data +public class IcSyncJobDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID + */ + private String orgId; + + /** + * 组织ID的上级 + */ + private String pid; + + /** + * 组织ID的所有上级，包括org_id + */ + private String orgIdPath; + + /** + * 任务类型，残疾：disability；死亡：death；核酸：nat； + */ + private String jobType; + + /** + * 操作员ID【staffId】 + */ + private String operatorId; + + /** + * 操作状态,等待中：waiting；进行中：processing；结束：finish + */ + private String operationStatus; + + /** + * + */ + 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/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 2ea0a33db9..56ec47f551 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -112,4 +112,16 @@ public class DataSyncConfigController { return new Result(); } + @PostMapping("deathInfoScanTask") + public Result deathInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ + dataSyncConfigService.deathInfoScanTask(formDTO); + return new Result(); + } + + @PostMapping("disabilityInfoScanTask") + public Result disabilityInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ + dataSyncConfigService.disabilityInfoScanTask(formDTO); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java new file mode 100644 index 0000000000..5b4ad6684e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcSyncJobEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 同步任务表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-11-08 + */ +@Mapper +public interface IcSyncJobDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSyncJobEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSyncJobEntity.java new file mode 100644 index 0000000000..0a83b7aa56 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSyncJobEntity.java @@ -0,0 +1,59 @@ +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-11-08 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_sync_job") +public class IcSyncJobEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID + */ + private String orgId; + + /** + * 组织ID的上级 + */ + private String pid; + + /** + * 组织ID的所有上级，包括org_id + */ + private String orgIdPath; + + /** + * 任务类型，残疾：disability；死亡：death；核酸：nat； + */ + private String jobType; + + /** + * 操作员ID【staffId】 + */ + private String operatorId; + + /** + * 操作状态,等待中：waiting；进行中：processing；结束：finish + */ + private String operationStatus; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index fe51881c46..50e65d3b23 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -83,4 +83,9 @@ public interface DataSyncConfigService extends BaseService void scopeSave(ScopeSaveFormDTO formDTO); void dataSyncForYanTaiTask(DataSyncTaskParam formDTO); + + void deathInfoScanTask(DataSyncTaskParam formDTO); + + void disabilityInfoScanTask(DataSyncTaskParam formDTO); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcSyncJobService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcSyncJobService.java new file mode 100644 index 0000000000..fab06ea871 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcSyncJobService.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.IcSyncJobDTO; +import com.epmet.entity.IcSyncJobEntity; + +import java.util.List; +import java.util.Map; + +/** + * 同步任务表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-11-08 + */ +public interface IcSyncJobService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-11-08 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-11-08 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcSyncJobDTO + * @author generator + * @date 2022-11-08 + */ + IcSyncJobDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-11-08 + */ + void save(IcSyncJobDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-11-08 + */ + void update(IcSyncJobDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-11-08 + */ + 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/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 815c36d9cf..cd544907bb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -225,6 +225,28 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl configList, DataSyncTaskParam formDTO) { if (CollectionUtils.isEmpty(configList)) { log.warn("dataSyncYanTaiParallel configList is null"); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcSyncJobServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcSyncJobServiceImpl.java new file mode 100644 index 0000000000..c9e415eead --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcSyncJobServiceImpl.java @@ -0,0 +1,83 @@ +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.IcSyncJobDao; +import com.epmet.dto.IcSyncJobDTO; +import com.epmet.entity.IcSyncJobEntity; +import com.epmet.service.IcSyncJobService; +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-11-08 + */ +@Service +public class IcSyncJobServiceImpl extends BaseServiceImpl implements IcSyncJobService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcSyncJobDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcSyncJobDTO.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 IcSyncJobDTO get(String id) { + IcSyncJobEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcSyncJobDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcSyncJobDTO dto) { + IcSyncJobEntity entity = ConvertUtils.sourceToTarget(dto, IcSyncJobEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcSyncJobDTO dto) { + IcSyncJobEntity entity = ConvertUtils.sourceToTarget(dto, IcSyncJobEntity.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/IcSyncJobDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml new file mode 100644 index 0000000000..0b7ecc334d --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From cd1cf9c9eaf2e6c3f6ab82d7e445860c49568855 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 09:42:34 +0800 Subject: [PATCH 520/621] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9B=B4=E6=8D=A2=E6=A8=A1=E6=9D=BF=E3=80=90?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80=EF=BC=8C?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=8A=A0=E6=98=9F=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=8E=9F=E6=A8=A1=E6=9D=BF=E4=BF=9D=E7=95=99=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E6=94=B9=E4=B8=BAold=5F20221108=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 77824 -> 76288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 707fec0bae8077c9cd3e592f0a05b2442b408d9c..553966a9f2139973810cc343a340ff42400f0e52 100644 GIT binary patch delta 13126 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

1d^4<2Ioy~Ay+KsyqUc$Yrx)khOsaK) z`M_7u`;@L5Bl|Tb>qpW^*Qmy^LT@39yrXGEMyYbjM^vVCH=&zHq8S2afIC;vG@8-T z87uOpqdZ(}N7zkfn*m2iG0lWY#uJM$p;(Ow>Qh3Wp$4i$_l#h>;kodOY7g6=PVBu$ z?utn_Qx)0u!n_0yS|j3hIyAbcr-CY!FpVe80RHf)$*S@X#? z*davnH?Ab>&_KB*|jD5W8^SY%Z>yI$4dYaps`FZO-4;*_W?fuEwQa z_t@k;)83yarX);8y9TNC3r)Z^R6O77xMAfPh3QFTO)k8J#xy5(>z#a*>yfzE?7CxS&wv{;=J|;@*);t z!trc?M~F4{YE3pQ;EEgLHZpMd{Z`b8ekb2AL@u3J031p$H&&s%}XO&@>HMfp~hUERjIaB{zx!nyDch zT}QWQC>rQiZ}BmJw;}OOv~WMvDw<}~SyaJ7x^6ZuMP%w`Z-O&>fXBYCNnZp?%5I@9HUNu zxoLI5Wi?2B+O&-oMxJYI;CZP^+JJZ|<;{r>>O7u=tLcvawD9l9 zs}s^}mtC9T)4<9n;@8(XyS7TIFxDv=$9slgg60U20 z*&VFvWMm(mlrNsK$y@fuiIsBq-dUG4zTEwiB=|ZmQN=ZA7cX<$_1TdwUF))tU_VeXHwvSFAb04kwir&yG7Tj^}A)Snqj? zKFJr0T}Kd@C)X@z_OFSCl8+x^6g7PbjXWCc$>BJ@X z23O!rDq92b6W2{AKQtAerAMF%y6y*1J*(RZ=OJr8&d#^K`(}Lial&y{?sme_1?+^g z1Y4IKVQM_*W<4#%4?e6*PBI9CP=EG0h((;eW2=&)I`LLu`0yAtz9PH%JrCy-G0?8j`3V!h01}R3f1#juDpPvewxa$*jR&2haTg-1%7+`(uQrU->!gb&AV@_+mDX( z(E`q+T+Ie#{>zyZOPH@4fgg;%Ia7RDEBDbmM0-wZs+|@T=F9f@#`lRbKXmQ+WUu(aJ+&*Zb=PU4>pw!R#|znV z{(&Elf?T$*qt0Ua`$X;Q=X(BKG-SqSFiD>)eZAx2ze`vD@*Ga{zW8x;by7ru+Yc|;d}7y zJ#uLETNE$rCrEKqAlPd(0Z(T?1#9|`a1^L#l#GM zMfP78^TGwa6~PL8kk5BIWSlsTEi_*|sLbZ;$a%iUK=V9K+-N_29qs4XkM?uyNBimP zXg|Mxv{zmEhyT$O(Xr3L=e`}*1ThYqFg_~eKP&gRI3Xe4xq8_q-e46pG)igWfhQ70 zrugx;uLuW++`b~*27|YKKL0e0sY07No!JO$NDsJ%Ymv~ zF<;!9E(~Tmdj9i&nhj;qqe-NJg{t#t9A5F0wyVemvVOI&?mOqMt* z#Ga1i9FZZ`bd1aq!))wwmlTzi^dDF_sIa(j@W8U-jvYCou;Yas;fUa0pW`MqFKS)6 fW@Xdbj_w?hZ05;4_QpkxEeDcw#e4kEdg1>K^UuR1 From 147fbcb78fd7703e0791031215a837c7d87ec506 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 09:44:02 +0800 Subject: [PATCH 521/621] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9B=B4=E6=8D=A2=E6=A8=A1=E6=9D=BF=E3=80=90?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80=EF=BC=8C?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=8A=A0=E6=98=9F=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=8E=9F=E6=A8=A1=E6=9D=BF=E4=BF=9D=E7=95=99=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E6=94=B9=E4=B8=BAold=5F20221108=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_resi_import_template_old_20221108.xls | Bin 0 -> 77824 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls new file mode 100644 index 0000000000000000000000000000000000000000..c0c8966ab55c15bee0eadbbc5a8285173ced4d18 GIT binary patch literal 77824 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 Date: Tue, 8 Nov 2022 10:00:17 +0800 Subject: [PATCH 522/621] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E4=BA=BA=E7=BE=A4=E5=90=8D=E5=8D=95=EF=BC=8C=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E9=98=B2=E7=96=AB=E4=B8=AD=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=9A=94=E7=A6=BB=E7=8A=B6=E6=80=81=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B7=B2=E5=87=BA=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 6484609fba..afb67b17d8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -8,7 +8,9 @@ UPDATE ic_epidemic_special_attention SET UPDATED_TIME = NOW(), IS_ATTENTION = 0, - IS_HISTORY = '1' + IS_HISTORY = '1', + + ISOLATED_STATE = '3' WHERE del_flag = 0 AND attention_type = #{attentionType} AND id IN ( From 3e70714e357727292baa40ac0b76e7fb0d91281a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 10:30:38 +0800 Subject: [PATCH 523/621] test --- .../src/main/java/com/epmet/controller/AgencyController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3d86d05fb6..7b3933ad70 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 @@ -414,7 +414,7 @@ public class AgencyController { //获取AccessToken String accessToken = ThirdUtils.getAccessToken(tokenDto.getCustomerId()).getResiToken(); if (org.apache.commons.lang3.StringUtils.isBlank(accessToken)) { - log.warn("获取accessToken失败，customerId:{}", tokenDto.getCustomerId()); + log.error("获取accessToken失败，customerId:{}", tokenDto.getCustomerId()); throw new RenException("获取accessToken失败，customerId:{}", tokenDto.getCustomerId()); } CustomerAgencyDTO customerAgencyDTO = customerAgencyService.get(id); @@ -446,6 +446,7 @@ public class AgencyController { qrCodeMultipartFile.setOriginalFilename(originalFilename); Result uploadResult = ossFeignClient.uploadQrCode(qrCodeMultipartFile); if (!uploadResult.success()) { + log.error("调用oss服务上传活动居民信息录入码失败"); throw new RenException("调用oss服务上传活动居民信息录入码失败"); } From 5c3aad5f2cfa0442322a0a3c3c4587f7cf7757cc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 8 Nov 2022 11:17:45 +0800 Subject: [PATCH 524/621] =?UTF-8?q?=E6=9A=82=E6=8F=90=E4=B8=80=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/EpmetUserOpenFeignClient.java | 11 +- .../EpmetUserOpenFeignClientFallback.java | 15 ++ .../com/epmet/constant/EpidemicConstant.java | 15 ++ .../controller/DataSyncConfigController.java | 26 ++- .../java/com/epmet/dao/DataSyncConfigDao.java | 4 +- .../epmet/service/DataSyncConfigService.java | 20 +++ .../impl/DataSyncConfigServiceImpl.java | 152 +++++++++++++++++- .../resources/mapper/DataSyncConfigDao.xml | 11 ++ 8 files changed, 248 insertions(+), 6 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 9abd3a1073..24ca6b3873 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -922,7 +922,7 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/userbaseinfo/dingResiLogin") Result dingResiLogin(@RequestBody DingLoginResiFormDTO formDTO); - @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask") + @PostMapping("/epmetuser/dataSyncConfig/dataSyncForYanTaiTask") Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO); /** @@ -943,4 +943,13 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/registerrelation/getAllResiByGrid") Result getAllResiByGrid(@RequestBody AllResiByGridFormDTO formDTO); + + @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask") + Result natInfoScanTaskV2(@RequestBody DataSyncTaskParam formDTO); + + @PostMapping("/epmetuser/dataSyncConfig/deathInfoScanTask") + Result deathInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + + @PostMapping("/epmetuser/dataSyncConfig/disabilityInfoScanTask") + Result disabilityInfoScanTask(@RequestBody DataSyncTaskParam formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 2e198c04d9..d13aab8c15 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -726,4 +726,19 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result getAllResiByGrid(AllResiByGridFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getAllResiByGrid", formDTO); } + + @Override + public Result natInfoScanTaskV2(DataSyncTaskParam formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "natInfoScanTaskV2", formDTO); + } + + @Override + public Result deathInfoScanTask(DataSyncTaskParam formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "deathInfoScanTask", formDTO); + } + + @Override + public Result disabilityInfoScanTask(DataSyncTaskParam formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabilityInfoScanTask", formDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java new file mode 100644 index 0000000000..41bdd00158 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java @@ -0,0 +1,15 @@ +package com.epmet.constant; + +public interface EpidemicConstant { + + /** + * 数据配置的dataCode + * 核酸检测 + * 残疾人 + * 死亡 + */ + String DATA_CODE_NAT = "hesuan"; + String DATA_CODE_DISABILITY = "canji"; + String DATA_CODE_DEATH = "siwang"; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 56ec47f551..7f67e1df52 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -106,18 +106,42 @@ public class DataSyncConfigController { return new Result(); } + @PostMapping("dataSyncForYanTaiTask") + public Result dataSyncForYanTaiTask(@RequestBody DataSyncTaskParam formDTO){ + dataSyncConfigService.dataSyncForYanTaiTask(formDTO); + return new Result(); + } + + /** + * @Description 核酸检测信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/8 10:37 + */ @PostMapping("natInfoScanTask") public Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ - dataSyncConfigService.dataSyncForYanTaiTask(formDTO); + dataSyncConfigService.natInfoScanTask(formDTO); return new Result(); } + /** + * @Description 死亡信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/8 09:01 + */ @PostMapping("deathInfoScanTask") public Result deathInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ dataSyncConfigService.deathInfoScanTask(formDTO); return new Result(); } + /** + * @Description 残疾信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/8 09:01 + */ @PostMapping("disabilityInfoScanTask") public Result disabilityInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ dataSyncConfigService.disabilityInfoScanTask(formDTO); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java index 2963617263..35bbc6266d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java @@ -38,7 +38,7 @@ public interface DataSyncConfigDao extends BaseDao { * @author zxc * @date 2022/9/26 15:04 */ - List list(@Param("customerId") String customerId, @Param("switchStatus") String switchStatus); + List list(@Param("customerId") String customerId, @Param("switchStatus") String switchStatus, @Param("dataCode")String dataCode); List scopeList(@Param("id") String id); @@ -60,4 +60,6 @@ public interface DataSyncConfigDao extends BaseDao { */ List getIdCardsByScope(DataSyncTaskParam formDTO); + DataSyncConfigDTO getConfigInfoByType(@Param("customerId") String customerId, @Param("switchStatus") String switchStatus,@Param("dataCode")String dataCode); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index 50e65d3b23..8ffba84f3b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -84,8 +84,28 @@ public interface DataSyncConfigService extends BaseService void dataSyncForYanTaiTask(DataSyncTaskParam formDTO); + /** + * @Description 死亡信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/8 09:01 + */ void deathInfoScanTask(DataSyncTaskParam formDTO); + /** + * @Description 残疾信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/8 09:01 + */ void disabilityInfoScanTask(DataSyncTaskParam formDTO); + /** + * @Description 核酸检测信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/8 10:37 + */ + void natInfoScanTask(DataSyncTaskParam formDTO); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index cd544907bb..81a894be8e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.YtHsResUtils; +import com.epmet.constant.EpidemicConstant; import com.epmet.dao.DataSyncConfigDao; import com.epmet.dao.IcNatDao; import com.epmet.dto.DataSyncConfigDTO; @@ -134,7 +135,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl result = new PageData<>(new ArrayList<>(), NumConstant.ZERO_L); PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) - .doSelectPageInfo(() -> baseDao.list(tokenDto.getCustomerId(), null)); + .doSelectPageInfo(() -> baseDao.list(tokenDto.getCustomerId(), null,null)); if (CollectionUtils.isNotEmpty(pageInfo.getList())) { result.setList(pageInfo.getList()); result.setTotal(Integer.parseInt(String.valueOf(pageInfo.getTotal()))); @@ -189,7 +190,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl allConfigList = baseDao.list(formDTO.getCustomerId(), "open"); + List allConfigList = baseDao.list(formDTO.getCustomerId(), "open",null); if (CollectionUtils.isEmpty(allConfigList)) { return; } @@ -233,7 +234,43 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl configData = getConfigData(null, EpidemicConstant.DATA_CODE_DEATH); + if (CollectionUtils.isEmpty(configData)){ + log.warn("deathInfoScanTask not exists config data,customer is "+formDTO.getCustomerId()); + return; + } + long count = configData.stream().filter(o -> CollectionUtils.isNotEmpty(o.getScopeList())).count(); + if (count < 1) { + log.warn("deathInfoScanTask scopeList is null"); + return; + } + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_THOUSAND; + List dbResiList = null; + do { + for (DataSyncConfigDTO config : configData) { + // 设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + if (CollectionUtils.isEmpty(dbResiList)) { + continue; + } + switch (anEnum) { + case SI_WANG: + try { + //查询正常状态的居民 + siWang(dbResiList); + log.info("======siWang信息拉取结束======"); + } catch (Exception e) { + log.error("death thread execute exception", e); + } + default: + log.warn("没有要处理的数据"); + } + } + pageNo++; + } while (dbResiList != null && dbResiList.size() == pageSize); } /** @@ -244,7 +281,116 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl configData = getConfigData(null, EpidemicConstant.DATA_CODE_DISABILITY); + if (CollectionUtils.isEmpty(configData)){ + log.warn("disabilityInfoScanTask not exists config data,customer is "+formDTO.getCustomerId()); + return; + } + long count = configData.stream().filter(o -> CollectionUtils.isNotEmpty(o.getScopeList())).count(); + if (count < 1) { + log.warn("disabilityInfoScanTask scopeList is null"); + return; + } + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_THOUSAND; + List dbResiList = null; + do { + for (DataSyncConfigDTO config : configData) { + // 设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + formDTO.setCategoryColumn("IS_CJ"); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + if (CollectionUtils.isEmpty(dbResiList)) { + continue; + } + switch (anEnum) { + case CAN_JI: + try { + //查询正常状态的居民 + canJi(dbResiList); + log.info("======canJi信息拉取结束======"); + } catch (Exception e) { + log.error("disability thread execute exception", e); + } + break; + default: + log.warn("没有要处理的数据"); + } + } + pageNo++; + } while (dbResiList != null && dbResiList.size() == pageSize); + } + /** + * @Description 核酸检测信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/8 10:37 + */ + @Override + public void natInfoScanTask(DataSyncTaskParam formDTO) { + List configData = new ArrayList<>(); + if (StringUtils.isBlank(formDTO.getAgencyId())){ + configData = getConfigData(null, EpidemicConstant.DATA_CODE_DISABILITY); + if (CollectionUtils.isEmpty(configData)){ + log.warn("natInfoScanTask not exists config data,customer is "+formDTO.getCustomerId()); + return; + } + long count = configData.stream().filter(o -> CollectionUtils.isNotEmpty(o.getScopeList())).count(); + if (count < 1) { + log.warn("natInfoScanTask scopeList is null"); + return; + } + } + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_THOUSAND; + List dbResiList = null; + do { + if (StringUtils.isBlank(formDTO.getAgencyId())){ + for (DataSyncConfigDTO config : configData) { + // 设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + if (CollectionUtils.isEmpty(dbResiList)) { + continue; + } + switch (anEnum) { + case HE_SUAN: + try { + //查询正常状态的居民 + yantaiHsjcByDbView(dbResiList, config.getCustomerId(), formDTO.getIsSync()); + log.info("======核酸检测信息拉取结束======"); + } catch (Exception e) { + log.error("nat thread execute exception", e); + } + break; + default: + log.warn("没有要处理的数据"); + } + } + }else { + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + if (CollectionUtils.isEmpty(dbResiList)){ + return; + } + yantaiHsjcByDbView(dbResiList, dbResiList.get(NumConstant.ZERO).getCustomerId(), formDTO.getIsSync()); + } + pageNo++; + } while (dbResiList != null && dbResiList.size() == pageSize); + } + + /** + * @Description 配置信息查询 + * @param customerId + * @param dataCode + * @Author zxc + * @Date 2022/11/8 10:41 + */ + public List getConfigData(String customerId, String dataCode){ + List allConfigList = baseDao.list(customerId, "open",dataCode); + return CollectionUtils.isEmpty(allConfigList) ? new ArrayList<>() : allConfigList; } private void dataSyncYanTaiParallel(List configList, DataSyncTaskParam formDTO) { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml index cc4209f310..911b5102bd 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml @@ -47,6 +47,9 @@ AND CUSTOMER_ID = #{customerId} + + AND data_code = #{dataCode} + order by sort @@ -103,4 +106,12 @@ ORDER BY CREATED_TIME + + From 89f45c19e698e9e8ddbea72d86f7eac50dd66469 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 8 Nov 2022 13:26:36 +0800 Subject: [PATCH 525/621] =?UTF-8?q?=E6=9A=82=E6=8F=90=E4=B8=80=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/task/NatInfoScanTask.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java index f141cc818a..459fdfd72b 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java @@ -30,11 +30,34 @@ public class NatInfoScanTask implements ITask { if (StringUtils.isNotBlank(params)) { formDTO = JSON.parseObject(params, DataSyncTaskParam.class); } - Result result = userOpenFeignClient.natInfoScanTask(formDTO); + /*Result result = userOpenFeignClient.natInfoScanTask(formDTO); if (result.success()) { log.info("NatInfoScanTask定时任务执行成功"); } else { log.error("NatInfoScanTask定时任务执行失败:" + result.getMsg()); + }*/ + // 核酸检测 + Result natResult = userOpenFeignClient.natInfoScanTaskV2(formDTO); + if (natResult.success()) { + log.info("NatInfoScanTask定时任务执行成功"); + } else { + log.error("NatInfoScanTask定时任务执行失败:" + natResult.getMsg()); + } + + // 死亡 + Result deathResult = userOpenFeignClient.deathInfoScanTask(formDTO); + if (deathResult.success()) { + log.info("deathInfoScanTask定时任务执行成功"); + } else { + log.error("deathInfoScanTask定时任务执行失败:" + deathResult.getMsg()); + } + + // 残疾 + Result disabilityResult = userOpenFeignClient.disabilityInfoScanTask(formDTO); + if (disabilityResult.success()) { + log.info("disabilityInfoScanTask定时任务执行成功"); + } else { + log.error("disabilityInfoScanTask定时任务执行失败:" + disabilityResult.getMsg()); } } } From ed0605fd660d23e8f5f8d058743482986ae68505 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 8 Nov 2022 13:28:56 +0800 Subject: [PATCH 526/621] emm --- .../src/main/java/com/epmet/task/NatInfoScanTask.java | 4 ++-- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 4 ++-- .../feign/fallback/EpmetUserOpenFeignClientFallback.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java index 459fdfd72b..e50793f551 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java @@ -30,14 +30,14 @@ public class NatInfoScanTask implements ITask { if (StringUtils.isNotBlank(params)) { formDTO = JSON.parseObject(params, DataSyncTaskParam.class); } - /*Result result = userOpenFeignClient.natInfoScanTask(formDTO); + /*Result result = userOpenFeignClient.dataSyncForYanTaiTask(formDTO); if (result.success()) { log.info("NatInfoScanTask定时任务执行成功"); } else { log.error("NatInfoScanTask定时任务执行失败:" + result.getMsg()); }*/ // 核酸检测 - Result natResult = userOpenFeignClient.natInfoScanTaskV2(formDTO); + Result natResult = userOpenFeignClient.natInfoScanTask(formDTO); if (natResult.success()) { log.info("NatInfoScanTask定时任务执行成功"); } else { diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 24ca6b3873..b24a4a9651 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -923,7 +923,7 @@ public interface EpmetUserOpenFeignClient { Result dingResiLogin(@RequestBody DingLoginResiFormDTO formDTO); @PostMapping("/epmetuser/dataSyncConfig/dataSyncForYanTaiTask") - Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + Result dataSyncForYanTaiTask(@RequestBody DataSyncTaskParam formDTO); /** * Desc: 客户下所有工作人员放缓存 @@ -945,7 +945,7 @@ public interface EpmetUserOpenFeignClient { Result getAllResiByGrid(@RequestBody AllResiByGridFormDTO formDTO); @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask") - Result natInfoScanTaskV2(@RequestBody DataSyncTaskParam formDTO); + Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO); @PostMapping("/epmetuser/dataSyncConfig/deathInfoScanTask") Result deathInfoScanTask(@RequestBody DataSyncTaskParam formDTO); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index d13aab8c15..b675a7626b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -713,8 +713,8 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result natInfoScanTask(DataSyncTaskParam formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "natInfoScanTask", formDTO); + public Result dataSyncForYanTaiTask(DataSyncTaskParam formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "dataSyncForYanTaiTask", formDTO); } @Override @@ -728,7 +728,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result natInfoScanTaskV2(DataSyncTaskParam formDTO) { + public Result natInfoScanTask(DataSyncTaskParam formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "natInfoScanTaskV2", formDTO); } From 922abb6bd44cb817d71fa2af36a9e52c4950e28a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 14:47:13 +0800 Subject: [PATCH 527/621] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=9A=82=E6=97=B6=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 76288 -> 77824 bytes ...s => ic_resi_import_template_new_1108.xls} | Bin 77824 -> 76288 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_import_template_old_20221108.xls => ic_resi_import_template_new_1108.xls} (53%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 553966a9f2139973810cc343a340ff42400f0e52..c0c8966ab55c15bee0eadbbc5a8285173ced4d18 100644 GIT binary patch delta 14516 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 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls similarity index 53% rename from epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls rename to epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls index c0c8966ab55c15bee0eadbbc5a8285173ced4d18..553966a9f2139973810cc343a340ff42400f0e52 100644 GIT binary patch delta 13125 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 delta 14516 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 Date: Tue, 8 Nov 2022 15:00:54 +0800 Subject: [PATCH 528/621] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9=E6=A0=87=E7=BA=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 77824 -> 77824 bytes ... ic_resi_import_template_old_20221108.xls} | Bin 76288 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_import_template_new_1108.xls => ic_resi_import_template_old_20221108.xls} (53%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index c0c8966ab55c15bee0eadbbc5a8285173ced4d18..cac3bb824cb18be22265bea1c4c08d825c7077bd 100644 GIT binary patch delta 15427 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 delta 15527 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 bEgjh+-o%b**v+$R>vzTHh?D%+-Jt&kGBx76 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls similarity index 53% rename from epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls rename to epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls index 553966a9f2139973810cc343a340ff42400f0e52..c0c8966ab55c15bee0eadbbc5a8285173ced4d18 100644 GIT binary patch delta 14516 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 From 892de51f78048e8110116252da914b84237dfd5e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 15:18:01 +0800 Subject: [PATCH 529/621] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 77824 -> 77824 bytes ...s => ic_resi_import_template_new_1108.xls} | Bin 77824 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_import_template_old_20221108.xls => ic_resi_import_template_new_1108.xls} (53%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index cac3bb824cb18be22265bea1c4c08d825c7077bd..e93a220109893f906aadd80c20ecd0fd7f6ba213 100644 GIT binary patch delta 15527 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%0D=zf9ZwzNrOH=_4Q+^C)V$H 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 bTRO5uyonvruv=%>*6)hX5hwYtyFvd8VVmMo delta 15427 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 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls similarity index 53% rename from epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls rename to epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_new_1108.xls index c0c8966ab55c15bee0eadbbc5a8285173ced4d18..8f9cf94926449c101231a9a451d7fbd5b68bc34a 100644 GIT binary patch delta 15427 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 delta 15527 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 bEgjh+-o%b**v+$R>vzTHh?D%+-Jt&kGBx76 From 8d8ff32cdce6768735e8787db6bc5051b11bcab7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 15:22:27 +0800 Subject: [PATCH 530/621] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 77824 -> 79360 bytes .../ic_resi_import_template_old_1108.xls | Bin 0 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index e93a220109893f906aadd80c20ecd0fd7f6ba213..2137379ab92584418e891469ab4e75eb52cf0c59 100644 GIT binary patch delta 13722 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 NnZIzaW-$Ab{U2O0&Q<^b delta 12800 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 MIqW2(e(EtDd diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls new file mode 100644 index 0000000000000000000000000000000000000000..e93a220109893f906aadd80c20ecd0fd7f6ba213 GIT binary patch literal 77824 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 Date: Tue, 8 Nov 2022 15:23:35 +0800 Subject: [PATCH 531/621] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 2 + .../com/epmet/dto/form/DataSyncTaskParam.java | 2 + .../com/epmet/constant/EpidemicConstant.java | 6 + .../controller/DataSyncConfigController.java | 8 ++ .../epmet/service/DataSyncConfigService.java | 2 + .../impl/DataSyncConfigServiceImpl.java | 103 +++++++++++++++++- 6 files changed, 122 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 0bf690a8ea..8bea28a618 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -217,6 +217,8 @@ public enum EpmetErrorCode { CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"), CATEGORY_NAME(9102,"分类名称已存在，不允许重复"), + EXIST_SYNC_JOB_ERROR(9103,"存在同步任务"), + OTHER_SYNC_JOB_ERROR(9104,"同步任务已提交，请稍后查看数据"), // open api异常 OPEN_API_UNAUTHENTICATED(10100, "请求未认证"), diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java index 00134f6c45..215ffabf28 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java @@ -47,4 +47,6 @@ public class DataSyncTaskParam implements Serializable { */ private String agencyId = null; private String dataCode; + + private String staffId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java index 41bdd00158..0ad814d722 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java @@ -12,4 +12,10 @@ public interface EpidemicConstant { String DATA_CODE_DISABILITY = "canji"; String DATA_CODE_DEATH = "siwang"; + String JOB_TYPE_NAT = "nat"; + + String OPERATION_STATUS_WAITING = "waiting"; + String OPERATION_STATUS_PROCESSING = "processing"; + String OPERATION_STATUS_FINISH = "finish"; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 7f67e1df52..cbbc409d6b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -124,6 +124,14 @@ public class DataSyncConfigController { return new Result(); } + @PostMapping("natInfoSyncButton") + public Result natInfoSyncButton(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + dataSyncConfigService.natInfoSyncButton(formDTO); + return new Result(); + } + /** * @Description 死亡信息定时拉取 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index 8ffba84f3b..dd1efb81b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -108,4 +108,6 @@ public interface DataSyncConfigService extends BaseService */ void natInfoScanTask(DataSyncTaskParam formDTO); + void natInfoSyncButton(DataSyncTaskParam formDTO); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 81a894be8e..88e30607ba 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1,20 +1,27 @@ package com.epmet.service.impl; +import java.util.Date; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; import com.epmet.commons.tools.enums.GenderEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; 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.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; @@ -24,6 +31,7 @@ import com.epmet.commons.tools.utils.YtHsResUtils; import com.epmet.constant.EpidemicConstant; import com.epmet.dao.DataSyncConfigDao; import com.epmet.dao.IcNatDao; +import com.epmet.dao.IcSyncJobDao; import com.epmet.dto.DataSyncConfigDTO; import com.epmet.dto.DataSyncRecordDeathDTO; import com.epmet.dto.DataSyncRecordDisabilityDTO; @@ -40,6 +48,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; +import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; @@ -50,9 +59,12 @@ import javax.annotation.Resource; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; +import static com.epmet.constant.EpidemicConstant.*; + /** * 数据更新配置表 * @@ -77,6 +89,12 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl configData = new ArrayList<>(); if (StringUtils.isBlank(formDTO.getAgencyId())){ - configData = getConfigData(null, EpidemicConstant.DATA_CODE_DISABILITY); + configData = getConfigData(null, EpidemicConstant.DATA_CODE_NAT); if (CollectionUtils.isEmpty(configData)){ log.warn("natInfoScanTask not exists config data,customer is "+formDTO.getCustomerId()); return; @@ -381,6 +399,89 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl qw = new LambdaQueryWrapper<>(); + qw.eq(IcSyncJobEntity::getOrgId,formDTO.getAgencyId()).in(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING,OPERATION_STATUS_PROCESSING); + List icSyncJobEntities = icSyncJobDao.selectList(qw); + // 当前组织下存在同步任务 + if (CollectionUtils.isNotEmpty(icSyncJobEntities)){ + throw new EpmetException(EpmetErrorCode.EXIST_SYNC_JOB_ERROR.getCode()); + } + // 不存在新增一条记录 + IcSyncJobEntity e = new IcSyncJobEntity(); + e.setCustomerId(formDTO.getCustomerId()); + e.setOrgId(formDTO.getAgencyId()); + e.setPid(agencyInfo.getPid()); + e.setOrgIdPath(StringUtils.isBlank(agencyInfo.getPids()) ? agencyInfo.getId() : agencyInfo.getPids()+":"+agencyInfo.getId()); + e.setJobType(JOB_TYPE_NAT); + e.setOperatorId(formDTO.getStaffId()); + e.setOperationStatus(OPERATION_STATUS_WAITING); + insertSync(e); + // 客户下，type=nat 存在两条正在进行中的同步任务 + LambdaQueryWrapper qw2 = new LambdaQueryWrapper<>(); + qw2.eq(IcSyncJobEntity::getCustomerId,formDTO.getCustomerId()) + .eq(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_PROCESSING) + .eq(IcSyncJobEntity::getJobType,JOB_TYPE_NAT); + List processingList = icSyncJobDao.selectList(qw2); + if (CollectionUtils.isNotEmpty(processingList) && processingList.size() >= NumConstant.TWO){ + throw new EpmetException(EpmetErrorCode.OTHER_SYNC_JOB_ERROR.getCode()); + } + List waitList; + do { + LambdaQueryWrapper qw3 = new LambdaQueryWrapper<>(); + qw3.eq(IcSyncJobEntity::getCustomerId,formDTO.getCustomerId()) + .eq(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING) + .eq(IcSyncJobEntity::getJobType,JOB_TYPE_NAT) + .orderByAsc(BaseEpmetEntity::getCreatedTime); + waitList = icSyncJobDao.selectList(qw3); + if (CollectionUtils.isNotEmpty(waitList)){ + for (IcSyncJobEntity entity : waitList) { + RLock lock = null; + try { + lock = distributedLock.getLock(entity.getOrgId() + JOB_TYPE_NAT, 60L, 60L, TimeUnit.SECONDS); + updateSync(entity.getId(),OPERATION_STATUS_PROCESSING); + }catch (Exception ex){ + log.error(ex.getMessage()); + throw new EpmetException(ex.getMessage()); + }finally { + lock.unlock(); + } + formDTO.setAgencyId(entity.getOrgId()); + try { + natInfoScanTask(formDTO); + }catch (Exception ee){ + log.error(ee.getMessage()); + throw new EpmetException(ee.getMessage()); + }finally { + updateSync(entity.getId(),OPERATION_STATUS_FINISH); + } + } + } + }while (CollectionUtils.isNotEmpty(waitList)); + } + + @Transactional(rollbackFor = Exception.class) + public void updateSync(String id,String status){ + LambdaUpdateWrapper qwUpdate = new LambdaUpdateWrapper<>(); + qwUpdate.eq(BaseEpmetEntity::getId,id) + .set(IcSyncJobEntity::getOperationStatus,status) + .set(BaseEpmetEntity::getUpdatedTime, new Date()); + icSyncJobDao.update(null,qwUpdate); + } + @Transactional(rollbackFor = Exception.class) + public void insertSync(IcSyncJobEntity e){ + icSyncJobService.insert(e); + } + /** * @Description 配置信息查询 * @param customerId From ae4809496653f67a27a493f8657d32cdc4952a7d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Nov 2022 15:58:21 +0800 Subject: [PATCH 532/621] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_resi_import_template_old_1108.xls | Bin 77824 -> 0 bytes ... ic_resi_import_template_old_20221108.xls} | Bin 77824 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_import_template_new_1108.xls => ic_resi_import_template_old_20221108.xls} (66%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_1108.xls deleted file mode 100644 index e93a220109893f906aadd80c20ecd0fd7f6ba213..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77824 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 Date: Tue, 8 Nov 2022 17:08:57 +0800 Subject: [PATCH 533/621] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 79360 -> 79360 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 2137379ab92584418e891469ab4e75eb52cf0c59..4d7e3660d70c03c14b60ef06fc052ed571a7b71c 100644 GIT binary patch delta 7263 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 L?d5~TftddR_u Date: Tue, 8 Nov 2022 17:29:29 +0800 Subject: [PATCH 534/621] =?UTF-8?q?/heart/icpartyactivity/search=E8=81=94?= =?UTF-8?q?=E5=BB=BA=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyUnitServiceImpl.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 7a07763ea1..17ed0d4dde 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -43,6 +43,7 @@ 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.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; @@ -75,6 +76,7 @@ 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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -114,7 +116,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl search(PartyUnitFormDTO formDTO) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); @@ -329,11 +332,18 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl option(IcPartyUnitDTO dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcPartyUnitEntity::getAgencyId, dto.getAgencyId()); - wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime); - wrapper.eq(StringUtils.isNotBlank(dto.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, dto.getServiceMatter()); - List list = baseDao.selectList(wrapper); + // LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + // wrapper.eq(IcPartyUnitEntity::getAgencyId, dto.getAgencyId()); + // wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime); + // wrapper.eq(StringUtils.isNotBlank(dto.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, dto.getServiceMatter()); + // List list = baseDao.selectList(wrapper); + // 改成查询当前组织及下级的数据 + String customerId = loginUserUtil.getLoginUserCustomerId(); + PartyUnitFormDTO partyUnitFormDTO = new PartyUnitFormDTO(); + partyUnitFormDTO.setCustomerId(customerId); + partyUnitFormDTO.setAgencyId(dto.getAgencyId()); + partyUnitFormDTO.setServiceMatter(dto.getServiceMatter()); + List list = baseDao.pageList(partyUnitFormDTO); if (CollectionUtils.isEmpty(list)) { return Collections.emptyList(); } From 599109db1c9c8ea3b53857b900d3860f84d65148 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 18:17:42 +0800 Subject: [PATCH 535/621] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcPartyUnitDao.java | 2 ++ .../com/epmet/dao/IcServiceItemDictDao.java | 3 +++ .../com/epmet/service/IcPartyUnitService.java | 20 ++++++++++++------- .../service/IcServiceItemDictService.java | 2 ++ .../impl/IcPartyActivityServiceImpl.java | 17 ++++++++++++++++ .../service/impl/IcPartyUnitServiceImpl.java | 14 +++++++++++++ .../impl/IcServiceItemDictServiceImpl.java | 5 ++++- .../resources/mapper/IcPartyActivityDao.xml | 3 ++- .../main/resources/mapper/IcPartyUnitDao.xml | 13 ++++++++++++ .../resources/mapper/IcServiceItemDictDao.xml | 10 ++++++++++ 10 files changed, 80 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java index e0cb649327..30fcd451c8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java @@ -124,4 +124,6 @@ public interface IcPartyUnitDao extends BaseDao { * @return */ List pageList(PartyUnitFormDTO formDTO); + + List getUnitNames(@Param("unitIds") List unitIds); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java index 1e1fd873c9..c01c80b4d4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.result.demand.ServiceItemResultDTO; import com.epmet.entity.IcServiceItemDictEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,4 +37,6 @@ public interface IcServiceItemDictDao extends BaseDao { List pageList(String customerId); IcServiceItemDictEntity selectMax(String customerId); + + String selectName(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java index 8cc2d342a7..3ea2e48394 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java @@ -6,13 +6,12 @@ import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcPartyUnitDTO; -import com.epmet.dto.form.PartyActivityFormDTO; -import com.epmet.dto.form.PartyTypepercentFormDTO; -import com.epmet.dto.form.PartyUnitFormDTO; -import com.epmet.dto.form.PartyUnitListFormDTO; -import com.epmet.dto.form.PartyUnitListbriefFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.form.demand.ServiceQueryFormDTO; -import com.epmet.dto.result.*; +import com.epmet.dto.result.CheckStaffInfoResultDTO; +import com.epmet.dto.result.PartyTypepercentResultDTO; +import com.epmet.dto.result.PartyUnitDistributionResultDTO; +import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyUnitEntity; import org.springframework.web.multipart.MultipartFile; @@ -20,7 +19,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; /** * 联建单位 @@ -181,4 +179,12 @@ public interface IcPartyUnitService extends BaseService { List getTypepercent(PartyTypepercentFormDTO form); void editPartyOrCommunity(CheckStaffInfoResultDTO formDTO); + + /** + * 查询联建单位名称， + * 不限制del_flag='0' + * @param unitIds + * @return + */ + List getUnitNames(List unitIds); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java index af01c8a4c3..6ed62cbdf2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java @@ -79,4 +79,6 @@ public interface IcServiceItemDictService extends BaseService unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA)); List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(unitNames)){ + unitNames=icPartyUnitService.getUnitNames(unitIds); + } dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); if (StringUtils.isNotEmpty(dto.getGridId())) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); @@ -132,6 +135,20 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl serviceMatterid = Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA)); + List serviceMatterNameList=new ArrayList<>(); + for(String id:serviceMatterid){ + String categoryName=icServiceItemDictService.getCategoryName(dto.getCustomerId(),id); + if(StringUtils.isNotBlank(categoryName)){ + serviceMatterNameList.add(categoryName); + } + } + dto.setServiceMatterList(serviceMatterid); + dto.setServiceMatterNameList(serviceMatterNameList); + dto.setServiceMatterName(StringUtils.join(serviceMatterNameList, StrConstant.COMMA)); + } }); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 17ed0d4dde..0f31a1287d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -778,4 +778,18 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl getUnitNames(List unitIds) { + if(CollectionUtils.isEmpty(unitIds)){ + return new ArrayList<>(); + } + return baseDao.getUnitNames(unitIds); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java index 3fbda7cd37..a34bb83907 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java @@ -201,5 +201,8 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl order by u.CREATED_TIME desc + + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml index 787ccb9d66..4582741dbb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml @@ -31,4 +31,14 @@ order by CATEGORY_CODE desc limit 1 + + \ No newline at end of file From a093d3a0df80e93ad5f07fd179978dcce0ea406a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 18:28:42 +0800 Subject: [PATCH 536/621] zaishishi --- .../com/epmet/service/impl/IcPartyActivityServiceImpl.java | 1 + .../src/main/resources/mapper/IcPartyUnitDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 75a58580cf..96219850ae 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -127,6 +127,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl - - ID = #{i.id} + + u.ID = #{id} From d2b124d87556bc7048ff518b1110f2abdbebc687 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 20:05:00 +0800 Subject: [PATCH 537/621] 1 --- .../service/impl/IcPartyActivityServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 96219850ae..2367f0bbb1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -119,16 +119,17 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + // Map option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); dtoList.forEach(dto -> { //联建单位ID与单位名匹配 List unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA)); - List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(unitNames)){ - unitNames=icPartyUnitService.getUnitNames(unitIds); - } + // List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); + // if(CollectionUtils.isEmpty(unitNames)){ + List unitNames=icPartyUnitService.getUnitNames(unitIds); + // } dto.setUnitIdList(unitIds); dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); + dto.setUnitNameList(unitNames); if (StringUtils.isNotEmpty(dto.getGridId())) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); if (null != gridInfo) { From de445aa48ca2097385034726fce0e4e066b8b83f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 8 Nov 2022 20:32:24 +0800 Subject: [PATCH 538/621] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPartyUnitDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml index f595e07234..42137b9611 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml @@ -236,5 +236,11 @@ u.ID = #{id} + ORDER BY field( + u.ID, + + #{unitId} + + ) \ No newline at end of file From cf75416107e7784a7bec5cb750b6edd625490314 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 8 Nov 2022 20:40:56 +0800 Subject: [PATCH 539/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 2 +- .../main/java/com/epmet/UserApplication.java | 2 + .../main/java/com/epmet/dao/IcSyncJobDao.java | 8 +- .../processor/YanTaiNatSyncProcessor.java | 126 ++++++++++++++++++ .../epmet/service/DataSyncConfigService.java | 23 ++++ .../impl/DataSyncConfigServiceImpl.java | 114 ++++++++++------ .../main/resources/mapper/IcSyncJobDao.xml | 23 ++++ 7 files changed, 253 insertions(+), 45 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 8bea28a618..46e02f1d12 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -217,7 +217,7 @@ public enum EpmetErrorCode { CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"), CATEGORY_NAME(9102,"分类名称已存在，不允许重复"), - EXIST_SYNC_JOB_ERROR(9103,"存在同步任务"), + EXIST_SYNC_JOB_ERROR(9103,"存在等待或进行中的任务"), OTHER_SYNC_JOB_ERROR(9104,"同步任务已提交，请稍后查看数据"), // open api异常 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java index 5767fb4d33..dd147516e9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java @@ -14,6 +14,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; /** * 管理后台 @@ -22,6 +23,7 @@ import org.springframework.scheduling.annotation.EnableAsync; * @since 1.0.0 */ +@EnableScheduling @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java index 5b4ad6684e..298b5fb6b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java @@ -3,6 +3,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcSyncJobEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 同步任务表 @@ -12,5 +15,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcSyncJobDao extends BaseDao { - + + List selectExecutableJobList(@Param("jobType") String jobType, + @Param("operationStatus") String operationStatus, + @Param("itemCount") int itemCount); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java new file mode 100644 index 0000000000..fb8b4a2230 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java @@ -0,0 +1,126 @@ +package com.epmet.processor; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.constant.EpidemicConstant; +import com.epmet.dao.IcSyncJobDao; +import com.epmet.entity.IcSyncJobEntity; +import com.epmet.service.DataSyncConfigService; +import lombok.extern.slf4j.Slf4j; +import org.redisson.api.RLock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; + +import static com.epmet.constant.EpidemicConstant.JOB_TYPE_NAT; + +// 烟台核酸检测数据同步处理器 +@Component +@Slf4j +public class YanTaiNatSyncProcessor { + + public static final int MAX_EXECUTING_COUNT = 3; + + @Autowired + private ExecutorService executorService; + + @Autowired + private IcSyncJobDao icSyncJobDao; + + @Autowired + private DataSyncConfigService dataSyncConfigService; + + @Autowired + private DistributedLock distributedLock; + + @Autowired + RedisUtils redisUtils; + + /** + * 定时扫描和执行同步任务 + * 10s扫一次库 + * + * @author wxz + * @date 2022/11/8 下午5:42 + */ + @Scheduled(cron = "0/10 * * * * ? ") + public void scanJobs() { + log.info("【异步数据更新】开始同步任务"); + + String dataSyncEnable = redisUtils.getString("data:sync:enable"); + if (StringUtils.isEmpty(dataSyncEnable)) { + return; + } + + LambdaQueryWrapper executingListQuery = new LambdaQueryWrapper<>(); + executingListQuery.eq(IcSyncJobEntity::getOperationStatus, EpidemicConstant.OPERATION_STATUS_PROCESSING); + List executingJobList = icSyncJobDao.selectList(executingListQuery); + + if (!CollectionUtils.isEmpty(executingJobList) && executingJobList.size() >= MAX_EXECUTING_COUNT) { + // 最多只允许同时3条线程运行 + return; + } + + int executingCount = executingJobList.size(); + // 还可以运行几条线程 + int leftCount = MAX_EXECUTING_COUNT - executingCount; + + RLock lock = null; + try { + lock = distributedLock.getLock("data:sync:" + JOB_TYPE_NAT, 60L, 60L, TimeUnit.SECONDS); + // 查询可执行的任务列表，并且异步执行 + List icSyncJobToExec = icSyncJobDao.selectExecutableJobList( + EpidemicConstant.JOB_TYPE_NAT, + EpidemicConstant.OPERATION_STATUS_WAITING, + leftCount); + + if (!CollectionUtils.isEmpty(icSyncJobToExec)) { + // 异步提交任务 + for (IcSyncJobEntity jobEntity : icSyncJobToExec) { + + updateJobStatus(jobEntity.getId(), EpidemicConstant.OPERATION_STATUS_PROCESSING); + executorService.submit(() -> { + // 将此任务状态修改为执行中 + + dataSyncConfigService.execSyncByJobProcessor(jobEntity); + + // 更新任务状态为结束 + updateJobStatus(jobEntity.getId(), EpidemicConstant.OPERATION_STATUS_FINISH); + }); + } + } + } catch (Exception e) { + log.error("【异步数据更新】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } finally { + if (lock != null) { + lock.unlock(); + } + } + } + + /** + * 更新任务状态 + * @author wxz + * @date 2022/11/8 下午8:25 + * @param id + * @param status + + */ + private void updateJobStatus(String id, String status) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcSyncJobEntity::getId, id); + + IcSyncJobEntity updateEntity = new IcSyncJobEntity(); + updateEntity.setOperationStatus(status); + icSyncJobDao.update(updateEntity, query); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index dd1efb81b1..d7e44b58de 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -8,7 +8,11 @@ import com.epmet.dto.DataSyncConfigDTO; import com.epmet.dto.form.ConfigSwitchFormDTO; import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.dto.form.ScopeSaveFormDTO; +import com.epmet.dto.result.NatUserInfoResultDTO; import com.epmet.entity.DataSyncConfigEntity; +import com.epmet.entity.IcSyncJobEntity; + +import java.util.List; /** * 数据更新配置表 @@ -110,4 +114,23 @@ public interface DataSyncConfigService extends BaseService void natInfoSyncButton(DataSyncTaskParam formDTO); + List getNatUserInfoFromDb(DataSyncTaskParam formDTO, int pageNo, int pageSize); + + /** + * 烟台核酸检测(视图方式获取数据) + * @param resiInfos + * @param customerId + * @param isSync + */ + void yantaiHsjcByDbView(List resiInfos, String customerId, String isSync); + + /** + * 更新居民核酸检测信息(通过任务处理器) + * @author wxz + * @date 2022/11/8 下午8:17 + * @param jobEntity + + */ + void execSyncByJobProcessor(IcSyncJobEntity jobEntity); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 88e30607ba..3013c0bd79 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -399,6 +399,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl qw = new LambdaQueryWrapper<>(); - qw.eq(IcSyncJobEntity::getOrgId,formDTO.getAgencyId()).in(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING,OPERATION_STATUS_PROCESSING); + qw.eq(IcSyncJobEntity::getOrgId,formDTO.getAgencyId()) + .in(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING,OPERATION_STATUS_PROCESSING); List icSyncJobEntities = icSyncJobDao.selectList(qw); // 当前组织下存在同步任务 if (CollectionUtils.isNotEmpty(icSyncJobEntities)){ throw new EpmetException(EpmetErrorCode.EXIST_SYNC_JOB_ERROR.getCode()); } + // 不存在新增一条记录 IcSyncJobEntity e = new IcSyncJobEntity(); e.setCustomerId(formDTO.getCustomerId()); @@ -426,47 +437,39 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl qw2 = new LambdaQueryWrapper<>(); - qw2.eq(IcSyncJobEntity::getCustomerId,formDTO.getCustomerId()) - .eq(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_PROCESSING) - .eq(IcSyncJobEntity::getJobType,JOB_TYPE_NAT); - List processingList = icSyncJobDao.selectList(qw2); - if (CollectionUtils.isNotEmpty(processingList) && processingList.size() >= NumConstant.TWO){ - throw new EpmetException(EpmetErrorCode.OTHER_SYNC_JOB_ERROR.getCode()); - } - List waitList; - do { - LambdaQueryWrapper qw3 = new LambdaQueryWrapper<>(); - qw3.eq(IcSyncJobEntity::getCustomerId,formDTO.getCustomerId()) - .eq(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING) - .eq(IcSyncJobEntity::getJobType,JOB_TYPE_NAT) - .orderByAsc(BaseEpmetEntity::getCreatedTime); - waitList = icSyncJobDao.selectList(qw3); - if (CollectionUtils.isNotEmpty(waitList)){ - for (IcSyncJobEntity entity : waitList) { - RLock lock = null; - try { - lock = distributedLock.getLock(entity.getOrgId() + JOB_TYPE_NAT, 60L, 60L, TimeUnit.SECONDS); - updateSync(entity.getId(),OPERATION_STATUS_PROCESSING); - }catch (Exception ex){ - log.error(ex.getMessage()); - throw new EpmetException(ex.getMessage()); - }finally { - lock.unlock(); - } - formDTO.setAgencyId(entity.getOrgId()); - try { - natInfoScanTask(formDTO); - }catch (Exception ee){ - log.error(ee.getMessage()); - throw new EpmetException(ee.getMessage()); - }finally { - updateSync(entity.getId(),OPERATION_STATUS_FINISH); - } - } - } - }while (CollectionUtils.isNotEmpty(waitList)); + + //List waitList; + //do { + // LambdaQueryWrapper qw3 = new LambdaQueryWrapper<>(); + // qw3.eq(IcSyncJobEntity::getCustomerId,formDTO.getCustomerId()) + // .eq(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING) + // .eq(IcSyncJobEntity::getJobType,JOB_TYPE_NAT) + // .orderByAsc(BaseEpmetEntity::getCreatedTime); + // waitList = icSyncJobDao.selectList(qw3); + // if (CollectionUtils.isNotEmpty(waitList)){ + // for (IcSyncJobEntity entity : waitList) { + // RLock lock = null; + // try { + // lock = distributedLock.getLock(entity.getOrgId() + JOB_TYPE_NAT, 60L, 60L, TimeUnit.SECONDS); + // updateSync(entity.getId(),OPERATION_STATUS_PROCESSING); + // }catch (Exception ex){ + // log.error(ex.getMessage()); + // throw new EpmetException(ex.getMessage()); + // }finally { + // lock.unlock(); + // } + // formDTO.setAgencyId(entity.getOrgId()); + // try { + // natInfoScanTask(formDTO); + // }catch (Exception ee){ + // log.error(ee.getMessage()); + // throw new EpmetException(ee.getMessage()); + // }finally { + // updateSync(entity.getId(),OPERATION_STATUS_FINISH); + // } + // } + // } + //}while (CollectionUtils.isNotEmpty(waitList)); } @Transactional(rollbackFor = Exception.class) @@ -695,7 +698,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl getNatUserInfoFromDb(DataSyncTaskParam formDTO, int pageNo, int pageSize) { + public List getNatUserInfoFromDb(DataSyncTaskParam formDTO, int pageNo, int pageSize) { //根据 组织 分页获取 居民数据 PageInfo pageInfo = PageHelper.startPage(pageNo, pageSize, false) .doSelectPageInfo(() -> baseDao.getIdCardsByScope(formDTO)); @@ -1171,4 +1174,29 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl resis = null; + int pageNo = 1; + int pageSize = 1000; + do { + // 分页，一次查询1000居民，循环更新他们的核酸检测信息 + resis = getNatUserInfoFromDb(p, pageNo, pageSize); + yantaiHsjcByDbView(resis, jobEntity.getCustomerId(), NumConstant.ONE_STR); + pageNo++; + } while (org.springframework.util.CollectionUtils.isEmpty(resis)); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml index 0b7ecc334d..9f712c8896 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml @@ -3,4 +3,27 @@ + + \ No newline at end of file From 7a00d9b038a6180e84e7c8e4be2826fa9d922125 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 8 Nov 2022 20:47:41 +0800 Subject: [PATCH 540/621] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.81__data_sync_job.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__data_sync_job.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__data_sync_job.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__data_sync_job.sql new file mode 100644 index 0000000000..6008cbf584 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__data_sync_job.sql @@ -0,0 +1,20 @@ +create table ic_sync_job +( + ID varchar(64) not null comment 'ID' + primary key, + CUSTOMER_ID varchar(64) not null comment '客户ID', + ORG_ID varchar(64) not null comment '组织ID', + PID varchar(255) not null comment '组织ID的上级', + ORG_ID_PATH varchar(1024) not null comment '组织ID的所有上级，包括org_id', + JOB_TYPE varchar(255) not null comment '任务类型，残疾：disability；死亡：death；核酸：nat；', + OPERATOR_ID varchar(255) not null comment '操作员ID【staffId】', + OPERATION_STATUS varchar(255) null comment '操作状态,等待中：waiting；进行中：processing；结束：finish', + DEL_FLAG int not null, + REVISION int not null comment '乐观锁', + CREATED_BY varchar(32) not null comment '创建人', + CREATED_TIME datetime not null comment '创建时间', + UPDATED_BY varchar(32) not null comment '更新人', + UPDATED_TIME datetime not null comment '更新时间', + index(ORG_ID,OPERATION_STATUS,JOB_TYPE) using btree +) + comment '同步任务表'; From 159ffb1b94e7fb2610bd4a5dfd27c9470a82348f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 8 Nov 2022 20:49:49 +0800 Subject: [PATCH 541/621] - --- .../{V0.0.81__data_sync_job.sql => V0.0.84__data_sync_job.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.81__data_sync_job.sql => V0.0.84__data_sync_job.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__data_sync_job.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__data_sync_job.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__data_sync_job.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__data_sync_job.sql From 283b0b70452f2c91992c1b332e44d949e8dbc3fc Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 8 Nov 2022 20:51:08 +0800 Subject: [PATCH 542/621] - --- .../db/migration/V0.0.84__data_sync_job.sql | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__data_sync_job.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__data_sync_job.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__data_sync_job.sql deleted file mode 100644 index 6008cbf584..0000000000 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.84__data_sync_job.sql +++ /dev/null @@ -1,20 +0,0 @@ -create table ic_sync_job -( - ID varchar(64) not null comment 'ID' - primary key, - CUSTOMER_ID varchar(64) not null comment '客户ID', - ORG_ID varchar(64) not null comment '组织ID', - PID varchar(255) not null comment '组织ID的上级', - ORG_ID_PATH varchar(1024) not null comment '组织ID的所有上级，包括org_id', - JOB_TYPE varchar(255) not null comment '任务类型，残疾：disability；死亡：death；核酸：nat；', - OPERATOR_ID varchar(255) not null comment '操作员ID【staffId】', - OPERATION_STATUS varchar(255) null comment '操作状态,等待中：waiting；进行中：processing；结束：finish', - DEL_FLAG int not null, - REVISION int not null comment '乐观锁', - CREATED_BY varchar(32) not null comment '创建人', - CREATED_TIME datetime not null comment '创建时间', - UPDATED_BY varchar(32) not null comment '更新人', - UPDATED_TIME datetime not null comment '更新时间', - index(ORG_ID,OPERATION_STATUS,JOB_TYPE) using btree -) - comment '同步任务表'; From e3c051dbe98ed50dc02d555ec66e0569310ca047 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 8 Nov 2022 22:31:47 +0800 Subject: [PATCH 543/621] - --- .../main/java/com/epmet/dao/IcSyncJobDao.java | 1 - .../processor/YanTaiNatSyncProcessor.java | 18 ++++++++++-------- .../impl/DataSyncConfigServiceImpl.java | 19 +++++++++++-------- .../main/resources/mapper/IcSyncJobDao.xml | 2 +- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java index 298b5fb6b1..a8dfd6bee2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSyncJobDao.java @@ -17,6 +17,5 @@ import java.util.List; public interface IcSyncJobDao extends BaseDao { List selectExecutableJobList(@Param("jobType") String jobType, - @Param("operationStatus") String operationStatus, @Param("itemCount") int itemCount); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java index fb8b4a2230..e3417c3811 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java @@ -55,10 +55,10 @@ public class YanTaiNatSyncProcessor { public void scanJobs() { log.info("【异步数据更新】开始同步任务"); - String dataSyncEnable = redisUtils.getString("data:sync:enable"); - if (StringUtils.isEmpty(dataSyncEnable)) { - return; - } + //String dataSyncEnable = redisUtils.getString("data:sync:enable"); + //if (StringUtils.isEmpty(dataSyncEnable)) { + // return; + //} LambdaQueryWrapper executingListQuery = new LambdaQueryWrapper<>(); executingListQuery.eq(IcSyncJobEntity::getOperationStatus, EpidemicConstant.OPERATION_STATUS_PROCESSING); @@ -79,7 +79,6 @@ public class YanTaiNatSyncProcessor { // 查询可执行的任务列表，并且异步执行 List icSyncJobToExec = icSyncJobDao.selectExecutableJobList( EpidemicConstant.JOB_TYPE_NAT, - EpidemicConstant.OPERATION_STATUS_WAITING, leftCount); if (!CollectionUtils.isEmpty(icSyncJobToExec)) { @@ -90,10 +89,13 @@ public class YanTaiNatSyncProcessor { executorService.submit(() -> { // 将此任务状态修改为执行中 - dataSyncConfigService.execSyncByJobProcessor(jobEntity); + try { + dataSyncConfigService.execSyncByJobProcessor(jobEntity); + } finally { + // 更新任务状态为结束 + updateJobStatus(jobEntity.getId(), EpidemicConstant.OPERATION_STATUS_FINISH); + } - // 更新任务状态为结束 - updateJobStatus(jobEntity.getId(), EpidemicConstant.OPERATION_STATUS_FINISH); }); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 3013c0bd79..e462eea806 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1099,7 +1099,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl resis = null; int pageNo = 1; int pageSize = 1000; + int updatedResiCount = 0; do { // 分页，一次查询1000居民，循环更新他们的核酸检测信息 resis = getNatUserInfoFromDb(p, pageNo, pageSize); yantaiHsjcByDbView(resis, jobEntity.getCustomerId(), NumConstant.ONE_STR); pageNo++; - } while (org.springframework.util.CollectionUtils.isEmpty(resis)); + updatedResiCount += pageSize; + log.info("【任务处理器同步数据】组织Id:{},同步类型:{},已完成居民数:{}", jobEntity.getOrgId(), jobEntity.getJobType(), updatedResiCount); + } while (!org.springframework.util.CollectionUtils.isEmpty(resis)); } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml index 9f712c8896..6ed0708d43 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSyncJobDao.xml @@ -20,7 +20,7 @@ updated_by, updated_time from ic_sync_job - where OPERATION_STATUS = 'wating' + where OPERATION_STATUS = 'waiting' and JOB_TYPE = #{jobType} and DEL_FLAG = 0 order by CREATED_TIME asc From 3c0f1b789bc8d609311ad75d3ee8d703fbc1cf6d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 9 Nov 2022 00:44:03 +0800 Subject: [PATCH 544/621] - --- .../dto/result/NatUserInfoResultDTO.java | 9 +++++++ .../processor/YanTaiNatSyncProcessor.java | 2 +- .../impl/DataSyncConfigServiceImpl.java | 26 ++++++++++++------- .../src/main/resources/mapper/IcNatDao.xml | 3 ++- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java index dc696ff8dc..5b0300f764 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -37,4 +38,12 @@ public class NatUserInfoResultDTO implements Serializable { * ic_nat表ID */ private String id; + + /** + * 采样时间 + * @author wxz + * @date 2022/11/9 上午12:22 + * @param null + */ + private Date sampleTime; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java index e3417c3811..1fbfb6a69f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java @@ -53,7 +53,7 @@ public class YanTaiNatSyncProcessor { */ @Scheduled(cron = "0/10 * * * * ? ") public void scanJobs() { - log.info("【异步数据更新】开始同步任务"); + //log.info("【异步数据更新】开始同步任务"); //String dataSyncEnable = redisUtils.getString("data:sync:enable"); //if (StringUtils.isEmpty(dataSyncEnable)) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index e462eea806..4010a1c231 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -906,10 +906,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl existInfo.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> { - e.setExistStatus(true); - e.setId(i.getId()); - })); + entities.forEach(e -> existInfo.stream() + .filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard()) && i.getSampleTime().equals(e.getSampleTime())) + .forEach(i -> { + e.setExistStatus(true); + e.setId(i.getId()); + })); + Map> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus)); if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) { for (List icNatEntities : ListUtils.partition(groupByStatus.get(false), NumConstant.FIVE_HUNDRED)) { @@ -1087,7 +1090,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl args = new HashMap<>(); args.put("idcards", idCards); - log.info("【更新核酸检测信息(from 兰图)】本批次身份证号为:{}", String.join(",", idCards)); + //log.info("【更新核酸检测信息(from 兰图)】本批次身份证号为:{}", String.join(",", idCards)); // 2.=====================核酸采样========================= // 这一批居民的核酸采样列表 @@ -1193,13 +1196,16 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Wed, 9 Nov 2022 09:07:03 +0800 Subject: [PATCH 545/621] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E8=B0=83=E5=A4=A7=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql new file mode 100644 index 0000000000..da82f0f859 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.85__ic_volunteer_poly.sql @@ -0,0 +1,3 @@ +alter table ic_volunteer_poly MODIFY COLUMN `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号'; + +alter table ic_volunteer_poly_category MODIFY COLUMN `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号'; \ No newline at end of file From bb51816f8e62eb2fb20d112eb8b31542bb31c37e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 10:54:43 +0800 Subject: [PATCH 546/621] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcFollowUpRecordController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java index 7428da58be..b3b5d05816 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java @@ -56,6 +56,11 @@ public class IcFollowUpRecordController { return new Result>().ok(page); } + /** + * 随访记录，查看详情 + * @param id + * @return + */ @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@PathVariable("id") String id){ IcFollowUpRecordDTO data = icFollowUpRecordService.get(id); @@ -86,6 +91,11 @@ public class IcFollowUpRecordController { return new Result(); } + /** + * 随访记录删除 + * @param ids + * @return + */ @PostMapping("delete") public Result delete(@RequestBody String[] ids){ //效验数据 From 8f187adf0e2434adeae7b8c6a0c7c3b97c5d45ef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 11:04:52 +0800 Subject: [PATCH 547/621] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=9A=E5=91=98?= =?UTF-8?q?=E9=A3=8E=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartymemberStyleController.java | 11 +++++++++++ .../service/impl/IcPartymemberStyleServiceImpl.java | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java index 786f22d542..9f23510fa6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java @@ -89,6 +89,12 @@ public class IcPartymemberStyleController { return new Result().ok(data); } + /** + * 党员风采-新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto) { @@ -98,6 +104,11 @@ public class IcPartymemberStyleController { return new Result(); } + /** + * 党员风采-删除 + * @param dto + * @return + */ @PostMapping("delete") public Result delete(@RequestBody IcPartymemberStyleDTO dto) { //效验数据 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index 435038822f..b7299c3ad8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -208,11 +208,17 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl Date: Wed, 9 Nov 2022 11:15:03 +0800 Subject: [PATCH 548/621] =?UTF-8?q?=E6=B2=A1=E4=BB=80=E4=B9=88=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcPartyActivityController.java | 6 ++++++ .../java/com/epmet/controller/IcPartyUnitController.java | 6 ++++++ .../com/epmet/service/impl/IcFollowUpRecordServiceImpl.java | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 67b3c5da5a..38b63b836d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -89,6 +89,12 @@ public class IcPartyActivityController { return new Result().ok(data); } + /** + * 联建活动-新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActivityDTO dto){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 8a0ba036ff..4545cb226b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -90,6 +90,12 @@ public class IcPartyUnitController { return new Result().ok(data); } + /** + * 联建单位新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyUnitDTO dto) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java index 451271fd6a..3628786d60 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java @@ -76,6 +76,10 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl Date: Wed, 9 Nov 2022 13:33:40 +0800 Subject: [PATCH 549/621] =?UTF-8?q?/gov/org/agency/maporg=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AgencyServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 10499f4b52..3cf98078f5 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 @@ -766,6 +766,9 @@ public class AgencyServiceImpl implements AgencyService { } if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)) { CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId()); + if (null == entity) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_agency is null orgId:" + formDTO.getOrgId(), "组织信息查询为空orgId:" + formDTO.getOrgId()); + } result = ConvertUtils.sourceToTarget(entity, MapOrgResultDTO.class); result.setName(entity.getOrganizationName()); result.setLevel(formDTO.getLevel()); From 84861a2d7248c6d29a7e1d088350bdaa4abfca82 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 9 Nov 2022 14:03:04 +0800 Subject: [PATCH 550/621] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E9=A5=BC=E5=9B=BE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/EmphasisTripListFormDTO.java | 1 + .../com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java | 1 + .../src/main/resources/mapper/IcTripReportRecordDao.xml | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java index 3539affe85..5f338be962 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -14,6 +14,7 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable private static final long serialVersionUID = 5850717233738956442L; private String code; + private String name; private String dangerLevel; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java index 96a5ed7399..a6bc94b2ed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -17,6 +17,7 @@ public class EmphasisTripPieDetailFormDTO implements Serializable { // @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) private String code; + private String name; private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 490810a020..b9f942b776 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -98,8 +98,8 @@ AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') + + AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%') @@ -120,8 +120,8 @@ FROM ic_trip_report_record WHERE DEL_FLAG = '0' AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') + + AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%') AND sojourn_history != '3' group by dangerLevel From a04630317d0c26ad16f9bda6c8dabed81f93bb51 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 9 Nov 2022 14:54:13 +0800 Subject: [PATCH 551/621] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/EmphasisTripListResultDTO.java | 21 +++++++++++++++++++ .../impl/IcTripReportRecordServiceImpl.java | 3 +++ .../mapper/IcTripReportRecordDao.xml | 4 ++++ 3 files changed, 28 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java index f44bf4e952..40ce0f9b38 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -22,6 +22,7 @@ public class EmphasisTripListResultDTO implements Serializable { * 来源地 */ private String sourceAddress; + private String sourceDetailAddress; /** * 来曹事由 @@ -68,4 +69,24 @@ public class EmphasisTripListResultDTO implements Serializable { private String remark; + /** + * 返回方式 + */ + private String trafficTypeName; + + /** + * 疫苗接种针次 + */ + private Integer vaccineNum; + + /** + * 交通方式 + */ + private String trafficType; + + /** + * 其他返回方式，交通方式为其他时此列需要有值 + */ + private String trafficTypeExplain; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index c7e37d77dd..715d1a63c9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -759,6 +759,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SOJOURN_HISTORY.getCode()); Map sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + //交通方式 + Map trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()).getData(); // 隔离状态字典 Map isolateMap = new HashMap<>(); @@ -768,6 +770,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl { l.setIsolateTypeName(isolateMap.get(l.getIsolateType())); l.setSojournHistoryName(sojournMap.get(l.getSojournHistory())); + l.setTrafficTypeName(trafficTypeMap.containsKey(l.getTrafficType()) ? trafficTypeMap.get(l.getTrafficType()) : "无"); }); } return result; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 490810a020..63fa414be6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -87,6 +87,10 @@ LEAVE_DATE, PRESENT_ADDRESS, DETAIL_ADDRESS, + IFNULL(source_detail_address,'') AS sourceDetailAddress, + IFNULL(vaccine_num,0) AS vaccineNum, + traffic_type, + IFNULL(traffic_type_explain,'') AS trafficTypeExplain, REMARK, IFNULL(nat_outcome,'0') as natOutcome, (case when nat_outcome = '1' then '阳性' when nat_outcome = '0' then '阴性' else '阴性' end) as natOutComeName From 4c4cc558214ef7cfccae7a73c836b6bafac1aa67 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Nov 2022 15:30:00 +0800 Subject: [PATCH 552/621] =?UTF-8?q?=E8=BF=94=E5=8F=82=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BA=BA=E5=A7=93=E5=90=8D=EF=BC=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=9A=94=E7=A6=BB=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 5 ++++ .../epmet/dto/form/PageTripReportFormDTO.java | 5 ++++ .../mapper/IcTripReportRecordDao.xml | 23 +++++++++++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index e81053a3c0..7796f0f5d8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -365,4 +365,9 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String tripDataTypeName; + /** + * 上报人姓名(createdBy对应人名) + */ + @ExcelIgnore + private String createdByName; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java index 4c2e07b48d..b28e494577 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java @@ -60,4 +60,9 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable { */ private String sojournHistory; + /** + * 隔离状态，字典表(isolate_type)【磐石】 + */ + private String isolateType; + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 63fa414be6..eaf72e3c95 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -7,9 +7,17 @@ From a11c7f920761cc382ce2ee30b361b0761baa0df7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 15:34:49 +0800 Subject: [PATCH 553/621] =?UTF-8?q?gov/access/govrole/page=E5=88=86?= =?UTF-8?q?=E4=B9=9F=E4=B8=8D=E5=A5=BD=E4=BD=BF=E4=B9=9F=E6=B2=A1=E4=BA=BA?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E5=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GovRoleServiceImpl.java | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index 3f7bae6b47..5b3be75aa5 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -18,7 +18,6 @@ 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.constant.FieldConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -34,6 +33,8 @@ import com.epmet.redis.GovRoleRedis; import com.epmet.service.GovRoleMenuService; import com.epmet.service.GovRoleService; import com.epmet.service.GovRoleUserService; +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; @@ -64,11 +65,20 @@ public class GovRoleServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovRoleDTO.class); + Integer pageNo = Integer.valueOf((String) params.get("pageNo")); + Integer pageSize = Integer.valueOf((String) params.get("pageSize")); + String id = (String) params.get(FieldConstant.ID_HUMP); + String name = (String) params.get(FieldConstant.NAME_HUMP); + String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .like(StringUtils.isNotBlank(name), FieldConstant.NAME, name) + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId); + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.selectList(wrapper); + List resList = ConvertUtils.sourceToTarget(list, GovRoleDTO.class); + PageInfo pageInfo = new PageInfo<>(resList); + return new PageData<>(resList, pageInfo.getTotal()); } @Override @@ -79,10 +89,10 @@ public class GovRoleServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String name = (String)params.get(FieldConstant.NAME_HUMP); - String customerId = (String)params.get(FieldConstant.CUSTOMER_ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String name = (String) params.get(FieldConstant.NAME_HUMP); + String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name) .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId); @@ -101,7 +111,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl Date: Wed, 9 Nov 2022 16:26:02 +0800 Subject: [PATCH 554/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B0=E5=A2=9E=E5=88=97=E8=A1=A8=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=9D=87=E5=A2=9E=E5=8A=A07=E5=A4=A9=E9=80=94?= =?UTF-8?q?=E5=BE=84=E5=9C=B0=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=AF=B9=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E5=AD=97=E6=AE=B5=E5=80=BC=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 5 ++ .../epmet/dto/form/IcTripReportFormDTO.java | 4 + .../entity/IcTripReportRecordEntity.java | 4 + .../excel/IcPsTripReportRecordExcel.java | 7 +- .../IcPsTripReportRecordExportExcel.java | 8 +- .../IcPsTripReportExcelImportListener.java | 79 +++++++++++++----- .../IcTripReportExcelImportListener.java | 38 ++++++--- .../V0.0.86__alter_ic_trip_report.sql | 3 + .../excel/ps_trip_report_import_template.xlsx | Bin 10373 -> 10294 bytes 9 files changed, 109 insertions(+), 39 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.86__alter_ic_trip_report.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 7796f0f5d8..60491f0b17 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -289,6 +289,11 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String registeredResidence; + /** + * 7天内到达或途径【磐石】 + */ + @ExcelIgnore + private String passBy; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 1f2cf09949..65f289cd46 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -209,6 +209,10 @@ public class IcTripReportFormDTO implements Serializable { */ @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; + /** + * 7天内到达或途径【磐石】 + */ + private String passBy; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 497e0707c6..3ab91a19b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -139,6 +139,10 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 户籍地 【磐石】 */ private String registeredResidence; + /** + * 7天内到达或途径【磐石】 + */ + private String passBy; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 743aa60438..1c442cac62 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -39,6 +39,9 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; + @ExcelProperty("7天内到达或途径") + private String passBy; + @ExcelProperty("来曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") @@ -84,10 +87,10 @@ public class IcPsTripReportRecordExcel { @ExcelProperty("是否达到曹县") private String isArrive; - @ExcelProperty("上报时间\n" + + /*@ExcelProperty("上报时间\n" + "（2022-01-01）") @JsonFormat(pattern = "yyyy-MM-dd") - private Date reportingTime; + private Date reportingTime;*/ @ExcelProperty("管控措施\n" + "（500字以内）") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index fd9c52e04a..f036e4a185 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -55,11 +55,17 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ColumnWidth(30) @ExcelProperty(value = "来自地区详细地址",order = 6) private String sourceDetailAddress; + /** + * 7天内到达或途径【磐石】 + */ + @ColumnWidth(25) + @ExcelProperty(value = "7天内到达或途径") + private String passBy; /** * 来曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "来曹事由（100字以内）",order = 7) + @ExcelProperty(value = "来曹事由（100字以内）") private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java index 8fc2a65e39..06cea360b2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java @@ -6,17 +6,18 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IcResiUserConstant; import com.epmet.entity.IcTripReportRecordEntity; import com.epmet.excel.IcPsTripReportRecordExcel; -import com.epmet.excel.data.IcTripReportExcelData; import com.epmet.excel.error.IcPsTripReportRecordErrorExcel; import com.epmet.service.impl.IcTripReportRecordServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; @@ -78,18 +79,45 @@ public class IcPsTripReportExcelImportListener implements ReadListenerxss=+T7YtLaVb?$)^;9U79mp}a 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 mKT6^Lk5@DO4*=%HW{PTnrlug3_kNh7?$w>tO From 69f8a3e9db2f5d67f9899ea8d1a3d738b9f72d7b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 16:34:52 +0800 Subject: [PATCH 555/621] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcTripReportRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 354c3be87c..0e149ed9df 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -469,7 +469,7 @@ public class IcTripReportRecordController implements ResultDataResolver { } /** - * @Description 重点行程详情 + * @Description 可视化重点行程名单统计-详情 已废弃不用这个接口了，改用管理平台详情 * @param formDTO * @Author zxc * @Date 2022/11/1 16:05 From f7bd7b655b862596cd44a08b0ae416e57feafc00 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Nov 2022 17:27:51 +0800 Subject: [PATCH 556/621] =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=B8=8B=E6=B5=8B?= =?UTF-8?q?=E7=A3=90=E7=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/constant/StrConstant.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index fb294721f8..77e9d4fa8f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -100,7 +100,8 @@ public interface StrConstant { //平音客户跟组织Id String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135"; //磐石街道客户Id - String PS_CUSTOMER_ID = "1580460084738760705"; + //String PS_CUSTOMER_ID = "1580460084738760705"; + String PS_CUSTOMER_ID = "45687aa479955f9d06204d415238f7cc"; /** * 单位积分,积分上限，积分说明，积分事件 From 25507d8f1ed70ea595bef2c83609185161fd95f2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 10 Nov 2022 09:52:11 +0800 Subject: [PATCH 557/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E8=B5=8B=E5=80=BC=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcTripReportRecordServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 715d1a63c9..06ae46b36a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -203,6 +203,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 10 Nov 2022 10:08:30 +0800 Subject: [PATCH 558/621] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=90=BD=E5=9C=B0=E6=A3=80=E6=98=AF=E5=90=A6=E5=88=B0=E8=BE=BE?= =?UTF-8?q?=E6=9B=B9=E5=8E=BF=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/IcPsTripReportExcelImportListener.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java index 06cea360b2..2715302612 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java @@ -84,31 +84,31 @@ public class IcPsTripReportExcelImportListener implements ReadListener Date: Thu, 10 Nov 2022 10:52:01 +0800 Subject: [PATCH 559/621] =?UTF-8?q?=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcTripReportRecordDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index eaf72e3c95..0a5b35e2f5 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -10,7 +10,7 @@ r.CREATED_TIME AS reportTime, ( CASE - WHEN r.USER_TYPE = 'resi' THEN IFNULL(ubi.`NAME`, '无') + WHEN r.USER_TYPE = 'resi' THEN IFNULL(ubi.REAL_NAME, '无') ELSE IFNULL(cs.REAL_NAME, '无') END ) AS createdByName @@ -40,7 +40,7 @@ r.MOBILE as realMobile, ( CASE - WHEN r.USER_TYPE = 'resi' THEN IFNULL(ubi.`NAME`, '无') + WHEN r.USER_TYPE = 'resi' THEN IFNULL(ubi.REAL_NAME, '无') ELSE IFNULL(cs.REAL_NAME, '无') END ) AS createdByName From 88e941fdcfc2602819320e0359dd577b98ce8009 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 10 Nov 2022 12:43:46 +0800 Subject: [PATCH 560/621] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=A0=B8=E9=85=B8?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E8=B0=83=E6=95=B4=E6=94=B9=E4=B8=BA=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...IcNatCompareRecordExcelImportListener.java | 125 ++++++++++++++++-- .../impl/IcNatCompareRecordServiceImpl.java | 13 +- 2 files changed, 128 insertions(+), 10 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java index 44ed565c6e..265d492107 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java @@ -5,9 +5,6 @@ import com.alibaba.excel.read.listener.ReadListener; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.dto.result.YtHscyResDTO; -import com.epmet.commons.tools.dto.result.YtHsjcResDTO; -import com.epmet.commons.tools.dto.result.YtHsjcResDetailDTO; import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -15,18 +12,17 @@ import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ObjectUtil; -import com.epmet.commons.tools.utils.YtHsResUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.entity.IcNatCompareRecordEntity; import com.epmet.excel.data.IcNatCompareRecordExcelData; import com.epmet.service.impl.IcNatCompareRecordServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Description @@ -60,16 +56,22 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener args = new HashMap<>(); + args.put("idcard", data.getIdCard()); + List> hscyList = yantaiNamedParamLantuJdbcTemplate.queryForList( + "select id, name,card_no, create_time, realname from hscyxxb where card_no =:idcard order by create_time desc limit 1", args); + + if (CollectionUtils.isNotEmpty(hscyList) && MapUtils.isNotEmpty(hscyList.get(0))) { + // 存在 最近一条采样记录 + Map latestCyMap = hscyList.get(0); + String create_time = (String) latestCyMap.get("create_time"); + if (StringUtils.isBlank(create_time)) { + // 最近一次采样时间为空，说明这人好久不做核酸了 + compareRecordEntity.setInternalRemark("采样时间create_time is null"); + } else { + // 赋值采样时间 + compareRecordEntity.setLatestCyTime(DateUtils.parse(create_time, DateUtils.DATE_TIME_PATTERN)); + // 查询最后一次检测结果 + List> hsjcResultList = yantaiNamedParamLantuJdbcTemplate.queryForList( + "select name, telephone, card_no, test_time, SAMPLE_TIME, SAMPLE_RESULT_PCR, SAMPLING_ORG_PCR from hsjcxxb where card_no =:idcard order by test_time desc limit 1", args); + + if (CollectionUtils.isNotEmpty(hsjcResultList) && MapUtils.isNotEmpty(hsjcResultList.get(0))) { + Map latestJcMap = hsjcResultList.get(0); + // 采样时间 + String sample_time = (String) latestJcMap.get("SAMPLE_TIME"); + // 检测时间 + String test_time = (String) latestJcMap.get("test_time"); + // 核酸采样机构 + String sampling_org_pcr = (String) latestJcMap.get("SAMPLING_ORG_PCR"); + // 核酸检测结果 1:阳性,2:阴性 + String sample_result_pcr = (String) latestJcMap.get("SAMPLE_RESULT_PCR"); + // 联系地址 + String address = (String) latestJcMap.get("address"); + + // 最近一次采样时间，与最近一次检测结果的采样时间相比较 + if (compareRecordEntity.getLatestCyTime().equals(sample_time)) { + // 一致说明出结果了 + if (StringUtils.isNotBlank(test_time)) { + // 赋值最近一次核酸时间 + compareRecordEntity.setLatestNatTime(DateUtils.parse(test_time, DateUtils.DATE_TIME_PATTERN)); + } + // 赋值检测地点 + compareRecordEntity.setNatAddress(StringUtils.isNotBlank(sampling_org_pcr) ? sampling_org_pcr : StrConstant.EPMETY_STR); + + // 核酸检测结果 1:阳性,2:阴性 + if (NumConstant.ONE_STR.equals(sample_result_pcr)) { + // 检测结果(0:阴性 1:阳性):接口填入 + compareRecordEntity.setNatResult(NumConstant.ONE_STR); + } else if (NumConstant.TWO_STR.equals(sample_result_pcr)) { + compareRecordEntity.setNatResult(NumConstant.ZERO_STR); + } + compareRecordEntity.setContactAddress(StringUtils.isNotBlank(address) ? address : StrConstant.EPMETY_STR); + } else { + // 采样时间不一致，说明未出结果 + compareRecordEntity.setInternalRemark(String.format("采样时间不一致,采样视图最近一次采样时间：%s,检测结果视图的最近一次采样时间：%s", compareRecordEntity.getLatestCyTime(), sample_time)); + } + } else { + compareRecordEntity.setInternalRemark("最近一次检测结果为空"); + } + } + } else { + // 没有核酸采样记录 + compareRecordEntity.setInternalRemark("最近一次采样结果为空"); + } + } + datas.add(compareRecordEntity); + if (datas.size() == MAX_THRESHOLD) { execPersist(); } @@ -159,6 +265,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener Date: Thu, 10 Nov 2022 13:53:03 +0800 Subject: [PATCH 561/621] . --- .../java/com/epmet/commons/tools/constant/StrConstant.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index 77e9d4fa8f..fb294721f8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -100,8 +100,7 @@ public interface StrConstant { //平音客户跟组织Id String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135"; //磐石街道客户Id - //String PS_CUSTOMER_ID = "1580460084738760705"; - String PS_CUSTOMER_ID = "45687aa479955f9d06204d415238f7cc"; + String PS_CUSTOMER_ID = "1580460084738760705"; /** * 单位积分,积分上限，积分说明，积分事件 From 28ccffcabcdc456c0372ba685028a767bae8b5c6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 10 Nov 2022 14:49:24 +0800 Subject: [PATCH 562/621] address --- .../excel/handler/IcNatCompareRecordExcelImportListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java index 265d492107..d163fc0192 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java @@ -195,7 +195,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener> hsjcResultList = yantaiNamedParamLantuJdbcTemplate.queryForList( - "select name, telephone, card_no, test_time, SAMPLE_TIME, SAMPLE_RESULT_PCR, SAMPLING_ORG_PCR from hsjcxxb where card_no =:idcard order by test_time desc limit 1", args); + "select name, telephone, card_no, address, test_time, SAMPLE_TIME, SAMPLE_RESULT_PCR, SAMPLING_ORG_PCR from hsjcxxb where card_no =:idcard order by test_time desc limit 1", args); if (CollectionUtils.isNotEmpty(hsjcResultList) && MapUtils.isNotEmpty(hsjcResultList.get(0))) { Map latestJcMap = hsjcResultList.get(0); From ae8e8b9db5455f4817096b023bc85ce639275a02 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 10 Nov 2022 15:13:55 +0800 Subject: [PATCH 563/621] getExistUserByHouseIds --- .../src/main/resources/mapper/IcResiUserDao.xml | 1 + 1 file changed, 1 insertion(+) 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 9c48f39c2f..aba350f712 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 @@ -824,6 +824,7 @@ DISTINCT home_id FROM ic_resi_user WHERE DEL_FLAG = '0' + and STATUS='0' AND home_id IN ( #{id} From 0dc98744403548d89c56d9b4c5095a0f55b238b4 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 10 Nov 2022 18:12:24 +0800 Subject: [PATCH 564/621] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcNatCompareRecordExcelImportListener.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java index d163fc0192..531e977ea7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java @@ -186,13 +186,13 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener latestCyMap = hscyList.get(0); - String create_time = (String) latestCyMap.get("create_time"); - if (StringUtils.isBlank(create_time)) { + Date create_time = (Date) latestCyMap.get("create_time"); + if (create_time == null) { // 最近一次采样时间为空，说明这人好久不做核酸了 compareRecordEntity.setInternalRemark("采样时间create_time is null"); } else { // 赋值采样时间 - compareRecordEntity.setLatestCyTime(DateUtils.parse(create_time, DateUtils.DATE_TIME_PATTERN)); + compareRecordEntity.setLatestCyTime(create_time); // 查询最后一次检测结果 List> hsjcResultList = yantaiNamedParamLantuJdbcTemplate.queryForList( "select name, telephone, card_no, address, test_time, SAMPLE_TIME, SAMPLE_RESULT_PCR, SAMPLING_ORG_PCR from hsjcxxb where card_no =:idcard order by test_time desc limit 1", args); @@ -200,9 +200,9 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener latestJcMap = hsjcResultList.get(0); // 采样时间 - String sample_time = (String) latestJcMap.get("SAMPLE_TIME"); + Date sample_time = (Date) latestJcMap.get("SAMPLE_TIME"); // 检测时间 - String test_time = (String) latestJcMap.get("test_time"); + Date test_time = (Date) latestJcMap.get("test_time"); // 核酸采样机构 String sampling_org_pcr = (String) latestJcMap.get("SAMPLING_ORG_PCR"); // 核酸检测结果 1:阳性,2:阴性 @@ -213,9 +213,9 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener Date: Fri, 11 Nov 2022 08:42:06 +0800 Subject: [PATCH 565/621] =?UTF-8?q?getExistUserByHouseIds=20=E6=81=A2?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 1 - 1 file changed, 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 aba350f712..9c48f39c2f 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 @@ -824,7 +824,6 @@ DISTINCT home_id FROM ic_resi_user WHERE DEL_FLAG = '0' - and STATUS='0' AND home_id IN ( #{id} From f282ab0914b34ba4cabd2cfec513094e9b3ca1c7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 11 Nov 2022 14:10:30 +0800 Subject: [PATCH 566/621] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/EpidemicConstant.java | 6 + .../processor/YanTaiVaccineSyncProcessor.java | 112 ++++++++++++++++++ .../epmet/service/DataSyncConfigService.java | 3 +- .../impl/DataSyncConfigServiceImpl.java | 57 +++++++-- 4 files changed, 167 insertions(+), 11 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java index 0ad814d722..388b0d05a5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java @@ -12,7 +12,13 @@ public interface EpidemicConstant { String DATA_CODE_DISABILITY = "canji"; String DATA_CODE_DEATH = "siwang"; + /** + * ic_sync_job 任务类型 + * 核酸检测 + * 疫苗接种 + */ String JOB_TYPE_NAT = "nat"; + String JOB_TYPE_VACCINE = "vaccine"; String OPERATION_STATUS_WAITING = "waiting"; String OPERATION_STATUS_PROCESSING = "processing"; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java new file mode 100644 index 0000000000..e53a279a46 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java @@ -0,0 +1,112 @@ +package com.epmet.processor; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.constant.EpidemicConstant; +import com.epmet.dao.IcSyncJobDao; +import com.epmet.entity.IcSyncJobEntity; +import com.epmet.service.DataSyncConfigService; +import lombok.extern.slf4j.Slf4j; +import org.redisson.api.RLock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; + +import static com.epmet.constant.EpidemicConstant.JOB_TYPE_NAT; +import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE; + +// 烟台核酸检测数据同步处理器 +@Component +@Slf4j +public class YanTaiVaccineSyncProcessor { + + public static final int MAX_EXECUTING_COUNT = 3; + + @Autowired + private ExecutorService executorService; + + @Autowired + private IcSyncJobDao icSyncJobDao; + + @Autowired + private DataSyncConfigService dataSyncConfigService; + + @Autowired + private DistributedLock distributedLock; + + @Autowired + RedisUtils redisUtils; + + /** + * @Description 定时扫描和执行同步任务【疫苗接种】 + * @Author zxc + * @Date 2022/11/11 10:32 + */ + @Scheduled(cron = "0/10 * * * * ? ") + public void scanJobs() { + LambdaQueryWrapper executingListQuery = new LambdaQueryWrapper<>(); + executingListQuery.eq(IcSyncJobEntity::getOperationStatus, EpidemicConstant.OPERATION_STATUS_PROCESSING); + List executingJobList = icSyncJobDao.selectList(executingListQuery); + if (!CollectionUtils.isEmpty(executingJobList) && executingJobList.size() >= MAX_EXECUTING_COUNT) { + // 最多只允许同时3条线程运行 + return; + } + int executingCount = executingJobList.size(); + // 还可以运行几条线程 + int leftCount = MAX_EXECUTING_COUNT - executingCount; + RLock lock = null; + try { + lock = distributedLock.getLock("data:sync:" + JOB_TYPE_VACCINE, 60L, 60L, TimeUnit.SECONDS); + // 查询可执行的任务列表，并且异步执行 + List icSyncJobToExec = icSyncJobDao.selectExecutableJobList( + EpidemicConstant.JOB_TYPE_VACCINE, + leftCount); + if (!CollectionUtils.isEmpty(icSyncJobToExec)) { + // 异步提交任务 + for (IcSyncJobEntity jobEntity : icSyncJobToExec) { + updateJobStatus(jobEntity.getId(), EpidemicConstant.OPERATION_STATUS_PROCESSING); + executorService.submit(() -> { + // 将此任务状态修改为执行中 + try { + dataSyncConfigService.execSyncByJobProcessor(jobEntity); + } finally { + // 更新任务状态为结束 + updateJobStatus(jobEntity.getId(), EpidemicConstant.OPERATION_STATUS_FINISH); + } + }); + } + } + } catch (Exception e) { + log.error("【异步数据更新】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } finally { + if (lock != null) { + lock.unlock(); + } + } + } + + /** + * 更新任务状态 + * @author wxz + * @date 2022/11/8 下午8:25 + * @param id + * @param status + + */ + private void updateJobStatus(String id, String status) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcSyncJobEntity::getId, id); + + IcSyncJobEntity updateEntity = new IcSyncJobEntity(); + updateEntity.setOperationStatus(status); + icSyncJobDao.update(updateEntity, query); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index d7e44b58de..9d17dad7f9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -121,8 +121,9 @@ public interface DataSyncConfigService extends BaseService * @param resiInfos * @param customerId * @param isSync + * @param jobType */ - void yantaiHsjcByDbView(List resiInfos, String customerId, String isSync); + void yanTaiDbViewByType(List resiInfos, String customerId, String isSync, String jobType); /** * 更新居民核酸检测信息(通过任务处理器) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 4010a1c231..513561b057 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -378,7 +378,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl resiInfos, String customerId, String isSync) { - List> resiInfobatchs = ListUtils.partition(resiInfos, 50); - for (List resibatch : resiInfobatchs) { + public void yanTaiDbViewByType(List resiInfos, String customerId, String isSync, String jobType) { + List> resiInfoBatchs = ListUtils.partition(resiInfos, 50); + for (List resiBatch : resiInfoBatchs) { // n个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 try { - yantaiHsjcByDbViewPartition(resibatch, customerId, isSync); + switch (jobType){ + // 核酸检测 + case JOB_TYPE_NAT: + yantaiHsjcByDbViewPartition(resiBatch, customerId, isSync); + // 疫苗接种 + case JOB_TYPE_VACCINE: + yanTaiVaccineByDbViewPartition(resiBatch, customerId, isSync); + default: + break; + } } catch (Exception e) { String errorMsg = ExceptionUtils.getErrorStackTrace(e); - log.error("【更新核酸检测信息(from 兰图)】失败，信息:{}", errorMsg); + log.error("【更新{}信息(from 兰图)】失败，信息:{}", jobType, errorMsg); } } } + /** + * @Description 疫苗接种信息处理 + * @param resiInfos + * @param customerId + * @param isSync + * @Author zxc + * @Date 2022/11/11 11:07 + */ + public void yanTaiVaccineByDbViewPartition(List resiInfos, String customerId, String isSync){ + // 将居民信息转化为的map + Map idCardAndResiInfoMap = resiInfos.stream().collect(Collectors.toMap(resi -> resi.getIdCard(), Function.identity())); + List idCards = new ArrayList<>(idCardAndResiInfoMap.keySet()); + // 1.获取核酸采样信息 + Map args = new HashMap<>(); + args.put("idcards", idCards); + // todo 疫苗接种视图 + + List> vaccineList = yantaiNamedParamLantuJdbcTemplate.queryForList( + "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idcards)", args); + if (CollectionUtils.isNotEmpty(vaccineList)) { + List entities = new ArrayList<>(); + vaccineList.forEach(resiVaccineInfo -> { + // 从视图中获取到的疫苗接种相关信息 + + }); + } + } + /** * n个一批，来处理他们的核酸信息，太多怕给数据库查崩了。 * @param resiInfos @@ -1198,10 +1235,10 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Fri, 11 Nov 2022 14:36:25 +0800 Subject: [PATCH 567/621] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/DataSyncTaskParam.java | 6 +++ .../impl/DataSyncConfigServiceImpl.java | 42 ++----------------- 2 files changed, 9 insertions(+), 39 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java index 215ffabf28..13a230c644 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java @@ -49,4 +49,10 @@ public class DataSyncTaskParam implements Serializable { private String dataCode; private String staffId; + + /** + * nat：核酸检测； + * vaccine：疫苗接种 + */ + private String jobType; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 513561b057..0f21e9e539 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -408,10 +408,6 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl qw = new LambdaQueryWrapper<>(); qw.eq(IcSyncJobEntity::getOrgId,formDTO.getAgencyId()) + .eq(IcSyncJobEntity::getJobType,formDTO.getJobType()) .in(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING,OPERATION_STATUS_PROCESSING); List icSyncJobEntities = icSyncJobDao.selectList(qw); // 当前组织下存在同步任务 @@ -433,43 +430,10 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl waitList; - //do { - // LambdaQueryWrapper qw3 = new LambdaQueryWrapper<>(); - // qw3.eq(IcSyncJobEntity::getCustomerId,formDTO.getCustomerId()) - // .eq(IcSyncJobEntity::getOperationStatus,OPERATION_STATUS_WAITING) - // .eq(IcSyncJobEntity::getJobType,JOB_TYPE_NAT) - // .orderByAsc(BaseEpmetEntity::getCreatedTime); - // waitList = icSyncJobDao.selectList(qw3); - // if (CollectionUtils.isNotEmpty(waitList)){ - // for (IcSyncJobEntity entity : waitList) { - // RLock lock = null; - // try { - // lock = distributedLock.getLock(entity.getOrgId() + JOB_TYPE_NAT, 60L, 60L, TimeUnit.SECONDS); - // updateSync(entity.getId(),OPERATION_STATUS_PROCESSING); - // }catch (Exception ex){ - // log.error(ex.getMessage()); - // throw new EpmetException(ex.getMessage()); - // }finally { - // lock.unlock(); - // } - // formDTO.setAgencyId(entity.getOrgId()); - // try { - // natInfoScanTask(formDTO); - // }catch (Exception ee){ - // log.error(ee.getMessage()); - // throw new EpmetException(ee.getMessage()); - // }finally { - // updateSync(entity.getId(),OPERATION_STATUS_FINISH); - // } - // } - // } - //}while (CollectionUtils.isNotEmpty(waitList)); } @Transactional(rollbackFor = Exception.class) @@ -1103,7 +1067,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl> vaccineList = yantaiNamedParamLantuJdbcTemplate.queryForList( - "select id, name,card_no, create_time, realname from hscyxxb where card_no in (:idcards)", args); + "select id, name,card_no, create_time from hscyxxb where card_no in (:idcards)", args); if (CollectionUtils.isNotEmpty(vaccineList)) { List entities = new ArrayList<>(); vaccineList.forEach(resiVaccineInfo -> { From f57a120d0f2e877bd40e2e20e8bf4f971506db0f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 11 Nov 2022 15:17:22 +0800 Subject: [PATCH 568/621] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=AC?= =?UTF-8?q?=E8=BE=96=E5=8C=BA=E5=B1=85=E6=B0=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccineRelationDTO.java | 5 +++++ .../epmet/dto/result/IcVaccineListResultDTO.java | 7 +++++++ .../com/epmet/entity/IcVaccineRelationEntity.java | 5 +++++ .../epmet/service/impl/IcVaccineServiceImpl.java | 15 ++++++++------- .../V0.0.87__alter_ic_vaccine_relation.sql | 5 +++++ .../src/main/resources/mapper/IcVaccineDao.xml | 3 ++- 6 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.87__alter_ic_vaccine_relation.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java index 7939293b5b..5fcb403a1e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java @@ -50,6 +50,11 @@ public class IcVaccineRelationDTO implements Serializable { */ private String userType; + /** + * 是否本辖区居民，1：是；0：否 + */ + private String isLocalResiUser; + /** * 删除标识 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java index 87480268cf..1764d1c61c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java @@ -85,5 +85,12 @@ public class IcVaccineListResultDTO implements Serializable { @ExcelProperty(value = "疫苗厂家",order = 7) private String manufacturer; + /** + * 是否本辖区居民，1：是；0：否 + */ + @ExcelIgnore + private String isLocalResiUser; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java index d4cfb6ad48..cbacf0b140 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java @@ -49,4 +49,9 @@ public class IcVaccineRelationEntity extends BaseEpmetEntity { */ private String userType; + /** + * 是否本辖区居民，1：是；0：否 + */ + private String isLocalResiUser; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 6d183807ab..cdb0e2348b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -23,10 +23,7 @@ import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccineRelationDao; import com.epmet.dto.IcVaccineDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.IcVaccineListResultDTO; -import com.epmet.dto.result.LoginUserDetailsResultDTO; -import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.dto.result.VaccineListDTO; +import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcVaccineEntity; import com.epmet.entity.IcVaccineRelationEntity; @@ -369,7 +366,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper<>(); @@ -440,6 +437,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl #{endTime} - AND b.IS_RESI_USER = #{isResiUser} + AND a.is_local_resi_user = #{isResiUser} ORDER BY b.INOCULATE_TIME DESC, b.id ASC From 8fef98a908a00c35ec001829c07dac0d492f2b78 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 11 Nov 2022 16:20:55 +0800 Subject: [PATCH 569/621] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8C=89=E9=92=AE-todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/YTVaccineListDTO.java | 27 +++++++ .../dto/result/NatUserInfoResultDTO.java | 2 + .../main/java/com/epmet/dao/IcVaccineDao.java | 9 +++ .../com/epmet/entity/IcVaccineEntity.java | 8 ++ .../impl/DataSyncConfigServiceImpl.java | 80 ++++++++++++++++--- .../resources/mapper/DataSyncConfigDao.xml | 3 +- .../main/resources/mapper/IcVaccineDao.xml | 14 ++++ 7 files changed, 131 insertions(+), 12 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java new file mode 100644 index 0000000000..94b2b30418 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/11 15:05 + */ +@Data +public class YTVaccineListDTO implements Serializable { + private static final long serialVersionUID = -5583350277850076659L; + + private String idCard; + + /** + * 接种时间 + */ + private String inoculateDate; + + /** + * 接种地点 + */ + private String lastStationName; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java index 5b0300f764..ef4b4e0eab 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java @@ -29,6 +29,8 @@ public class NatUserInfoResultDTO implements Serializable { private String name; + private String mobile; + /** * 18大类 中 某一类的 是否值，用于比较 同步数据结果确定是否要插入到表中 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index 55b4591be3..f2c6829689 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcNatDTO; import com.epmet.dto.IcVaccineDTO; +import com.epmet.dto.YTVaccineListDTO; import com.epmet.dto.form.MyNatListFormDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListResultDTO; @@ -72,4 +73,12 @@ public interface IcVaccineDao extends BaseDao { */ List getVaccineListByIdCard(@Param("idCard") String idCard,@Param("time") String time); + /** + * @Description 根据 身份证 + 疫苗接种时间 查询库里存在的 + * @param list + * @Author zxc + * @Date 2022/11/11 15:11 + */ + List getExistVaccine(@Param("list")List list); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java index b17256f3a0..2a1121de34 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -61,6 +62,7 @@ public class IcVaccineEntity extends BaseEpmetEntity { /** * 接种时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date inoculateTime; /** @@ -93,4 +95,10 @@ public class IcVaccineEntity extends BaseEpmetEntity { */ private String remark; + @TableField(exist = false) + private String agencyId; + + @TableField(exist = false) + private String pids; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 0f21e9e539..dff88efba3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -11,7 +11,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.dto.form.PageFormDTO; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; @@ -21,7 +20,6 @@ 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.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; @@ -32,9 +30,11 @@ import com.epmet.constant.EpidemicConstant; import com.epmet.dao.DataSyncConfigDao; import com.epmet.dao.IcNatDao; import com.epmet.dao.IcSyncJobDao; +import com.epmet.dao.IcVaccineDao; import com.epmet.dto.DataSyncConfigDTO; import com.epmet.dto.DataSyncRecordDeathDTO; import com.epmet.dto.DataSyncRecordDisabilityDTO; +import com.epmet.dto.YTVaccineListDTO; import com.epmet.dto.form.ConfigSwitchFormDTO; import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.dto.form.ScopeSaveFormDTO; @@ -48,7 +48,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; -import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; @@ -59,7 +58,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; @@ -95,6 +93,12 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl args = new HashMap<>(); args.put("idcards", idCards); // todo 疫苗接种视图 - - List> vaccineList = yantaiNamedParamLantuJdbcTemplate.queryForList( - "select id, name,card_no, create_time from hscyxxb where card_no in (:idcards)", args); + String json = "[\n" + + "{\n" + + "\t\"idCard\":\"370785195001012558\",\n" + + "\t\"inoculateDate\":\"2023-01-01 10:01\",\n" + + "\t\"lastStationName\":\"北京\"\n" + + "},\n" + + "{\n" + + "\t\"idCard\":\"370785195001012558\",\n" + + "\t\"inoculateDate\":\"2022-01-01 10:01\",\n" + + "\t\"lastStationName\":\"南京\"\n" + + "}\n" + + "]"; + List> vaccineList = new ArrayList<>();/*yantaiNamedParamLantuJdbcTemplate.queryForList( + "select id, name,card_no, create_time from hscyxxb where card_no in (:idcards)", args);*/ + Map m = new HashMap<>(); + vaccineList.add(m); if (CollectionUtils.isNotEmpty(vaccineList)) { List entities = new ArrayList<>(); - vaccineList.forEach(resiVaccineInfo -> { - // 从视图中获取到的疫苗接种相关信息 - - }); +// List ytVaccineListDTOS = ConvertUtils.sourceToTarget(vaccineList, YTVaccineListDTO.class); + List ytVaccineListDTOS = JSON.parseArray(json,YTVaccineListDTO.class); + List existVaccine = icVaccineDao.getExistVaccine(ytVaccineListDTOS); + if (CollectionUtils.isNotEmpty(existVaccine)){ + for (YTVaccineListDTO e : existVaccine) { + for (int i = 0; i < ytVaccineListDTOS.size(); i++) { + if (ytVaccineListDTOS.get(i).getIdCard().equals(e.getIdCard()) && ytVaccineListDTOS.get(i).getInoculateDate().equals(e.getInoculateDate())){ + ytVaccineListDTOS.remove(i); + } + } + } + } + if (CollectionUtils.isNotEmpty(ytVaccineListDTOS)){ + ytVaccineListDTOS.forEach(v -> { + resiInfos.forEach(u -> { + if (v.getIdCard().equals(u.getIdCard())){ + IcVaccineEntity e = new IcVaccineEntity(); + e.setCustomerId(customerId); + e.setName(u.getName()); + e.setMobile(u.getMobile()); + e.setIdCard(u.getIdCard()); + e.setIsResiUser(StringUtils.isBlank(u.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR); + e.setUserId(StringUtils.isBlank(u.getUserId()) ? "" : u.getUserId()); + e.setUserType("ytPull"); + e.setInoculateTime(DateUtils.parseDate(v.getInoculateDate(),DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)); + e.setInoculateAddress(v.getLastStationName()); + e.setAgencyId(u.getAgencyId()); + e.setPids(u.getPids()); + entities.add(e); + } + }); + }); + icVaccineService.insertBatch(entities); + List relationEntities = new ArrayList<>(); + entities.forEach(e -> { + IcVaccineRelationEntity re = new IcVaccineRelationEntity(); + re.setIcVaccineId(e.getAgencyId()); + re.setPids(e.getPids()); + re.setCustomerId(customerId); + re.setUserType("ytPull"); + re.setAgencyId(e.getAgencyId()); + relationEntities.add(re); + }); + icVaccineRelationService.insertBatch(relationEntities); + } } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml index 911b5102bd..7b0e96f023 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml @@ -70,7 +70,8 @@ ${categoryColumn} AS categoryColumn, - pids + pids, + mobile FROM ic_resi_user WHERE DEL_FLAG = '0' diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index b8113074cf..77fca51a32 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -183,4 +183,18 @@ and ID_CARD = #{idCard} and DATE_FORMAT( INOCULATE_TIME, '%Y-%m-%d' ) = #{time} + + + From 32fe851abec20e8d1a542470190b479390585b46 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 11 Nov 2022 17:04:46 +0800 Subject: [PATCH 570/621] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/EpmetUserOpenFeignClient.java | 3 ++ .../EpmetUserOpenFeignClientFallback.java | 5 ++ .../com/epmet/constant/EpidemicConstant.java | 2 + .../controller/DataSyncConfigController.java | 12 +++++ .../java/com/epmet/enums/DataSyncEnum.java | 1 + .../epmet/service/DataSyncConfigService.java | 8 +++ .../impl/DataSyncConfigServiceImpl.java | 52 ++++++++++++++++++- 7 files changed, 81 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index b24a4a9651..dab50be493 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -952,4 +952,7 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/dataSyncConfig/disabilityInfoScanTask") Result disabilityInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + + @PostMapping("/epmetuser/dataSyncConfig/vaccineInfoScanTask") + Result vaccineInfoScanTask(@RequestBody DataSyncTaskParam formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index b675a7626b..8ac8382a78 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -741,4 +741,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result disabilityInfoScanTask(DataSyncTaskParam formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabilityInfoScanTask", formDTO); } + + @Override + public Result vaccineInfoScanTask(DataSyncTaskParam formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "vaccineInfoScanTask", formDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java index 388b0d05a5..e2817f165c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java @@ -7,10 +7,12 @@ public interface EpidemicConstant { * 核酸检测 * 残疾人 * 死亡 + * 疫苗接种 */ String DATA_CODE_NAT = "hesuan"; String DATA_CODE_DISABILITY = "canji"; String DATA_CODE_DEATH = "siwang"; + String DATA_CODE_VACCINE = "yimiaojiezhong"; /** * ic_sync_job 任务类型 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index cbbc409d6b..948471cbe3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -156,4 +156,16 @@ public class DataSyncConfigController { return new Result(); } + /** + * @Description 疫苗接种信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/11 16:56 + */ + @PostMapping("vaccineInfoScanTask") + public Result vaccineInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ + dataSyncConfigService.vaccineInfoScanTask(formDTO); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java index a3a66c4efc..438453f134 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java @@ -12,6 +12,7 @@ public enum DataSyncEnum { HE_SUAN("hesuan", "核酸检测数据"), CAN_JI("canji", "残疾数据"), SI_WANG("siwang", "死亡数据"), + VACCINE("yimiaojiezhong", "疫苗接种"), OTHER("qita","其他"), ; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index 9d17dad7f9..b4d80051da 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -134,4 +134,12 @@ public interface DataSyncConfigService extends BaseService */ void execSyncByJobProcessor(IcSyncJobEntity jobEntity); + /** + * @Description 疫苗接种信息定时拉取 + * @param formDTO + * @Author zxc + * @Date 2022/11/11 16:56 + */ + void vaccineInfoScanTask(DataSyncTaskParam formDTO); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index dff88efba3..c01925d3ef 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1119,7 +1119,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl relationEntities = new ArrayList<>(); entities.forEach(e -> { IcVaccineRelationEntity re = new IcVaccineRelationEntity(); @@ -1130,7 +1130,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl configData = getConfigData(null, EpidemicConstant.DATA_CODE_VACCINE); + if (CollectionUtils.isEmpty(configData)){ + log.warn("vaccineInfoScanTask not exists config data,customer is "+formDTO.getCustomerId()); + return; + } + long count = configData.stream().filter(o -> CollectionUtils.isNotEmpty(o.getScopeList())).count(); + if (count < 1) { + log.warn("vaccineInfoScanTask scopeList is null"); + return; + } + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_THOUSAND; + List dbResiList = null; + do { + for (DataSyncConfigDTO config : configData) { + // 设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize); + if (CollectionUtils.isEmpty(dbResiList)) { + continue; + } + switch (anEnum) { + case VACCINE: + try { + //查询正常状态的居民 + yanTaiVaccineByDbViewPartition(dbResiList,config.getCustomerId(),NumConstant.ZERO_STR); + log.info("======vaccine信息拉取结束======"); + } catch (Exception e) { + log.error("vaccine thread execute exception", e); + } + break; + default: + log.warn("没有要处理的数据"); + } + } + pageNo++; + } while (dbResiList != null && dbResiList.size() == pageSize); + } } From f7e96ebfade796cfd77ca44d785d18f6c5d04ea9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 11 Nov 2022 17:09:28 +0800 Subject: [PATCH 571/621] emm --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index c01925d3ef..9baed2955c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1278,7 +1278,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl configData = getConfigData(null, EpidemicConstant.DATA_CODE_VACCINE); if (CollectionUtils.isEmpty(configData)){ - log.warn("vaccineInfoScanTask not exists config data,customer is "+formDTO.getCustomerId()); + log.warn("vaccineInfoScanTask not exists config data "); return; } long count = configData.stream().filter(o -> CollectionUtils.isNotEmpty(o.getScopeList())).count(); From 9cce2df712da319ab52aa3a99827393dc45fd0e5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 11 Nov 2022 17:49:29 +0800 Subject: [PATCH 572/621] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcVaccineController.java | 7 +++ .../main/java/com/epmet/dao/IcVaccineDao.java | 6 +++ .../com/epmet/service/IcVaccineService.java | 2 + .../service/impl/IcVaccineServiceImpl.java | 45 +++++++++++++++++++ .../main/resources/mapper/IcVaccineDao.xml | 42 +++++++++++++++++ 5 files changed, 102 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java index 8c742919a7..cf78a5535a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java @@ -277,5 +277,12 @@ public class IcVaccineController implements ResultDataResolver { return new Result<>(); } + @PostMapping("initVaccineLocal") + public Result initVaccineLocal(){ + icVaccineService.initVaccineLocal(); + return new Result(); + } + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index 55b4591be3..c081011f88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.MyNatListFormDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListResultDTO; import com.epmet.dto.result.MyNatListResultDTO; +import com.epmet.dto.result.RelationAndNatResultDTO; import com.epmet.entity.IcVaccineEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -72,4 +73,9 @@ public interface IcVaccineDao extends BaseDao { */ List getVaccineListByIdCard(@Param("idCard") String idCard,@Param("time") String time); + List initVaccineLocal(); + + void updateRelation(List list); + + void updateRelationOther(@Param("isLocalResiUser") String isLocalResiUser); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java index c89b5f2db4..609297b255 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java @@ -68,4 +68,6 @@ public interface IcVaccineService extends BaseService { void edit(AddIcVaccineFormDTO formDTO); void del(IcVaccineFormDTO formDTO); + + void initVaccineLocal(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index cdb0e2348b..0d6b3418bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -18,6 +18,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.*; import com.epmet.constants.ImportTaskConstants; +import com.epmet.dao.IcNatDao; import com.epmet.dao.IcResiUserDao; import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccineRelationDao; @@ -79,6 +80,8 @@ public class IcVaccineServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(no, NumConstant.ONE_THOUSAND).doSelectPageInfo(() -> baseDao.initVaccineLocal()); + List list = pageInfo.getList(); + size = list.size(); + if (CollectionUtils.isNotEmpty(list)){ + List users = icNatDao.getResiByIdCards(list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList())); + if (CollectionUtils.isNotEmpty(users)){ + for (RelationAndNatResultDTO l : list) { + for (IcResiUserEntity u : users) { + if (l.getStaffAgencyIdPath().contains(u.getAgencyId())){ + l.setIsLocalResiUser(NumConstant.ONE_STR); + break; + } + } + } + updateRelation(list,NumConstant.ONE_STR); + } + } + no++; + }while (size == NumConstant.ONE_THOUSAND); + // 其他类型的userType直接是居民的组织信息，所以直接赋值 is_local_resi_user = '1' + updateRelation(null,NumConstant.TWO_STR); + log.error("/epmetuser/icNat/initNatLocal更新核酸检测记录关系表，是否是本辖区居民标志 end"); + } + + @Transactional(rollbackFor = Exception.class) + public void updateRelation(List list,String type){ + if (NumConstant.ONE_STR.equals(type)){ + if (CollectionUtils.isNotEmpty(list)){ + baseDao.updateRelation(list); + } + }else { + baseDao.updateRelationOther("1"); + baseDao.updateRelationOther("0"); + } + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index d4a58ec8a9..a580d72a00 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -184,4 +184,46 @@ and ID_CARD = #{idCard} and DATE_FORMAT( INOCULATE_TIME, '%Y-%m-%d' ) = #{time} + + + + + UPDATE ic_vaccine_relation + + + + when ID = #{l.relationId} then #{l.isLocalResiUser} + + + updated_time = NOW() + + WHERE ID IN( + + #{l.relationId} + ) + + + UPDATE ic_vaccine_relation a + INNER JOIN ic_vaccine b ON a.ic_vaccine_id = b.id + set a.is_local_resi_user = #{isLocalResiUser}, + a.updated_time = NOW() + where a.user_type != 'import' + + and b.USER_ID is not null + and b.USER_ID != '' + + + and (b.USER_ID is null or b.USER_ID ='') + + From d02b0fb6509b914dde0710ac988f373a7e62677d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 14 Nov 2022 09:03:40 +0800 Subject: [PATCH 573/621] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=9A=84pids=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcNatServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index fe452ead61..8d0486a925 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -703,28 +703,28 @@ public class IcNatServiceImpl extends BaseServiceImpl imp /** * 创建nat关系 * @param natId - * @param currentUserAgencyId 居民所属组织 + * @param currentResiAgencyId 居民所属组织 * @param staffAgencyId 工作人员所属组织 * @param agencyPids 工作人员所属组织路径 */ - private void createNatRelation(String natId, String currentUserAgencyId, String agencyPids,String staffAgencyId) { + private void createNatRelation(String natId, String currentResiAgencyId, String agencyPids,String staffAgencyId) { // 没有关系创建关系，有关系就跳过 // 2022-10-25 修改：不管是不是本辖区居民，都创建关系，用 is_local_resi_user区分是不是本辖区居民 // 组织ID都改成工作人员所属组织ID LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcNatRelationEntity::getIcNatId, natId); - query.eq(IcNatRelationEntity::getAgencyId, currentUserAgencyId); + query.eq(IcNatRelationEntity::getAgencyId, currentResiAgencyId); if (icNatRelationDao.selectCount(query) > 0) { return; } IcNatRelationEntity relation = new IcNatRelationEntity(); - relation.setAgencyId(currentUserAgencyId); - relation.setPids(String.join(":", Arrays.asList(agencyPids, currentUserAgencyId))); + relation.setAgencyId(currentResiAgencyId); + relation.setPids(String.join(":", Arrays.asList(agencyPids, staffAgencyId))); relation.setIcNatId(natId); relation.setUserType("import"); - relation.setIsLocalResiUser(agencyPids.contains(currentUserAgencyId) ? NumConstant.ONE_STR : NumConstant.ZERO_STR); + relation.setIsLocalResiUser(agencyPids.contains(currentResiAgencyId) ? NumConstant.ONE_STR : NumConstant.ZERO_STR); icNatRelationDao.insert(relation); } From 9064d1ca46449799a325f16defb710c4812f7b5d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 14 Nov 2022 10:02:03 +0800 Subject: [PATCH 574/621] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9C=AC=E5=9C=B0=E5=B1=85=E6=B0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 9baed2955c..803283776a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1128,6 +1128,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Mon, 14 Nov 2022 13:48:08 +0800 Subject: [PATCH 575/621] edit --- .../java/com/epmet/service/impl/IcNatServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 8d0486a925..78c935c4ca 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -246,9 +246,14 @@ public class IcNatServiceImpl extends BaseServiceImpl imp public void edit(AddIcNatFormDTO formDTO) { disposeIsNull(formDTO); //0.先根据身份证号和检测时间以及检测结果校验除当前数据是否还存在相同数据 - IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), formDTO.getIcNatId(), formDTO.getIdCard(), null != formDTO.getNatTime() ? DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE) : null, formDTO.getNatResult(), null != formDTO.getSampleTime() ? DateUtils.format(formDTO.getSampleTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE) : null); + IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), + formDTO.getIcNatId(), + formDTO.getIdCard(), + null != formDTO.getNatTime() ? DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE) : null, + formDTO.getNatResult(), + null != formDTO.getSampleTime() ? DateUtils.format(formDTO.getSampleTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE) : null); if (null != icNatDTO) { - throw new RenException(EpmetErrorCode.IC_NAT.getCode(), EpmetErrorCode.IC_NAT.getMsg()); + throw new EpmetException(EpmetErrorCode.IC_NAT.getCode(), EpmetErrorCode.IC_NAT.getMsg()); } //1.更新核酸记录基础信息表数据 IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); From 763752c586f8fcc0967764214659a7cd16ba9c59 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 14 Nov 2022 15:08:45 +0800 Subject: [PATCH 576/621] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=A0=B8=E9=85=B8?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?internalRemark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java | 5 +++++ .../handler/IcNatCompareRecordExcelImportListener.java | 7 ++++++- .../src/main/resources/mapper/IcNatCompareRecordDao.xml | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java index be20e5fa68..4a8c8f2be6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java @@ -129,4 +129,9 @@ public class IcNatCompareRecordDTO implements Serializable { @ColumnWidth(30) @ExcelProperty("导入组织") private String agencyName; + + /** + * + */ + private String internalRemark; } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java index 531e977ea7..3ebe113874 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java @@ -228,9 +228,14 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener Date: Mon, 14 Nov 2022 15:41:52 +0800 Subject: [PATCH 577/621] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=A0=B8=E9=85=B8?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?internalRemark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/handler/IcNatCompareRecordExcelImportListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java index 3ebe113874..3bda1ff40f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java @@ -233,7 +233,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener Date: Mon, 14 Nov 2022 15:57:12 +0800 Subject: [PATCH 578/621] zhushi --- .../com/epmet/service/impl/IcNatCompareRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java index 503669e07f..1af182250a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java @@ -227,7 +227,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl Date: Mon, 14 Nov 2022 17:52:23 +0800 Subject: [PATCH 579/621] LambdaUpdateWrapper --- .../com/epmet/dto/IcNatCompareRecordDTO.java | 2 +- .../entity/IcNatCompareRecordEntity.java | 49 ++++++++++--------- ...IcNatCompareRecordExcelImportListener.java | 11 +++-- .../impl/IcNatCompareRecordServiceImpl.java | 16 +++++- 4 files changed, 48 insertions(+), 30 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java index 4a8c8f2be6..a852edac8e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java @@ -94,7 +94,7 @@ public class IcNatCompareRecordDTO implements Serializable { * 最近一次核酸时间:接口填入 */ @ColumnWidth(30) - @ExcelProperty("最近一次核酸时间") + @ExcelProperty("最近一次检测时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date latestNatTime; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java index 75b18618fe..e87e4c3e3b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import java.util.Date; + /** * 核酸比对记录 * @@ -21,47 +22,47 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; private String customerId; - /** - * 姓名 - */ + /** + * 姓名 + */ private String name; - /** - * 身份证 - */ + /** + * 身份证 + */ private String idCard; - /** - * 手机号 - */ + /** + * 手机号 + */ private String mobile; - /** - * 是否客户下居民(0:否 1:是) - */ + /** + * 是否客户下居民(0:否 1:是) + */ private String isResiUser; - /** - * 是否客户下居民，ic_resi_user.id - */ + /** + * 是否客户下居民，ic_resi_user.id + */ private String icResiUserId; /** * 最近一次采样时间:接口填入 */ private Date latestCyTime; - /** - * 最近一次核酸时间:接口填入 - */ + /** + * 最近一次核酸时间:接口填入 + */ private Date latestNatTime; - /** - * 检测结果(0:阴性 1:阳性):接口填入 - */ + /** + * 检测结果(0:阴性 1:阳性):接口填入 + */ private String natResult; - /** - * 检测地点:接口填入 - */ + /** + * 检测地点:接口填入 + */ private String natAddress; /** * 联系地址：接口填入 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java index 3bda1ff40f..04238846f5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatCompareRecordExcelImportListener.java @@ -171,6 +171,7 @@ public class IcNatCompareRecordExcelImportListener implements ReadListener updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcNatCompareRecordEntity::getId,origin.getId()); + updateWrapper.set(IcNatCompareRecordEntity::getName, origin.getName()) + .set(IcNatCompareRecordEntity::getMobile, origin.getMobile()) + .set(IcNatCompareRecordEntity::getIsResiUser, origin.getIsResiUser()) + .set(IcNatCompareRecordEntity::getIcResiUserId, origin.getIcResiUserId()) + .set(IcNatCompareRecordEntity::getLatestCyTime, origin.getLatestCyTime()) + .set(IcNatCompareRecordEntity::getLatestNatTime, origin.getLatestNatTime()) + .set(IcNatCompareRecordEntity::getNatResult, origin.getNatResult()) + .set(IcNatCompareRecordEntity::getNatAddress, origin.getNatAddress()) + .set(IcNatCompareRecordEntity::getContactAddress, origin.getContactAddress()) + .set(IcNatCompareRecordEntity::getLatestImportTime, origin.getLatestImportTime()) + .set(IcNatCompareRecordEntity::getInternalRemark, origin.getInternalRemark()); + baseDao.update(null,updateWrapper); IcNatCompareRecRelationEntity existRelationEntity=icNatCompareRecRelationDao.selectExist(data.getCustomerId(),origin.getId(),staffInfo.getAgencyId(),importDate); if(null!=existRelationEntity){ // 是否本社区（agency_id）下居民(0:否 1:是) From aed2a4ce70515bd8484bc1bce87ee2a010172d83 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 14 Nov 2022 17:56:31 +0800 Subject: [PATCH 580/621] - --- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 803283776a..b3a50c4490 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1040,9 +1040,11 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Tue, 15 Nov 2022 10:02:59 +0800 Subject: [PATCH 581/621] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=AF=94=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/YtSfhyxxcxdsjjResDTO.java | 39 ++++ .../commons/tools/utils/YtHsResUtils.java | 35 +++ .../epmet/dto/IcResiComparisonRecordDTO.java | 105 +++++++++ .../com/epmet/dto/form/ComparisonFormDTO.java | 33 +++ .../dto/form/ResiComparisonListFormDTO.java | 39 ++++ .../epmet/dto/result/ComparisonResultDTO.java | 20 ++ .../result/ResiComparisonListResultDTO.java | 70 ++++++ .../IcResiComparisonRecordController.java | 136 +++++++++++ .../epmet/dao/IcResiComparisonRecordDao.java | 40 ++++ .../java/com/epmet/dao/IcResiUserDao.java | 3 + .../entity/IcResiComparisonRecordEntity.java | 71 ++++++ .../excel/IcResiComparisonRecordExcel.java | 64 ++++++ .../IcResiComparisonRecordService.java | 24 ++ .../IcResiComparisonRecordServiceImpl.java | 215 ++++++++++++++++++ .../mapper/IcResiComparisonRecordDao.xml | 108 +++++++++ .../main/resources/mapper/IcResiUserDao.xml | 14 ++ 16 files changed, 1016 insertions(+) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiComparisonRecordDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ComparisonFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiComparisonListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ComparisonResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiComparisonListResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiComparisonRecordController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiComparisonRecordDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiComparisonRecordEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiComparisonRecordExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiComparisonRecordService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java new file mode 100644 index 0000000000..8863619d26 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java @@ -0,0 +1,39 @@ +package com.epmet.commons.tools.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +/** + * @Description 根据身份证号和姓名查询公安部备案信息 + */ +@NoArgsConstructor +@Data +public class YtSfhyxxcxdsjjResDTO { + private int code = 200; + private String msg = "请求成功"; + /** + * 响应数据 + */ + private YtSfhyxxcxdsjjDetail data; + private int total; + + @Data + public static class YtSfhyxxcxdsjjDetail { + private String status = "000"; + private String statusMsg = "正常返回"; + private String count = "1"; + //结果数量 + private String total; + private List result; + } + @Data + public static class Result { + //身份证号 + private String GMSFHM; + //姓名 + private String XM; + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 9010c9b84a..371aa8b95b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHscyResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; +import com.epmet.commons.tools.dto.result.YtSfhyxxcxdsjjResDTO; import com.google.common.util.concurrent.RateLimiter; import lombok.extern.slf4j.Slf4j; @@ -226,6 +227,40 @@ public class YtHsResUtils { return failResult; } + /** + * desc:根据身份证号和姓名查询公安部备案信息 + * + * @return + */ + public static YtSfhyxxcxdsjjResDTO sfhyxxcxdsjj(String gmsfhm, String xm) { + try { + tryAcquire("sfhyxxcxdsjj"); + + Map param = new HashMap<>(); + param.put(APP_KEY, "RhOHlu7Bmkrj8Vk7uGTNNxHqI"); + param.put("gmsfhm", gmsfhm); + param.put("xm", xm); + log.info("sfhyxxcxdsjj api param:{}", param); + + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "sfhyxxcxdsjj", param); + log.info("sfhyxxcxdsjj api result:{}", JSON.toJSONString(result)); + if (result.success()) { + String data = result.getData(); + JSONObject jsonObject = JSON.parseObject(data); + if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) { + return JSON.parseObject(result.getData(), YtSfhyxxcxdsjjResDTO.class); + } else { + log.warn("sfhyxxcxdsjj 烟台公安部居民基础信息调用失败"); + } + } + } catch (Exception e) { + log.error(String.format("烟台公民基本信息查询异常gmsfhm:%s", gmsfhm), e); + } + YtSfhyxxcxdsjjResDTO resultResult = new YtSfhyxxcxdsjjResDTO(); + resultResult.setData(new YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail()); + return resultResult; + } + public static void main(String[] args) { //YtDataSyncResDTO canji = canji("123", "123"); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiComparisonRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiComparisonRecordDTO.java new file mode 100644 index 0000000000..b8f092cc4c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiComparisonRecordDTO.java @@ -0,0 +1,105 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 居民信息与公安部信息比对记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-11-14 + */ +@Data +public class IcResiComparisonRecordDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * ic_resi_user.id【比对时的数据值】 + */ + private String resiId; + + /** + * 数字社区人员姓名【比对时的数据值】 + */ + private String resiName; + + /** + * 数据社区身份证号【比对时的数据值】 + */ + private String resiIdCard; + + /** + * 公安部人员姓名 + */ + private String policeName; + + /** + * 公安部人员证件号 + */ + private String policeIdCard; + + /** + * 数据状态(0:未处理 1:已处理) + */ + private String type; + + /** + * 信息一致性(0:否 1:是 2:-)2代表程序比对了没有匹配上 + */ + private String identical; + + /** + * 是否比对过(0:否 1:是) + */ + private String isComparison; + + /** + * 比对结果说明 + */ + private String comparisonResult; + + /** + * + */ + 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/form/ComparisonFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ComparisonFormDTO.java new file mode 100644 index 0000000000..53688b39da --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ComparisonFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +@Data +public class ComparisonFormDTO extends PageFormDTO { + private static final long serialVersionUID = 9156247659994638103L; + public interface Update extends CustomerClientShowGroup { + } + + /** + * 居民Id集合 + */ + private List userIdList; + /** + * 比对记录Id + */ + @NotBlank(message = "比对记录Id不能为空", groups = {Update.class}) + private String comparisonRecordId; + + /** + * token里设置 + */ + private String customerId; + private String userId; + private String agencyId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiComparisonListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiComparisonListFormDTO.java new file mode 100644 index 0000000000..e16be96134 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiComparisonListFormDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description 数据比对列表-接口入参 + * @Author sun + */ +@Data +public class ResiComparisonListFormDTO extends PageFormDTO { + private static final long serialVersionUID = 9156247659994638103L; + + /** + * 信息一致性(0:否 1:是 2:-)2代表程序比对了没有匹配上 + */ + private String identical; + /** + * 数据状态(0:未处理 1:已处理) + */ + private String type; + /** + * 身份证号 + */ + private String idCard; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = true; + + + /** + * token里设置 + */ + private String customerId; + private String userId; + private String agencyId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ComparisonResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ComparisonResultDTO.java new file mode 100644 index 0000000000..9310c125e1 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ComparisonResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ComparisonResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 是否存在异常 + */ + private Boolean result = false; + /** + * 接口反馈说明 + */ + private String resultExplain; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiComparisonListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiComparisonListResultDTO.java new file mode 100644 index 0000000000..a25b565b80 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiComparisonListResultDTO.java @@ -0,0 +1,70 @@ +package com.epmet.dto.result; + +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 数据比对列表-接口返参 + * @Author sun + */ +@Data +public class ResiComparisonListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 比对记录表Id + */ + private String comparisonRecordId; + + /** + * ic_resi_user.id【比对时的数据值】 + */ + private String resiId; + + /** + * 居民库姓名 + */ + private String resiName; + + /** + * 居民库证件号 + */ + private String resiIdCard; + + /** + * 公安部人员姓名 + */ + private String policeName; + + /** + * 公安部人员证件号 + */ + private String policeIdCard; + + /** + * 数据状态(0:未处理 1:已处理) + */ + private String type; + private String typeName; + + /** + * 信息一致性(0:否 1:是 2:-)2代表程序比对了没有匹配上 + */ + private String identical; + private String identicalName; + + /** + * 是否比对过(0:否 1:是) + */ + private String isComparison; + private String isComparisonName; + + /** + * 比对结果说明 + */ + private String comparisonResult; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiComparisonRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiComparisonRecordController.java new file mode 100644 index 0000000000..10b14afe76 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiComparisonRecordController.java @@ -0,0 +1,136 @@ +package com.epmet.controller; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.feign.ResultDataResolver; +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.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.ComparisonFormDTO; +import com.epmet.dto.form.ResiComparisonListFormDTO; +import com.epmet.dto.result.ComparisonResultDTO; +import com.epmet.dto.result.ResiComparisonListResultDTO; +import com.epmet.excel.IcResiComparisonRecordExcel; +import com.epmet.service.IcResiComparisonRecordService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; +import java.util.List; + + +/** + * 居民信息与公安部信息比对记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-11-14 + */ +@Slf4j +@RestController +@RequestMapping("icResiComparisonRecord") +public class IcResiComparisonRecordController implements ResultDataResolver { + + @Autowired + private IcResiComparisonRecordService icResiComparisonRecordService; + + + /** + * @Author sun + * @Description 数据比对列表 + **/ + @PostMapping("resiComparisonList") + @MaskResponse(fieldNames = {"resiIdCard", "policeIdCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + public Result> resiComparisonList(@LoginUser TokenDto tokenDto, @RequestBody ResiComparisonListFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(icResiComparisonRecordService.resiComparisonList(formDTO)); + } + + /** + * @Author sun + * @Description 比对、批量比对、组织及下级比对 + **/ + @PostMapping("comparison") + public Result comparison(@LoginUser TokenDto tokenDto, @RequestBody ComparisonFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result().ok(icResiComparisonRecordService.comparison(formDTO)); + } + + /** + * @Author sun + * @Description 比对后的更新 + **/ + @PostMapping("comparisonUpdate") + public Result comparisonUpdate(@LoginUser TokenDto tokenDto, @RequestBody ComparisonFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ComparisonFormDTO.Update.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icResiComparisonRecordService.comparisonUpdate(formDTO); + return new Result(); + } + + /** + * @Author sun + * @Description 比对记录数据导出 + **/ + @NoRepeatSubmit + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody ResiComparisonListFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setIsPage(false); + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "比对记录" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcResiComparisonRecordExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icResiComparisonRecordService.resiComparisonList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcResiComparisonRecordExcel.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiComparisonRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiComparisonRecordDao.java new file mode 100644 index 0000000000..848067199c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiComparisonRecordDao.java @@ -0,0 +1,40 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.ResiComparisonListFormDTO; +import com.epmet.dto.result.ResiComparisonListResultDTO; +import com.epmet.entity.IcResiComparisonRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 居民信息与公安部信息比对记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-11-14 + */ +@Mapper +public interface IcResiComparisonRecordDao extends BaseDao { + + List getResiComparisonList(ResiComparisonListFormDTO formDTO); + + void saveInsert(IcResiComparisonRecordEntity recordEntity); +} \ No newline at end of file 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 8caa220af2..762baa4ed5 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 @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcResiUserConfirmDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.IcVolunteerPolyDTO; @@ -439,4 +440,6 @@ public interface IcResiUserDao extends BaseDao { * @Date 2022/10/24 15:47 */ ResiAndLocalResiResultDTO getResiCount(@Param("agencyId")String agencyId,@Param("idCard")String idCard,@Param("customerId")String customerId); + + List getResiUserList(ComparisonFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiComparisonRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiComparisonRecordEntity.java new file mode 100644 index 0000000000..ad290f5755 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiComparisonRecordEntity.java @@ -0,0 +1,71 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 出生管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-10 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_comparison_record") +public class IcResiComparisonRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * ic_resi_user.id【比对时的数据值】 + */ + private String resiId; + + /** + * 数字社区人员姓名【比对时的数据值】 + */ + private String resiName; + + /** + * 数据社区身份证号【比对时的数据值】 + */ + private String resiIdCard; + + /** + * 公安部人员姓名 + */ + private String policeName; + + /** + * 公安部人员证件号 + */ + private String policeIdCard; + + /** + * 数据状态(0:未处理 1:已处理) + */ + private String type; + + /** + * 信息一致性(0:否 1:是 2:-)2代表程序比对了没有匹配上 + */ + private String identical; + + /** + * 是否比对过(0:否 1:是) + */ + private String isComparison; + + /** + * 比对结果说明 + */ + private String comparisonResult; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiComparisonRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiComparisonRecordExcel.java new file mode 100644 index 0000000000..2442b95a31 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiComparisonRecordExcel.java @@ -0,0 +1,64 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import lombok.Data; + +import java.io.Serializable; + +/** + * 比对记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-11-14 + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class IcResiComparisonRecordExcel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 居民库姓名 + */ + @ExcelProperty(value = "居民库-姓名") + @ColumnWidth(15) + private String resiName; + + /** + * 居民库证件号 + */ + @ExcelProperty(value = "居民库=证件号") + @ColumnWidth(20) + private String resiIdCard; + + /** + * 公安部人员姓名 + */ + @ExcelProperty(value = "公安-姓名") + @ColumnWidth(15) + private String policeName; + + /** + * 公安部人员证件号 + */ + @ExcelProperty(value = "公安-证件号") + @ColumnWidth(20) + private String policeIdCard; + + /** + * 数据状态(0:未处理 1:已处理) + */ + @ExcelProperty(value = "状态") + @ColumnWidth(12) + private String typeName; + + /** + * 信息一致性(0:否 1:是 2:-)2代表程序比对了没有匹配上 + */ + @ExcelProperty(value = "信息一致") + @ColumnWidth(12) + private String identicalName; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiComparisonRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiComparisonRecordService.java new file mode 100644 index 0000000000..5d846db7d7 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiComparisonRecordService.java @@ -0,0 +1,24 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.form.ComparisonFormDTO; +import com.epmet.dto.form.ResiComparisonListFormDTO; +import com.epmet.dto.result.ComparisonResultDTO; +import com.epmet.dto.result.ResiComparisonListResultDTO; +import com.epmet.entity.IcResiComparisonRecordEntity; + +/** + * 居民信息与公安部信息比对记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-11-14 + */ +public interface IcResiComparisonRecordService extends BaseService { + + PageData resiComparisonList(ResiComparisonListFormDTO formDTO); + + ComparisonResultDTO comparison(ComparisonFormDTO formDTO); + + void comparisonUpdate(ComparisonFormDTO formDTO); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java new file mode 100644 index 0000000000..37f3427ac3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java @@ -0,0 +1,215 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.dto.result.YtSfhyxxcxdsjjResDTO; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.YtHsResUtils; +import com.epmet.dao.IcResiComparisonRecordDao; +import com.epmet.dao.IcResiUserDao; +import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.form.ComparisonFormDTO; +import com.epmet.dto.form.ResiComparisonListFormDTO; +import com.epmet.dto.result.ComparisonResultDTO; +import com.epmet.dto.result.ResiComparisonListResultDTO; +import com.epmet.entity.IcResiComparisonRecordEntity; +import com.epmet.entity.IcResiUserEntity; +import com.epmet.service.IcResiComparisonRecordService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +/** + * 居民信息与公安部信息比对记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-11-14 + */ +@Service +@Slf4j +public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl implements IcResiComparisonRecordService, ResultDataResolver { + @Autowired + private IcResiUserDao icResiUserDao; + + + @Override + public PageData resiComparisonList(ResiComparisonListFormDTO formDTO) { + //1.获取工作人员信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + //2.按条件分页查询数据s + PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> baseDao.getResiComparisonList(formDTO)); + + return new PageData(data.getList(), data.getTotal()); + } + + /** + * @Author sun + * @Description 比对、批量比对、组织及下级比对 + **/ + @Override + public ComparisonResultDTO comparison(ComparisonFormDTO formDTO) { + ComparisonResultDTO resultDTO = new ComparisonResultDTO(); + //1.获取工作人员信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + //2.判断是单条比对的则直接处理 + if (formDTO.getUserIdList().size() == 1) { + IcResiUserEntity entity = icResiUserDao.selectById(formDTO.getUserIdList().get(NumConstant.ZERO)); + if (null == entity) { + resultDTO.setResult(true); + resultDTO.setResultExplain("未查询到居民信息"); + return resultDTO; + } + IcResiComparisonRecordEntity recordEntity = new IcResiComparisonRecordEntity(); + recordEntity.setCustomerId(entity.getCustomerId()); + recordEntity.setResiId(entity.getId()); + recordEntity.setResiName(entity.getName()); + recordEntity.setResiIdCard(entity.getIdCard()); + recordEntity.setIsComparison("1"); + YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = YtHsResUtils.sfhyxxcxdsjj(entity.getIdCard(), entity.getName()); + /*YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = new YtSfhyxxcxdsjjResDTO(); + YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail f = new YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail(); + List l = new ArrayList<>(); + YtSfhyxxcxdsjjResDTO.Result d = new YtSfhyxxcxdsjjResDTO.Result(); + d.setGMSFHM("371424188808087654"); + d.setXM("小二"); + l.add(d); + f.setResult(l); + sfhyxxcxdsjjResult.setData(f);*/ + if (sfhyxxcxdsjjResult.getCode() != 200) { + recordEntity.setComparisonResult("公安部接口调用失败"); + resultDTO.setResult(true); + resultDTO.setResultExplain("公安部接口调用失败"); + return resultDTO; + } else { + //数据已处理 + recordEntity.setType("1"); + //公安部不存在的数据 + if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { + recordEntity.setComparisonResult("公安部身份证号对应数据不存在"); + //代表程序干活了 + recordEntity.setIdentical("2"); + resultDTO.setResult(true); + resultDTO.setResultExplain("公安部身份证号对应数据不存在"); + } else {//在公安部查询到了数据 + recordEntity.setPoliceName(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM()); + recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); + //公安部跟居民库姓名不一致 + if (!entity.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { + recordEntity.setIdentical("0"); + recordEntity.setComparisonResult("公安部与居民库姓名不相同"); + resultDTO.setResult(true); + resultDTO.setResultExplain("公安部与居民库姓名不相同"); + } else { + recordEntity.setIdentical("1"); + } + } + } + recordEntity.setCreatedBy(formDTO.getUserId()); + recordEntity.setUpdatedBy(formDTO.getUserId()); + baseDao.saveInsert(recordEntity); + return resultDTO; + } + //3.判断多条比对则开启子线程执行 + if (CollectionUtils.isEmpty(formDTO.getUserIdList()) || formDTO.getUserIdList().size() > NumConstant.ONE) { + asyncComparison(formDTO); + resultDTO.setResult(true); + resultDTO.setResultExplain("数据比对中请稍后"); + return resultDTO; + } + return resultDTO; + } + + /** + * @Author sun + * @Description 线程逐条比对居民信息 + **/ + @Async + public void asyncComparison(ComparisonFormDTO formDTO) { + PageData data = null; + formDTO.setIsPage(false); + formDTO.setPageSize(NumConstant.ONE_THOUSAND); + int pageNo = formDTO.getPageNo(); + do { + data = getResiUserList(formDTO); + data.getList().forEach(o -> { + IcResiComparisonRecordEntity recordEntity = new IcResiComparisonRecordEntity(); + recordEntity.setCustomerId(o.getCustomerId()); + recordEntity.setResiId(o.getId()); + recordEntity.setResiName(o.getName()); + recordEntity.setResiIdCard(o.getIdCard()); + recordEntity.setIsComparison("1"); + YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = YtHsResUtils.sfhyxxcxdsjj(o.getIdCard(), o.getName()); + if (sfhyxxcxdsjjResult.getCode() != 200) { + recordEntity.setComparisonResult("接口调用失败"); + } else { + //数据已处理 + recordEntity.setType("1"); + //公安部不存在的数据 + if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { + recordEntity.setComparisonResult("公安部身份证号对应数据不存在"); + //代表程序干活了 + recordEntity.setIdentical("2"); + } else {//在公安部查询到了数据 + recordEntity.setPoliceName(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM()); + recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); + //公安部跟居民库姓名不一致 + if (!o.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { + recordEntity.setIdentical("0"); + recordEntity.setComparisonResult("公安部与居民库姓名不相同"); + } else { + recordEntity.setIdentical("1"); + } + } + } + recordEntity.setCreatedBy(formDTO.getUserId()); + recordEntity.setUpdatedBy(formDTO.getUserId()); + baseDao.saveInsert(recordEntity); + }); + formDTO.setPageNo(++pageNo); + } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + } + + private PageData getResiUserList(ComparisonFormDTO formDTO) { + PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> icResiUserDao.getResiUserList(formDTO)); + return new PageData(data.getList(), data.getTotal()); + } + + /** + * @Author sun + * @Description 比对后的更新 + **/ + @Override + public void comparisonUpdate(ComparisonFormDTO formDTO) { + //1.查询比对记录表数据 + IcResiComparisonRecordEntity entity = baseDao.selectById(formDTO.getComparisonRecordId()); + if (null == entity) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查询到对应比对记录数据", "未查询到对应比对记录数据"); + } + //2.根据居民信息表数据 + IcResiUserEntity resiUserEntity = new IcResiUserEntity(); + resiUserEntity.setId(entity.getResiId()); + resiUserEntity.setName(entity.getPoliceName()); + icResiUserDao.updateById(resiUserEntity); + } + + +} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml new file mode 100644 index 0000000000..584f234505 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml @@ -0,0 +1,108 @@ + + + + + + + + SELECT replace(uuid(),'-','') AS ID + + INSERT INTO ic_resi_comparison_record + ( + id, + customer_id, + resi_id, + resi_name, + resi_id_card, + police_name, + police_id_card, + `type`, + identical, + is_comparison, + comparison_result, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) VALUE ( + #{id}, + #{customerId}, + #{resiId}, + #{resiName}, + #{resiIdCard}, + #{policeName}, + #{policeIdCard}, + #{type}, + #{identical}, + #{isComparison}, + #{comparisonResult}, + 0, + 0, + #{createdBy}, + now(), + #{createdBy}, + now() + ) ON DUPLICATE KEY UPDATE + resi_name = values(resi_name), + resi_id_card = values(resi_id_card), + police_name = values(police_name), + police_id_card = values(police_id_card), + `type` = values(`type`), + identical = values(identical), + is_comparison = values(is_comparison), + comparison_result = values(comparison_result), + updated_time = NOW(), + updated_by = #{updatedBy} + + + + + + \ 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 9c48f39c2f..a86af22468 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 @@ -1402,4 +1402,18 @@ AND ID_CARD = #{idCard} + + From 876a8e465a3ded93bb271d287ac87edee7a27367 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 15 Nov 2022 10:36:46 +0800 Subject: [PATCH 582/621] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiComparisonRecordServiceImpl.java | 4 ++-- .../src/main/resources/mapper/IcResiUserDao.xml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java index 37f3427ac3..02c856d326 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java @@ -93,7 +93,7 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl + + #{id} + + order by pids ASC, created_time DESC From 40b433e282a0898b5c18cdd84d549f52e17d5dd0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Nov 2022 11:17:39 +0800 Subject: [PATCH 583/621] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=89=94=E9=99=A4int?= =?UTF-8?q?ernalRemark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java index a852edac8e..653d8944ab 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java @@ -131,7 +131,8 @@ public class IcNatCompareRecordDTO implements Serializable { private String agencyName; /** - * + * 内部备注，开发人员用 */ + @ExcelIgnore private String internalRemark; } \ No newline at end of file From 1d2b7b3f4b60ca67515f8342b263c5eb92a7cecb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 15 Nov 2022 11:50:25 +0800 Subject: [PATCH 584/621] =?UTF-8?q?=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcResiComparisonRecordDao.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml index 584f234505..ff9e7a7fb1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml @@ -60,18 +60,18 @@ From b787f42c57905fd5612085a038e5e0bd8f2b6b8f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 15 Nov 2022 13:37:55 +0800 Subject: [PATCH 586/621] =?UTF-8?q?natInfoSyncButton=E6=94=B9=E4=B8=BAsubm?= =?UTF-8?q?itSyncJob=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/DataSyncConfigController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 948471cbe3..afaf67391b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -124,8 +124,16 @@ public class DataSyncConfigController { return new Result(); } - @PostMapping("natInfoSyncButton") - public Result natInfoSyncButton(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){ + /** + * 提交同步任务(核酸，疫苗，身份一致性验证) + * @author wxz + * @date 2022/11/15 下午1:37 + * @param formDTO + * @param tokenDto + * @return Result + */ + @PostMapping("submitSyncJob") + public Result submitSyncJob(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); dataSyncConfigService.natInfoSyncButton(formDTO); From f48f1c6112f8c36ebd1390ab72f5c9bea126dd43 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 15 Nov 2022 13:39:50 +0800 Subject: [PATCH 587/621] =?UTF-8?q?natInfoSyncButton=E6=94=B9=E4=B8=BAsubm?= =?UTF-8?q?itSyncJob=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/DataSyncConfigController.java | 2 +- .../src/main/java/com/epmet/service/DataSyncConfigService.java | 2 +- .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index afaf67391b..737bf81727 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -136,7 +136,7 @@ public class DataSyncConfigController { public Result submitSyncJob(@RequestBody DataSyncTaskParam formDTO, @LoginUser TokenDto tokenDto){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - dataSyncConfigService.natInfoSyncButton(formDTO); + dataSyncConfigService.submitSyncJob(formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index b4d80051da..300128bc4d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -112,7 +112,7 @@ public interface DataSyncConfigService extends BaseService */ void natInfoScanTask(DataSyncTaskParam formDTO); - void natInfoSyncButton(DataSyncTaskParam formDTO); + void submitSyncJob(DataSyncTaskParam formDTO); List getNatUserInfoFromDb(DataSyncTaskParam formDTO, int pageNo, int pageSize); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index b3a50c4490..79fd952139 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -411,7 +411,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl Date: Tue, 15 Nov 2022 13:44:11 +0800 Subject: [PATCH 588/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=94=B9=E4=B8=BA=20agency?= =?UTF-8?q?=5Fid+compare=5Frec=5Fid=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcNatCompareRecordServiceImpl.java | 4 +++- .../src/main/resources/mapper/IcNatCompareRecRelationDao.xml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java index 38bde062d2..47efdc1980 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java @@ -285,7 +285,8 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl AND r.IMPORT_DATE = #{importDate} + \ No newline at end of file From 0f95e7f1d42922fa625ab634676185b43602228e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Nov 2022 13:50:40 +0800 Subject: [PATCH 589/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=94=B9=E4=B8=BA=20agency?= =?UTF-8?q?=5Fid+compare=5Frec=5Fid=E5=94=AF=E4=B8=802?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcNatCompareRecordServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java index 47efdc1980..18071df16c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java @@ -300,6 +300,8 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl Date: Tue, 15 Nov 2022 14:48:18 +0800 Subject: [PATCH 590/621] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/common/CustomerOrgRedis.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java index 23a7f1dd3c..bf8425222a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java @@ -1,7 +1,6 @@ package com.epmet.commons.tools.redis.common; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.dto.form.CustomerGridFormDTO; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.CommonAggFeignClient; @@ -13,6 +12,7 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; @@ -55,6 +55,10 @@ public class CustomerOrgRedis { * @date 2021/11/5 3:12 下午 */ public static GridInfoCache getGridInfo(String gridId){ + if (StringUtils.isBlank(gridId)) { + log.warn("查询网格缓存,gridId is null"); + return null; + } String key = RedisKeys.getGridInfoKey(gridId); Map grid = customerOrgRedis.redisUtils.hGetAll(key); if (!CollectionUtils.isEmpty(grid)) { From e18c105d9e75736637c3f8e46df3c8098a4fa9b7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Nov 2022 15:00:15 +0800 Subject: [PATCH 591/621] =?UTF-8?q?=E6=94=B9=E6=88=90=E6=9F=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/YTVaccineListDTO.java | 2 +- .../impl/DataSyncConfigServiceImpl.java | 64 +++++++++++++------ .../main/resources/mapper/IcVaccineDao.xml | 2 +- 3 files changed, 48 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java index 94b2b30418..2950cd00c0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/YTVaccineListDTO.java @@ -12,7 +12,7 @@ import java.io.Serializable; public class YTVaccineListDTO implements Serializable { private static final long serialVersionUID = -5583350277850076659L; - private String idCard; + private String cardno; /** * 接种时间 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 79fd952139..438f0d80c7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1072,30 +1072,58 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl> vaccineList = new ArrayList<>();/*yantaiNamedParamLantuJdbcTemplate.queryForList( - "select id, name,card_no, create_time from hscyxxb where card_no in (:idcards)", args);*/ - Map m = new HashMap<>(); - vaccineList.add(m); +// List vaccineList = JSON.parseArray(json,Map.class); + List> vaccineList = yantaiNamedParamLantuJdbcTemplate.queryForList( + "select data, name, card_no, vaccineCount from t_ymjz_info where card_no in (:idcards)", args); + List ytVaccineListDTOS = new ArrayList<>(); if (CollectionUtils.isNotEmpty(vaccineList)) { + vaccineList.forEach(v -> { + if (v.containsKey("data")){ + Map data = (Map) v.get("data"); + if (data.containsKey("vaccineList")){ + List vaccineList1 = JSON.parseArray(data.get("vaccineList").toString(), YTVaccineListDTO.class); + vaccineList1.forEach(v1 -> { + v1.setCardno(v.get("cardno").toString()); + }); + ytVaccineListDTOS.addAll(vaccineList1); + } + } + }); List entities = new ArrayList<>(); -// List ytVaccineListDTOS = ConvertUtils.sourceToTarget(vaccineList, YTVaccineListDTO.class); - List ytVaccineListDTOS = JSON.parseArray(json,YTVaccineListDTO.class); List existVaccine = icVaccineDao.getExistVaccine(ytVaccineListDTOS); if (CollectionUtils.isNotEmpty(existVaccine)){ for (YTVaccineListDTO e : existVaccine) { for (int i = 0; i < ytVaccineListDTOS.size(); i++) { - if (ytVaccineListDTOS.get(i).getIdCard().equals(e.getIdCard()) && ytVaccineListDTOS.get(i).getInoculateDate().equals(e.getInoculateDate())){ + if (ytVaccineListDTOS.get(i).getCardno().equals(e.getCardno()) && ytVaccineListDTOS.get(i).getInoculateDate().equals(e.getInoculateDate())){ ytVaccineListDTOS.remove(i); } } @@ -1104,7 +1132,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl { resiInfos.forEach(u -> { - if (v.getIdCard().equals(u.getIdCard())){ + if (v.getCardno().equals(u.getIdCard())){ IcVaccineEntity e = new IcVaccineEntity(); e.setCustomerId(customerId); e.setName(u.getName()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml index 458a917ab6..319d7b959a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml @@ -236,7 +236,7 @@ WHERE DEL_FLAG = '0' AND ( - (ID_CARD = #{l.idCard} AND DATE_FORMAT(INOCULATE_TIME, '%Y-%m-%d %H:%i') = #{l.inoculateDate}) + (ID_CARD = #{l.cardno} AND DATE_FORMAT(INOCULATE_TIME, '%Y-%m-%d %H:%i') = #{l.inoculateDate}) ) From 1a3403afb8a1306a1d14c35878b32262fb5eac74 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 15 Nov 2022 15:22:42 +0800 Subject: [PATCH 592/621] =?UTF-8?q?=E6=AF=94=E5=AF=B9=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BC=82=E6=AD=A5=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/EpidemicConstant.java | 1 + .../epmet/dao/IcResiComparisonRecordDao.java | 6 +- .../YanTaiComparisonSyncProcessor.java | 118 +++++++++++++++ .../IcResiComparisonRecordService.java | 3 + .../IcResiComparisonRecordServiceImpl.java | 139 +++++++++++++++++- .../mapper/IcResiComparisonRecordDao.xml | 89 ++++++----- .../main/resources/mapper/IcResiUserDao.xml | 20 +-- 7 files changed, 325 insertions(+), 51 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiComparisonSyncProcessor.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java index e2817f165c..edd9d1a695 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java @@ -21,6 +21,7 @@ public interface EpidemicConstant { */ String JOB_TYPE_NAT = "nat"; String JOB_TYPE_VACCINE = "vaccine"; + String JOB_TYPE_COMPARISON = "comparison"; String OPERATION_STATUS_WAITING = "waiting"; String OPERATION_STATUS_PROCESSING = "processing"; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiComparisonRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiComparisonRecordDao.java index 848067199c..5eb830e9bf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiComparisonRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiComparisonRecordDao.java @@ -18,10 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.ComparisonFormDTO; import com.epmet.dto.form.ResiComparisonListFormDTO; import com.epmet.dto.result.ResiComparisonListResultDTO; import com.epmet.entity.IcResiComparisonRecordEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,5 +38,7 @@ public interface IcResiComparisonRecordDao extends BaseDao getResiComparisonList(ResiComparisonListFormDTO formDTO); - void saveInsert(IcResiComparisonRecordEntity recordEntity); + void saveInsert(@Param("list") List recordEntity); + + List getComparisonList(ComparisonFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiComparisonSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiComparisonSyncProcessor.java new file mode 100644 index 0000000000..cc07aafab2 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiComparisonSyncProcessor.java @@ -0,0 +1,118 @@ +package com.epmet.processor; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.constant.EpidemicConstant; +import com.epmet.dao.IcSyncJobDao; +import com.epmet.entity.IcSyncJobEntity; +import com.epmet.service.DataSyncConfigService; +import com.epmet.service.IcResiComparisonRecordService; +import lombok.extern.slf4j.Slf4j; +import org.redisson.api.RLock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; + +import static com.epmet.constant.EpidemicConstant.JOB_TYPE_NAT; + +// 烟台数据比对 +@Component +@Slf4j +public class YanTaiComparisonSyncProcessor { + + public static final int MAX_EXECUTING_COUNT = 3; + + @Autowired + private ExecutorService executorService; + + @Autowired + private IcSyncJobDao icSyncJobDao; + + @Autowired + private IcResiComparisonRecordService icResiComparisonRecordService; + + @Autowired + private DistributedLock distributedLock; + + @Autowired + RedisUtils redisUtils; + + /** + * 定时扫描和执行同步任务 + * 10s扫一次库 + */ + @Scheduled(cron = "0/10 * * * * ? ") + public void scanJobs() { + //log.info("【异步数据更新】开始同步任务"); + + LambdaQueryWrapper executingListQuery = new LambdaQueryWrapper<>(); + executingListQuery.eq(IcSyncJobEntity::getOperationStatus, EpidemicConstant.OPERATION_STATUS_PROCESSING); + List executingJobList = icSyncJobDao.selectList(executingListQuery); + + if (!CollectionUtils.isEmpty(executingJobList) && executingJobList.size() >= MAX_EXECUTING_COUNT) { + // 最多只允许同时3条线程运行 + return; + } + + int executingCount = executingJobList.size(); + // 还可以运行几条线程 + int leftCount = MAX_EXECUTING_COUNT - executingCount; + + RLock lock = null; + try { + lock = distributedLock.getLock("data:sync:" + "comparison", 60L, 60L, TimeUnit.SECONDS); + // 查询可执行的任务列表，并且异步执行 + List icSyncJobToExec = icSyncJobDao.selectExecutableJobList( + EpidemicConstant.JOB_TYPE_COMPARISON, + leftCount); + + if (!CollectionUtils.isEmpty(icSyncJobToExec)) { + // 异步提交任务 + for (IcSyncJobEntity jobEntity : icSyncJobToExec) { + + updateJobStatus(jobEntity.getId(), EpidemicConstant.OPERATION_STATUS_PROCESSING); + executorService.submit(() -> { + // 将此任务状态修改为执行中 + + try { + icResiComparisonRecordService.comparisonUserData(jobEntity); + } finally { + // 更新任务状态为结束 + updateJobStatus(jobEntity.getId(), EpidemicConstant.OPERATION_STATUS_FINISH); + } + + }); + } + } + } catch (Exception e) { + log.error("【异步数据更新】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } finally { + if (lock != null) { + lock.unlock(); + } + } + } + + /** + * 更新任务状态 + * @param id + * @param status + + */ + private void updateJobStatus(String id, String status) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcSyncJobEntity::getId, id); + + IcSyncJobEntity updateEntity = new IcSyncJobEntity(); + updateEntity.setOperationStatus(status); + icSyncJobDao.update(updateEntity, query); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiComparisonRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiComparisonRecordService.java index 5d846db7d7..fe49e4e884 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiComparisonRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiComparisonRecordService.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.ResiComparisonListFormDTO; import com.epmet.dto.result.ComparisonResultDTO; import com.epmet.dto.result.ResiComparisonListResultDTO; import com.epmet.entity.IcResiComparisonRecordEntity; +import com.epmet.entity.IcSyncJobEntity; /** * 居民信息与公安部信息比对记录表 @@ -20,5 +21,7 @@ public interface IcResiComparisonRecordService extends BaseService implements IcResiComparisonRecordService, ResultDataResolver { @Autowired private IcResiUserDao icResiUserDao; + @Autowired + private IcSyncJobDao icSyncJobDao; @Override @@ -77,6 +92,7 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl list = new ArrayList<>(); IcResiComparisonRecordEntity recordEntity = new IcResiComparisonRecordEntity(); recordEntity.setCustomerId(entity.getCustomerId()); recordEntity.setResiId(entity.getId()); @@ -124,12 +140,15 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl NumConstant.ONE) { - asyncComparison(formDTO); + //asyncComparison(formDTO); + saveComparison(formDTO); + saveJob(formDTO); resultDTO.setResult(true); resultDTO.setResultExplain("数据比对中请稍后"); return resultDTO; @@ -149,6 +168,7 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl list = new ArrayList<>(); data.getList().forEach(o -> { IcResiComparisonRecordEntity recordEntity = new IcResiComparisonRecordEntity(); recordEntity.setCustomerId(o.getCustomerId()); @@ -181,11 +201,124 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl data = null; + formDTO.setIsPage(false); + formDTO.setPageSize(NumConstant.ONE_THOUSAND); + int pageNo = formDTO.getPageNo(); + do { + data = getResiUserList(formDTO); + List list = new ArrayList<>(); + data.getList().forEach(o -> { + IcResiComparisonRecordEntity recordEntity = new IcResiComparisonRecordEntity(); + recordEntity.setCustomerId(o.getCustomerId()); + recordEntity.setResiId(o.getId()); + recordEntity.setResiName(o.getName()); + recordEntity.setResiIdCard(o.getIdCard()); + recordEntity.setType("0"); + recordEntity.setIdentical("0"); + recordEntity.setIsComparison("0"); + list.add(recordEntity); + }); + insertBatch(list); + formDTO.setPageNo(++pageNo); + } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + } + + public void saveJob(ComparisonFormDTO formDTO) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); + if (null == agencyInfo) { + throw new EpmetException("未查询到组织信息：" + formDTO.getAgencyId()); + } + + // 查询该组织是否存在等待中或者进行中的任务 + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(IcSyncJobEntity::getOrgId, formDTO.getAgencyId()) + .eq(IcSyncJobEntity::getJobType, EpidemicConstant.JOB_TYPE_COMPARISON) + .in(IcSyncJobEntity::getOperationStatus, OPERATION_STATUS_WAITING, OPERATION_STATUS_PROCESSING); + List icSyncJobEntities = icSyncJobDao.selectList(qw); + // 当前组织下存在同步任务 + if (CollectionUtils.isNotEmpty(icSyncJobEntities)) { + throw new EpmetException(EpmetErrorCode.EXIST_SYNC_JOB_ERROR.getCode()); + } + + // 不存在新增一条记录 + IcSyncJobEntity e = new IcSyncJobEntity(); + e.setCustomerId(formDTO.getCustomerId()); + e.setOrgId(formDTO.getAgencyId()); + e.setPid(agencyInfo.getPid()); + e.setOrgIdPath(StringUtils.isBlank(agencyInfo.getPids()) ? agencyInfo.getId() : agencyInfo.getPids() + ":" + agencyInfo.getId()); + e.setJobType(EpidemicConstant.JOB_TYPE_COMPARISON); + e.setOperatorId(formDTO.getUserId()); + e.setOperationStatus(OPERATION_STATUS_WAITING); + icSyncJobDao.insert(e); + } + @Override + public void comparisonUserData(IcSyncJobEntity jobEntity) { + ComparisonFormDTO formDTO = new ComparisonFormDTO(); + PageData data = null; + formDTO.setIsPage(false); + formDTO.setPageSize(NumConstant.ONE_THOUSAND); + int pageNo = NumConstant.ONE; + do { + data = getComparisonList(formDTO); + data.getList().forEach(o -> { + o.setIsComparison("1"); + YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = YtHsResUtils.sfhyxxcxdsjj(o.getResiIdCard(), o.getResiName()); + /*YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = new YtSfhyxxcxdsjjResDTO(); + YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail f = new YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail(); + List l = new ArrayList<>(); + YtSfhyxxcxdsjjResDTO.Result d = new YtSfhyxxcxdsjjResDTO.Result(); + d.setGMSFHM("371424188808087654"); + d.setXM("小二"); + l.add(d); + f.setResult(l); + sfhyxxcxdsjjResult.setData(f);*/ + if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) { + o.setComparisonResult("接口调用失败"); + } else { + //数据已处理 + o.setType("1"); + //公安部不存在的数据 + if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { + o.setComparisonResult("公安部身份证号对应数据不存在"); + //代表程序干活了 + o.setIdentical("2"); + } else {//在公安部查询到了数据 + o.setPoliceName(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM()); + o.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); + //公安部跟居民库姓名不一致 + if (!o.getResiName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { + o.setIdentical("0"); + o.setComparisonResult("公安部与居民库姓名不相同"); + } else { + o.setIdentical("1"); + } + } + } + o.setCreatedBy(formDTO.getUserId()); + o.setUpdatedBy(formDTO.getUserId()); }); + baseDao.saveInsert(data.getList()); formDTO.setPageNo(++pageNo); } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); } + private PageData getComparisonList(ComparisonFormDTO formDTO) { + PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> baseDao.getComparisonList(formDTO)); + return new PageData(data.getList(), data.getTotal()); + } private PageData getResiUserList(ComparisonFormDTO formDTO) { PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml index a4b098bb07..bb438e5500 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml @@ -3,10 +3,7 @@ - - - SELECT replace(uuid(),'-','') AS ID - + INSERT INTO ic_resi_comparison_record ( id, @@ -26,25 +23,30 @@ created_time, updated_by, updated_time - ) VALUE ( - #{id}, - #{customerId}, - #{resiId}, - #{resiName}, - #{resiIdCard}, - #{policeName}, - #{policeIdCard}, - #{type}, - #{identical}, - #{isComparison}, - #{comparisonResult}, + ) VALUE + + ( + REPLACE(UUID(), '-', ''), + #{i.customerId}, + #{i.resiId}, + #{i.resiName}, + #{i.resiIdCard}, + #{i.policeName}, + #{i.policeIdCard}, + #{i.type}, + #{i.identical}, + #{i.isComparison}, + #{i.comparisonResult}, 0, 0, - #{createdBy}, + #{i.createdBy}, now(), - #{createdBy}, + #{i.createdBy}, now() - ) ON DUPLICATE KEY UPDATE + ) + + ON DUPLICATE KEY + UPDATE resi_name = values(resi_name), resi_id_card = values(resi_id_card), police_name = values(police_name), @@ -54,33 +56,27 @@ is_comparison = values(is_comparison), comparison_result = values(comparison_result), updated_time = NOW(), - updated_by = #{updatedBy} + updated_by = values(updated_by) + + \ 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 5a5f1bafbf..c65e178660 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 @@ -1404,21 +1404,23 @@ From cc08fcbb8ede035326e87d02e9497a25d268dea8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 15 Nov 2022 15:39:24 +0800 Subject: [PATCH 593/621] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/IcResiComparisonRecordExcel.java | 2 +- .../V0.0.88__ic_resi_comparison_record.sql | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.88__ic_resi_comparison_record.sql diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiComparisonRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiComparisonRecordExcel.java index 2442b95a31..8bdf68cb39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiComparisonRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiComparisonRecordExcel.java @@ -29,7 +29,7 @@ public class IcResiComparisonRecordExcel implements Serializable { /** * 居民库证件号 */ - @ExcelProperty(value = "居民库=证件号") + @ExcelProperty(value = "居民库-证件号") @ColumnWidth(20) private String resiIdCard; diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.88__ic_resi_comparison_record.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.88__ic_resi_comparison_record.sql new file mode 100644 index 0000000000..3e05ced2fc --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.88__ic_resi_comparison_record.sql @@ -0,0 +1,21 @@ +CREATE TABLE `ic_resi_comparison_record` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `RESI_ID` varchar(64) NOT NULL COMMENT 'ic_resi_user.id【比对时的数据值】', + `RESI_NAME` varchar(64) NOT NULL COMMENT '数字社区人员姓名【比对时的数据值】', + `RESI_ID_CARD` varchar(18) NOT NULL COMMENT '数据社区身份证号【比对时的数据值】', + `POLICE_NAME` varchar(64) DEFAULT NULL COMMENT '公安部人员姓名', + `POLICE_ID_CARD` varchar(18) DEFAULT NULL COMMENT '公安部人员证件号', + `TYPE` varchar(1) NOT NULL DEFAULT '0' COMMENT '数据状态(0:未处理 1:已处理)', + `IDENTICAL` varchar(1) NOT NULL DEFAULT '0' COMMENT '信息一致性(0:否 1:是 2:-)2代表程序比对了没有匹配上', + `IS_COMPARISON` varchar(1) DEFAULT '0' COMMENT '是否比对过(0:否 1:是)', + `COMPARISON_RESULT` varchar(255) DEFAULT NULL COMMENT '比对结果说明', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + UNIQUE KEY `resi_id` (`RESI_ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='居民信息与公安部信息比对记录表'; From ed353fcbbcd0a40f2c70c9888b65d4232cea45b4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 15 Nov 2022 16:30:35 +0800 Subject: [PATCH 594/621] =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcResiComparisonRecordServiceImpl.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java index fdb31f71a9..792774849f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java @@ -115,11 +115,11 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl Date: Tue, 15 Nov 2022 16:45:33 +0800 Subject: [PATCH 595/621] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiComparisonRecordServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java index 792774849f..78b76b12f7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java @@ -351,6 +351,10 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl Date: Tue, 15 Nov 2022 17:03:19 +0800 Subject: [PATCH 596/621] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiComparisonRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml index bb438e5500..1301e1c4b3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml @@ -96,7 +96,7 @@ AND b.type =#{type} - ORDER BY a.pids ASC, b.created_time DESC + ORDER BY a.pids ASC, b.created_time DESC, a.`NAME` ASC + + + From c11e4ee226b331f9839a25d1589c13ad0770cc01 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Nov 2022 11:12:05 +0800 Subject: [PATCH 603/621] =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/OwnerRelationResultDTO.java | 5 ++ .../com/epmet/enums/RenHuConditionEnum.java | 52 +++++++++++++++++++ .../service/impl/IcResiUserServiceImpl.java | 6 +++ 3 files changed, 63 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java index 9a3e0c23d7..d42953a90e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java @@ -25,5 +25,10 @@ public class OwnerRelationResultDTO implements Serializable { private String userName; private String isSelf; private String relation; + + /** + * 人户状况 + */ + private String renHuCondition; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java new file mode 100644 index 0000000000..efdf23bbce --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java @@ -0,0 +1,52 @@ +package com.epmet.enums; + +import org.apache.commons.lang3.StringUtils; + +public enum RenHuConditionEnum { + + /** + * 人户一致，人在户不在，户在人不在， + * 为空的 暂不清楚 + */ + RHYZ("rhyz","人户一致"), + RZHBZ("rzhbz","人在户不在"), + HZRBZ("hzrbz","户在人不在"), + ZBQC("","暂不清楚"), + ; + + private String code; + private String name; + + public static String getNameByCode(String code){ + if (StringUtils.isBlank(code)){ + return ZBQC.name; + } + for (RenHuConditionEnum e : values()) { + if (e.getCode().equals(code)){ + return e.getName(); + } + } + return ZBQC.name; + } + + RenHuConditionEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} 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 2618c0cea7..fe04e0453b 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 @@ -63,6 +63,7 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; +import com.epmet.enums.RenHuConditionEnum; import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -1478,6 +1479,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 16 Nov 2022 13:47:05 +0800 Subject: [PATCH 604/621] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=9D=9E=E5=BF=85=E5=A1=AB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E2=80=9C=E8=AF=95=E7=AE=A1=E7=BC=96=E5=8F=B7=E2=80=9D?= =?UTF-8?q?=20=E5=AF=B9=E5=BA=94=E4=BA=A7=E8=9B=8B4679?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNatDTO.java | 5 +++++ .../com/epmet/dto/form/AddIcNatFormDTO.java | 4 ++++ .../epmet/dto/result/MyNatListResultDTO.java | 5 +++++ .../epmet/dto/result/NatListResultDTO.java | 13 ++++++++++--- .../java/com/epmet/entity/IcNatEntity.java | 5 +++++ .../excel/data/IcNatImportExcelData.java | 3 +++ .../db/migration/V0.0.89_alter_ic_nat.sql | 4 ++++ .../src/main/resources/excel/ic_nat.xlsx | Bin 9198 -> 9824 bytes .../src/main/resources/mapper/IcNatDao.xml | 12 ++++++++---- 9 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java index 1e8da051b1..de5e70080b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java @@ -107,6 +107,11 @@ public class IcNatDTO implements Serializable { */ private String attachmentUrl; + /** + * 试管编号 + */ + private String testTubeCode; + /** * 删除标识 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java index 1d7ba24673..b87f03d8d7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java @@ -89,6 +89,10 @@ public class AddIcNatFormDTO implements Serializable { * 附件地址 */ private String attachmentUrl; + /** + * 试管编号 + */ + private String testTubeCode; /** * 是否客户下居民(0:否 1:是) */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java index 355d52d213..59b0515e73 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java @@ -73,4 +73,9 @@ public class MyNatListResultDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date reportTime; + /** + * 试管编号 + */ + private String testTubeCode; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java index a93294b14f..bba32c13af 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java @@ -73,14 +73,14 @@ public class NatListResultDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ColumnWidth(25) - @ExcelProperty(value = "采样时间",order = 4) + @ExcelProperty(value = "采样时间",order = 5) private Date sampleTime; /** * 检测结果 */ @ColumnWidth(20) - @ExcelProperty(value = "检测结果",order = 5) + @ExcelProperty(value = "检测结果",order = 7) private String natResult; /** @@ -99,8 +99,15 @@ public class NatListResultDTO implements Serializable { * 检测地点 */ @ColumnWidth(30) - @ExcelProperty(value = "检测地点",order = 7) + @ExcelProperty(value = "检测地点",order = 6) private String natAddress; + /** + * 试管编号 + */ + @ColumnWidth(30) + @ExcelProperty(value = "试管编号",order = 8) + private String testTubeCode; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java index 7cbe8cdd66..3246d9be0a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java @@ -94,6 +94,11 @@ public class IcNatEntity extends BaseEpmetEntity { */ private String attachmentUrl; + /** + * 试管编号 + */ + private String testTubeCode; + @TableField(exist = false) private String agencyId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java index b54c571f8f..b5b52f8ea4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java @@ -43,6 +43,9 @@ public class IcNatImportExcelData { @ExcelProperty("检测结果") private String natResultZh; + @ExcelProperty("试管编号") + private String testTubeCode; + @Data public static class RowRemarkMessage { diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql new file mode 100644 index 0000000000..7925891a55 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql @@ -0,0 +1,4 @@ +-- 核酸记录表增加非必填字段“试管编号” 对应产蛋4679 +ALTER TABLE `ic_nat` +ADD COLUMN `TEST_TUBE_CODE` varchar(255) NULL COMMENT '试管编号' AFTER `ATTACHMENT_URL`; + diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx index 524d327bd7032cf01b51e60fcf15ec903428035d..de671285c675f9d081984301a95e52efe00ced57 100644 GIT binary patch literal 9824 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 delta 7306 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 Hu6+IvcU3~$ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index f6daee080d..243fbebcd7 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -16,7 +16,8 @@ nat_address natAddress, file_name fileName, attachment_url attachmentUrl, - created_time reportTime + created_time reportTime, + test_tube_code testTubeCode FROM ic_nat WHERE @@ -45,7 +46,8 @@ b.nat_time natTime, b.sample_time sampleTime, b.nat_result natResult, - b.nat_address natAddress + b.nat_address natAddress, + b.test_tube_code testTubeCode FROM ic_nat_relation a INNER JOIN ic_nat b ON a.IC_NAT_ID = b.ID @@ -93,7 +95,8 @@ nat_time natTime, sample_time sampleTime, nat_result natResult, - nat_address natAddress + nat_address natAddress, + test_tube_code testTubeCode FROM ic_nat WHERE @@ -134,7 +137,8 @@ nat_time, sample_time, nat_result, - nat_address + nat_address, + test_tube_code FROM ic_nat WHERE From 08a3d213c7b0f842f63fd485c9769e4bd89bf4ca Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 16 Nov 2022 13:49:34 +0800 Subject: [PATCH 605/621] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=AF=BC=E5=85=A5=EF=BC=8C=E9=94=99=E8=AF=AFexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 91dfa20ed9..becc763ba3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -90,7 +90,7 @@ public class EnterpriseImportExcelDTO { * 默认0 */ @ColumnWidth(20) - @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + @ExcelProperty(value = "场所类别") private String placeCategoryName; @ColumnWidth(20) From 88821961cd984b2ce4083cb1919aa3ee151d8a76 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Nov 2022 14:11:18 +0800 Subject: [PATCH 606/621] =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/SubUserHouseListResultDTO.java | 15 ++++++++++ .../epmet/service/impl/HouseServiceImpl.java | 20 +++++++++++++ .../epmet/dto/form/RHZKStatisticsFormDTO.java | 28 ++++++++++++++++++ .../dto/result/RHZKStatisticsResultDTO.java | 1 + .../epmet/feign/EpmetUserOpenFeignClient.java | 4 +++ .../EpmetUserOpenFeignClientFallback.java | 5 ++++ .../controller/IcResiUserController.java | 11 +++++-- .../java/com/epmet/dao/IcResiUserDao.java | 2 +- .../com/epmet/service/IcResiUserService.java | 6 ++-- .../service/impl/IcResiUserServiceImpl.java | 29 +++++++++++++++---- .../main/resources/mapper/IcResiUserDao.xml | 17 ++++++++--- 11 files changed, 123 insertions(+), 15 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java index 45ded6601b..a791a22fd0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; /** * @author sun @@ -79,4 +81,17 @@ public class SubUserHouseListResultDTO implements Serializable { */ private Double ldUserRatio = 0.0; + /** + * 人户一致，人在户不在，户在人不在， + * 为空的 暂不清楚 + */ + private Integer rhyzUserTotal = NumConstant.ZERO; + private BigDecimal rhyzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer rzhbzUserTotal = NumConstant.ZERO; + private BigDecimal rzhbzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer hzrzUserTotal = NumConstant.ZERO; + private BigDecimal hzrzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer zbqcUserTotal = NumConstant.ZERO; + private BigDecimal zbqcUserRatio = NumConstant.ZERO_DECIMAL; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 31aa88b033..cc07bd0323 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -935,6 +935,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (!userResult.success()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民人房统计数据失败" + userResult.getInternalMsg(), userResult.getMsg()); } + RHZKStatisticsFormDTO rhzkStatisticsFormDTO = new RHZKStatisticsFormDTO(); + rhzkStatisticsFormDTO.setOrgIds(idList); + rhzkStatisticsFormDTO.setOrgType(orgType); + Result> rhzkResult = epmetUserOpenFeignClient.renHuCondition(rhzkStatisticsFormDTO); + if (!rhzkResult.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民人户状况统计数据失败" + rhzkResult.getInternalMsg(), rhzkResult.getMsg()); + } //3.汇总封装数据 SubUserHouseListResultDTO dto = null; for (String id : idList) { @@ -964,6 +971,19 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { dto.setLdUserRatio(u.getLdUserRatio()); } } + for (RHZKStatisticsResultDTO r : rhzkResult.getData()) { + if (r.getOrgId().equals(id)){ + dto.setRhyzUserTotal(r.getRhyzUserTotal()); + dto.setRhyzUserRatio(r.getRhyzUserRatio()); + dto.setRzhbzUserTotal(r.getRzhbzUserTotal()); + dto.setRzhbzUserRatio(r.getRzhbzUserRatio()); + dto.setHzrzUserTotal(r.getHzrzUserTotal()); + dto.setHzrzUserRatio(r.getHzrzUserRatio()); + dto.setZbqcUserTotal(r.getZbqcUserTotal()); + dto.setZbqcUserRatio(r.getZbqcUserRatio()); + dto.setUserTotal(r.getUserTotal()); + } + } list.add(dto); } return list; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java new file mode 100644 index 0000000000..1d74462fad --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/11/16 13:26 + */ +@Data +public class RHZKStatisticsFormDTO implements Serializable { + private static final long serialVersionUID = -4474168123286467820L; + + private String orgId; + + private List orgIds; + + /** + * grid：网格；village：小区； + */ + private String orgType; + + private String staffId; + private String customerId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java index 5cdd7fc1dd..fc9e8d88ba 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java @@ -30,6 +30,7 @@ public class RHZKStatisticsResultDTO implements Serializable { private Integer zbqcUserTotal = NumConstant.ZERO; private BigDecimal zbqcUserRatio = NumConstant.ZERO_DECIMAL; + private String orgId; @JsonIgnore private Integer total; @JsonIgnore diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index b24a4a9651..752ad14639 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -952,4 +952,8 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/dataSyncConfig/disabilityInfoScanTask") Result disabilityInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + + @PostMapping("/epmetuser/icresiuser/rhzkList") + Result> renHuCondition(@RequestBody RHZKStatisticsFormDTO formDTO); + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index b675a7626b..0b50b901a6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -741,4 +741,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result disabilityInfoScanTask(DataSyncTaskParam formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabilityInfoScanTask", formDTO); } + + @Override + public Result> renHuCondition(RHZKStatisticsFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "renHuCondition", formDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index a7eb0af5e8..e38645b163 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1472,8 +1472,15 @@ public class IcResiUserController implements ResultDataResolver { * @Date 2022/11/16 09:22 */ @PostMapping("rhzk") - public Result renHuCondition(@LoginUser TokenDto tokenDto){ - return new Result().ok(icResiUserService.renHuCondition(tokenDto)); + public Result renHuCondition(@LoginUser TokenDto tokenDto,@RequestBody RHZKStatisticsFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result().ok(icResiUserService.renHuCondition(formDTO)); + } + + @PostMapping("rhzkList") + public Result> renHuConditionList(@RequestBody RHZKStatisticsFormDTO formDTO){ + return new Result>().ok(icResiUserService.renHuConditionList(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 b96b595ac1..2cab64a60b 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 @@ -440,5 +440,5 @@ public interface IcResiUserDao extends BaseDao { */ ResiAndLocalResiResultDTO getResiCount(@Param("agencyId")String agencyId,@Param("idCard")String idCard,@Param("customerId")String customerId); - List getUserByRenHu(@Param("agencyId")String agencyId); + List getUserByRenHu(RHZKStatisticsFormDTO 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 7bf36c3ecb..f346f2c3b1 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 @@ -528,10 +528,12 @@ public interface IcResiUserService extends BaseService { /** * @Description 人户状况统计查询 - * @param tokenDto + * @param formDTO * @Author zxc * @Date 2022/11/16 09:22 */ - RHZKStatisticsResultDTO renHuCondition(TokenDto tokenDto); + RHZKStatisticsResultDTO renHuCondition(RHZKStatisticsFormDTO formDTO); + + List renHuConditionList(RHZKStatisticsFormDTO formDTO); } 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 fe04e0453b..cda0e3ecc8 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 @@ -3639,17 +3639,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl userByRenHu = baseDao.getUserByRenHu(staffInfo.getAgencyId()); + List userByRenHu = baseDao.getUserByRenHu(formDTO); RHZKStatisticsResultDTO r = new RHZKStatisticsResultDTO(); if (CollectionUtils.isEmpty(userByRenHu)){ return r; @@ -3680,6 +3684,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl renHuConditionList(RHZKStatisticsFormDTO formDTO) { + if (CollectionUtils.isEmpty(formDTO.getOrgIds())){ + return new ArrayList<>(); + } + List result = new ArrayList<>(); + formDTO.getOrgIds().forEach(o -> { + formDTO.setOrgId(o); + result.add(renHuCondition(formDTO)); + }); + return result; + } + /** * @Description * @param total 总人数 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 22704d92d8..37abe1f808 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 @@ -1411,10 +1411,19 @@ (SELECT ID, IFNULL(RHZK,'') AS rhzk - FROM ic_resi_user - WHERE DEL_FLAG = '0' - AND `STATUS` = '0' - AND PIDS LIKE CONCAT('%',#{agencyId},'%')) t + FROM ic_resi_user + WHERE DEL_FLAG = '0' + AND `STATUS` = '0' + + AND PIDS LIKE CONCAT('%',#{orgId},'%') + + + AND GRID_ID = #{orgId} + + + AND VILLAGE_ID = #{orgId} + + ) t GROUP BY rhzk From e8e4112f36653bdc9ab22c6cc60265a2118118db Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Nov 2022 14:54:39 +0800 Subject: [PATCH 607/621] =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/HouseServiceImpl.java | 22 +++++++++------- .../com/epmet/dto/form/UserChartFormDTO.java | 5 ++++ .../service/impl/IcResiUserServiceImpl.java | 1 + .../main/resources/mapper/IcResiUserDao.xml | 26 +++++++++++++++++-- 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index cc07bd0323..36c85a879a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -972,16 +972,18 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } } for (RHZKStatisticsResultDTO r : rhzkResult.getData()) { - if (r.getOrgId().equals(id)){ - dto.setRhyzUserTotal(r.getRhyzUserTotal()); - dto.setRhyzUserRatio(r.getRhyzUserRatio()); - dto.setRzhbzUserTotal(r.getRzhbzUserTotal()); - dto.setRzhbzUserRatio(r.getRzhbzUserRatio()); - dto.setHzrzUserTotal(r.getHzrzUserTotal()); - dto.setHzrzUserRatio(r.getHzrzUserRatio()); - dto.setZbqcUserTotal(r.getZbqcUserTotal()); - dto.setZbqcUserRatio(r.getZbqcUserRatio()); - dto.setUserTotal(r.getUserTotal()); + if (StringUtils.isNotBlank(r.getOrgId())){ + if (r.getOrgId().equals(id)){ + dto.setRhyzUserTotal(r.getRhyzUserTotal()); + dto.setRhyzUserRatio(r.getRhyzUserRatio()); + dto.setRzhbzUserTotal(r.getRzhbzUserTotal()); + dto.setRzhbzUserRatio(r.getRzhbzUserRatio()); + dto.setHzrzUserTotal(r.getHzrzUserTotal()); + dto.setHzrzUserRatio(r.getHzrzUserRatio()); + dto.setZbqcUserTotal(r.getZbqcUserTotal()); + dto.setZbqcUserRatio(r.getZbqcUserRatio()); + dto.setUserTotal(r.getUserTotal()); + } } } list.add(dto); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java index 7d357089f6..b0b0db77d2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java @@ -27,6 +27,11 @@ public class UserChartFormDTO implements Serializable { */ private String type; + /** + * 人户一致:rhyz；人在户不在：rzhbz；户在人不在：hzrbz；暂不清楚：no；全部：all + */ + private String rhType; + private Integer pageNo = 1; private Integer pageSize = 20; private Boolean isPage = true; 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 cda0e3ecc8..c87e96b12c 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 @@ -3660,6 +3660,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl { + r.setOrgId(u.getOrgId()); switch (u.getRhzk()){ case UserConstant.R_H_Y_Z: r.setRhyzUserTotal(u.getTotal()); 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 37abe1f808..e2ea4571d3 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 @@ -1359,6 +1359,18 @@ AND (is_floating != '0' or is_floating is null) + + AND RHZK = 'rhyz' + + + AND RHZK = 'rzhbz' + + + AND RHZK = 'hzrbz' + + + AND(RHZK = '' or RHZK = null) + AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%')) @@ -1406,11 +1418,21 @@ SELECT - ID_CARD, - DATE_FORMAT(INOCULATE_TIME, '%Y-%m-%d %H:%i') AS inoculateDate + ID_CARD, + INOCULATE_TIME FROM ic_vaccine WHERE DEL_FLAG = '0' - AND ( - - (ID_CARD = #{l.cardno} AND DATE_FORMAT(INOCULATE_TIME, '%Y-%m-%d %H:%i') = #{l.inoculateDate}) - - ) + and ID_CARD IN + + #{v.cardno} + + + + + + From 1405eac691b6a1ae6b692e0d6550396f853f5962 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 17 Nov 2022 11:09:55 +0800 Subject: [PATCH 614/621] 89__ --- .../{V0.0.89_alter_ic_nat.sql => V0.0.89__alter_ic_nat.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.89_alter_ic_nat.sql => V0.0.89__alter_ic_nat.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89__alter_ic_nat.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89__alter_ic_nat.sql From 9a474878fce8e933d7a74064112ffa2ea52898ba Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 17 Nov 2022 13:00:21 +0800 Subject: [PATCH 615/621] =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/HouseServiceImpl.java | 4 ++++ .../java/com/epmet/dto/form/RHZKStatisticsFormDTO.java | 8 ++++++-- .../java/com/epmet/dto/result/OwnerRelationResultDTO.java | 2 +- .../src/main/java/com/epmet/enums/RenHuConditionEnum.java | 3 +++ .../com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 62a985443b..411cf85b80 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -927,6 +927,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { houseDTO.setOrgId(id); houseList.add(houseChart(houseDTO)); } + //start 2022.11.17需求：http://zentao.elinkservice.cn/story-view-718.html + //原来饼图是：居民总数、常住人口数、流动人口数 后改为下面的人户状况饼图，后面如果所有客户都上线了，就把第2步的查询注释掉。 //2.直属下级列表的居民数据 UserChartFormDTO userDTO = new UserChartFormDTO(); userDTO.setOrgType(orgType); @@ -935,6 +937,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (!userResult.success()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民人房统计数据失败" + userResult.getInternalMsg(), userResult.getMsg()); } + //end + //3.居民总数、人户一致、人在户不在、户在人不在，没填写是暂不清楚 RHZKStatisticsFormDTO rhzkStatisticsFormDTO = new RHZKStatisticsFormDTO(); rhzkStatisticsFormDTO.setOrgIds(idList); rhzkStatisticsFormDTO.setOrgType(orgType); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java index 1d74462fad..8d42f50714 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java @@ -15,13 +15,17 @@ public class RHZKStatisticsFormDTO implements Serializable { private String orgId; - private List orgIds; - /** * grid：网格；village：小区； */ private String orgType; + /** + * /epmetuser/icresiuser/rhzkList调用会赋值 + */ + private List orgIds; + + //tokenDto中获取 private String staffId; private String customerId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java index d42953a90e..8ec9b45ef1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java @@ -27,7 +27,7 @@ public class OwnerRelationResultDTO implements Serializable { private String relation; /** - * 人户状况 + * 2022.11.17：人户状况：人户一致、人在户不在、户在人不在、暂不清楚 */ private String renHuCondition; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java index efdf23bbce..a02850b7d6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java @@ -2,6 +2,9 @@ package com.epmet.enums; import org.apache.commons.lang3.StringUtils; +/** + * 居民信息里的人户状况枚举类 + */ public enum RenHuConditionEnum { /** 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 3533aa822c..a621131f35 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 @@ -1479,6 +1479,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 18 Nov 2022 10:25:52 +0800 Subject: [PATCH 616/621] =?UTF-8?q?ic=5Fform=5Fitem=5Fgroup=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0GROUP=5FCODE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcFormItemGroupDTO.java | 14 +++++ .../com/epmet/dto/result/FormGroupDTO.java | 5 ++ .../epmet/entity/IcFormItemGroupEntity.java | 10 ++++ .../db/migration/V0.0.40__itemgroup_code.sql | 56 +++++++++++++++++++ .../src/main/resources/mapper/IcFormDao.xml | 7 ++- 5 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java index 660171fce0..fa39a45b01 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java @@ -78,4 +78,18 @@ public class IcFormItemGroupDTO implements Serializable { */ private Boolean display; + /** + * 政策人员信息组件;1:展示；0：不展示；默认0 + */ + private String policyFlag; + + /** + * 1展示，0不展示，默认0 + */ + private String childShowFlag; + + /** + * 组编码,唯一标识 + */ + private String groupCode; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormGroupDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormGroupDTO.java index 1b2a6c8964..297b4e7163 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormGroupDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormGroupDTO.java @@ -39,6 +39,11 @@ public class FormGroupDTO implements Serializable { */ private String tableName; + /** + *组编码,唯一标识 + */ + private String groupCode; + /** * 分组里面的组件 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java index 0ce8f42320..9b0e91dde2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java @@ -79,4 +79,14 @@ public class IcFormItemGroupEntity extends BaseEpmetEntity { * 政策人员信息组件;1:展示；0：不展示；默认0 */ private String policyFlag; + + /** + * 1展示，0不展示，默认0 + */ + private String childShowFlag; + + /** + * 组编码,唯一标识 + */ + private String groupCode; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql new file mode 100644 index 0000000000..0e11715c94 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql @@ -0,0 +1,56 @@ +alter table ic_form_item_group add COLUMN GROUP_CODE VARCHAR(32) DEFAULT '' COMMENT '组编码,唯一标识' after CHILD_SHOW_FLAG; + +update ic_form_item_group g set g.GROUP_CODE='jcxx' +where g.LABEL='基础信息'; + + +update ic_form_item_group g set g.GROUP_CODE='jyxx' +where g.LABEL='教育信息'; + +update ic_form_item_group g set g.GROUP_CODE='xqah' +where g.LABEL='兴趣爱好'; + +update ic_form_item_group g set g.GROUP_CODE='zjxy' +where g.LABEL='宗教信仰'; + +update ic_form_item_group g set g.GROUP_CODE='jkxx' +where g.LABEL='健康信息'; + +update ic_form_item_group g set g.GROUP_CODE='gzxx' +where g.LABEL='工作信息'; + +update ic_form_item_group g set g.GROUP_CODE='jjzk' +where g.LABEL='经济状况'; + +update ic_form_item_group g set g.GROUP_CODE='jzxx' +where g.LABEL='居住信息'; + +update ic_form_item_group g set g.GROUP_CODE='jtxx' +where g.LABEL='家庭信息'; + +update ic_form_item_group g set g.GROUP_CODE='dyxx' +where g.LABEL='党员信息'; + +update ic_form_item_group g set g.GROUP_CODE='bzfxx' +where g.LABEL='保障房信息'; + +update ic_form_item_group g set g.GROUP_CODE='syxx' +where g.LABEL='失业信息'; + +update ic_form_item_group g set g.GROUP_CODE='tyjrxx' +where g.LABEL='退役军人信息'; + +update ic_form_item_group g set g.GROUP_CODE='zyzxx' +where g.LABEL='志愿者信息'; + +update ic_form_item_group g set g.GROUP_CODE='tsrqxx' +where g.LABEL='特殊人群信息'; + +update ic_form_item_group g set g.GROUP_CODE='tzry' +where g.LABEL='统战人员'; + +update ic_form_item_group g set g.GROUP_CODE='lnrxx' +where g.LABEL='老年人信息'; + +update ic_form_item_group g set g.GROUP_CODE='resi_demand' +where g.LABEL='居民需求信息'; \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml index d0cca510ad..6109c59bf5 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml @@ -66,7 +66,8 @@ g.LABEL, g.sort, g.SUPPORT_ADD, - g.TABLE_NAME AS TABLE_NAME + g.TABLE_NAME AS TABLE_NAME, + g.GROUP_CODE FROM ic_form_item_group g WHERE @@ -124,6 +125,7 @@ + @@ -200,7 +202,8 @@ case when g.table_name is null or g.table_name ='' then 'ic_resi_user' else g.TABLE_NAME end - ) AS TABLE_NAME + ) AS TABLE_NAME, + g.GROUP_CODE FROM ic_form_item_group g WHERE From 824b783c044d7245dcc5c2370b5dff0748360105 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Nov 2022 10:44:38 +0800 Subject: [PATCH 617/621] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcFormController.java | 3 +- .../epmet/service/impl/IcFormServiceImpl.java | 50 +++++++++---------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java index dcb08f35e7..28a82969e6 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java @@ -52,9 +52,10 @@ public class IcFormController { /** * desc: 初始化 客户表单配置 + * 运营端-数字社区初始化 * * @param customerId - * @param formCode + * @param formCode value: resi_base_info * @return com.epmet.commons.tools.utils.Result * @author LiuJanJun * @date 2021/12/8 4:28 下午 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java index 2871ac9a3e..be48d33692 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java @@ -172,7 +172,7 @@ public class IcFormServiceImpl extends BaseServiceImpl defaultIcForm.setCreatedTime(new Date()); defaultIcForm.setUpdatedBy("init_user"); defaultIcForm.setUpdatedTime(new Date()); - + // 1、设置ic_form int insert = baseDao.insert(defaultIcForm); log.info("insert icForm:" + insert); @@ -184,7 +184,7 @@ public class IcFormServiceImpl extends BaseServiceImpl return "默认配置错误"; } String defaultBaseInfoGroupId = "default_0"; - //设置ic_form_item + //2、设置ic_form_item itemList.forEach(item -> { item.setId(newPrefixed + item.getId()); item.setCustomerId(customerId); @@ -215,7 +215,7 @@ public class IcFormServiceImpl extends BaseServiceImpl icFormItemDao.insert(item); }); - //设置ic_form_item_options + //3、设置ic_form_item_options LambdaQueryWrapper wrapperOptions = new LambdaQueryWrapper<>(); wrapperOptions.eq(IcFormItemOptionsEntity::getCustomerId, defaultCustomerId); wrapperOptions.eq(IcFormItemOptionsEntity::getFormCode, formCode); @@ -233,7 +233,7 @@ public class IcFormServiceImpl extends BaseServiceImpl icFormItemOptionsDao.insert(item); }); - //设置ic_form_item_group + //4、设置ic_form_item_group LambdaQueryWrapper wrapperGroup = new LambdaQueryWrapper<>(); wrapperGroup.eq(IcFormItemGroupEntity::getCustomerId, defaultCustomerId); wrapperGroup.eq(IcFormItemGroupEntity::getFormCode, formCode); @@ -255,7 +255,7 @@ public class IcFormServiceImpl extends BaseServiceImpl icFormItemGroupDao.insert(item); }); - //设置ic_form_query_builder + //5、设置ic_form_query_builder LambdaQueryWrapper wrapperQuery = new LambdaQueryWrapper<>(); wrapperQuery.eq(IcFormQueryBuilderEntity::getCustomerId, defaultCustomerId); wrapperQuery.eq(IcFormQueryBuilderEntity::getFormCode, formCode); @@ -272,6 +272,26 @@ public class IcFormServiceImpl extends BaseServiceImpl icFormQueryBuilderDao.insert(item); }); + //6、设置ic_form_list_item + LambdaQueryWrapper listItemWapper = new LambdaQueryWrapper<>(); + listItemWapper.eq(IcFormListItemEntity::getCustomerId, defaultCustomerId); + listItemWapper.eq(IcFormListItemEntity::getFormCode, formCode); + List listItemList = icFormListItemDao.selectList(listItemWapper); + if (CollectionUtils.isEmpty(listItemList)) { + return "默认配置错误"; + } + listItemList.forEach(item -> { + item.setId(newPrefixed + item.getId()); + item.setCustomerId(customerId); + item.setFormItemId(newPrefixed + item.getFormItemId()); + item.setCreatedBy("init_user"); + item.setCreatedTime(new Date()); + item.setUpdatedBy("init_user"); + item.setUpdatedTime(new Date()); + log.debug("stats:"+ JSON.toJSONString(item)); + icFormListItemDao.insert(item); + }); + //设置ic_resi_category_stats_config LambdaQueryWrapper wrapperStats = new LambdaQueryWrapper<>(); wrapperStats.eq(IcResiCategoryStatsConfigEntity::getCustomerId, defaultCustomerId); @@ -302,26 +322,6 @@ public class IcFormServiceImpl extends BaseServiceImpl icResiCategoryWarnConfigDao.insert(item); }); - //设置ic_form_list_item - LambdaQueryWrapper listItemWapper = new LambdaQueryWrapper<>(); - listItemWapper.eq(IcFormListItemEntity::getCustomerId, defaultCustomerId); - listItemWapper.eq(IcFormListItemEntity::getFormCode, formCode); - List listItemList = icFormListItemDao.selectList(listItemWapper); - if (CollectionUtils.isEmpty(listItemList)) { - return "默认配置错误"; - } - listItemList.forEach(item -> { - item.setId(newPrefixed + item.getId()); - item.setCustomerId(customerId); - item.setFormItemId(newPrefixed + item.getFormItemId()); - item.setCreatedBy("init_user"); - item.setCreatedTime(new Date()); - item.setUpdatedBy("init_user"); - item.setUpdatedTime(new Date()); - log.debug("stats:"+ JSON.toJSONString(item)); - icFormListItemDao.insert(item); - }); - //设置ic_service_item_dict和ic_resi_demand_dict Result result = epmetHeartOpenFeignClient.customerInit(customerId); if (!result.success()) { From c9842b4f81ae42d0198565050ef9a20a2d5d3b25 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Nov 2022 12:58:29 +0800 Subject: [PATCH 618/621] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/CustomerAgencyController.java | 1 + 1 file changed, 1 insertion(+) 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 6a8c433250..e9fb4e56ef 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 @@ -342,6 +342,7 @@ public class CustomerAgencyController { /** * @Description 获取客户下组织树不含网格和部门 + * 哪些地方用到了比如：办事指南-指南管理查询条件 * @Param tokenDTO * @Return {@link Result< AgencyTreeResultDTO >} * @Author zhaoqifeng From 6962566bcfc97e531c8053fccc777bf79b2cce18 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Nov 2022 13:35:23 +0800 Subject: [PATCH 619/621] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcEventListFormDTO.java | 2 +- .../java/com/epmet/service/impl/IcEventServiceImpl.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java index c5330c05d8..b582675a11 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java @@ -1,7 +1,6 @@ package com.epmet.dto.form; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -28,6 +27,7 @@ public class IcEventListFormDTO implements Serializable { private String icEventId; /** * 所属组织 + * 前端传入，如果没传，默认查询登录用户所属组织及下级 */ private String agencyId; /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index b37344a620..d40ff78a46 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -112,9 +112,11 @@ public class IcEventServiceImpl extends BaseServiceImpl list(IcEventListFormDTO formDTO) { - //获取当前工作人员缓存信息 - CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - formDTO.setAgencyId(staffInfo.getAgencyId()); + if(StringUtils.isBlank(formDTO.getAgencyId())){ + //获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + formDTO.setAgencyId(staffInfo.getAgencyId()); + } //分页查询当前组织下网格内事件数据 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); From 2031b00a2e34d3978be1158a322c5f8bd6c9bb8b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Nov 2022 15:47:04 +0800 Subject: [PATCH 620/621] =?UTF-8?q?selectListResiMap=E5=B0=8F=E5=AF=A8?= =?UTF-8?q?=E5=AD=90=E5=86=99=E6=AD=BB=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcResiUserDao.xml | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) 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 7c73dcb419..d0a425e4fe 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 @@ -182,6 +182,7 @@ + From cd9097dc5c60dd891441bc5d018803efe7e3e76e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Nov 2022 16:02:29 +0800 Subject: [PATCH 621/621] IC_RESI_USER --- .../src/main/resources/mapper/IcResiUserDao.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 a9624783a8..ec51178649 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 @@ -216,12 +216,12 @@ ORDER BY - field( i.GRID_ID, '1537272060187049986', '1537272342477508609', '1537275342477501111', '1593432493598076929' ), - i.VILLAGE_ID ASC, - i.BUILD_ID ASC, - i.UNIT_ID ASC, - i.HOME_ID ASC, - i.ID ASC + field( IC_RESI_USER.GRID_ID, '1537272060187049986', '1537272342477508609', '1537275342477501111', '1593432493598076929' ), + IC_RESI_USER.VILLAGE_ID ASC, + IC_RESI_USER.BUILD_ID ASC, + IC_RESI_USER.UNIT_ID ASC, + IC_RESI_USER.HOME_ID ASC, + IC_RESI_USER.ID ASC ORDER BY