From bad43c683a2f839568ab85fbd0183ce954bd513c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 16 Jun 2022 17:39:23 +0800 Subject: [PATCH 001/105] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=9B=BE=E5=B1=82con?= =?UTF-8?q?troller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/controller/CoverageController.java | 16 ++++++++++++++++ .../com/epmet/controller/CoverageController.java | 15 +++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java 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 new file mode 100644 index 0000000000..4efdc11861 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -0,0 +1,16 @@ +package com.epmet.dataaggre.controller; + +import com.epmet.commons.tools.utils.Result; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 5大图层controller + */ +@RestController +@RequestMapping("coverage") +public class CoverageController { + + //public Result + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java new file mode 100644 index 0000000000..3eea45977f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java @@ -0,0 +1,15 @@ +package com.epmet.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 5大图层controller + */ +@RestController +@RequestMapping("coverage") +public class CoverageController { + + //public Result + +} \ No newline at end of file From fd8d6d3add9aaf75e58f088f6f01cfc4ccae75ff Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 17 Jun 2022 09:36:49 +0800 Subject: [PATCH 002/105] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=9A=84=E5=AD=97=E5=85=B8=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=B1=BB=E3=80=82=E6=96=B0=E5=A2=9E"=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/CoverageCategoryQueryFormDTO.java | 13 ++++ .../dto/result/CoverageCategoryResultDTO.java | 14 +++++ epmet-module/gov-org/gov-org-server/pom.xml | 4 +- .../epmet/controller/CoverageController.java | 24 +++++++- .../epmet/dao/IcCoverageCategoryDictDao.java | 16 +++++ .../entity/IcCoverageCategoryDictEntity.java | 59 +++++++++++++++++++ .../com/epmet/service/CoverageService.java | 16 +++++ .../service/impl/CoverageServiceImpl.java | 52 ++++++++++++++++ .../mapper/IcCoverageCategoryDictDao.xml | 23 ++++++++ 9 files changed, 218 insertions(+), 3 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CoverageCategoryResultDTO.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java new file mode 100644 index 0000000000..3495e9cdad --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java @@ -0,0 +1,13 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.util.List; + +/** + * 图层-类别查询form + */ +@Data +public class CoverageCategoryQueryFormDTO { + private List coverageTypes; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CoverageCategoryResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CoverageCategoryResultDTO.java new file mode 100644 index 0000000000..06066201cd --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CoverageCategoryResultDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.result; + +import lombok.Data; + +/** + * 五大图层-类别 结果类 + */ +@Data +public class CoverageCategoryResultDTO { + + private String categoryKey; + private String categoryName; + +} diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index b4a6ef92e1..5efca9400d 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -243,13 +243,13 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - 192.168.1.140 + localhost 6379 123456 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java index 3eea45977f..559e2f103a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java @@ -1,8 +1,17 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CoverageCategoryQueryFormDTO; +import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.service.CoverageService; +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 java.util.List; + /** * 5大图层controller */ @@ -10,6 +19,19 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("coverage") public class CoverageController { - //public Result + @Autowired + private CoverageService coverageService; + + /** + * 类别列表 + * @param form + * @return + */ + @PostMapping("categoryList") + public Result> categoryList(@RequestBody CoverageCategoryQueryFormDTO form) { + List coverageTypes = form.getCoverageTypes(); + List categories = coverageService.categoryList(coverageTypes); + return new Result>().ok(categories); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java new file mode 100755 index 0000000000..c614258580 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcCoverageCategoryDictEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 五大图层类别字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcCoverageCategoryDictDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java new file mode 100755 index 0000000000..c690e4a48a --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.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-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_coverage_category_dict") +public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * default；或者customerId + */ + private String customerId; + + /** + * 类别key + */ + private String categoryKey; + + /** + * 名称 + */ + private String categoryName; + + /** + * 所属场所类型； +社区自组织：community_org; +优势资源:superior_resource; +城市管理：city_management； +重点危化企业：dangerous_chemicals； +公共服务：public_service + */ + private String placeType; + + /** + * 所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层 + */ + private String coverageType; + + /** + * 排序 + */ + private Integer sort; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java new file mode 100644 index 0000000000..c7b6603a70 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java @@ -0,0 +1,16 @@ +package com.epmet.service; + +import com.epmet.dto.result.CoverageCategoryResultDTO; + +import java.util.List; + +public interface CoverageService { + + /** + * 根据图层列表，查询图层下的类别列表 + * @param coverageList 图层列表 + * @return 类别列表 + */ + List categoryList(List coverageTypeList); + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java new file mode 100644 index 0000000000..e6c71a0f61 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java @@ -0,0 +1,52 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.dao.IcCoverageCategoryDictDao; +import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.entity.IcCoverageCategoryDictEntity; +import com.epmet.service.CoverageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@Service +public class CoverageServiceImpl implements CoverageService { + + @Autowired + private IcCoverageCategoryDictDao coverageCategoryDictDao; + + /** + * 根据图层列表，查询图层下的类别列表 + * @param coverageTypeList 图层列表 + * @return 类别列表 + */ + @Override + public List categoryList(List coverageTypeList) { + Stream stream = coverageTypeList.stream().map(categoryType -> { + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcCoverageCategoryDictEntity::getCoverageType, categoryType); + query.orderByAsc(IcCoverageCategoryDictEntity::getCreatedTime); + List categoriesEntity = coverageCategoryDictDao.selectList(query); + + return categoriesEntity.stream().map(e -> { + CoverageCategoryResultDTO dto = new CoverageCategoryResultDTO(); + dto.setCategoryKey(e.getCategoryKey()); + dto.setCategoryName(e.getCategoryName()); + return dto; + }).collect(Collectors.toList()); + + }).flatMap(new Function, Stream>() { + @Override + public Stream apply(List coverageCategoryResultDTOS) { + return coverageCategoryResultDTOS.stream(); + } + }); + + return stream.collect(Collectors.toList()); + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml new file mode 100755 index 0000000000..bdac4ea573 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b07a8b1ecd1540a8f3a1d29da7406513b2bde61b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 13:33:42 +0800 Subject: [PATCH 003/105] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcEnterpriseController.java | 68 +++++++++++++ .../java/com/epmet/dao/IcEnterpriseDao.java | 16 ++++ .../dao/IcEnterprisePatrolRecordDao.java | 16 ++++ .../com/epmet/entity/IcEnterpriseEntity.java | 95 +++++++++++++++++++ .../IcEnterprisePatrolRecordEntity.java | 69 ++++++++++++++ .../epmet/service/IcEnterpriseService.java | 73 ++++++++++++++ .../service/impl/IcEnterpriseServiceImpl.java | 70 ++++++++++++++ .../main/resources/mapper/IcEnterpriseDao.xml | 31 ++++++ .../mapper/IcEnterprisePatrolRecordDao.xml | 26 +++++ 9 files changed, 464 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterprisePatrolRecordDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterprisePatrolRecordEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml 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 new file mode 100644 index 0000000000..3e64f3bd81 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -0,0 +1,68 @@ +package com.epmet.controller; + +import com.epmet.service.IcEnterpriseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 企事业单位表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-17 + */ +@RestController +@RequestMapping("enterprise") +public class IcEnterpriseController { + + @Autowired + private IcEnterpriseService icEnterpriseService; + + // @RequestMapping("page") + // public Result> page(@RequestParam Map params){ + // PageData page = icEnterpriseService.page(params); + // return new Result>().ok(page); + // } + // + // @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + // public Result get(@PathVariable("id") String id){ + // IcEnterpriseDTO data = icEnterpriseService.get(id); + // return new Result().ok(data); + // } + // + // @NoRepeatSubmit + // @PostMapping("save") + // public Result save(@RequestBody IcEnterpriseDTO dto){ + // //效验数据 + // ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + // icEnterpriseService.save(dto); + // return new Result(); + // } + // + // @NoRepeatSubmit + // @PostMapping("update") + // public Result update(@RequestBody IcEnterpriseDTO dto){ + // //效验数据 + // ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + // icEnterpriseService.update(dto); + // return new Result(); + // } + // + // @PostMapping("delete") + // public Result delete(@RequestBody String[] ids){ + // //效验数据 + // AssertUtils.isArrayEmpty(ids, "id"); + // icEnterpriseService.delete(ids); + // return new Result(); + // } + // + // @GetMapping("export") + // public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + // List list = icEnterpriseService.list(params); + // ExcelUtils.exportExcelToTarget(response, null, list, IcEnterpriseExcel.class); + // } + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java new file mode 100644 index 0000000000..5dd0b2c826 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEnterpriseEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 企事业单位表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-17 + */ +@Mapper +public interface IcEnterpriseDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterprisePatrolRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterprisePatrolRecordDao.java new file mode 100644 index 0000000000..df257e2507 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterprisePatrolRecordDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEnterprisePatrolRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 企事业单位巡查表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-17 + */ +@Mapper +public interface IcEnterprisePatrolRecordDao extends BaseDao { + +} \ No newline at end of file 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 new file mode 100644 index 0000000000..76d6d69a90 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseEntity.java @@ -0,0 +1,95 @@ +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-06-17 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_enterprise") +public class IcEnterpriseEntity 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; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterprisePatrolRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterprisePatrolRecordEntity.java new file mode 100644 index 0000000000..806a0a09ac --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterprisePatrolRecordEntity.java @@ -0,0 +1,69 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 企事业单位巡查表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-17 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_enterprise_patrol_record") +public class IcEnterprisePatrolRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 企事业单位id + */ + private String enterpriseId; + + /** + * 巡查时间 + */ + private Date patrolTime; + + /** + * 工作人员id + */ + private String staffId; + + /** + * 工作人员姓名 + */ + private String staffName; + + /** + * 工作人员手机号 + */ + private String mobile; + + /** + * 检查结果【0:合格 1:不合格】 + */ + private String result; + + /** + * 隐患明细 + */ + private String detailed; + + /** + * 拟复查时间 + */ + private Date reviewTime; + +} 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 new file mode 100644 index 0000000000..c2607efaa2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java @@ -0,0 +1,73 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.entity.IcEnterpriseEntity; + +/** + * 企事业单位表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-17 + */ +public interface IcEnterpriseService extends BaseService { + + // /** + // * 默认分页 + // * + // * @param params + // * @return PageData + // * @author generator + // * @date 2022-06-17 + // */ + // PageData page(Map params); + // + // /** + // * 默认查询 + // * + // * @param params + // * @return java.util.List + // * @author generator + // * @date 2022-06-17 + // */ + // List list(Map params); + // + // /** + // * 单条查询 + // * + // * @param id + // * @return IcEnterpriseDTO + // * @author generator + // * @date 2022-06-17 + // */ + // IcEnterpriseDTO get(String id); + // + // /** + // * 默认保存 + // * + // * @param dto + // * @return void + // * @author generator + // * @date 2022-06-17 + // */ + // void save(IcEnterpriseDTO dto); + // + // /** + // * 默认更新 + // * + // * @param dto + // * @return void + // * @author generator + // * @date 2022-06-17 + // */ + // void update(IcEnterpriseDTO dto); + // + // /** + // * 批量删除 + // * + // * @param ids + // * @return void + // * @author generator + // * @date 2022-06-17 + // */ + // 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/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java new file mode 100644 index 0000000000..9943497b41 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -0,0 +1,70 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dao.IcEnterpriseDao; +import com.epmet.entity.IcEnterpriseEntity; +import com.epmet.service.IcEnterpriseService; +import org.springframework.stereotype.Service; + +/** + * 企事业单位表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-17 + */ +@Service +public class IcEnterpriseServiceImpl extends BaseServiceImpl implements IcEnterpriseService { + + // @Override + // public PageData page(Map params) { + // IPage page = baseDao.selectPage( + // getPage(params, FieldConstant.CREATED_TIME, false), + // getWrapper(params) + // ); + // return getPageData(page, IcEnterpriseDTO.class); + // } + // + // @Override + // public List list(Map params) { + // List entityList = baseDao.selectList(getWrapper(params)); + // + // return ConvertUtils.sourceToTarget(entityList, IcEnterpriseDTO.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 IcEnterpriseDTO get(String id) { + // IcEnterpriseEntity entity = baseDao.selectById(id); + // return ConvertUtils.sourceToTarget(entity, IcEnterpriseDTO.class); + // } + // + // @Override + // @Transactional(rollbackFor = Exception.class) + // public void save(IcEnterpriseDTO dto) { + // IcEnterpriseEntity entity = ConvertUtils.sourceToTarget(dto, IcEnterpriseEntity.class); + // insert(entity); + // } + // + // @Override + // @Transactional(rollbackFor = Exception.class) + // public void update(IcEnterpriseDTO dto) { + // IcEnterpriseEntity entity = ConvertUtils.sourceToTarget(dto, IcEnterpriseEntity.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/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml new file mode 100644 index 0000000000..51c5356717 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml new file mode 100644 index 0000000000..2d5b0ca97d --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5d83c7c88736204c13853db45404fd9ef73d5a92 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Jun 2022 15:06:39 +0800 Subject: [PATCH 004/105] =?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 --- .../com/epmet/dto/IcCityManagementDTO.java | 109 ++++++++++++ .../epmet/dto/IcDangerousChemicalsDTO.java | 124 +++++++++++++ .../com/epmet/dto/IcPublicServiceDTO.java | 109 ++++++++++++ .../com/epmet/dto/IcSuperiorResourceDTO.java | 109 ++++++++++++ .../form/IcCityManagementAddEditFormDTO.java | 69 +++++++ .../dto/form/IcCityManagementListFormDTO.java | 38 ++++ .../IcDangerousChemicalsAddEditFormDTO.java | 81 +++++++++ .../form/IcDangerousChemicalsListFormDTO.java | 42 +++++ .../form/IcPublicServiceAddEditFormDTO.java | 69 +++++++ .../dto/form/IcPublicServiceListFormDTO.java | 38 ++++ .../IcSuperiorResourceAddEditFormDTO.java | 69 +++++++ .../form/IcSuperiorResourceListFormDTO.java | 38 ++++ .../result/IcCityManagementListResultDTO.java | 68 +++++++ .../IcDangerousChemicalsListResultDTO.java | 80 +++++++++ .../result/IcPublicServiceListResultDTO.java | 68 +++++++ .../IcSuperiorResourceListResultDTO.java | 68 +++++++ .../IcCityManagementController.java | 164 +++++++++++++++++ .../IcDangerousChemicalsController.java | 168 ++++++++++++++++++ .../controller/IcPublicServiceController.java | 165 +++++++++++++++++ .../IcSuperiorResourceController.java | 163 +++++++++++++++++ .../com/epmet/dao/IcCityManagementDao.java | 24 +++ .../epmet/dao/IcDangerousChemicalsDao.java | 23 +++ .../com/epmet/dao/IcPublicServiceDao.java | 23 +++ .../com/epmet/dao/IcSuperiorResourceDao.java | 23 +++ .../epmet/entity/IcCityManagementEntity.java | 79 ++++++++ .../entity/IcDangerousChemicalsEntity.java | 91 ++++++++++ .../epmet/entity/IcPublicServiceEntity.java | 79 ++++++++ .../entity/IcSuperiorResourceEntity.java | 79 ++++++++ .../epmet/excel/IcCityManagementExcel.java | 39 ++++ .../excel/IcDangerousChemicalsExcel.java | 81 +++++++++ .../com/epmet/excel/IcPublicServiceExcel.java | 39 ++++ .../epmet/excel/IcSuperiorResourceExcel.java | 37 ++++ .../service/IcCityManagementService.java | 73 ++++++++ .../service/IcDangerousChemicalsService.java | 70 ++++++++ .../epmet/service/IcPublicServiceService.java | 71 ++++++++ .../service/IcSuperiorResourceService.java | 70 ++++++++ .../impl/IcCityManagementServiceImpl.java | 160 +++++++++++++++++ .../impl/IcDangerousChemicalsServiceImpl.java | 160 +++++++++++++++++ .../impl/IcPublicServiceServiceImpl.java | 157 ++++++++++++++++ .../impl/IcSuperiorResourceServiceImpl.java | 157 ++++++++++++++++ .../resources/mapper/IcCityManagementDao.xml | 51 ++++++ .../mapper/IcDangerousChemicalsDao.xml | 52 ++++++ .../resources/mapper/IcPublicServiceDao.xml | 52 ++++++ .../mapper/IcSuperiorResourceDao.xml | 53 ++++++ 44 files changed, 3582 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcSuperiorResourceDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcSuperiorResourceAddEditFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcSuperiorResourceListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcDangerousChemicalsListResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcSuperiorResourceListResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcSuperiorResourceEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java new file mode 100644 index 0000000000..7e36b065b9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java @@ -0,0 +1,109 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 城市管理图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class IcCityManagementDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:city_management】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 删除标识 + */ + 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-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.java new file mode 100644 index 0000000000..8afffa5726 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.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-06-16 + */ +@Data +public class IcDangerousChemicalsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 企业名称 + */ + private String name; + + /** + * 企业类型【字典表ic_coverage_category_dict key:dangerous_chemicals】 + */ + private String category; + + /** + * 周边安全距离，单位公里 + */ + private String safeDistance; + + /** + * 危化品种类【字典表 ic_danger_type】 + */ + private String dangerType; + + /** + * 负责人姓名 + */ + private String principalName; + + /** + * 负责人电话 + */ + private String principalMobile; + + /** + * 经营地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标识 + */ + 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-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java new file mode 100644 index 0000000000..64045ddd17 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java @@ -0,0 +1,109 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class IcPublicServiceDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:public_service】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 删除标识 + */ + 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-org/gov-org-client/src/main/java/com/epmet/dto/IcSuperiorResourceDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcSuperiorResourceDTO.java new file mode 100644 index 0000000000..553e4318f0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcSuperiorResourceDTO.java @@ -0,0 +1,109 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class IcSuperiorResourceDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:superior_resource】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 删除标识 + */ + 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-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java new file mode 100644 index 0000000000..ab73efa810 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 优势资源新增/修改 + * @Author sun + */ +@Data +public class IcCityManagementAddEditFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface Del extends CustomerClientShowGroup { + } + + /** + * 场所Id + */ + @NotBlank(message = "场所Id不能为空", groups = {UpdateGroup.class, Del.class}) + private String icCityManagementId; + /** + * 场所名称 + */ + @NotBlank(message = "场所名称不能为空", groups = {AddGroup.class}) + @Length(max = 50, message = "场所名称不能超过50位", groups = AddGroup.class) + private String name; + /** + * 场所类别 + */ + @NotBlank(message = "场所类别不能为空", groups = {AddGroup.class}) + private String category; + /** + * 占地面积 + */ + private String areaCovered; + /** + * 容纳人数 + */ + private Integer capacity; + /** + * 经度 + */ + @NotBlank(message = "经度不能为空", groups = {AddGroup.class}) + private String longitude; + /** + * 维度 + */ + @NotBlank(message = "维度不能为空", groups = {AddGroup.class}) + private String latitude; + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = {AddGroup.class}) + @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) + private String address; + + + private String customerId; + private String userId; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementListFormDTO.java new file mode 100644 index 0000000000..0511b85bb6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementListFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 【优势资源】列表--接口入参 + * @Author sun + */ +@Data +public class IcCityManagementListFormDTO implements Serializable { + private static final long serialVersionUID = 9156247659994638103L; + + /** + * 场所名称 + */ + private String name; + /** + * 场所分类，字典表值 + */ + private String category; + /** + * 页码 + */ + private Integer pageNo = 1; + /** + * 每页显示数量 + */ + private Integer pageSize = 20; + + private Boolean isPage = true; + private String icCityManagementId; + private String customerId; + private String staffId; + private String agencyId; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java new file mode 100644 index 0000000000..c67cb48fb2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java @@ -0,0 +1,81 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 优势资源新增/修改 + * @Author sun + */ +@Data +public class IcDangerousChemicalsAddEditFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface Del extends CustomerClientShowGroup { + } + + /** + * 场所Id + */ + @NotBlank(message = "场所Id不能为空", groups = {UpdateGroup.class, Del.class}) + private String icDangerousChemicalsId; + /** + * 企业名称 + */ + @NotBlank(message = "企业名称不能为空", groups = {AddGroup.class}) + @Length(max = 50, message = "场所名称不能超过50位", groups = AddGroup.class) + private String name; + /** + * 企业类型值 + */ + @NotBlank(message = "企业类型不能为空", groups = {AddGroup.class}) + private String category; + /** + * 周边安全距离 + */ + private String safeDistance; + /** + * 危化品种类字典值, key值:ic_danger_type + */ + private String dangerType; + /** + * 负责人 + */ + private String principalName; + /** + * 联系电话 + */ + private String principalMobile; + /** + * 经度 + */ + @NotBlank(message = "经度不能为空", groups = {AddGroup.class}) + private String longitude; + /** + * 维度 + */ + @NotBlank(message = "维度不能为空", groups = {AddGroup.class}) + private String latitude; + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = {AddGroup.class}) + @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) + private String address; + /** + * 备注 + */ + private String remark; + + + private String customerId; + private String userId; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsListFormDTO.java new file mode 100644 index 0000000000..b0b7e589f4 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsListFormDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 【优势资源】列表--接口入参 + * @Author sun + */ +@Data +public class IcDangerousChemicalsListFormDTO implements Serializable { + private static final long serialVersionUID = 9156247659994638103L; + + /** + * 场所名称 + */ + private String name; + /** + * 场所分类，字典表值 + */ + private String category; + /** + * 危化品种类字典值 + */ + private String dangerType; + /** + * 页码 + */ + private Integer pageNo = 1; + /** + * 每页显示数量 + */ + private Integer pageSize = 20; + + private Boolean isPage = true; + private String icDangerousChemicalsId; + private String customerId; + private String staffId; + private String agencyId; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java new file mode 100644 index 0000000000..fb9cbf6b26 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 优势资源新增/修改 + * @Author sun + */ +@Data +public class IcPublicServiceAddEditFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface Del extends CustomerClientShowGroup { + } + + /** + * 场所Id + */ + @NotBlank(message = "场所Id不能为空", groups = {UpdateGroup.class, Del.class}) + private String icPublicServiceId; + /** + * 场所名称 + */ + @NotBlank(message = "场所名称不能为空", groups = {AddGroup.class}) + @Length(max = 50, message = "场所名称不能超过50位", groups = AddGroup.class) + private String name; + /** + * 场所类别 + */ + @NotBlank(message = "场所类别不能为空", groups = {AddGroup.class}) + private String category; + /** + * 占地面积 + */ + private String areaCovered; + /** + * 容纳人数 + */ + private Integer capacity; + /** + * 经度 + */ + @NotBlank(message = "经度不能为空", groups = {AddGroup.class}) + private String longitude; + /** + * 维度 + */ + @NotBlank(message = "维度不能为空", groups = {AddGroup.class}) + private String latitude; + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = {AddGroup.class}) + @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) + private String address; + + + private String customerId; + private String userId; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceListFormDTO.java new file mode 100644 index 0000000000..ca5b8aefda --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceListFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 【优势资源】列表--接口入参 + * @Author sun + */ +@Data +public class IcPublicServiceListFormDTO implements Serializable { + private static final long serialVersionUID = 9156247659994638103L; + + /** + * 场所名称 + */ + private String name; + /** + * 场所分类，字典表值 + */ + private String category; + /** + * 页码 + */ + private Integer pageNo = 1; + /** + * 每页显示数量 + */ + private Integer pageSize = 20; + + private Boolean isPage = true; + private String icPublicServiceId; + private String customerId; + private String staffId; + private String agencyId; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcSuperiorResourceAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcSuperiorResourceAddEditFormDTO.java new file mode 100644 index 0000000000..d28569a0a1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcSuperiorResourceAddEditFormDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 优势资源新增/修改 + * @Author sun + */ +@Data +public class IcSuperiorResourceAddEditFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface Del extends CustomerClientShowGroup { + } + + /** + * 场所Id + */ + @NotBlank(message = "场所Id不能为空", groups = {UpdateGroup.class, Del.class}) + private String icSuperiorResourceId; + /** + * 场所名称 + */ + @NotBlank(message = "场所名称不能为空", groups = {AddGroup.class}) + @Length(max = 50, message = "场所名称不能超过50位", groups = AddGroup.class) + private String name; + /** + * 场所类别 + */ + @NotBlank(message = "场所类别不能为空", groups = {AddGroup.class}) + private String category; + /** + * 占地面积 + */ + private String areaCovered; + /** + * 容纳人数 + */ + private Integer capacity; + /** + * 经度 + */ + @NotBlank(message = "经度不能为空", groups = {AddGroup.class}) + private String longitude; + /** + * 维度 + */ + @NotBlank(message = "维度不能为空", groups = {AddGroup.class}) + private String latitude; + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = {AddGroup.class}) + @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) + private String address; + + + private String customerId; + private String userId; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcSuperiorResourceListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcSuperiorResourceListFormDTO.java new file mode 100644 index 0000000000..026ece3d56 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcSuperiorResourceListFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 【优势资源】列表--接口入参 + * @Author sun + */ +@Data +public class IcSuperiorResourceListFormDTO implements Serializable { + private static final long serialVersionUID = 9156247659994638103L; + + /** + * 场所名称 + */ + private String name; + /** + * 场所分类，字典表值 + */ + private String category; + /** + * 页码 + */ + private Integer pageNo = 1; + /** + * 每页显示数量 + */ + private Integer pageSize = 20; + + private Boolean isPage = true; + private String icSuperiorResourceId; + private String customerId; + private String staffId; + private String agencyId; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java new file mode 100644 index 0000000000..6c40cb030c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java @@ -0,0 +1,68 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 【优势资源】列表--接口返参 + * @Author sun + */ +@Data +public class IcCityManagementListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 场所Id + */ + private String icCityManagementId; + /** + * 组织Id + */ + private String agencyId; + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + /** + * 场所名称 + */ + private String name; + /** + * 场所类别值 + */ + private String category; + /** + * 场所类别名 + */ + private String categoryName; + /** + * 占地面积值 + */ + private String areaCovered; + /** + * 占地面积名 + */ + private String areaCoveredName; + /** + * 容纳人数值 + */ + private String capacity; + /** + * 容纳人数名 + */ + private String capacityName; + /** + * 经度 + */ + private String longitude; + /** + * 纬度 + */ + private String latitude; + /** + * 地址 + */ + private String address; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcDangerousChemicalsListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcDangerousChemicalsListResultDTO.java new file mode 100644 index 0000000000..bf00d9205e --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcDangerousChemicalsListResultDTO.java @@ -0,0 +1,80 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 【优势资源】列表--接口返参 + * @Author sun + */ +@Data +public class IcDangerousChemicalsListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 企业Id + */ + private String icDangerousChemicalsId; + /** + * 组织Id + */ + private String agencyId; + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + /** + * 企业名称 + */ + private String name; + /** + * 企业类型值 + */ + private String category; + /** + * 企业类型名 + */ + private String categoryName; + /** + * 周边安全距离 + */ + private String safeDistance; + /** + * 周边安全距离名 + */ + private String safeDistanceName; + /** + * 危化品种类值 + */ + private String dangerType; + /** + * 危化品种类名 + */ + private String dangerTypeName; + /** + * 负责人 + */ + private String principalName; + /** + * 联系电话 + */ + private String principalMobile; + /** + * 经度 + */ + private String longitude; + /** + * 纬度 + */ + private String latitude; + /** + * 地址 + */ + private String address; + /** + * 备注 + */ + private String remark; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java new file mode 100644 index 0000000000..859b36faca --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java @@ -0,0 +1,68 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 【优势资源】列表--接口返参 + * @Author sun + */ +@Data +public class IcPublicServiceListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 场所Id + */ + private String icPublicServiceId; + /** + * 组织Id + */ + private String agencyId; + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + /** + * 场所名称 + */ + private String name; + /** + * 场所类别值 + */ + private String category; + /** + * 场所类别名 + */ + private String categoryName; + /** + * 占地面积值 + */ + private String areaCovered; + /** + * 占地面积名 + */ + private String areaCoveredName; + /** + * 容纳人数值 + */ + private String capacity; + /** + * 容纳人数名 + */ + private String capacityName; + /** + * 经度 + */ + private String longitude; + /** + * 纬度 + */ + private String latitude; + /** + * 地址 + */ + private String address; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcSuperiorResourceListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcSuperiorResourceListResultDTO.java new file mode 100644 index 0000000000..28f5c6202f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcSuperiorResourceListResultDTO.java @@ -0,0 +1,68 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 【优势资源】列表--接口返参 + * @Author sun + */ +@Data +public class IcSuperiorResourceListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 场所Id + */ + private String icSuperiorResourceId; + /** + * 组织Id + */ + private String agencyId; + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + /** + * 场所名称 + */ + private String name; + /** + * 场所类别值 + */ + private String category; + /** + * 场所类别名 + */ + private String categoryName; + /** + * 占地面积值 + */ + private String areaCovered; + /** + * 占地面积名 + */ + private String areaCoveredName; + /** + * 容纳人数值 + */ + private String capacity; + /** + * 容纳人数名 + */ + private String capacityName; + /** + * 经度 + */ + private String longitude; + /** + * 纬度 + */ + private String latitude; + /** + * 地址 + */ + private String address; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java new file mode 100644 index 0000000000..76e111baa2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java @@ -0,0 +1,164 @@ +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.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.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.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.IcCityManagementDTO; +import com.epmet.dto.form.IcCityManagementAddEditFormDTO; +import com.epmet.dto.form.IcCityManagementListFormDTO; +import com.epmet.dto.result.IcCityManagementListResultDTO; +import com.epmet.excel.IcCityManagementExcel; +import com.epmet.service.IcCityManagementService; +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.io.PrintWriter; +import java.net.URLEncoder; +import java.util.Date; +import java.util.List; + + +/** + * 城市管理图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@RestController +@RequestMapping("icCityManagement") +@Slf4j +public class IcCityManagementController { + + @Autowired + private IcCityManagementService icCityManagementService; + + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcCityManagementListFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icCityManagementService.list(formDTO)); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcCityManagementDTO data = icCityManagementService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("add") + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcCityManagementAddEditFormDTO dto) { + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setUserId(tokenDto.getUserId()); + icCityManagementService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("edit") + public Result update(@LoginUser TokenDto tokenDto, @RequestBody IcCityManagementAddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icCityManagementService.update(formDTO); + return new Result(); + } + + @PostMapping("del") + public Result delete(@LoginUser TokenDto tokenDto, @RequestBody IcCityManagementAddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, IcCityManagementAddEditFormDTO.Del.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icCityManagementService.delete(formDTO); + return new Result(); + } + + @RequestMapping("detail") + public Result detail(@RequestBody IcCityManagementListFormDTO formDTO) { + return new Result().ok(icCityManagementService.detail(formDTO)); + } + + @RequestMapping(value = "download", method = {RequestMethod.GET, RequestMethod.POST}) + 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/superior_resource_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcCityManagementListFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(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), IcCityManagementExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icCityManagementService.list(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcCityManagementExcel.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-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java new file mode 100644 index 0000000000..84289ab8a5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java @@ -0,0 +1,168 @@ +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.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.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.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.IcDangerousChemicalsDTO; +import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; +import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; +import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; +import com.epmet.excel.IcDangerousChemicalsExcel; +import com.epmet.excel.IcDangerousChemicalsExcel; +import com.epmet.service.IcDangerousChemicalsService; +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.io.PrintWriter; +import java.net.URLEncoder; +import java.util.Date; +import java.util.List; +import java.util.Map; + + +/** + * 重点危化品企业 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@RestController +@RequestMapping("icDangerousChemicals") +@Slf4j +public class IcDangerousChemicalsController { + + @Autowired + private IcDangerousChemicalsService icDangerousChemicalsService; + + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcDangerousChemicalsListFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icDangerousChemicalsService.list(formDTO)); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcDangerousChemicalsDTO data = icDangerousChemicalsService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("add") + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcDangerousChemicalsAddEditFormDTO dto) { + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setUserId(tokenDto.getUserId()); + icDangerousChemicalsService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("edit") + public Result update(@LoginUser TokenDto tokenDto, @RequestBody IcDangerousChemicalsAddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icDangerousChemicalsService.update(formDTO); + return new Result(); + } + + @PostMapping("del") + public Result delete(@LoginUser TokenDto tokenDto, @RequestBody IcDangerousChemicalsAddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, IcDangerousChemicalsAddEditFormDTO.Del.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icDangerousChemicalsService.delete(formDTO); + return new Result(); + } + + @RequestMapping("detail") + public Result detail(@RequestBody IcDangerousChemicalsListFormDTO formDTO) { + return new Result().ok(icDangerousChemicalsService.detail(formDTO)); + } + + @RequestMapping(value = "download", method = {RequestMethod.GET, RequestMethod.POST}) + 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/superior_resource_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcDangerousChemicalsListFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(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), IcDangerousChemicalsExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icDangerousChemicalsService.list(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcDangerousChemicalsExcel.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-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java new file mode 100644 index 0000000000..3071f4d97e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -0,0 +1,165 @@ +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.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.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.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.IcPublicServiceDTO; +import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; +import com.epmet.dto.form.IcPublicServiceListFormDTO; +import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; +import com.epmet.dto.result.IcPublicServiceListResultDTO; +import com.epmet.excel.IcPublicServiceExcel; +import com.epmet.service.IcPublicServiceService; +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.io.PrintWriter; +import java.net.URLEncoder; +import java.util.Date; +import java.util.List; + + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@RestController +@RequestMapping("icPublicService") +@Slf4j +public class IcPublicServiceController { + + @Autowired + private IcPublicServiceService icPublicServiceService; + + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcPublicServiceListFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icPublicServiceService.list(formDTO)); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPublicServiceDTO data = icPublicServiceService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("add") + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPublicServiceAddEditFormDTO dto) { + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setUserId(tokenDto.getUserId()); + icPublicServiceService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("edit") + public Result update(@LoginUser TokenDto tokenDto, @RequestBody IcPublicServiceAddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icPublicServiceService.update(formDTO); + return new Result(); + } + + @PostMapping("del") + public Result delete(@LoginUser TokenDto tokenDto, @RequestBody IcPublicServiceAddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, IcSuperiorResourceAddEditFormDTO.Del.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icPublicServiceService.delete(formDTO); + return new Result(); + } + + @RequestMapping("detail") + public Result detail(@RequestBody IcPublicServiceListFormDTO formDTO) { + return new Result().ok(icPublicServiceService.detail(formDTO)); + } + + @RequestMapping(value = "download", method = {RequestMethod.GET, RequestMethod.POST}) + 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/public_service_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcPublicServiceListFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(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), IcPublicServiceExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icPublicServiceService.list(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcPublicServiceExcel.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-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java new file mode 100644 index 0000000000..c9aec6b4d0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java @@ -0,0 +1,163 @@ +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.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.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.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.IcSuperiorResourceDTO; +import com.epmet.dto.form.IcSuperiorResourceListFormDTO; +import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; +import com.epmet.dto.result.IcSuperiorResourceListResultDTO; +import com.epmet.excel.IcSuperiorResourceExcel; +import com.epmet.service.IcSuperiorResourceService; +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.io.PrintWriter; +import java.net.URLEncoder; +import java.util.Date; +import java.util.List; + + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@RestController +@RequestMapping("icSuperiorResource") +@Slf4j +public class IcSuperiorResourceController { + + @Autowired + private IcSuperiorResourceService icSuperiorResourceService; + + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcSuperiorResourceListFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icSuperiorResourceService.list(formDTO)); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + IcSuperiorResourceDTO data = icSuperiorResourceService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("add") + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcSuperiorResourceAddEditFormDTO dto) { + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setUserId(tokenDto.getUserId()); + icSuperiorResourceService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("edit") + public Result update(@LoginUser TokenDto tokenDto, @RequestBody IcSuperiorResourceAddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icSuperiorResourceService.update(formDTO); + return new Result(); + } + + @PostMapping("del") + public Result delete(@LoginUser TokenDto tokenDto, @RequestBody IcSuperiorResourceAddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, IcSuperiorResourceAddEditFormDTO.Del.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icSuperiorResourceService.delete(formDTO); + return new Result(); + } + + @RequestMapping("detail") + public Result detail(@RequestBody IcSuperiorResourceListFormDTO formDTO) { + return new Result().ok(icSuperiorResourceService.detail(formDTO)); + } + + @RequestMapping(value = "download", method = {RequestMethod.GET, RequestMethod.POST}) + 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/superior_resource_template.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcSuperiorResourceListFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(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), IcSuperiorResourceExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icSuperiorResourceService.list(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcSuperiorResourceExcel.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-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java new file mode 100644 index 0000000000..ba554957d5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java @@ -0,0 +1,24 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcCityManagementListFormDTO; +import com.epmet.dto.result.IcCityManagementListResultDTO; +import com.epmet.entity.IcCityManagementEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 城市管理图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcCityManagementDao extends BaseDao { + + List selectCityManagementList(IcCityManagementListFormDTO formDTO); + + void del(IcCityManagementEntity entity); + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java new file mode 100644 index 0000000000..03c1c90c62 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java @@ -0,0 +1,23 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; +import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; +import com.epmet.entity.IcDangerousChemicalsEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 重点危化品企业 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcDangerousChemicalsDao extends BaseDao { + + List selectDangerousChemicalsList(IcDangerousChemicalsListFormDTO formDTO); + + void del(IcDangerousChemicalsEntity entity); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java new file mode 100644 index 0000000000..e1a168ae30 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java @@ -0,0 +1,23 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcPublicServiceListFormDTO; +import com.epmet.dto.result.IcPublicServiceListResultDTO; +import com.epmet.entity.IcPublicServiceEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcPublicServiceDao extends BaseDao { + + List selectPublicServiceList(IcPublicServiceListFormDTO formDTO); + + void del(IcPublicServiceEntity entity); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java new file mode 100644 index 0000000000..1ac3c972f0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java @@ -0,0 +1,23 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcSuperiorResourceListFormDTO; +import com.epmet.dto.result.IcSuperiorResourceListResultDTO; +import com.epmet.entity.IcSuperiorResourceEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcSuperiorResourceDao extends BaseDao { + + List selectSuperiorResourceList(IcSuperiorResourceListFormDTO formDTO); + + void del(IcSuperiorResourceEntity entity); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java new file mode 100644 index 0000000000..8a90c40380 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java @@ -0,0 +1,79 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 城市管理图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_city_management") +public class IcCityManagementEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:city_management】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java new file mode 100644 index 0000000000..e4e9e35252 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java @@ -0,0 +1,91 @@ +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-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_dangerous_chemicals") +public class IcDangerousChemicalsEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 企业名称 + */ + private String name; + + /** + * 企业类型【字典表ic_coverage_category_dict key:dangerous_chemicals】 + */ + private String category; + + /** + * 周边安全距离，单位公里 + */ + private String safeDistance; + + /** + * 危化品种类【字典表 ic_danger_type】 + */ + private String dangerType; + + /** + * 负责人姓名 + */ + private String principalName; + + /** + * 负责人电话 + */ + private String principalMobile; + + /** + * 经营地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 备注 + */ + private String remark; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java new file mode 100644 index 0000000000..5c0e35ec89 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java @@ -0,0 +1,79 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_public_service") +public class IcPublicServiceEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:public_service】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcSuperiorResourceEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcSuperiorResourceEntity.java new file mode 100644 index 0000000000..193a8a5283 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcSuperiorResourceEntity.java @@ -0,0 +1,79 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_superior_resource") +public class IcSuperiorResourceEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:superior_resource】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java new file mode 100644 index 0000000000..aa616ce854 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -0,0 +1,39 @@ +package com.epmet.excel; + +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 java.util.Date; + +/** + * 城市管理图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class IcCityManagementExcel { + + @ExcelProperty(value = "场所名称") + @ColumnWidth(25) + private String name; + + @ExcelProperty(value = "场所类别") + @ColumnWidth(20) + private String categoryName; + + @ExcelProperty(value = "占地面积") + @ColumnWidth(25) + private String areaCoveredName; + + @ExcelProperty(value = "容纳人数") + @ColumnWidth(20) + private Integer capacityName; + + @ExcelProperty(value = "地址") + @ColumnWidth(25) + private String address; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java new file mode 100644 index 0000000000..9a4c6ad7aa --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java @@ -0,0 +1,81 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 重点危化品企业 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class IcDangerousChemicalsExcel { + + @Excel(name = "ID") + private String id; + + @Excel(name = "客户Id") + private String customerId; + + @Excel(name = "所属组织机构Id") + private String agencyId; + + @Excel(name = "agencyId的所有上级，包含自己") + private String agencyIdPath; + + @Excel(name = "来源【新增:add 导入:import 】") + private String sourceType; + + @Excel(name = "企业名称") + private String name; + + @Excel(name = "企业类型【字典表ic_coverage_category_dict key:dangerous_chemicals】") + private String category; + + @Excel(name = "周边安全距离，单位公里") + private String safeDistance; + + @Excel(name = "危化品种类【字典表 ic_danger_type】") + private Integer dangerType; + + @Excel(name = "负责人姓名") + private String principalName; + + @Excel(name = "负责人电话") + private String principalMobile; + + @Excel(name = "经营地址") + private String address; + + @Excel(name = "经度") + private String longitude; + + @Excel(name = "纬度") + private String latitude; + + @Excel(name = "备注") + private String remark; + + @Excel(name = "删除标识") + private String 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/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java new file mode 100644 index 0000000000..34edee1026 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -0,0 +1,39 @@ +package com.epmet.excel; + +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 java.util.Date; + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class IcPublicServiceExcel { + + @ExcelProperty(value = "场所名称") + @ColumnWidth(25) + private String name; + + @ExcelProperty(value = "场所类别") + @ColumnWidth(20) + private String categoryName; + + @ExcelProperty(value = "占地面积") + @ColumnWidth(25) + private String areaCoveredName; + + @ExcelProperty(value = "容纳人数") + @ColumnWidth(20) + private Integer capacityName; + + @ExcelProperty(value = "地址") + @ColumnWidth(25) + private String address; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java new file mode 100644 index 0000000000..b62792ec1c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java @@ -0,0 +1,37 @@ +package com.epmet.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class IcSuperiorResourceExcel { + + @ExcelProperty(value = "场所名称") + @ColumnWidth(25) + private String name; + + @ExcelProperty(value = "场所类别") + @ColumnWidth(20) + private String categoryName; + + @ExcelProperty(value = "占地面积") + @ColumnWidth(25) + private String areaCoveredName; + + @ExcelProperty(value = "容纳人数") + @ColumnWidth(20) + private Integer capacityName; + + @ExcelProperty(value = "地址") + @ColumnWidth(25) + private String address; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java new file mode 100644 index 0000000000..cd8eb0ab00 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java @@ -0,0 +1,73 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcCityManagementDTO; +import com.epmet.dto.form.IcCityManagementAddEditFormDTO; +import com.epmet.dto.form.IcCityManagementListFormDTO; +import com.epmet.dto.result.IcCityManagementListResultDTO; +import com.epmet.entity.IcCityManagementEntity; + +import java.util.List; +import java.util.Map; + +/** + * 城市管理图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +public interface IcCityManagementService extends BaseService { + + /** + * 默认查询 + * + * @param formDTO + * @return java.util.List + * @author generator + * @date 2022-06-16 + */ + PageData list(IcCityManagementListFormDTO formDTO); + + /** + * 单条查询 + * + * @param id + * @return IcCityManagementDTO + * @author generator + * @date 2022-06-16 + */ + IcCityManagementDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void save(IcCityManagementAddEditFormDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void update(IcCityManagementAddEditFormDTO dto); + + /** + * 批量删除 + * + * @return void + * @author generator + * @date 2022-06-16 + */ + void delete(IcCityManagementAddEditFormDTO formDTO); + + IcCityManagementListResultDTO detail(IcCityManagementListFormDTO formDTO); + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java new file mode 100644 index 0000000000..321437f1f6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java @@ -0,0 +1,70 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcDangerousChemicalsDTO; +import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; +import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; +import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; +import com.epmet.entity.IcDangerousChemicalsEntity; + +/** + * 重点危化品企业 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +public interface IcDangerousChemicalsService extends BaseService { + + /** + * 默认查询 + * + * @param formDTO + * @return java.util.List + * @author generator + * @date 2022-06-16 + */ + PageData list(IcDangerousChemicalsListFormDTO formDTO); + + /** + * 单条查询 + * + * @param id + * @return IcDangerousChemicalsDTO + * @author generator + * @date 2022-06-16 + */ + IcDangerousChemicalsDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void save(IcDangerousChemicalsAddEditFormDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void update(IcDangerousChemicalsAddEditFormDTO dto); + + /** + * 批量删除 + * + * @return void + * @author generator + * @date 2022-06-16 + */ + void delete(IcDangerousChemicalsAddEditFormDTO formDTO); + + IcDangerousChemicalsListResultDTO detail(IcDangerousChemicalsListFormDTO formDTO); + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java new file mode 100644 index 0000000000..062337b6d3 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java @@ -0,0 +1,71 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcPublicServiceDTO; +import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; +import com.epmet.dto.form.IcPublicServiceListFormDTO; +import com.epmet.dto.result.IcPublicServiceListResultDTO; +import com.epmet.entity.IcPublicServiceEntity; + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +public interface IcPublicServiceService extends BaseService { + + /** + * 默认查询 + * + * @param formDTO + * @return java.util.List + * @author generator + * @date 2022-06-16 + */ + PageData list(IcPublicServiceListFormDTO formDTO); + + /** + * 单条查询 + * + * @param id + * @return IcPublicServiceDTO + * @author generator + * @date 2022-06-16 + */ + IcPublicServiceDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void save(IcPublicServiceAddEditFormDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void update(IcPublicServiceAddEditFormDTO dto); + + /** + * 批量删除 + * + * @return void + * @author generator + * @date 2022-06-16 + */ + void delete(IcPublicServiceAddEditFormDTO dto); + + IcPublicServiceListResultDTO detail(IcPublicServiceListFormDTO formDTO); + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java new file mode 100644 index 0000000000..23eff34421 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java @@ -0,0 +1,70 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcSuperiorResourceDTO; +import com.epmet.dto.form.IcSuperiorResourceListFormDTO; +import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; +import com.epmet.dto.result.IcSuperiorResourceListResultDTO; +import com.epmet.entity.IcSuperiorResourceEntity; + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +public interface IcSuperiorResourceService extends BaseService { + + /** + * 默认查询 + * + * @param formDTO + * @return java.util.List + * @author generator + * @date 2022-06-16 + */ + PageData list(IcSuperiorResourceListFormDTO formDTO); + + /** + * 单条查询 + * + * @param id + * @return IcSuperiorResourceDTO + * @author generator + * @date 2022-06-16 + */ + IcSuperiorResourceDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void save(IcSuperiorResourceAddEditFormDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void update(IcSuperiorResourceAddEditFormDTO dto); + + /** + * 批量删除 + * + * @return void + * @author generator + * @date 2022-06-16 + */ + void delete(IcSuperiorResourceAddEditFormDTO formDTO); + + IcSuperiorResourceListResultDTO detail(IcSuperiorResourceListFormDTO formDTO); + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java new file mode 100644 index 0000000000..5a8c4d2800 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java @@ -0,0 +1,160 @@ +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.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.dao.IcCityManagementDao; +import com.epmet.dto.IcCityManagementDTO; +import com.epmet.dto.form.IcCityManagementAddEditFormDTO; +import com.epmet.dto.form.IcCityManagementListFormDTO; +import com.epmet.dto.result.IcCityManagementListResultDTO; +import com.epmet.entity.IcCityManagementEntity; +import com.epmet.entity.IcCityManagementEntity; +import com.epmet.service.IcCityManagementService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 城市管理图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Service +public class IcCityManagementServiceImpl extends BaseServiceImpl implements IcCityManagementService { + + + @Override + public PageData list(IcCityManagementListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + //查询当前组织及下级数据 + formDTO.setAgencyId(staffInfo.getAgencyId()); + //列表/导出查询 + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectCityManagementList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + + //封装类别数据 + if (!CollectionUtils.isEmpty(list)) { + /*Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + for (IcCityManagementListResultDTO v : list) { + if (StringUtils.isNotBlank(v.getCategory())) { + v.setCategoryName(statusMap.get(v.getCategory())); + } + }*/ + } + + return new PageData<>(list, pageInfo.getTotal()); + } + + 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 IcCityManagementDTO get(String id) { + IcCityManagementEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcCityManagementDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcCityManagementAddEditFormDTO formDTO) { + //1.获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //2.校验同组织下服务组织名称不能重复 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcCityManagementEntity::getAgencyId, staffInfo.getAgencyId()); + tWrapper.eq(IcCityManagementEntity::getName, formDTO.getName()); + List entityList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(entityList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的场所"); + } + //3.新增服务组织数据 + IcCityManagementEntity entity = ConvertUtils.sourceToTarget(formDTO, IcCityManagementEntity.class); + entity.setAgencyId(staffInfo.getAgencyId()); + entity.setAgencyIdPath(StringUtils.isEmpty(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId()); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcCityManagementAddEditFormDTO formDTO) { + //1.获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //2.校验同组织下服务组织名称不能重复 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcCityManagementEntity::getAgencyId, staffInfo.getAgencyId()); + tWrapper.ne(IcCityManagementEntity::getId, formDTO.getIcCityManagementId()); + tWrapper.eq(IcCityManagementEntity::getName, formDTO.getName()); + List entityList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(entityList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的服务组织"); + } + //3.更新服务组织数据 + IcCityManagementEntity entity = ConvertUtils.sourceToTarget(formDTO, IcCityManagementEntity.class); + entity.setId(formDTO.getIcCityManagementId()); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(IcCityManagementAddEditFormDTO formDTO) { + IcCityManagementEntity entity = new IcCityManagementEntity(); + entity.setId(formDTO.getIcCityManagementId()); + entity.setUpdatedBy(formDTO.getUserId()); + baseDao.del(entity); + } + + @Override + public IcCityManagementListResultDTO detail(IcCityManagementListFormDTO formDTO) { + IcCityManagementListResultDTO resultDTO = new IcCityManagementListResultDTO(); + //1.查询服务组织信息 + List list = baseDao.selectCityManagementList(formDTO); + + //封装类别数据 + if (!CollectionUtils.isEmpty(list)) { + /*Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + for (IcCityManagementListResultDTO v : list) { + if (StringUtils.isNotBlank(v.getCategory())) { + v.setCategoryName(statusMap.get(v.getCategory())); + } + }*/ + } + + return resultDTO; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java new file mode 100644 index 0000000000..62a4c240e5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -0,0 +1,160 @@ +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.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.dao.IcDangerousChemicalsDao; +import com.epmet.dto.IcDangerousChemicalsDTO; +import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; +import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; +import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; +import com.epmet.entity.IcDangerousChemicalsEntity; +import com.epmet.entity.IcDangerousChemicalsEntity; +import com.epmet.service.IcDangerousChemicalsService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 重点危化品企业 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Service +public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl implements IcDangerousChemicalsService { + + + @Override + public PageData list(IcDangerousChemicalsListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + //查询当前组织及下级数据 + formDTO.setAgencyId(staffInfo.getAgencyId()); + //列表/导出查询 + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectDangerousChemicalsList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + + //封装类别数据 + if (!CollectionUtils.isEmpty(list)) { + /*Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + for (IcDangerousChemicalsListResultDTO v : list) { + if (StringUtils.isNotBlank(v.getCategory())) { + v.setCategoryName(statusMap.get(v.getCategory())); + } + }*/ + } + + return new PageData<>(list, pageInfo.getTotal()); + } + + 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 IcDangerousChemicalsDTO get(String id) { + IcDangerousChemicalsEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcDangerousChemicalsDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcDangerousChemicalsAddEditFormDTO formDTO) { + //1.获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //2.校验同组织下服务组织名称不能重复 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcDangerousChemicalsEntity::getAgencyId, staffInfo.getAgencyId()); + tWrapper.eq(IcDangerousChemicalsEntity::getName, formDTO.getName()); + List entityList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(entityList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的场所"); + } + //3.新增服务组织数据 + IcDangerousChemicalsEntity entity = ConvertUtils.sourceToTarget(formDTO, IcDangerousChemicalsEntity.class); + entity.setAgencyId(staffInfo.getAgencyId()); + entity.setAgencyIdPath(StringUtils.isEmpty(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId()); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcDangerousChemicalsAddEditFormDTO formDTO) { + //1.获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //2.校验同组织下服务组织名称不能重复 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcDangerousChemicalsEntity::getAgencyId, staffInfo.getAgencyId()); + tWrapper.ne(IcDangerousChemicalsEntity::getId, formDTO.getIcDangerousChemicalsId()); + tWrapper.eq(IcDangerousChemicalsEntity::getName, formDTO.getName()); + List entityList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(entityList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的服务组织"); + } + //3.更新服务组织数据 + IcDangerousChemicalsEntity entity = ConvertUtils.sourceToTarget(formDTO, IcDangerousChemicalsEntity.class); + entity.setId(formDTO.getIcDangerousChemicalsId()); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(IcDangerousChemicalsAddEditFormDTO formDTO) { + IcDangerousChemicalsEntity entity = new IcDangerousChemicalsEntity(); + entity.setId(formDTO.getIcDangerousChemicalsId()); + entity.setUpdatedBy(formDTO.getUserId()); + baseDao.del(entity); + } + + @Override + public IcDangerousChemicalsListResultDTO detail(IcDangerousChemicalsListFormDTO formDTO) { + IcDangerousChemicalsListResultDTO resultDTO = new IcDangerousChemicalsListResultDTO(); + //1.查询服务组织信息 + List list = baseDao.selectDangerousChemicalsList(formDTO); + + //封装类别数据 + if (!CollectionUtils.isEmpty(list)) { + /*Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + for (IcDangerousChemicalsListResultDTO v : list) { + if (StringUtils.isNotBlank(v.getCategory())) { + v.setCategoryName(statusMap.get(v.getCategory())); + } + }*/ + } + + return resultDTO; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java new file mode 100644 index 0000000000..e26a033a01 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -0,0 +1,157 @@ +package com.epmet.service.impl; + +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.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.dao.IcPublicServiceDao; +import com.epmet.dto.IcPublicServiceDTO; +import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; +import com.epmet.dto.form.IcPublicServiceListFormDTO; +import com.epmet.dto.result.IcPublicServiceListResultDTO; +import com.epmet.entity.IcPublicServiceEntity; +import com.epmet.service.IcPublicServiceService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Map; + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Service +public class IcPublicServiceServiceImpl extends BaseServiceImpl implements IcPublicServiceService { + + + @Override + public PageData list(IcPublicServiceListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + //查询当前组织及下级数据 + formDTO.setAgencyId(staffInfo.getAgencyId()); + //列表/导出查询 + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectPublicServiceList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + + //封装类别数据 + if (!CollectionUtils.isEmpty(list)) { + /*Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + for (IcPublicServiceListResultDTO v : list) { + if (StringUtils.isNotBlank(v.getCategory())) { + v.setCategoryName(statusMap.get(v.getCategory())); + } + }*/ + } + + return new PageData<>(list, pageInfo.getTotal()); + } + + 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 IcPublicServiceDTO get(String id) { + IcPublicServiceEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPublicServiceDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPublicServiceAddEditFormDTO formDTO) { + //1.获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //2.校验同组织下服务组织名称不能重复 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcPublicServiceEntity::getAgencyId, staffInfo.getAgencyId()); + tWrapper.eq(IcPublicServiceEntity::getName, formDTO.getName()); + List entityList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(entityList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的场所"); + } + //3.新增服务组织数据 + IcPublicServiceEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPublicServiceEntity.class); + entity.setAgencyId(staffInfo.getAgencyId()); + entity.setAgencyIdPath(StringUtils.isEmpty(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId()); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPublicServiceAddEditFormDTO formDTO) { + //1.获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //2.校验同组织下服务组织名称不能重复 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcPublicServiceEntity::getAgencyId, staffInfo.getAgencyId()); + tWrapper.ne(IcPublicServiceEntity::getId, formDTO.getIcPublicServiceId()); + tWrapper.eq(IcPublicServiceEntity::getName, formDTO.getName()); + List entityList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(entityList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的服务组织"); + } + //3.更新服务组织数据 + IcPublicServiceEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPublicServiceEntity.class); + entity.setId(formDTO.getIcPublicServiceId()); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(IcPublicServiceAddEditFormDTO formDTO) { + IcPublicServiceEntity entity = new IcPublicServiceEntity(); + entity.setId(formDTO.getIcPublicServiceId()); + entity.setUpdatedBy(formDTO.getUserId()); + baseDao.del(entity); + } + + @Override + public IcPublicServiceListResultDTO detail(IcPublicServiceListFormDTO formDTO) { + IcPublicServiceListResultDTO resultDTO = new IcPublicServiceListResultDTO(); + //1.查询服务组织信息 + List list = baseDao.selectPublicServiceList(formDTO); + + //封装类别数据 + if (!CollectionUtils.isEmpty(list)) { + /*Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + for (IcPublicServiceListResultDTO v : list) { + if (StringUtils.isNotBlank(v.getCategory())) { + v.setCategoryName(statusMap.get(v.getCategory())); + } + }*/ + } + + return resultDTO; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java new file mode 100644 index 0000000000..27e940c730 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -0,0 +1,157 @@ +package com.epmet.service.impl; + +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.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.dao.IcSuperiorResourceDao; +import com.epmet.dto.IcSuperiorResourceDTO; +import com.epmet.dto.form.IcSuperiorResourceListFormDTO; +import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; +import com.epmet.dto.result.IcSuperiorResourceListResultDTO; +import com.epmet.entity.IcSuperiorResourceEntity; +import com.epmet.service.IcSuperiorResourceService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Map; + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Service +public class IcSuperiorResourceServiceImpl extends BaseServiceImpl implements IcSuperiorResourceService { + + + @Override + public PageData list(IcSuperiorResourceListFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + //查询当前组织及下级数据 + formDTO.setAgencyId(staffInfo.getAgencyId()); + //列表/导出查询 + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectSuperiorResourceList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + + //封装类别数据 + if (!CollectionUtils.isEmpty(list)) { + /*Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + for (IcSuperiorResourceListResultDTO v : list) { + if (StringUtils.isNotBlank(v.getCategory())) { + v.setCategoryName(statusMap.get(v.getCategory())); + } + }*/ + } + + return new PageData<>(list, pageInfo.getTotal()); + } + + 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 IcSuperiorResourceDTO get(String id) { + IcSuperiorResourceEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcSuperiorResourceDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcSuperiorResourceAddEditFormDTO formDTO) { + //1.获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //2.校验同组织下服务组织名称不能重复 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcSuperiorResourceEntity::getAgencyId, staffInfo.getAgencyId()); + tWrapper.eq(IcSuperiorResourceEntity::getName, formDTO.getName()); + List entityList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(entityList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的场所"); + } + //3.新增服务组织数据 + IcSuperiorResourceEntity entity = ConvertUtils.sourceToTarget(formDTO, IcSuperiorResourceEntity.class); + entity.setAgencyId(staffInfo.getAgencyId()); + entity.setAgencyIdPath(StringUtils.isEmpty(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId()); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcSuperiorResourceAddEditFormDTO formDTO) { + //1.获取当前工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //2.校验同组织下服务组织名称不能重复 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcSuperiorResourceEntity::getAgencyId, staffInfo.getAgencyId()); + tWrapper.ne(IcSuperiorResourceEntity::getId, formDTO.getIcSuperiorResourceId()); + tWrapper.eq(IcSuperiorResourceEntity::getName, formDTO.getName()); + List entityList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(entityList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的服务组织"); + } + //3.更新服务组织数据 + IcSuperiorResourceEntity entity = ConvertUtils.sourceToTarget(formDTO, IcSuperiorResourceEntity.class); + entity.setId(formDTO.getIcSuperiorResourceId()); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(IcSuperiorResourceAddEditFormDTO formDTO) { + IcSuperiorResourceEntity entity = new IcSuperiorResourceEntity(); + entity.setId(formDTO.getIcSuperiorResourceId()); + entity.setUpdatedBy(formDTO.getUserId()); + baseDao.del(entity); + } + + @Override + public IcSuperiorResourceListResultDTO detail(IcSuperiorResourceListFormDTO formDTO) { + IcSuperiorResourceListResultDTO resultDTO = new IcSuperiorResourceListResultDTO(); + //1.查询服务组织信息 + List list = baseDao.selectSuperiorResourceList(formDTO); + + //封装类别数据 + if (!CollectionUtils.isEmpty(list)) { + /*Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + for (IcSuperiorResourceListResultDTO v : list) { + if (StringUtils.isNotBlank(v.getCategory())) { + v.setCategoryName(statusMap.get(v.getCategory())); + } + }*/ + } + + return resultDTO; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml new file mode 100644 index 0000000000..5d7e5dfdbc --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml @@ -0,0 +1,51 @@ + + + + + + + + + UPDATE ic_city_management + SET del_flag = '1', + updated_by = #{updatedBy}, + updated_time = NOW() + WHERE + id = #{id} + AND del_flag = '0' + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml new file mode 100644 index 0000000000..c9d2242132 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml @@ -0,0 +1,52 @@ + + + + + + + + + UPDATE ic_dangerous_chemicals + SET del_flag = '1', + updated_by = #{updatedBy}, + updated_time = NOW() + WHERE + id = #{id} + AND del_flag = '0' + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml new file mode 100644 index 0000000000..91ea0d7cce --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -0,0 +1,52 @@ + + + + + + + + + UPDATE ic_public_service + SET del_flag = '1', + updated_by = #{updatedBy}, + updated_time = NOW() + WHERE + id = #{id} + AND del_flag = '0' + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml new file mode 100644 index 0000000000..9edfe1c756 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml @@ -0,0 +1,53 @@ + + + + + + + + + UPDATE ic_superior_resource + SET del_flag = '1', + updated_by = #{updatedBy}, + updated_time = NOW() + WHERE + id = #{id} + AND del_flag = '0' + + + + \ No newline at end of file From e74d78b07c8e7c3a6c65371c47074f4f9041d215 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Jun 2022 15:33:13 +0800 Subject: [PATCH 005/105] =?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 --- .../IcDangerousChemicalsController.java | 5 +- .../IcSuperiorResourceController.java | 2 +- .../epmet/excel/IcCityManagementExcel.java | 3 - .../excel/IcDangerousChemicalsExcel.java | 79 ++++++------------- .../com/epmet/excel/IcPublicServiceExcel.java | 3 - .../service/IcCityManagementService.java | 3 - .../service/IcSuperiorResourceService.java | 2 +- .../impl/IcCityManagementServiceImpl.java | 3 - .../impl/IcDangerousChemicalsServiceImpl.java | 3 - .../impl/IcSuperiorResourceServiceImpl.java | 2 +- 10 files changed, 27 insertions(+), 78 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java index 84289ab8a5..3163f3e67c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java @@ -16,17 +16,15 @@ 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.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.IcDangerousChemicalsDTO; import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.excel.IcDangerousChemicalsExcel; -import com.epmet.excel.IcDangerousChemicalsExcel; import com.epmet.service.IcDangerousChemicalsService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -43,7 +41,6 @@ import java.io.PrintWriter; import java.net.URLEncoder; import java.util.Date; import java.util.List; -import java.util.Map; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java index c9aec6b4d0..1664941d01 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java @@ -21,8 +21,8 @@ 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.IcSuperiorResourceDTO; -import com.epmet.dto.form.IcSuperiorResourceListFormDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; +import com.epmet.dto.form.IcSuperiorResourceListFormDTO; import com.epmet.dto.result.IcSuperiorResourceListResultDTO; import com.epmet.excel.IcSuperiorResourceExcel; import com.epmet.service.IcSuperiorResourceService; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java index aa616ce854..07b7ceae8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -1,12 +1,9 @@ package com.epmet.excel; -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 java.util.Date; - /** * 城市管理图层 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java index 9a4c6ad7aa..d7b612e504 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java @@ -1,10 +1,9 @@ package com.epmet.excel; -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 java.util.Date; - /** * 重点危化品企业 * @@ -14,68 +13,36 @@ import java.util.Date; @Data public class IcDangerousChemicalsExcel { - @Excel(name = "ID") - private String id; - - @Excel(name = "客户Id") - private String customerId; - - @Excel(name = "所属组织机构Id") - private String agencyId; - - @Excel(name = "agencyId的所有上级，包含自己") - private String agencyIdPath; - - @Excel(name = "来源【新增:add 导入:import 】") - private String sourceType; - - @Excel(name = "企业名称") + @ExcelProperty(value = "企业名称") + @ColumnWidth(25) private String name; - @Excel(name = "企业类型【字典表ic_coverage_category_dict key:dangerous_chemicals】") - private String category; - - @Excel(name = "周边安全距离，单位公里") - private String safeDistance; + @ExcelProperty(value = "企业类型") + @ColumnWidth(20) + private String categoryName; - @Excel(name = "危化品种类【字典表 ic_danger_type】") - private Integer dangerType; + @ExcelProperty(value = "周边安全距离") + @ColumnWidth(20) + private String safeDistanceName; - @Excel(name = "负责人姓名") - private String principalName; - - @Excel(name = "负责人电话") - private String principalMobile; + @ExcelProperty(value = "危化品种类") + @ColumnWidth(20) + private String dangerTypeName; - @Excel(name = "经营地址") + @ExcelProperty(value = "经营地址") + @ColumnWidth(25) private String address; - @Excel(name = "经度") - private String longitude; + @ExcelProperty(value = "负责人") + @ColumnWidth(20) + private String principalName; - @Excel(name = "纬度") - private String latitude; + @ExcelProperty(value = "联系电话") + @ColumnWidth(20) + private String principalMobile; - @Excel(name = "备注") + @ExcelProperty(value = "备注") + @ColumnWidth(25) private String remark; - @Excel(name = "删除标识") - private String 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/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index 34edee1026..b8e97b24ce 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -1,12 +1,9 @@ package com.epmet.excel; -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 java.util.Date; - /** * 公共服务图层 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java index cd8eb0ab00..5b5c6ab410 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java @@ -8,9 +8,6 @@ import com.epmet.dto.form.IcCityManagementListFormDTO; import com.epmet.dto.result.IcCityManagementListResultDTO; import com.epmet.entity.IcCityManagementEntity; -import java.util.List; -import java.util.Map; - /** * 城市管理图层 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java index 23eff34421..eca67512ae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcSuperiorResourceService.java @@ -3,8 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcSuperiorResourceDTO; -import com.epmet.dto.form.IcSuperiorResourceListFormDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; +import com.epmet.dto.form.IcSuperiorResourceListFormDTO; import com.epmet.dto.result.IcSuperiorResourceListResultDTO; import com.epmet.entity.IcSuperiorResourceEntity; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java index 5a8c4d2800..a90d710b90 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java @@ -2,7 +2,6 @@ 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.dto.result.CustomerStaffInfoCacheResult; @@ -17,7 +16,6 @@ import com.epmet.dto.form.IcCityManagementAddEditFormDTO; import com.epmet.dto.form.IcCityManagementListFormDTO; import com.epmet.dto.result.IcCityManagementListResultDTO; import com.epmet.entity.IcCityManagementEntity; -import com.epmet.entity.IcCityManagementEntity; import com.epmet.service.IcCityManagementService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -26,7 +24,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index 62a4c240e5..6744a3bb3c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -2,7 +2,6 @@ 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.dto.result.CustomerStaffInfoCacheResult; @@ -17,7 +16,6 @@ import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.entity.IcDangerousChemicalsEntity; -import com.epmet.entity.IcDangerousChemicalsEntity; import com.epmet.service.IcDangerousChemicalsService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -26,7 +24,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java index 27e940c730..2939f13d68 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -12,8 +12,8 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcSuperiorResourceDao; import com.epmet.dto.IcSuperiorResourceDTO; -import com.epmet.dto.form.IcSuperiorResourceListFormDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; +import com.epmet.dto.form.IcSuperiorResourceListFormDTO; import com.epmet.dto.result.IcSuperiorResourceListResultDTO; import com.epmet.entity.IcSuperiorResourceEntity; import com.epmet.service.IcSuperiorResourceService; From 037d140998eddb5520484a063e40af64c3627968 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Jun 2022 15:41:43 +0800 Subject: [PATCH 006/105] =?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 --- .../controller/IcCityManagementController.java | 4 ++-- .../IcDangerousChemicalsController.java | 4 ++-- .../controller/IcPublicServiceController.java | 2 +- .../excel/city_management_template.xlsx | Bin 0 -> 9032 bytes .../excel/dangerous_chemicals_template.xlsx | Bin 0 -> 9386 bytes .../excel/public_service_template.xlsx | Bin 0 -> 9065 bytes .../excel/superior_resource_template.xlsx | Bin 0 -> 10434 bytes 7 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/dangerous_chemicals_template.xlsx create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/public_service_template.xlsx create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/superior_resource_template.xlsx diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java index 76e111baa2..646843848d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java @@ -109,9 +109,9 @@ public class IcCityManagementController { 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"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("城市管理导入模板", "UTF-8") + ".xlsx"); - InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/superior_resource_template.xlsx"); + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/city_management_template.xlsx"); try { ServletOutputStream os = response.getOutputStream(); IOUtils.copy(is, os); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java index 3163f3e67c..97e34f384b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java @@ -109,9 +109,9 @@ public class IcDangerousChemicalsController { 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"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("重点危化管理导入模板", "UTF-8") + ".xlsx"); - InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/superior_resource_template.xlsx"); + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/dangerous_chemicals_template.xlsx"); try { ServletOutputStream os = response.getOutputStream(); IOUtils.copy(is, os); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java index 3071f4d97e..b503c39720 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -110,7 +110,7 @@ public class IcPublicServiceController { 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"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("公共服务导入模板", "UTF-8") + ".xlsx"); InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/public_service_template.xlsx"); try { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1d9f5b6aa78d44019e74d19704431499926097bb GIT binary patch literal 9032 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 S*sK^2$6w$dUU2c58 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

K;mPG+ZLNnV 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 B+jal| literal 0 HcmV?d00001 From 5e26df02f6cae0ae7827d434f8664a920c9d46c9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Jun 2022 16:05:42 +0800 Subject: [PATCH 007/105] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcCoverageCategoryDictListResultDTO.java | 14 ++++++++ .../epmet/controller/CoverageController.java | 14 +++++--- .../epmet/dao/IcCoverageCategoryDictDao.java | 9 ++++- .../com/epmet/service/CoverageService.java | 2 ++ .../service/impl/CoverageServiceImpl.java | 7 ++++ .../mapper/IcCoverageCategoryDictDao.xml | 34 +++++++++++-------- 6 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java new file mode 100644 index 0000000000..bc66b1ad5d --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.result; + +import lombok.Data; + +/** + * 五大图层-类别下拉框字典 + */ +@Data +public class IcCoverageCategoryDictListResultDTO { + + private String categoryKey; + private String categoryName; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java index 559e2f103a..3ddfa982e6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java @@ -1,16 +1,17 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CoverageCategoryQueryFormDTO; import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.service.CoverageService; 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; +import java.util.Map; /** * 5大图层controller @@ -34,4 +35,9 @@ public class CoverageController { return new Result>().ok(categories); } + @PostMapping("dict-select-list/{placeType}") + public Result> dictMap(@LoginUser TokenDto tokenDto, @PathVariable("placeType") String placeType) { + return new Result>().ok(coverageService.dictMap(tokenDto.getCustomerId(), placeType)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java index c614258580..ae507878c5 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java @@ -1,8 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.entity.IcCoverageCategoryDictEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 五大图层类别字典表 @@ -12,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcCoverageCategoryDictDao extends BaseDao { - + + List dictMap(@Param("customerId") String customerId, @Param("placeType") String placeType); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java index c7b6603a70..4375ebd85b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java @@ -1,6 +1,7 @@ package com.epmet.service; import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import java.util.List; @@ -13,4 +14,5 @@ public interface CoverageService { */ List categoryList(List coverageTypeList); + List dictMap(String customerId, String placeType); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java index e6c71a0f61..648e019223 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.dao.IcCoverageCategoryDictDao; import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.entity.IcCoverageCategoryDictEntity; import com.epmet.service.CoverageService; import org.springframework.beans.factory.annotation.Autowired; @@ -49,4 +50,10 @@ public class CoverageServiceImpl implements CoverageService { return stream.collect(Collectors.toList()); } + + @Override + public List dictMap(String customerId, String placeType) { + List resultList = coverageCategoryDictDao.dictMap(customerId, placeType); + return resultList; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml index bdac4ea573..0bc660a561 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml @@ -3,21 +3,25 @@ - - - - - - - - - - - - - - - + \ No newline at end of file From e53cdf7114f8b0c7ea115bc27c00bc9fae1d743b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Jun 2022 17:26:22 +0800 Subject: [PATCH 008/105] =?UTF-8?q?=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/DictTypeEnum.java | 1 + .../impl/IcCityManagementServiceImpl.java | 23 ++++++---- .../impl/IcDangerousChemicalsServiceImpl.java | 44 +++++++++++++++---- .../impl/IcPublicServiceServiceImpl.java | 24 ++++++---- .../impl/IcSuperiorResourceServiceImpl.java | 24 ++++++---- 5 files changed, 84 insertions(+), 32 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 6c8f4271ce..f552db723a 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 @@ -26,6 +26,7 @@ public enum DictTypeEnum { SELF_ORG_CATEGORY("self_org_category","社区自组织分类",15), IC_EVENT_SOURCE_TYPE("ic_event_source_type","事件管理",19), IC_SERVICE_TYPE("ic_service_type","服务类别",20), + IC_DANGER_TYPE("ic_danger_type","危化品种类",24), ; private final String code; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java index a90d710b90..aa6f0f2a45 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java @@ -15,17 +15,21 @@ import com.epmet.dto.IcCityManagementDTO; import com.epmet.dto.form.IcCityManagementAddEditFormDTO; import com.epmet.dto.form.IcCityManagementListFormDTO; import com.epmet.dto.result.IcCityManagementListResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.entity.IcCityManagementEntity; +import com.epmet.service.CoverageService; import com.epmet.service.IcCityManagementService; 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 org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 城市管理图层 @@ -36,6 +40,9 @@ import java.util.Map; @Service public class IcCityManagementServiceImpl extends BaseServiceImpl implements IcCityManagementService { + @Autowired + private CoverageService coverageService; + @Override public PageData list(IcCityManagementListFormDTO formDTO) { @@ -52,13 +59,13 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); - Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); for (IcCityManagementListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(statusMap.get(v.getCategory())); + v.setCategoryName(dictMap.get(v.getCategory())); } - }*/ + } } return new PageData<>(list, pageInfo.getTotal()); @@ -142,13 +149,13 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); - Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); for (IcCityManagementListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(statusMap.get(v.getCategory())); + v.setCategoryName(dictMap.get(v.getCategory())); } - }*/ + } } return resultDTO; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index 6744a3bb3c..2b55ec4150 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -5,27 +5,37 @@ 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.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.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcDangerousChemicalsDao; import com.epmet.dto.IcDangerousChemicalsDTO; import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; +import com.epmet.dto.result.IcCityManagementListResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.entity.IcDangerousChemicalsEntity; +import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.service.CoverageService; import com.epmet.service.IcDangerousChemicalsService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +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.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 重点危化品企业 @@ -36,6 +46,10 @@ import java.util.Map; @Service public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl implements IcDangerousChemicalsService { + @Autowired + private EpmetAdminOpenFeignClient adminOpenFeignClient; + @Autowired + private CoverageService coverageService; @Override public PageData list(IcDangerousChemicalsListFormDTO formDTO) { @@ -52,20 +66,27 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + //危化品种类字典 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode()); Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + //企业类别字典数据 + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); for (IcDangerousChemicalsListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(statusMap.get(v.getCategory())); + v.setCategoryName(dictMap.get(v.getCategory())); } - }*/ + if (StringUtils.isNotBlank(v.getDangerType())) { + v.setDangerTypeName(statusMap.get(v.getDangerType())); + } + } } return new PageData<>(list, pageInfo.getTotal()); } - private QueryWrapper 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); @@ -142,13 +163,20 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + //危化品种类字典 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode()); Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + //企业类别字典数据 + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); for (IcDangerousChemicalsListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(statusMap.get(v.getCategory())); + v.setCategoryName(dictMap.get(v.getCategory())); + } + if (StringUtils.isNotBlank(v.getDangerType())) { + v.setDangerTypeName(statusMap.get(v.getDangerType())); } - }*/ + } } return resultDTO; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index e26a033a01..13630ad5aa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -14,18 +14,23 @@ import com.epmet.dao.IcPublicServiceDao; import com.epmet.dto.IcPublicServiceDTO; import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; import com.epmet.dto.form.IcPublicServiceListFormDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; +import com.epmet.dto.result.IcSuperiorResourceListResultDTO; import com.epmet.entity.IcPublicServiceEntity; +import com.epmet.service.CoverageService; import com.epmet.service.IcPublicServiceService; 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 org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 公共服务图层 @@ -36,6 +41,9 @@ import java.util.Map; @Service public class IcPublicServiceServiceImpl extends BaseServiceImpl implements IcPublicServiceService { + @Autowired + private CoverageService coverageService; + @Override public PageData list(IcPublicServiceListFormDTO formDTO) { @@ -52,13 +60,13 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); - Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); for (IcPublicServiceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(statusMap.get(v.getCategory())); + v.setCategoryName(dictMap.get(v.getCategory())); } - }*/ + } } return new PageData<>(list, pageInfo.getTotal()); @@ -142,13 +150,13 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); - Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); for (IcPublicServiceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(statusMap.get(v.getCategory())); + v.setCategoryName(dictMap.get(v.getCategory())); } - }*/ + } } return resultDTO; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java index 2939f13d68..3e306a1826 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -14,18 +14,23 @@ import com.epmet.dao.IcSuperiorResourceDao; import com.epmet.dto.IcSuperiorResourceDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; import com.epmet.dto.form.IcSuperiorResourceListFormDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcSuperiorResourceListResultDTO; +import com.epmet.dto.result.StaffRoleResultDTO; import com.epmet.entity.IcSuperiorResourceEntity; +import com.epmet.service.CoverageService; import com.epmet.service.IcSuperiorResourceService; 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 org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 优势资源管理 @@ -36,6 +41,9 @@ import java.util.Map; @Service public class IcSuperiorResourceServiceImpl extends BaseServiceImpl implements IcSuperiorResourceService { + @Autowired + private CoverageService coverageService; + @Override public PageData list(IcSuperiorResourceListFormDTO formDTO) { @@ -52,13 +60,13 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); - Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); for (IcSuperiorResourceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(statusMap.get(v.getCategory())); + v.setCategoryName(dictMap.get(v.getCategory())); } - }*/ + } } return new PageData<>(list, pageInfo.getTotal()); @@ -142,13 +150,13 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); - Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); for (IcSuperiorResourceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(statusMap.get(v.getCategory())); + v.setCategoryName(dictMap.get(v.getCategory())); } - }*/ + } } return resultDTO; From 0b0c5d00b63b6ad466d7182ae04375992500c435 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Jun 2022 10:01:54 +0800 Subject: [PATCH 009/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=88=AB=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-module/gov-org/gov-org-server/pom.xml | 4 ++-- .../com/epmet/controller/CoverageController.java | 2 +- .../epmet/service/impl/CoverageServiceImpl.java | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 5efca9400d..b4a6ef92e1 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -243,13 +243,13 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - localhost + 192.168.1.140 6379 123456 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java index 559e2f103a..26483f353b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java @@ -23,7 +23,7 @@ public class CoverageController { private CoverageService coverageService; /** - * 类别列表 + * 根据图层列表查询图层下的类别列表。按照图层传递顺序一级排序，sort二级排序 * @param form * @return */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java index e6c71a0f61..eeafb95080 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java @@ -1,10 +1,12 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dao.IcCoverageCategoryDictDao; import com.epmet.dto.result.CoverageCategoryResultDTO; import com.epmet.entity.IcCoverageCategoryDictEntity; import com.epmet.service.CoverageService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,11 +28,22 @@ public class CoverageServiceImpl implements CoverageService { */ @Override public List categoryList(List coverageTypeList) { + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + List categoryList = categoryList(coverageTypeList, customerId); + if (CollectionUtils.isNotEmpty(categoryList)) { + return categoryList; + } + return categoryList(coverageTypeList, "default"); + + } + + private List categoryList(List coverageTypeList, String customerId) { Stream stream = coverageTypeList.stream().map(categoryType -> { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcCoverageCategoryDictEntity::getCoverageType, categoryType); - query.orderByAsc(IcCoverageCategoryDictEntity::getCreatedTime); + query.eq(IcCoverageCategoryDictEntity::getCustomerId, customerId); + query.orderByAsc(IcCoverageCategoryDictEntity::getSort); List categoriesEntity = coverageCategoryDictDao.selectList(query); return categoriesEntity.stream().map(e -> { From 6ab8973fa51c3a6f0d6af8dcee5dcb5f8a7a87de Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Jun 2022 10:04:32 +0800 Subject: [PATCH 010/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91EpmetRequestHolder=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=92=88=E5=AF=B9customerId,client,?= =?UTF-8?q?app=E7=AD=89=E7=9A=84=E7=9B=B4=E6=8E=A5=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/utils/EpmetRequestHolder.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java index f0dad5d9ab..c86ef93152 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java @@ -1,6 +1,7 @@ package com.epmet.commons.tools.utils; import com.alibaba.ttl.TransmittableThreadLocal; +import com.epmet.commons.tools.constant.AppClientConstant; import org.apache.commons.lang3.StringUtils; import java.util.HashMap; @@ -53,6 +54,38 @@ public class EpmetRequestHolder { return stringStringMap.get(headerName.toLowerCase()); } + /** + * 当前登录人客户id + * @return + */ + public static String getLoginUserCustomerId() { + return getHeader(AppClientConstant.CUSTOMER_ID); + } + + /** + * 当前登录人user_id + * @return + */ + public static String getLoginUserId() { + return getHeader(AppClientConstant.USER_ID); + } + + /** + * 当前登录人app + * @return + */ + public static String getLoginUserApp() { + return getHeader(AppClientConstant.APP); + } + + /** + * 当前登录人client + * @return + */ + public static String getLoginUserClient() { + return getHeader(AppClientConstant.CLIENT); + } + /** * 获取所有 * @return From cf70177a6de7c85912bb72e4b56b72a12df132a3 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Jun 2022 13:28:09 +0800 Subject: [PATCH 011/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E5=AE=8C=E6=88=90"=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2"=E5=A4=A7=E4=BD=93?= =?UTF-8?q?=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/common/bean/BuildingInfoCache.java | 10 + .../epmetuser/result/IcResiInfoResultDTO.java | 13 ++ .../form/CoverageAnalisisDataListFormDTO.java | 30 +++ .../CoverageAnalisisDataListResultDTO.java | 38 ++++ .../controller/CoverageController.java | 29 ++- .../dao/epmetuser/IcResiUserDao.java | 7 + .../dao/govorg/IcCoverageCategoryDictDao.java | 16 ++ .../govorg/IcCoverageCategoryDictEntity.java | 56 ++++++ .../dataaggre/service/CoverageService.java | 22 +++ .../service/epmetuser/IcResiService.java | 38 ++++ .../epmetuser/impl/IcResiServiceImpl.java | 65 +++++++ .../service/govorg/GovOrgCoverageService.java | 38 ++++ .../impl/GovOrgCoverageServiceImpl.java | 66 +++++++ .../service/impl/CoverageServiceImpl.java | 173 ++++++++++++++++++ .../mapper/epmetuser/IcResiUserDao.xml | 15 ++ .../resources/mapper/govorg/IcBuildingDao.xml | 4 +- .../govorg/IcCoverageCategoryDictDao.xml | 23 +++ 17 files changed, 641 insertions(+), 2 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/BuildingInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/BuildingInfoCache.java index 4cb2416328..f1d197c895 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/BuildingInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/BuildingInfoCache.java @@ -40,5 +40,15 @@ public class BuildingInfoCache implements Serializable { private String neighborHoodName; private String agencyId; + /** + * 维度 + */ + private String latitude; + + /** + * 经度 + */ + private String longitude; + // 后续用到啥再加吧........ } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java new file mode 100644 index 0000000000..659805383f --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java @@ -0,0 +1,13 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +/** + * 居民信息封装类 + */ +@Data +public class IcResiInfoResultDTO { + private String id; + private String name; + private String buildId; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java new file mode 100644 index 0000000000..179dc80aba --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dataaggre.dto.govorg.form; + +import lombok.Data; + +import java.util.List; + +/** + * 图层数据分析-数据列表 + */ +@Data +public class CoverageAnalisisDataListFormDTO { + + /** + * 图层类型列表 + */ + private List coverageTypes; + + /** + * 分类key + */ + private List categoryKeys; + + /** + * 搜索关键词 + */ + private String search; + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java new file mode 100644 index 0000000000..2d526227d5 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CoverageAnalisisDataListResultDTO { + + private String id; + /** + * 分类key + */ + private String categoryKey; + + /** + * 场所类型 + */ + private String placeType; + + /** + * 内容 + */ + private String content; + + /** + *维度 + */ + private String latitude; + + /** + * 经度 + */ + private String longitude; + +} 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 4efdc11861..4e77d73bff 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,9 +1,17 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.utils.Result; +import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.service.CoverageService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +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; + /** * 5大图层controller */ @@ -11,6 +19,25 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("coverage") public class CoverageController { - //public Result + @Autowired + private CoverageService coverageService; + + /** + * 数据分析-数据列表 + * @param input + * @return + */ + @RequestMapping("dataList") + public Result> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) { + List coverageTypes = input.getCoverageTypes(); + List categoryKeys = input.getCategoryKeys(); + if (CollectionUtils.isEmpty(coverageTypes)) { + return new Result(); + } + + List l = coverageService.analysisDataList(coverageTypes, categoryKeys, + input.getSearch(), input.getPageNo(), input.getPageSize(), input.getIsPage()); + return new Result>().ok(l); + } } 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 1e34921a43..ac78a4ae94 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 @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dto.IcResiUserDTO; @@ -46,4 +47,10 @@ public interface IcResiUserDao extends BaseDao { * @author sun */ List getHomeUserList(@Param("homeId") String homeId, @Param("icUserId") String icUserId); + + List listSpecialResisBySpecialType(@Param("customerId") String customerId, + @Param("agencyId") String agencyId, + @Param("queryPids") String queryPids, + @Param("categoryKey") String categoryKey, + @Param("search") String search); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java new file mode 100644 index 0000000000..e81167fc39 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java @@ -0,0 +1,16 @@ +package com.epmet.dataaggre.dao.govorg; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 五大图层类别字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcCoverageCategoryDictDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java new file mode 100644 index 0000000000..cdaca78b91 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java @@ -0,0 +1,56 @@ +package com.epmet.dataaggre.entity.govorg; + +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-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_coverage_category_dict") +public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * default；或者customerId + */ + private String customerId; + + /** + * 类别key + */ + private String categoryKey; + + /** + * 名称 + */ + private String categoryName; + + /** + * 所属场所类型； +社区自组织：community_org; +优势资源:superior_resource; +城市管理：city_management； +重点危化企业：dangerous_chemicals； +公共服务：public_service + */ + private String placeType; + + /** + * 所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层 + */ + private String coverageType; + + /** + * 排序 + */ + private Integer sort; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java new file mode 100644 index 0000000000..446afa9e48 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -0,0 +1,22 @@ +package com.epmet.dataaggre.service; + +import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; + +import java.util.List; + +/** + * 5大图层 + */ +public interface CoverageService { + /** + * 图层，大屏数据分析，数据列表 + * @param coverageTypes 图层列表 + * @param categoryKeys 分类列表 + * @param search 搜索关键词 + * @param pageNo 页码 + * @param pageSize 页面大小 + * @return + */ + List analysisDataList(List coverageTypes, List categoryKeys, + String search, Integer pageNo, Integer pageSize, Boolean isPage); +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java new file mode 100644 index 0000000000..30c5bb1043 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java @@ -0,0 +1,38 @@ +package com.epmet.dataaggre.service.epmetuser; + +import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; +import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; + +import java.util.List; + +/** + * IC居民 + */ +public interface IcResiService { + + /** + * 5大图层，居民查询 + * @param categoryKey 居民类别 + * @param search 搜索关键词，姓名 + * @param pageNo + * @param pageSize + * @param isPage + * @return + */ + List listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search, + Integer pageNo, Integer pageSize, Boolean isPage); + + /** + * 使用特殊人群类别查询居民列表 + * @param customerId + * @param queryPids + * @param categoryKey + * @param search + * @param pageNo + * @param pageSize + * @param isPage + * @return + */ + List listSpecialResisBySpecialType(String customerId, String agencyId, String queryPids, String categoryKey, String search, + Integer pageNo, Integer pageSize, Boolean isPage); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java new file mode 100644 index 0000000000..afc06839be --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -0,0 +1,65 @@ +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.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.epmetuser.IcResiUserDao; +import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; +import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; +import com.epmet.dataaggre.service.epmetuser.IcResiService; +import com.github.pagehelper.PageHelper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@DataSource(value = DataSourceConstant.EPMET_USER) +@Service +public class IcResiServiceImpl implements IcResiService { + + @Autowired + private IcResiUserDao resiUserDao; + + /** + * 5大图层，居民查询 + * @param categoryKey 居民类别 + * @param search 搜索关键词，姓名 + * @param pageNo + * @param pageSize + * @param isPage + * @return + */ + @Override + public List listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search, + Integer pageNo, Integer pageSize, Boolean isPage) { + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiUserEntity::getCustomerId, customerId); + //query.likeRight(IcResiUserEntity::getPids, queryPids); + query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids)); + if ("resi_xfry".equals(categoryKey)) { + // 信访人员 + query.eq(IcResiUserEntity::getIsXfry, true); + } else if ("resi_snry".equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsSn, true); + } + + if (StringUtils.isNotBlank(search)) { + query.like(IcResiUserEntity::getName, search); + } + return resiUserDao.selectList(query); + } + + @Override + public List listSpecialResisBySpecialType(String customerId, String agencyId, String queryPids, String categoryKey, String search, + Integer pageNo, Integer pageSize, Boolean isPage) { + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } + return resiUserDao.listSpecialResisBySpecialType(customerId, agencyId, queryPids, categoryKey, search); + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java new file mode 100644 index 0000000000..bad471c582 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -0,0 +1,38 @@ +package com.epmet.dataaggre.service.govorg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * org库的图层service + */ +public interface GovOrgCoverageService { + + @Data + @NoArgsConstructor + @AllArgsConstructor + class CategoryCoverageMapping { + private String placeType; + private String coverageType; + private String categoryKey; + } + + /** + * 根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map + * @param categoryKeys + * @return + */ + Map> getMappingRelationByCategoryKey(List categoryKeys); + + /** + * 根据coverageTypes分类key列表，查询他们和图层时间的关系，映射为一个map + * @param coverageTypes + * @return + */ + Map> getMappingRelationByCoverageType(List coverageTypes); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java new file mode 100644 index 0000000000..e53d39884b --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -0,0 +1,66 @@ +package com.epmet.dataaggre.service.govorg.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.govorg.IcCoverageCategoryDictDao; +import com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity; +import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * org 图层service + */ +@Service +@DataSource(value = DataSourceConstant.GOV_ORG) +public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { + + @Autowired + private IcCoverageCategoryDictDao coverageCategoryDictDao; + + /** + * 根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map + * @param categoryKeys + * @return + */ + public Map> getMappingRelationByCategoryKey(List categoryKeys) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.in(IcCoverageCategoryDictEntity::getCategoryKey, categoryKeys); + + List dict = coverageCategoryDictDao.selectList(query); + return map(dict); + } + + @Override + public Map> getMappingRelationByCoverageType(List coverageTypes) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.in(IcCoverageCategoryDictEntity::getCoverageType, coverageTypes); + + List dict = coverageCategoryDictDao.selectList(query); + return map(dict); + } + + /** + * 执行映射 + * @param dict + * @return + */ + public Map> map(List dict) { + HashMap> mapping = new HashMap<>(); + for (IcCoverageCategoryDictEntity item : dict) { + String coverageType = item.getCoverageType(); + CategoryCoverageMapping m = new CategoryCoverageMapping(item.getPlaceType(), coverageType, item.getCategoryKey()); + if (mapping.containsKey(coverageType)) { + mapping.get(coverageType).add(m); + } else { + List ms = new ArrayList<>(); + ms.add(m); + mapping.put(coverageType, ms); + } + } + return mapping; + } +} 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 new file mode 100644 index 0000000000..75fc1d6192 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.dataaggre.service.impl; + +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.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; +import com.epmet.dataaggre.service.CoverageService; +import com.epmet.dataaggre.service.epmetuser.IcResiService; +import com.epmet.dataaggre.service.epmetuser.impl.IcResiServiceImpl; +import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; +import com.epmet.dataaggre.service.govorg.GovOrgService; +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 java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Slf4j +@Service +public class CoverageServiceImpl implements CoverageService { + + @Autowired + private GovOrgCoverageService orgCoverageService; + + @Autowired + private GovOrgService govOrgService; + + @Autowired + private IcResiService icResiService; + + /** + * 场所类型常量 + */ + public static final String PLACE_TYPE_RESI = "resi"; + public static final String PLACE_TYPE_SPECIAL_RESI = "special_resi"; + public static final String PLACE_TYPE_EVENT= "event"; + public static final String PLACE_TYPE_CITY_MANAGEMENT= "city_management"; + public static final String PLACE_TYPE_COMUNITY_ORG= "community_org"; + public static final String PLACE_TYPE_DANGEROUS_CHEMICALS= "dangerous_chemicals"; + public static final String PLACE_TYPE_ENTERPRISE_PARTROL= "enterprise_partrol"; + public static final String PLACE_TYPE_GROUP_RENT= "group_rent"; + public static final String PLACE_TYPE_PUBLIC_SERVICE= "public_service"; + public static final String PLACE_TYPE_SUPERIOR_RESOURCE= "superior_resource"; + + /** 优势资源 **/ + public static final String PLACE_TYPE_YSZY= "yszy"; + + /** + * 图层，大屏数据分析，数据列表 + * @param coverageTypes 图层列表 + * @param categoryKeys 分类列表 + * @param search 搜索关键词 + * @param pageNo 页码 + * @param pageSize 页面大小 + * @return + */ + @Override + public List analysisDataList(List coverageTypes, List categoryKeys, + String search, Integer pageNo, Integer pageSize, Boolean isPage) { + + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + String staffId = EpmetRequestHolder.getLoginUserId(); + + // 1.根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map + Map> mapping; + if (CollectionUtils.isNotEmpty(categoryKeys)) { + // 有分类keys，使用分类keys查询，使用coverageTypes分组 + mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys); + } else { + // 没有分类keys，使用coverageTypes直接查询 + mapping = orgCoverageService.getMappingRelationByCoverageType(coverageTypes); + } + + // 2.循环coverageTypes，使用key到map中查询(为了顺序)，得到categoryKeys列表之后，根据实际情况做相应的查询 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId); + + if (staffInfo == null) { + String msg = "未找到当前登录人信息。staffId:" + EpmetRequestHolder.getLoginUserId(); + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg); + } + + String staffPids = getStaffPidsFromStaffInfo(staffInfo); + String agencyId = staffInfo.getAgencyId(); + + List rls = new ArrayList<>(); + for (String coverageType : coverageTypes) { + List ccm = mapping.get(coverageType); + if (CollectionUtils.isEmpty(ccm)) { + continue; + } + for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) { + // 执行查询 + List rl = doDataListSearch(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), e.getCategoryKey(), search, pageNo, pageSize, isPage); + rls.addAll(rl); + } + } + return rls; + } + + /** + * 从staff信息中获取工作人员的PIDS + * @param staffInfo + * @return + */ + private String getStaffPidsFromStaffInfo(CustomerStaffInfoCacheResult staffInfo) { + String agencyId = staffInfo.getAgencyId(); + String agencyPIds = staffInfo.getAgencyPIds(); + if (StringUtils.isNotBlank(agencyPIds) && !"0".equals(agencyPIds)) { + return agencyPIds.concat(":").concat(agencyId); + } else { + return agencyId; + } + } + + /** + * 执行数据查询 + * @param categoryKey + * @return + */ + public List doDataListSearch(String customerId, String agencyId, String agencyPids, String placeType, String categoryKey, String search, + Integer pageNo, Integer pageSize,Boolean isPage) { + + if (PLACE_TYPE_RESI.equals(placeType)) { + // 使用分类查询居民信息 + List resiEntities = icResiService.listResisByCategories4Coverage(customerId, agencyId, agencyPids, categoryKey, search, pageNo, pageSize, isPage); + return resiEntities.stream().map(re -> { + // 使用楼栋的坐标补充居民的坐标信息 + BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); + return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), resiBuilding.getLatitude(), resiBuilding.getLongitude()); + }).collect(Collectors.toList()); + } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { + // 特殊人群 + List resiInfos = icResiService.listSpecialResisBySpecialType(customerId, agencyId, agencyPids, categoryKey, search, pageNo, pageSize, isPage); + return resiInfos.stream().map(re -> { + BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); + return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), resiBuilding.getLatitude(), resiBuilding.getLongitude()); + }).collect(Collectors.toList()); + } else if (PLACE_TYPE_EVENT.equals(placeType)) { + // 难点痛点 + + + } else if (PLACE_TYPE_YSZY.equals(placeType)) { + + + } + + return null; + } + + /** + * 楼栋信息 + * @param resiId + * @param buildingId + * @return + */ + private BuildingInfoCache getBuildingInfo(String resiId, String buildingId) { + BuildingInfoCache resiBuilding = govOrgService.queryBuildingInfo(buildingId); + if (resiBuilding == null) { + log.warn("居民信息所属楼栋信息未找到。居民id:{},楼栋id:{}", resiId, buildingId); + } + return resiBuilding; + } +} \ No newline at end of file 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 c28d81375c..d4fdc69fa7 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 @@ -36,4 +36,19 @@ ORDER BY id = #{icUserId} desc + + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcBuildingDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcBuildingDao.xml index 342c05e0c8..a1b7bc4a64 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcBuildingDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcBuildingDao.xml @@ -10,7 +10,9 @@ ib.NEIGHBOR_HOOD_ID as neighborHoodId, ih.NEIGHBOR_HOOD_NAME as neighborHoodName, ih.GRID_ID as gridId, - ih.AGENCY_ID as agencyId + ih.AGENCY_ID as agencyId, + ib.LATITUDE as latitude, + ib.LONGITUDE as longitude FROM ic_building ib INNER JOIN ic_neighbor_hood ih ON ( ib.NEIGHBOR_HOOD_ID = ih.id ) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml new file mode 100644 index 0000000000..beb08a1262 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 59e8a2fdb7b1fdcacbad04f6e4d5a6189aca77ec Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 20 Jun 2022 13:53:22 +0800 Subject: [PATCH 012/105] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunitySelfOrganizationListFormDTO.java | 2 ++ ...IcCommunitySelfOrganizationController.java | 11 ++++++++ .../IcCommunitySelfOrganizationService.java | 7 +++++ ...cCommunitySelfOrganizationServiceImpl.java | 26 +++++++++++++++++++ .../mapper/IcCommunitySelfOrganizationDao.xml | 7 ++++- 5 files changed, 52 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java index 7a8fba0899..30c0584e95 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java @@ -50,4 +50,6 @@ public class CommunitySelfOrganizationListFormDTO implements Serializable { private String remark; private String categoryCode; + //查详情时候用 + private String orgId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java index 399e9c7e81..ccdc9c79d7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java @@ -255,6 +255,17 @@ public class IcCommunitySelfOrganizationController { return new Result().ok(icCommunitySelfOrganizationService.communitySelfOrganizationList(tokenDto, formDTO)); } + /** + * 社区自组织详情 + * @param orgId 社区自组织id + * @return + */ + @PostMapping("community-self-org-detail/{orgId}") + public Result communitySelfOrganizationDetail(@LoginUser TokenDto tokenDto,@PathVariable("orgId") String orgId){ + return new Result().ok(icCommunitySelfOrganizationService.communitySelfOrganizationDetail(orgId,tokenDto.getCustomerId())); + } + + /** * @Description 社区自组织删除 * @param formDTO diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java index 14008a7ce2..1da3a3137e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java @@ -181,4 +181,11 @@ public interface IcCommunitySelfOrganizationService extends BaseService queryCoordinateList(CategorySelfOrgFormDTO formDTO); + + /** + * 社区自组织详情 + * @param orgId + * @return + */ + CommunitySelfOrganizationListDTO communitySelfOrganizationDetail(String orgId,String customerId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java index 52b11d72a1..7f6eee3a8f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java @@ -800,4 +800,30 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl(list, NumConstant.ONE_NEG); } + /** + * 社区自组织详情 + * + * @param orgId + * @return + */ + @Override + public CommunitySelfOrganizationListDTO communitySelfOrganizationDetail(String orgId,String customerId) { + //获取分类名称字典 + Result> dictMapRes=adminOpenFeignClient.dictMap(DictTypeEnum.SELF_ORG_CATEGORY.getCode()); + Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); + CommunitySelfOrganizationListFormDTO formDTO=new CommunitySelfOrganizationListFormDTO(); + formDTO.setCustomerId(customerId); + formDTO.setOrgId(orgId); + List list=baseDao.selectCommunitySelfOrganizationList(formDTO); + if(CollectionUtils.isEmpty(list)){ + return null; + } + for (CommunitySelfOrganizationListDTO l : list) { + //赋值分类名称 + l.setCategoryName(dictMap.get(l.getCategoryCode())); + } + return list.get(NumConstant.ZERO); + } + + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index d7b90133a4..bb705fc32a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -62,7 +62,9 @@ so.remark FROM ic_community_self_organization so WHERE so.DEL_FLAG = 0 - AND so.ORG_ID = #{agencyId} + + AND so.ORG_ID = #{agencyId} + AND so.CUSTOMER_ID = #{customerId} AND so.ORGANIZATION_NAME LIKE CONCAT('%',#{organizationName},'%') @@ -76,6 +78,9 @@ AND so.ORGANIZATION_CREATED_TIME #{endTime} + + AND so.ID = #{orgId} + ORDER BY so.ORGANIZATION_CREATED_TIME DESC From adce94369f0e72505dc4c6f088f35880d6a2773b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 20 Jun 2022 14:20:48 +0800 Subject: [PATCH 013/105] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=88=86=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcPartyUnitDTO.java | 9 ++++++ .../feign/EpmetHeartOpenFeignClient.java | 10 +++++++ .../EpmetHeartOpenFeignClientFallback.java | 13 ++++++++ .../service/impl/IcPartyUnitServiceImpl.java | 30 +++++++++++++++++-- 4 files changed, 59 insertions(+), 3 deletions(-) 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 ef85be1d31..2258b94762 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 @@ -69,12 +69,21 @@ public class IcPartyUnitDTO implements Serializable { @NotBlank(message = "分类不能为空",groups = AddGroup.class) private String type; + /** + * 分类名称 + */ + private String typeName; + /** * 服务事项 多选逗号隔开 */ private String serviceMatter; private List serviceMatterList; + /** + * 服务事项名称 + */ + private List serviceMatterNameList; /** * 联系人 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index 755a5d881d..ba771344e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -12,11 +12,13 @@ import com.epmet.dto.form.IcDemandFormDTO; import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.demand.DemandRecId; import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; +import com.epmet.dto.form.demand.ServiceItemSelectFormDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.form.resi.VolunteerCommonFormDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -157,4 +159,12 @@ public interface EpmetHeartOpenFeignClient { */ @PostMapping("/heart/resi/volunteer/addVolunteer") Result addVolunteer(@RequestBody ResiVolunteerAuthenticateFormDTO formDTO); + + /** + * 联建单位查询可用的服务事项列表 + * @param formDTO + * @return + */ + @PostMapping("/heart/serviceitem/dict-list") + Result> queryDictList(@RequestBody ServiceItemSelectFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java index e818a49b04..06c21b8121 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java @@ -13,11 +13,13 @@ import com.epmet.dto.form.IcDemandFormDTO; import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.demand.DemandRecId; import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; +import com.epmet.dto.form.demand.ServiceItemSelectFormDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.form.resi.VolunteerCommonFormDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.feign.EpmetHeartOpenFeignClient; @@ -158,4 +160,15 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli public Result addVolunteer(ResiVolunteerAuthenticateFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "addVolunteer", formDTO); } + + /** + * 联建单位查询可用的服务事项列表 + * + * @param formDTO + * @return + */ + @Override + public Result> queryDictList(ServiceItemSelectFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryDictList", 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 5d7f450672..f0adeed24b 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 @@ -51,6 +51,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcPartyUnitDao; import com.epmet.dto.IcPartyUnitDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.demand.ServiceItemSelectFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; @@ -60,15 +61,16 @@ import com.epmet.excel.IcPartyUnitImportExcel; import com.epmet.excel.IcPartyUnitImportFailedExcel; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetHeartOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.service.IcPartyUnitService; -import com.epmet.service.IcResiDemandDictService; import com.epmet.service.IcServiceItemDictService; import com.epmet.service.IcUserDemandRecService; 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; @@ -103,13 +105,13 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl search(PartyUnitFormDTO formDTO) { @@ -198,6 +200,28 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl pointMap = icUserDemandRecService.getServicePoint(entity.getCustomerId(), UserDemandConstant.PARTY_UNIT); dto.setServiceMatterList(Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA))); dto.setScore(null == pointMap.get(id) ? NumConstant.ZERO : pointMap.get(id)); + // 分类名称 + //获取分类名称字典 + Result> typeDictMapRes=epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode()); + Map typeDictMap = typeDictMapRes.success() && MapUtils.isNotEmpty(typeDictMapRes.getData()) ? typeDictMapRes.getData() : new HashMap<>(); + dto.setType(MapUtils.isNotEmpty(typeDictMap) && typeDictMap.containsKey(dto.getType()) ? typeDictMap.get(dto.getType()) : StrConstant.EPMETY_STR); + // 服务事项 + if(CollectionUtils.isNotEmpty(dto.getServiceMatterList())){ + ServiceItemSelectFormDTO serviceItemSelectFormDTO=new ServiceItemSelectFormDTO(); + serviceItemSelectFormDTO.setCustomerId(entity.getCustomerId()); + serviceItemSelectFormDTO.setType("usable"); + Result> serviceMateerRes=heartOpenFeignClient.queryDictList(serviceItemSelectFormDTO); + if(serviceMateerRes.success()&&CollectionUtils.isNotEmpty(serviceMateerRes.getData())){ + Map serviceMap=serviceMateerRes.getData().stream().collect(Collectors.toMap(OptionDTO::getValue,OptionDTO::getLabel)); + List serviceMatterNameList=new ArrayList<>(); + for(String serviceMatterCode:dto.getServiceMatterList()){ + if(MapUtils.isNotEmpty(serviceMap)&&serviceMap.containsKey(serviceMatterCode)){ + serviceMatterNameList.add(serviceMap.get(serviceMatterCode)); + } + } + dto.setServiceMatterNameList(serviceMatterNameList); + } + } } return dto; } From 265d45de8f9f0c7637db743594334f7c950973e4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 20 Jun 2022 14:24:22 +0800 Subject: [PATCH 014/105] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=88=86=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetHeartOpenFeignClient.java | 9 --------- .../fallback/EpmetHeartOpenFeignClientFallback.java | 10 ---------- .../com/epmet/service/impl/IcPartyUnitServiceImpl.java | 10 +++------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index ba771344e9..f3c8430b3e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -12,13 +12,11 @@ import com.epmet.dto.form.IcDemandFormDTO; import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.demand.DemandRecId; import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; -import com.epmet.dto.form.demand.ServiceItemSelectFormDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.form.resi.VolunteerCommonFormDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; -import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -160,11 +158,4 @@ public interface EpmetHeartOpenFeignClient { @PostMapping("/heart/resi/volunteer/addVolunteer") Result addVolunteer(@RequestBody ResiVolunteerAuthenticateFormDTO formDTO); - /** - * 联建单位查询可用的服务事项列表 - * @param formDTO - * @return - */ - @PostMapping("/heart/serviceitem/dict-list") - Result> queryDictList(@RequestBody ServiceItemSelectFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java index 06c21b8121..10670de1ab 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java @@ -161,14 +161,4 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "addVolunteer", formDTO); } - /** - * 联建单位查询可用的服务事项列表 - * - * @param formDTO - * @return - */ - @Override - public Result> queryDictList(ServiceItemSelectFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryDictList", 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 f0adeed24b..91dc0baa57 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 @@ -51,7 +51,6 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcPartyUnitDao; import com.epmet.dto.IcPartyUnitDTO; import com.epmet.dto.form.*; -import com.epmet.dto.form.demand.ServiceItemSelectFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; @@ -207,12 +206,9 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl> serviceMateerRes=heartOpenFeignClient.queryDictList(serviceItemSelectFormDTO); - if(serviceMateerRes.success()&&CollectionUtils.isNotEmpty(serviceMateerRes.getData())){ - Map serviceMap=serviceMateerRes.getData().stream().collect(Collectors.toMap(OptionDTO::getValue,OptionDTO::getLabel)); + List serviceMateerRes=icServiceItemDictService.queryDictList(entity.getCustomerId()); + if(CollectionUtils.isNotEmpty(serviceMateerRes)){ + Map serviceMap=serviceMateerRes.stream().collect(Collectors.toMap(OptionDTO::getValue,OptionDTO::getLabel)); List serviceMatterNameList=new ArrayList<>(); for(String serviceMatterCode:dto.getServiceMatterList()){ if(MapUtils.isNotEmpty(serviceMap)&&serviceMap.containsKey(serviceMatterCode)){ From ee5caab044bc5ee59ce7b77a54a68f72f52553c9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 20 Jun 2022 14:48:35 +0800 Subject: [PATCH 015/105] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcCityManagementController.java | 59 +++++++- .../controller/IcPublicServiceController.java | 59 +++++++- .../IcSuperiorResourceController.java | 61 +++++++- .../epmet/excel/IcCityManagementExcel.java | 25 ++++ .../com/epmet/excel/IcPublicServiceExcel.java | 25 ++++ .../epmet/excel/IcSuperiorResourceExcel.java | 24 ++++ .../IcCityManagementExcelImportListener.java | 132 +++++++++++++++++ .../IcPublicServiceExcelImportListener.java | 132 +++++++++++++++++ ...IcSuperiorResourceExcelImportListener.java | 134 ++++++++++++++++++ .../service/IcCityManagementService.java | 3 + .../epmet/service/IcPublicServiceService.java | 4 +- .../service/IcSuperiorResourceService.java | 3 + .../impl/IcCityManagementServiceImpl.java | 131 ++++++++++++++++- .../impl/IcPublicServiceServiceImpl.java | 129 ++++++++++++++++- .../impl/IcSuperiorResourceServiceImpl.java | 130 ++++++++++++++++- 15 files changed, 1032 insertions(+), 19 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java index 646843848d..04862f1752 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java @@ -7,40 +7,47 @@ import com.alibaba.fastjson.JSON; 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.constant.ServiceConstant; 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.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.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcCityManagementDTO; import com.epmet.dto.form.IcCityManagementAddEditFormDTO; import com.epmet.dto.form.IcCityManagementListFormDTO; import com.epmet.dto.result.IcCityManagementListResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcCityManagementExcel; import com.epmet.service.IcCityManagementService; +import com.epmet.utils.ImportTaskUtils; 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 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.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.UUID; /** @@ -52,7 +59,7 @@ import java.util.List; @RestController @RequestMapping("icCityManagement") @Slf4j -public class IcCityManagementController { +public class IcCityManagementController implements ResultDataResolver { @Autowired private IcCityManagementService icCityManagementService; @@ -159,6 +166,48 @@ public class IcCityManagementController { } } + @PostMapping("import") + public Result importExcel(MultipartFile file) { + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_city_management", "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("importExcel exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "excel导入优势资源管理信息错误", + "导入势资源管理信息失败"); + + // 3.执行导入 + icCityManagementService.importExcel(fileSavePath, rstData.getTaskId()); + + return new Result(); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java index b503c39720..71f9fe324b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -7,41 +7,48 @@ import com.alibaba.fastjson.JSON; 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.constant.ServiceConstant; 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.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.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcPublicServiceDTO; import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcPublicServiceExcel; import com.epmet.service.IcPublicServiceService; +import com.epmet.utils.ImportTaskUtils; 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 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.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.UUID; /** @@ -53,7 +60,7 @@ import java.util.List; @RestController @RequestMapping("icPublicService") @Slf4j -public class IcPublicServiceController { +public class IcPublicServiceController implements ResultDataResolver { @Autowired private IcPublicServiceService icPublicServiceService; @@ -160,6 +167,48 @@ public class IcPublicServiceController { } } + @PostMapping("import") + public Result importExcel(MultipartFile file) { + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_public_service", "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("importExcel exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "excel导入优势资源管理信息错误", + "导入势资源管理信息失败"); + + // 3.执行导入 + icPublicServiceService.importExcel(fileSavePath, rstData.getTaskId()); + + return new Result(); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java index 1664941d01..df66d7a734 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java @@ -6,41 +6,49 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; 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.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +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.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcSuperiorResourceDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; import com.epmet.dto.form.IcSuperiorResourceListFormDTO; import com.epmet.dto.result.IcSuperiorResourceListResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcSuperiorResourceExcel; import com.epmet.service.IcSuperiorResourceService; +import com.epmet.utils.ImportTaskUtils; 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 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.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.UUID; /** @@ -52,7 +60,7 @@ import java.util.List; @RestController @RequestMapping("icSuperiorResource") @Slf4j -public class IcSuperiorResourceController { +public class IcSuperiorResourceController implements ResultDataResolver { @Autowired private IcSuperiorResourceService icSuperiorResourceService; @@ -159,5 +167,48 @@ public class IcSuperiorResourceController { } } + @PostMapping("import") + public Result importExcel(MultipartFile file) { + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_superior_resource", "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("importExcel exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "excel导入优势资源管理信息错误", + "导入势资源管理信息失败"); + + // 3.执行导入 + icSuperiorResourceService.importExcel(fileSavePath, rstData.getTaskId()); + + return new Result(); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java index 07b7ceae8b..5cc3b6556f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 城市管理图层 * @@ -15,10 +17,12 @@ public class IcCityManagementExcel { @ExcelProperty(value = "场所名称") @ColumnWidth(25) + @NotBlank(message = "场所名称为必填项") private String name; @ExcelProperty(value = "场所类别") @ColumnWidth(20) + @NotBlank(message = "场所类别为必填项") private String categoryName; @ExcelProperty(value = "占地面积") @@ -31,6 +35,27 @@ public class IcCityManagementExcel { @ExcelProperty(value = "地址") @ColumnWidth(25) + @NotBlank(message = "地址为必填项") private String address; + @Data + public static class RowRemarkMessage { + + @ExcelProperty("场所名称") + @ColumnWidth(20) + private String name; + + @ExcelProperty("场所类别") + @ColumnWidth(20) + private String categoryName; + + @ExcelProperty("地址") + @ColumnWidth(20) + private String address; + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index b8e97b24ce..9f3728cb22 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 公共服务图层 * @@ -15,10 +17,12 @@ public class IcPublicServiceExcel { @ExcelProperty(value = "场所名称") @ColumnWidth(25) + @NotBlank(message = "场所名称为必填项") private String name; @ExcelProperty(value = "场所类别") @ColumnWidth(20) + @NotBlank(message = "场所类别为必填项") private String categoryName; @ExcelProperty(value = "占地面积") @@ -31,6 +35,27 @@ public class IcPublicServiceExcel { @ExcelProperty(value = "地址") @ColumnWidth(25) + @NotBlank(message = "地址为必填项") private String address; + @Data + public static class RowRemarkMessage { + + @ExcelProperty("场所名称") + @ColumnWidth(20) + private String name; + + @ExcelProperty("场所类别") + @ColumnWidth(20) + private String categoryName; + + @ExcelProperty("地址") + @ColumnWidth(20) + private String address; + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java index b62792ec1c..1f3b1a8667 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 优势资源管理 * @@ -15,10 +17,12 @@ public class IcSuperiorResourceExcel { @ExcelProperty(value = "场所名称") @ColumnWidth(25) + @NotBlank(message = "场所名称为必填项") private String name; @ExcelProperty(value = "场所类别") @ColumnWidth(20) + @NotBlank(message = "场所类别为必填项") private String categoryName; @ExcelProperty(value = "占地面积") @@ -31,7 +35,27 @@ public class IcSuperiorResourceExcel { @ExcelProperty(value = "地址") @ColumnWidth(25) + @NotBlank(message = "地址为必填项") private String address; + @Data + public static class RowRemarkMessage { + + @ExcelProperty("场所名称") + @ColumnWidth(20) + private String name; + + @ExcelProperty("场所类别") + @ColumnWidth(20) + private String categoryName; + + @ExcelProperty("地址") + @ColumnWidth(20) + private String address; + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java new file mode 100644 index 0000000000..064a322727 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -0,0 +1,132 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +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.dto.result.IcCoverageCategoryDictListResultDTO; +import com.epmet.entity.IcCityManagementEntity; +import com.epmet.excel.IcCityManagementExcel; +import com.epmet.service.CoverageService; +import com.epmet.service.impl.IcCityManagementServiceImpl; +import lombok.Data; +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.stream.Collectors; + +/** + * 城市管理excel导入监听器 + */ +@Data +@Slf4j +public class IcCityManagementExcelImportListener implements ReadListener { + + //最大条数阈值 + public static final int MAX_THRESHOLD = 200; + private String currentUserId; + private String currentCustomerId; + private String currentAgencyId; + private String currentAgencyPids; + + //数据 + private List datas = new ArrayList<>(); + //错误项列表 + private List errorRows = new ArrayList<>(); + //其他被标记出来的列表列表 + private List otherRows = new ArrayList<>(); + private IcCityManagementServiceImpl IcCityManagementServiceImpl; + private CoverageService coverageService; + + public IcCityManagementExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, IcCityManagementServiceImpl IcCityManagementServiceImpl, CoverageService coverageService) { + this.currentUserId = currentUserId; + this.currentCustomerId = currentCustomerId; + this.currentAgencyId = currentAgencyId; + this.currentAgencyPids = currentAgencyPids; + this.IcCityManagementServiceImpl = IcCityManagementServiceImpl; + this.coverageService = coverageService; + } + + @Override + public void invoke(IcCityManagementExcel data, AnalysisContext context) { + + try { + // 先校验数据 + ValidatorUtils.validateEntity(data); + + // 去除前后空格 + if (StringUtils.isNotBlank(data.getName())) { + data.setName(data.getName().trim()); + } + if (StringUtils.isNotBlank(data.getCategoryName())) { + data.setCategoryName(data.getCategoryName().trim()); + } + if (StringUtils.isNotBlank(data.getAddress())) { + data.setAddress(data.getAddress().trim()); + } + + IcCityManagementEntity IcCityManagementEntity = ConvertUtils.sourceToTarget(data, IcCityManagementEntity.class); + IcCityManagementEntity.setSourceType("import"); + IcCityManagementEntity.setCategory(data.getCategoryName()); + IcCityManagementEntity.setAreaCovered(data.getAreaCoveredName()); + IcCityManagementEntity.setCapacity(data.getCapacityName()); + datas.add(IcCityManagementEntity); + + 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)); + } + + IcCityManagementExcel.RowRemarkMessage errorRow = new IcCityManagementExcel.RowRemarkMessage(); + errorRow.setName(data.getName()); + errorRow.setCategoryName(data.getCategoryName()); + errorRow.setAddress(data.getAddress()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + List dictList = coverageService.dictMap(currentCustomerId, "city_management"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + datas.forEach(d -> { + d.setCategory(dictMap.get(d.getCategory())); + }); + IcCityManagementServiceImpl.insertBatch(datas); + + } finally { + datas.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java new file mode 100644 index 0000000000..de96036a56 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java @@ -0,0 +1,132 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +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.dto.result.IcCoverageCategoryDictListResultDTO; +import com.epmet.entity.IcPublicServiceEntity; +import com.epmet.excel.IcPublicServiceExcel; +import com.epmet.service.CoverageService; +import com.epmet.service.impl.IcPublicServiceServiceImpl; +import lombok.Data; +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.stream.Collectors; + +/** + * 公共服务管理excel导入监听器 + */ +@Data +@Slf4j +public class IcPublicServiceExcelImportListener implements ReadListener { + + //最大条数阈值 + public static final int MAX_THRESHOLD = 200; + private String currentUserId; + private String currentCustomerId; + private String currentAgencyId; + private String currentAgencyPids; + + //数据 + private List datas = new ArrayList<>(); + //错误项列表 + private List errorRows = new ArrayList<>(); + //其他被标记出来的列表列表 + private List otherRows = new ArrayList<>(); + private IcPublicServiceServiceImpl IcPublicServiceServiceImpl; + private CoverageService coverageService; + + public IcPublicServiceExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, IcPublicServiceServiceImpl IcPublicServiceServiceImpl, CoverageService coverageService) { + this.currentUserId = currentUserId; + this.currentCustomerId = currentCustomerId; + this.currentAgencyId = currentAgencyId; + this.currentAgencyPids = currentAgencyPids; + this.IcPublicServiceServiceImpl = IcPublicServiceServiceImpl; + this.coverageService = coverageService; + } + + @Override + public void invoke(IcPublicServiceExcel data, AnalysisContext context) { + + try { + // 先校验数据 + ValidatorUtils.validateEntity(data); + + // 去除前后空格 + if (StringUtils.isNotBlank(data.getName())) { + data.setName(data.getName().trim()); + } + if (StringUtils.isNotBlank(data.getCategoryName())) { + data.setCategoryName(data.getCategoryName().trim()); + } + if (StringUtils.isNotBlank(data.getAddress())) { + data.setAddress(data.getAddress().trim()); + } + + IcPublicServiceEntity IcPublicServiceEntity = ConvertUtils.sourceToTarget(data, IcPublicServiceEntity.class); + IcPublicServiceEntity.setSourceType("import"); + IcPublicServiceEntity.setCategory(data.getCategoryName()); + IcPublicServiceEntity.setAreaCovered(data.getAreaCoveredName()); + IcPublicServiceEntity.setCapacity(data.getCapacityName()); + datas.add(IcPublicServiceEntity); + + 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)); + } + + IcPublicServiceExcel.RowRemarkMessage errorRow = new IcPublicServiceExcel.RowRemarkMessage(); + errorRow.setName(data.getName()); + errorRow.setCategoryName(data.getCategoryName()); + errorRow.setAddress(data.getAddress()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + List dictList = coverageService.dictMap(currentCustomerId, "public_service"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + datas.forEach(d -> { + d.setCategory(dictMap.get(d.getCategory())); + }); + IcPublicServiceServiceImpl.insertBatch(datas); + + } finally { + datas.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java new file mode 100644 index 0000000000..69ade8cc8d --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java @@ -0,0 +1,134 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +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.dto.result.IcCoverageCategoryDictListResultDTO; +import com.epmet.dto.result.IcSuperiorResourceListResultDTO; +import com.epmet.entity.IcSuperiorResourceEntity; +import com.epmet.excel.IcSuperiorResourceExcel; +import com.epmet.service.CoverageService; +import com.epmet.service.impl.IcSuperiorResourceServiceImpl; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +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; +import java.util.stream.Collectors; + +/** + * 优势资源管理excel导入监听器 + */ +@Data +@Slf4j +public class IcSuperiorResourceExcelImportListener implements ReadListener { + + //最大条数阈值 + public static final int MAX_THRESHOLD = 200; + private String currentUserId; + private String currentCustomerId; + private String currentAgencyId; + private String currentAgencyPids; + + //数据 + private List datas = new ArrayList<>(); + //错误项列表 + private List errorRows = new ArrayList<>(); + //其他被标记出来的列表列表 + private List otherRows = new ArrayList<>(); + private IcSuperiorResourceServiceImpl icSuperiorResourceServiceImpl; + private CoverageService coverageService; + + public IcSuperiorResourceExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, IcSuperiorResourceServiceImpl icSuperiorResourceServiceImpl, CoverageService coverageService) { + this.currentUserId = currentUserId; + this.currentCustomerId = currentCustomerId; + this.currentAgencyId = currentAgencyId; + this.currentAgencyPids = currentAgencyPids; + this.icSuperiorResourceServiceImpl = icSuperiorResourceServiceImpl; + this.coverageService = coverageService; + } + + @Override + public void invoke(IcSuperiorResourceExcel data, AnalysisContext context) { + + try { + // 先校验数据 + ValidatorUtils.validateEntity(data); + + // 去除前后空格 + if (StringUtils.isNotBlank(data.getName())) { + data.setName(data.getName().trim()); + } + if (StringUtils.isNotBlank(data.getCategoryName())) { + data.setCategoryName(data.getCategoryName().trim()); + } + if (StringUtils.isNotBlank(data.getAddress())) { + data.setAddress(data.getAddress().trim()); + } + + IcSuperiorResourceEntity icSuperiorResourceEntity = ConvertUtils.sourceToTarget(data, IcSuperiorResourceEntity.class); + icSuperiorResourceEntity.setSourceType("import"); + icSuperiorResourceEntity.setCategory(data.getCategoryName()); + icSuperiorResourceEntity.setAreaCovered(data.getAreaCoveredName()); + icSuperiorResourceEntity.setCapacity(data.getCapacityName()); + datas.add(icSuperiorResourceEntity); + + 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)); + } + + IcSuperiorResourceExcel.RowRemarkMessage errorRow = new IcSuperiorResourceExcel.RowRemarkMessage(); + errorRow.setName(data.getName()); + errorRow.setCategoryName(data.getCategoryName()); + errorRow.setAddress(data.getAddress()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + List dictList = coverageService.dictMap(currentCustomerId, "superior_resource"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + datas.forEach(d -> { + d.setCategory(dictMap.get(d.getCategory())); + }); + icSuperiorResourceServiceImpl.insertBatch(datas); + + } finally { + datas.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java index 5b5c6ab410..f14db83adb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcCityManagementService.java @@ -8,6 +8,8 @@ import com.epmet.dto.form.IcCityManagementListFormDTO; import com.epmet.dto.result.IcCityManagementListResultDTO; import com.epmet.entity.IcCityManagementEntity; +import java.nio.file.Path; + /** * 城市管理图层 * @@ -67,4 +69,5 @@ public interface IcCityManagementService extends BaseService implements IcCityManagementService { @Autowired private CoverageService coverageService; + @Autowired + private OssFeignClient ossFeignClient; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @Override @@ -160,5 +191,103 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl errorRows = listener.getErrorRows(); + List otherRows = listener.getOtherRows(); + + boolean failed = errorRows.size() > 0; + + // 合并到一起写入 + errorRows.addAll(otherRows); + + // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; + if (errorRows.size() > 0) { + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_ity_management", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcCityManagementExcel.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + + } finally { + IOUtils.closeQuietly(os); + if (!fileItem.isInMemory()) { + try { + fileItem.delete(); + } catch (Exception e) { + log.error("【城市管理导入】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + } + + Result result = ImportTaskUtils.finishImportTask( + importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); + + if (!result.success()) { + log.error("【城市管理导入】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【城市管理导入】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + 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(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + } + + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index 13630ad5aa..9131912181 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -1,35 +1,60 @@ 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.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; 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.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.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.FileUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcPublicServiceDao; import com.epmet.dto.IcPublicServiceDTO; import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; import com.epmet.dto.form.IcPublicServiceListFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; -import com.epmet.dto.result.IcSuperiorResourceListResultDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcPublicServiceEntity; +import com.epmet.excel.IcPublicServiceExcel; +import com.epmet.excel.handler.IcPublicServiceExcelImportListener; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.CoverageService; import com.epmet.service.IcPublicServiceService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; +import org.apache.poi.util.IOUtils; 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.util.CollectionUtils; +import org.springframework.web.multipart.commons.CommonsMultipartFile; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.List; import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -39,10 +64,15 @@ import java.util.stream.Collectors; * @since v1.0.0 2022-06-16 */ @Service +@Slf4j public class IcPublicServiceServiceImpl extends BaseServiceImpl implements IcPublicServiceService { @Autowired private CoverageService coverageService; + @Autowired + private OssFeignClient ossFeignClient; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @Override @@ -162,4 +192,101 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl errorRows = listener.getErrorRows(); + List otherRows = listener.getOtherRows(); + + boolean failed = errorRows.size() > 0; + + // 合并到一起写入 + errorRows.addAll(otherRows); + + // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; + if (errorRows.size() > 0) { + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_superior_resource", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcPublicServiceExcel.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + + } finally { + IOUtils.closeQuietly(os); + if (!fileItem.isInMemory()) { + try { + fileItem.delete(); + } catch (Exception e) { + log.error("【公共服务管理导入】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + } + + Result result = ImportTaskUtils.finishImportTask( + importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); + + if (!result.success()) { + log.error("【公共服务管理导入】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【公共服务管理导入】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + 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(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java index 3e306a1826..873b17157e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -1,35 +1,60 @@ 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.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; 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.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.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.FileUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcSuperiorResourceDao; import com.epmet.dto.IcSuperiorResourceDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; import com.epmet.dto.form.IcSuperiorResourceListFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcSuperiorResourceListResultDTO; -import com.epmet.dto.result.StaffRoleResultDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcSuperiorResourceEntity; +import com.epmet.excel.IcSuperiorResourceExcel; +import com.epmet.excel.handler.IcSuperiorResourceExcelImportListener; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.CoverageService; import com.epmet.service.IcSuperiorResourceService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; +import org.apache.poi.util.IOUtils; 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.util.CollectionUtils; +import org.springframework.web.multipart.commons.CommonsMultipartFile; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.List; import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -39,10 +64,15 @@ import java.util.stream.Collectors; * @since v1.0.0 2022-06-16 */ @Service +@Slf4j public class IcSuperiorResourceServiceImpl extends BaseServiceImpl implements IcSuperiorResourceService { @Autowired private CoverageService coverageService; + @Autowired + private OssFeignClient ossFeignClient; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @Override @@ -162,4 +192,102 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl errorRows = listener.getErrorRows(); + List otherRows = listener.getOtherRows(); + + boolean failed = errorRows.size() > 0; + + // 合并到一起写入 + errorRows.addAll(otherRows); + + // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; + if (errorRows.size() > 0) { + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_superior_resource", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcSuperiorResourceExcel.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + + } finally { + IOUtils.closeQuietly(os); + if (!fileItem.isInMemory()) { + try { + fileItem.delete(); + } catch (Exception e) { + log.error("【优势资源管理导入】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + } + + Result result = ImportTaskUtils.finishImportTask( + importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); + + if (!result.success()) { + log.error("【优势资源管理导入】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【优势资源管理导入】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + 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(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + } + + } \ No newline at end of file From 7934aa997ff41f61b7fbd28ff7f32c10ebf15bb9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 20 Jun 2022 14:57:02 +0800 Subject: [PATCH 016/105] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=8D=B1=E5=8C=96?= =?UTF-8?q?=E5=93=81=E4=BC=81=E4=B8=9A=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 1 + .../IcDangerousChemicalsController.java | 64 +++++++++- .../entity/IcDangerousChemicalsEntity.java | 7 + .../DangerousChemicalsImportListener.java | 113 +++++++++++++++++ .../epmet/model/DangerousChemicalsModel.java | 56 ++++++++ .../service/IcDangerousChemicalsService.java | 12 ++ .../impl/IcDangerousChemicalsServiceImpl.java | 120 ++++++++++++++++++ 7 files changed, 368 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 8c439aa218..86417c86ea 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -19,6 +19,7 @@ public interface ImportTaskConstants { String BIZ_TYPE_ATTENTION_VACCINATION = "attention_vaccination"; String BIZ_TYPE_ATTENTION_TRIP_REPORT = "attention_vaccination"; String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member"; + String BIZ_TYPE_IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals"; /** * 核酸检测 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java index 97e34f384b..d7679b31fa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java @@ -7,40 +7,48 @@ import com.alibaba.fastjson.JSON; 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.constant.ServiceConstant; 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.DateUtils; -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.ValidatorUtils; 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.constants.ImportTaskConstants; import com.epmet.dto.IcDangerousChemicalsDTO; import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcDangerousChemicalsExcel; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcDangerousChemicalsService; +import com.epmet.utils.ImportTaskUtils; 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 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.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.UUID; /** @@ -56,6 +64,8 @@ public class IcDangerousChemicalsController { @Autowired private IcDangerousChemicalsService icDangerousChemicalsService; + @Autowired + private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; @RequestMapping("list") public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcDangerousChemicalsListFormDTO formDTO) { @@ -159,7 +169,51 @@ public class IcDangerousChemicalsController { } } - + /** + * Desc: 重点危化品企业导入 + * @param file + * @param tokenDto + * @author zxc + * @date 2022/6/20 10:25 + */ + @PostMapping("import") + public Result dangerousChemicalsImport(@RequestParam("file")MultipartFile file,@LoginUser TokenDto tokenDto){ + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_dangerous_chemicals", "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("importExcel exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + // 2.生成导入任务记录 + ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO(); + importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_IC_DANGEROUS_CHEMICALS); + importFormDTO.setOperatorId(tokenDto.getUserId()); + importFormDTO.setOriginFileName(file.getOriginalFilename()); + Result importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO); + if (!importTask.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", "存在进行中的导入"); + } + icDangerousChemicalsService.dangerousChemicalsImport(fileSavePath,importTask.getData().getTaskId(),tokenDto); + return new Result(); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java index e4e9e35252..a3961735a8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.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; @@ -88,4 +89,10 @@ public class IcDangerousChemicalsEntity extends BaseEpmetEntity { */ private String remark; + @TableField(exist = false) + private String dangerTypeName; + + @TableField(exist = false) + private String categoryName; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java new file mode 100644 index 0000000000..a3df4b3b18 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java @@ -0,0 +1,113 @@ +package com.epmet.model; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; +import com.epmet.entity.IcDangerousChemicalsEntity; +import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.service.CoverageService; +import com.epmet.service.IcDangerousChemicalsService; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author zxc + * @DateTime 2022/6/20 10:31 + * @DESC + */ +@Data +@Slf4j +public class DangerousChemicalsImportListener extends AnalysisEventListener { + + private IcDangerousChemicalsService icDangerousChemicalsService; + private EpmetAdminOpenFeignClient adminOpenFeignClient; + private CoverageService coverageService; + private AgencyInfoCache agencyInfo; + + private List errorRows = new ArrayList<>(); + private List otherRows = new ArrayList<>(); + private List insertList = new ArrayList<>(); + + public DangerousChemicalsImportListener(AgencyInfoCache agencyInfo, IcDangerousChemicalsService icDangerousChemicalsService, CoverageService coverageService,EpmetAdminOpenFeignClient adminOpenFeignClient){ + this.agencyInfo = agencyInfo; + this.icDangerousChemicalsService = icDangerousChemicalsService; + this.coverageService = coverageService; + this.adminOpenFeignClient = adminOpenFeignClient; + } + + @Override + public void invoke(DangerousChemicalsModel data, AnalysisContext context) { + IcDangerousChemicalsEntity e = ConvertUtils.sourceToTarget(data, IcDangerousChemicalsEntity.class); + e.setSourceType("import"); + e.setAgencyId(agencyInfo.getId()); + e.setCustomerId(agencyInfo.getCustomerId()); + e.setAgencyIdPath(agencyInfo.getPids().equals(NumConstant.ZERO_STR) || agencyInfo.getPids().equals("") ? agencyInfo.getId() : agencyInfo.getPids().concat(":").concat(agencyInfo.getId())); + insertList.add(e); + if (insertList.size() == NumConstant.ONE_HUNDRED){ + execPersist(); + } + + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + execPersist(); + } + + /** + * Desc: 数据库插入 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(insertList)) { + //危化品种类字典 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode()); + if (!statusRes.success()){ + throw new EpmetException("获取IC_DANGER_TYPE字典表失败"); + } + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(16); + //企业类别字典数据 + List dictList = coverageService.dictMap(agencyInfo.getCustomerId(), "dangerous_chemicals"); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + insertList.forEach(i -> { + statusMap.forEach((k,v) -> { + if (i.getDangerTypeName().equals(v)){ + i.setDangerType(k); + } + }); + dictMap.forEach((k,v) -> { + if (i.getCategoryName().equals(v)){ + i.setCategory(k); + } + }); + }); + icDangerousChemicalsService.insertBatch(insertList); + } + } finally { + insertList.clear(); + } + } + + /** + * 获取错误行 + * @return + */ + public List getErrorRows() { + return errorRows; + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java new file mode 100644 index 0000000000..4f74294aeb --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java @@ -0,0 +1,56 @@ +package com.epmet.model; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; + +/** + * @Author zxc + * @DateTime 2022/6/20 10:33 + * @DESC + */ +@Data +public class DangerousChemicalsModel { + + @NotBlank(message = "企业名称为必填项") + @Length(max = 50,message = "企业名称长度超出50字限制") + @ExcelProperty(value = "企业名称") + private String name; + + @NotBlank(message = "企业类型为必填项") + @ExcelProperty(value = "企业类型") + private String categoryName; + + @ExcelProperty(value = "周边安全间距（公里）") + private String safeDistance = NumConstant.ZERO_STR; + + @ExcelProperty(value = "危化品种类") + private String dangerTypeName; + + @ExcelProperty(value = "负责人") + private String principalName; + + @Length(max = 50,message = "联系电话长度超出50字限制") + @ExcelProperty(value = "联系电话") + private String principalMobile; + + @Length(max = 50,message = "经营地址长度超出50字限制") + @ExcelProperty(value = "经营地址") + private String address; + + @ExcelProperty(value = "备注") + private String remark; + + @Data + public static class RowRemarkMessage { + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java index 321437f1f6..2f91dc22dd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java @@ -2,12 +2,15 @@ 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.IcDangerousChemicalsDTO; import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.entity.IcDangerousChemicalsEntity; +import java.nio.file.Path; + /** * 重点危化品企业 * @@ -67,4 +70,13 @@ public interface IcDangerousChemicalsService extends BaseService implements IcDangerousChemicalsService { @Autowired private EpmetAdminOpenFeignClient adminOpenFeignClient; @Autowired private CoverageService coverageService; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Autowired + private OssFeignClient ossFeignClient; @Override public PageData list(IcDangerousChemicalsListFormDTO formDTO) { @@ -182,4 +213,93 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl errorRows = listener.getErrorRows(); + List otherRows = listener.getOtherRows(); + boolean failed = errorRows.size() > 0; + // 合并到一起写入 + errorRows.addAll(otherRows); + // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; + if (errorRows.size() > 0) { + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_dangerous_chemicals", "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); + EasyExcel.write(os, DangerousChemicalsModel.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + } finally { + IOUtils.closeQuietly(os); + if (!fileItem.isInMemory()) { + try { + fileItem.delete(); + } catch (Exception e){ + log.error("【重点危化品企业导入】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + } + Result result = ImportTaskUtils.finishImportTask( + importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); + if (!result.success()) { + log.error("【重点危化品企业导入】finishImportTask失败"); + } + }catch (Exception e){ + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【重点危化品企业导入】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(tokenDto.getUserId()); + importFinishTaskForm.setResultDesc("导入失败"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【重点危化品企业导入】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + } \ No newline at end of file From 8695e8d9fe3508417da2a001da1bbfaa3cbb26c7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 20 Jun 2022 15:18:56 +0800 Subject: [PATCH 017/105] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=8D=B1=E5=8C=96?= =?UTF-8?q?=E5=93=81=E4=BC=81=E4=B8=9A=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DangerousChemicalsImportListener.java | 41 +++++++++++++++++++ .../epmet/model/DangerousChemicalsModel.java | 35 ++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java index a3df4b3b18..72c9201ca8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java @@ -18,6 +18,7 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.HashMap; @@ -52,6 +53,46 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener NumConstant.FIFTY){ + DangerousChemicalsModel.RowRemarkMessage row = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class); + row.setRowNum(rowNum); + row.setErrorInfo("企业名称长度超出50字限制"); + errorRows.add(row); + } + if (data.getPrincipalMobile().length() > NumConstant.FIFTY){ + DangerousChemicalsModel.RowRemarkMessage row = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class); + row.setRowNum(rowNum); + row.setErrorInfo("联系电话长度超出50字限制"); + errorRows.add(row); + } + if (data.getName().length() > NumConstant.FIFTY){ + DangerousChemicalsModel.RowRemarkMessage row = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class); + row.setRowNum(rowNum); + row.setErrorInfo("经营地址长度超出50字限制"); + errorRows.add(row); + } IcDangerousChemicalsEntity e = ConvertUtils.sourceToTarget(data, IcDangerousChemicalsEntity.class); e.setSourceType("import"); e.setAgencyId(agencyInfo.getId()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java index 4f74294aeb..a56c947429 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java @@ -48,6 +48,41 @@ public class DangerousChemicalsModel { @Data public static class RowRemarkMessage { + @ExcelProperty(value = "行号") + private Integer rowNum; + + @ColumnWidth(20) + @ExcelProperty(value = "企业名称") + private String name; + + @ColumnWidth(20) + @ExcelProperty(value = "企业类型") + private String categoryName; + + @ColumnWidth(20) + @ExcelProperty(value = "周边安全间距（公里）") + private String safeDistance = NumConstant.ZERO_STR; + + @ColumnWidth(20) + @ExcelProperty(value = "危化品种类") + private String dangerTypeName; + + @ColumnWidth(20) + @ExcelProperty(value = "负责人") + private String principalName; + + @ColumnWidth(20) + @ExcelProperty(value = "联系电话") + private String principalMobile; + + @ColumnWidth(40) + @ExcelProperty(value = "经营地址") + private String address; + + @ColumnWidth(60) + @ExcelProperty(value = "备注") + private String remark; + @ColumnWidth(60) @ExcelProperty("错误信息") private String errorInfo; From ec14ad625c32250c87a46ae61efb9c717b6c984b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 20 Jun 2022 15:25:51 +0800 Subject: [PATCH 018/105] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=8D=B1=E5=8C=96?= =?UTF-8?q?=E5=93=81=E4=BC=81=E4=B8=9A=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/model/DangerousChemicalsImportListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java index 72c9201ca8..d5a58f174f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java @@ -75,19 +75,19 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener NumConstant.FIFTY){ + if (data.getName().trim().length() > NumConstant.FIFTY){ DangerousChemicalsModel.RowRemarkMessage row = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class); row.setRowNum(rowNum); row.setErrorInfo("企业名称长度超出50字限制"); errorRows.add(row); } - if (data.getPrincipalMobile().length() > NumConstant.FIFTY){ + if (data.getPrincipalMobile().trim().length() > NumConstant.FIFTY){ DangerousChemicalsModel.RowRemarkMessage row = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class); row.setRowNum(rowNum); row.setErrorInfo("联系电话长度超出50字限制"); errorRows.add(row); } - if (data.getName().length() > NumConstant.FIFTY){ + if (data.getAddress().trim().length() > NumConstant.FIFTY){ DangerousChemicalsModel.RowRemarkMessage row = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class); row.setRowNum(rowNum); row.setErrorInfo("经营地址长度超出50字限制"); From 34b30f321a71c133af0a93ef5a4bbe31853fca42 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 20 Jun 2022 15:54:55 +0800 Subject: [PATCH 019/105] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcEventDTO.java | 5 ++++ .../epmet/dto/form/IcEventAddEditFormDTO.java | 4 +++ .../epmet/dto/form/IcEventListFormDTO.java | 10 +++++++ .../dto/result/IcEventListResultDTO.java | 10 +++++++ .../epmet/controller/IcEventController.java | 10 +++++++ .../main/java/com/epmet/dao/IcEventDao.java | 3 ++ .../java/com/epmet/entity/IcEventEntity.java | 5 ++++ .../com/epmet/service/IcEventService.java | 2 ++ .../service/impl/IcEventServiceImpl.java | 29 +++++++++++++++++++ .../db/migration/V0.0.25__alter_ic_event.sql | 2 ++ .../src/main/resources/mapper/IcEventDao.xml | 20 ++++++++++++- 11 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.25__alter_ic_event.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 b357632bf8..3b14fc3266 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 @@ -172,6 +172,11 @@ approved：人工审核通过） */ private String auditReason; + /** + * 是否标记难点堵点 0:否 1：是 + */ + private String difficultPoint; + /** * 删除标识:0.未删除 1.已删除 */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java index 6774329890..07d9a8bcf9 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java @@ -98,6 +98,10 @@ public class IcEventAddEditFormDTO implements Serializable { * 处理中：processing；已办结：closed_case */ private String status; + /** + * 是否标记难点堵点 0:否 1：是 + */ + private String difficultPoint; /** * 立项接口入参对象 */ 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 7d8187c110..22343e9007 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 @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; /** * @Description 【迁入管理】列表--接口入参 @@ -75,4 +76,13 @@ public class IcEventListFormDTO implements Serializable { private String customerId; private String staffId; + /** + * 事件ID集合 + */ + private List icEventIdList; + /** + * 操作类型 0:取消标记 1:标记 + */ + private String type; + } 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 408d0c1ea6..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 @@ -192,6 +192,16 @@ public class IcEventListResultDTO implements Serializable { */ private String imageUrl; + /** + * 是否标记难点堵点 0:否 1：是 + */ + private String difficultPoint; + + /** + * 是否标记难点堵点 0:否 1：是 + */ + private String difficultPointName; + /** * 事件附件 */ 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 12416e4276..951d2196fc 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 @@ -491,4 +491,14 @@ public class IcEventController { return new Result(); } + /** + * @Author sun + * @Description 标记事件为难点堵点 + **/ + @PostMapping("difficultpointevent") + public Result difficultPointEvent(@RequestBody IcEventListFormDTO formDTO) { + icEventService.difficultPointEvent(formDTO); + return new Result(); + } + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index 386225e922..8240dee3c6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcEventDTO; import com.epmet.dto.form.IcEventCategoryAnalysisFormDTO; import com.epmet.dto.form.IcEventListFormDTO; import com.epmet.dto.form.MyReportIcEvFormDTO; @@ -136,4 +137,6 @@ public interface IcEventDao extends BaseDao { * @return */ Integer getResiReportEventCount(@Param("reportorIdCard") String reportorIdCard); + + List getByEventIds(@Param("icEventIdList") List icEventIdList); } \ 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 a8e83bcf7c..ce8d9bdd6a 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 @@ -171,4 +171,9 @@ public class IcEventEntity extends BaseEpmetEntity { */ private String auditReason; + /** + * 是否标记难点堵点 0:否 1：是 + */ + private String difficultPoint; + } 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 2a3545fc9c..eb26fc1fa5 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 @@ -220,4 +220,6 @@ public interface IcEventService extends BaseService { * @Description 工作端事件红点消除 **/ void govRedDot(String icEventId); + + void difficultPointEvent(IcEventListFormDTO formDTO); } \ 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 ed76a24e82..f8de2e8936 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 @@ -677,6 +677,7 @@ public class IcEventServiceImpl extends BaseServiceImpl list = baseDao.getByEventIds(formDTO.getIcEventIdList()); + if (!CollectionUtils.isEmpty(list)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在已结案或已标记为难点堵点的事件，不允许重复操作", "存在已结案或已标记为难点堵点的事件，不允许重复操作"); + } + } + + List entityList = new ArrayList<>(); + String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); + formDTO.getIcEventIdList().forEach(ev -> { + IcEventEntity entity = new IcEventEntity(); + entity.setId(ev); + entity.setDifficultPoint(formDTO.getType()); + entity.setUpdatedBy(userId); + entity.setUpdatedTime(new Date()); + entityList.add(entity); + }); + updateBatchById(entityList); + + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.25__alter_ic_event.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.25__alter_ic_event.sql new file mode 100644 index 0000000000..c460c844b2 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.25__alter_ic_event.sql @@ -0,0 +1,2 @@ +ALTER TABLE `ic_event` +ADD COLUMN `DIFFICULT_POINT` varchar(3) NULL DEFAULT '0' COMMENT '是否标记难点堵点 0:否 1：是' AFTER `AUDIT_REASON`; 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 b03c73efaf..bb3165fb8b 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 @@ -126,6 +126,8 @@ + + + + \ No newline at end of file From d0a98261eaee679adcaf3d4d6d0368de849f2c99 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Jun 2022 15:57:33 +0800 Subject: [PATCH 020/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/IcCityManagementDao.java | 17 +++ .../dao/govorg/IcDangerousChemicalsDao.java | 15 +++ .../dataaggre/dao/govorg/IcHouseDao.java | 15 +++ .../heart/IcCommunitySelfOrganizationDao.java | 32 +++++ .../entity/govorg/IcCityManagementEntity.java | 76 +++++++++++ .../govorg/IcDangerousChemicalsEntity.java | 91 +++++++++++++ .../entity/govorg/IcHouseEntity.java | 120 ++++++++++++++++++ .../IcCommunitySelfOrganizationEntity.java | 115 +++++++++++++++++ .../service/govorg/GovOrgCoverageService.java | 43 +++++++ .../impl/GovOrgCoverageServiceImpl.java | 72 +++++++++++ .../dataaggre/service/heart/HeartService.java | 23 ++++ .../service/heart/impl/HeartServiceImpl.java | 47 +++++++ .../service/impl/CoverageServiceImpl.java | 59 +++++++-- .../mapper/govorg/IcCityManagementDao.xml | 6 + .../mapper/govorg/IcDangerousChemicalsDao.xml | 6 + .../resources/mapper/govorg/IcHouseDao.xml | 6 + .../heart/IcCommunitySelfOrganizationDao.xml | 5 + 17 files changed, 738 insertions(+), 10 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcDangerousChemicalsDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcDangerousChemicalsEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcCommunitySelfOrganizationEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcDangerousChemicalsDao.xml create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java new file mode 100644 index 0000000000..46e2005b33 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java @@ -0,0 +1,17 @@ +package com.epmet.dataaggre.dao.govorg; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 城市管理图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcCityManagementDao extends BaseDao { + + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcDangerousChemicalsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcDangerousChemicalsDao.java new file mode 100644 index 0000000000..1474d31ef9 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcDangerousChemicalsDao.java @@ -0,0 +1,15 @@ +package com.epmet.dataaggre.dao.govorg; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 重点危化品企业 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcDangerousChemicalsDao extends BaseDao { +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java new file mode 100644 index 0000000000..5df9a571dc --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java @@ -0,0 +1,15 @@ +package com.epmet.dataaggre.dao.govorg; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 房屋信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-25 + */ +@Mapper +public interface IcHouseDao extends BaseDao { +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java new file mode 100644 index 0000000000..2499308cf6 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java @@ -0,0 +1,32 @@ +/** + * 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.dataaggre.dao.heart; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 社区自组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-11-18 + */ +@Mapper +public interface IcCommunitySelfOrganizationDao extends BaseDao { +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java new file mode 100644 index 0000000000..a1baff300a --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java @@ -0,0 +1,76 @@ +package com.epmet.dataaggre.entity.govorg; + +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-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_city_management") +public class IcCityManagementEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:city_management】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcDangerousChemicalsEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcDangerousChemicalsEntity.java new file mode 100644 index 0000000000..f63c518051 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcDangerousChemicalsEntity.java @@ -0,0 +1,91 @@ +package com.epmet.dataaggre.entity.govorg; + +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-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_dangerous_chemicals") +public class IcDangerousChemicalsEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 企业名称 + */ + private String name; + + /** + * 企业类型【字典表ic_coverage_category_dict key:dangerous_chemicals】 + */ + private String category; + + /** + * 周边安全距离，单位公里 + */ + private String safeDistance; + + /** + * 危化品种类【字典表 ic_danger_type】 + */ + private String dangerType; + + /** + * 负责人姓名 + */ + private String principalName; + + /** + * 负责人电话 + */ + private String principalMobile; + + /** + * 经营地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 备注 + */ + private String remark; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java new file mode 100644 index 0000000000..8f02451776 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java @@ -0,0 +1,120 @@ +/** + * 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.dataaggre.entity.govorg; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 房屋信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-25 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_house") +public class IcHouseEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 小区id + */ + private String neighborHoodId; + + /** + * 片区id，neighbor_hood_part.id,可为空。 + */ + private String partId; + + /** + * 所属楼栋id + */ + private String buildingId; + + /** + * 所属单元id + */ + private String buildingUnitId; + + /** + * 房屋名字后台插入时生成 + */ + private String houseName; + + /** + * 门牌号 + */ + private String doorName; + + /** + * 房屋类型，这里存储字典value就可以 + */ + private String houseType; + + /** + * 存储字典value + */ + private String purpose; + + /** + * 1：出租 0：自住 2：闲置 3：未出售 + */ + private Integer rentFlag; + + /** + * 房主姓名 + */ + private String ownerName; + + /** + * 房主电话 + */ + private String ownerPhone; + + /** + * 房主身份证号 + */ + private String ownerIdCard; + + /** + * 排序 + */ + private BigDecimal sort; + + /** + * 备注 + */ + private String remark; + + /** + * 房屋编码 + */ + private String houseCode; + private String houseQrcodeUrl; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcCommunitySelfOrganizationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcCommunitySelfOrganizationEntity.java new file mode 100644 index 0000000000..94d8aa3baf --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcCommunitySelfOrganizationEntity.java @@ -0,0 +1,115 @@ +/** + * 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.dataaggre.entity.heart; + +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 2021-11-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_community_self_organization") +public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID + */ + private String orgId; + + /** + * 组织类型，agency：组织，grid：网格 + */ + private String orgType; + + /** + * 组织ID的父级 + */ + private String pid; + + /** + * org_id的所有上级 + */ + private String pids; + + /** + * 组织名称 + */ + private String organizationName; + + /** + * 分类，来源于字典表dictType=self_org_category; + */ + private String categoryCode; + + /** + * 组织人数 + */ + private Integer organizationPersonCount; + + /** + * 负责人姓名 + */ + private String principalName; + + /** + * 负责人电话 + */ + private String principalPhone; + + /** + * 服务事项 + */ + private String serviceItem; + + /** + * 社区自组织创建时间 + */ + private Date organizationCreatedTime; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 备注 + */ + private String remark; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index bad471c582..7549b7f76f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -1,5 +1,9 @@ package com.epmet.dataaggre.service.govorg; +import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; +import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -35,4 +39,43 @@ public interface GovOrgCoverageService { * @return */ Map> getMappingRelationByCoverageType(List coverageTypes); + + /** + * 搜索城市资源 + * @param customerId + * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search 关键词，名称 + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + List searchCityResourceEntities(String customerId, String agencyIdPath, String search, Boolean isPage, + Integer pageNo, Integer pageSize); + + /** + * 搜索危化企业列表 + * @param customerId + * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search 关键词，名称 + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + List searchDangerousChemicalEntities(String customerId, String agencyIdPath, String search, Boolean isPage, + Integer pageNo, Integer pageSize); + + /** + * 搜索群租房列表 + * @param customerId + * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + List searchGroupRentHouseEntities(String customerId, String agencyIdPath, String search, Boolean isPage, + Integer pageNo, Integer pageSize); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index e53d39884b..758331793c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -3,9 +3,17 @@ package com.epmet.dataaggre.service.govorg.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.govorg.IcCityManagementDao; import com.epmet.dataaggre.dao.govorg.IcCoverageCategoryDictDao; +import com.epmet.dataaggre.dao.govorg.IcDangerousChemicalsDao; +import com.epmet.dataaggre.dao.govorg.IcHouseDao; +import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; import com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity; +import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; +import com.github.pagehelper.PageHelper; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +29,15 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { @Autowired private IcCoverageCategoryDictDao coverageCategoryDictDao; + @Autowired + private IcCityManagementDao cityManagementDao; + + @Autowired + private IcDangerousChemicalsDao dangerousChemicalsDao; + + @Autowired + private IcHouseDao icHouseDao; + /** * 根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map * @param categoryKeys @@ -63,4 +80,59 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { } return mapping; } + + /** + * 搜索城市资源 + * @param customerId + * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search 关键词，名称 + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + @Override + public List searchCityResourceEntities(String customerId, String agencyIdPath, String search, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcCityManagementEntity::getCustomerId, customerId); + query.likeRight(IcCityManagementEntity::getAgencyIdPath, agencyIdPath); + if (StringUtils.isNotBlank(search)) { + query.like(IcCityManagementEntity::getName, search); + } + + if (isPage) { + PageHelper.startPage(pageNo ,pageSize); + } + return cityManagementDao.selectList(query); + } + + /** + * 搜索危化企业列表 + * @param customerId + * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search 关键词，名称 + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + @Override + public List searchDangerousChemicalEntities(String customerId, String agencyIdPath, String search, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcDangerousChemicalsEntity::getCustomerId, customerId); + query.likeRight(IcDangerousChemicalsEntity::getAgencyIdPath, agencyIdPath); + if (StringUtils.isNotBlank(search)) { + query.like(IcDangerousChemicalsEntity::getName, search); + } + + if (isPage) { + PageHelper.startPage(pageNo ,pageSize); + } + return dangerousChemicalsDao.selectList(query); + } + + @Override + public List searchGroupRentHouseEntities(String customerId, String agencyIdPath, String search, Boolean isPage, Integer pageNo, Integer pageSize) { + return null; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java new file mode 100644 index 0000000000..a48ff394b8 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java @@ -0,0 +1,23 @@ +package com.epmet.dataaggre.service.heart; + +import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; + +import java.util.List; + +/** + * heart service + */ +public interface HeartService { + /** + * 搜索社区自组织列表 + * @param customerId 客户ID + * @param agencyId 当前查询人员所属组织ID + * @param agencyPids 当前查询人员所属组织的所有上级id path + * @param search 搜索条件 + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + List searchCommunityOrgEntities(String customerId, String agencyId, String agencyPids, String search, Boolean isPage, Integer pageNo, Integer pageSize); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java new file mode 100644 index 0000000000..6774ae9b0d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java @@ -0,0 +1,47 @@ +package com.epmet.dataaggre.service.heart.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.dataaggre.dao.heart.IcCommunitySelfOrganizationDao; +import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; +import com.epmet.dataaggre.service.heart.HeartService; +import com.epmet.dto.result.PartyMemberUserIdsResultDTO; +import com.github.pagehelper.PageHelper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class HeartServiceImpl implements HeartService { + + @Autowired + private IcCommunitySelfOrganizationDao communitySelfOrganizationDao; + + /** + * 搜索社区自组织列表 + * @param customerId 客户ID + * @param agencyId 当前查询人员所属组织ID + * @param agencyPids 当前查询人员所属组织的所有上级id path + * @param search 搜索条件 + * @return 社区自组织列表 + */ + @Override + public List searchCommunityOrgEntities( + String customerId, String agencyId, String agencyPids, String search, + Boolean isPage, Integer pageNo, Integer pageSize) { + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcCommunitySelfOrganizationEntity::getCustomerId, customerId); + query.like(IcCommunitySelfOrganizationEntity::getOrganizationName, search); + query.or(q -> q.eq(IcCommunitySelfOrganizationEntity::getOrgId, agencyId).likeRight(IcCommunitySelfOrganizationEntity::getPids, agencyPids)); + if (StringUtils.isNotBlank(search)) { + query.like(IcCommunitySelfOrganizationEntity::getOrganizationName, search); + } + + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } + return communitySelfOrganizationDao.selectList(query); + } +} 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 75fc1d6192..bd3456f43b 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,11 +9,15 @@ import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; +import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; +import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity; +import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.epmet.dataaggre.service.epmetuser.impl.IcResiServiceImpl; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.heart.HeartService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -38,6 +42,9 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private IcResiService icResiService; + @Autowired + private HeartService heartService; + /** * 场所类型常量 */ @@ -52,9 +59,6 @@ public class CoverageServiceImpl implements CoverageService { public static final String PLACE_TYPE_PUBLIC_SERVICE= "public_service"; public static final String PLACE_TYPE_SUPERIOR_RESOURCE= "superior_resource"; - /** 优势资源 **/ - public static final String PLACE_TYPE_YSZY= "yszy"; - /** * 图层，大屏数据分析，数据列表 * @param coverageTypes 图层列表 @@ -124,15 +128,20 @@ public class CoverageServiceImpl implements CoverageService { /** * 执行数据查询 - * @param categoryKey + * @param customerId + * @param agencyId 查询的工作人员所在组织id + * @param staffOrgIds 查询的工作人员所在组织的id path，包含agencyId + * @param placeType 场所类型 + * @param categoryKey 类别key + * @param search 关键词 * @return */ - public List doDataListSearch(String customerId, String agencyId, String agencyPids, String placeType, String categoryKey, String search, + public List doDataListSearch(String customerId, String agencyId, String staffOrgIds, String placeType, String categoryKey, String search, Integer pageNo, Integer pageSize,Boolean isPage) { if (PLACE_TYPE_RESI.equals(placeType)) { // 使用分类查询居民信息 - List resiEntities = icResiService.listResisByCategories4Coverage(customerId, agencyId, agencyPids, categoryKey, search, pageNo, pageSize, isPage); + List resiEntities = icResiService.listResisByCategories4Coverage(customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); return resiEntities.stream().map(re -> { // 使用楼栋的坐标补充居民的坐标信息 BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); @@ -140,20 +149,50 @@ public class CoverageServiceImpl implements CoverageService { }).collect(Collectors.toList()); } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { // 特殊人群 - List resiInfos = icResiService.listSpecialResisBySpecialType(customerId, agencyId, agencyPids, categoryKey, search, pageNo, pageSize, isPage); + List resiInfos = icResiService.listSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); return resiInfos.stream().map(re -> { BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), resiBuilding.getLatitude(), resiBuilding.getLongitude()); }).collect(Collectors.toList()); } else if (PLACE_TYPE_EVENT.equals(placeType)) { - // 难点痛点 + // 难点痛点 todo + } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { + // 城市资源管理 + List cityResources = orgCoverageService.searchCityResourceEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize); + cityResources.stream() + .map(resource -> new CoverageAnalisisDataListResultDTO(resource.getId(), categoryKey, placeType, resource.getName(), resource.getLatitude(), resource.getLongitude())) + .collect(Collectors.toList()); - } else if (PLACE_TYPE_YSZY.equals(placeType)) { + } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { + // 社区自组织 + List l = heartService.searchCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, isPage, pageNo, pageSize); + return l.stream() + .map(org -> new CoverageAnalisisDataListResultDTO(org.getId(), categoryKey, placeType, org.getOrganizationName(), org.getLatitude(), org.getLongitude())) + .collect(Collectors.toList()); + } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) { + // 危化企业 + List l = orgCoverageService.searchDangerousChemicalEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize); + return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) + .collect(Collectors.toList()); + } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { + // 企事业单位巡查 todo + + + } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { + // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） - } + } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { + // 公共服务 + + + } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { + // 优势资源 + + + } return null; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml new file mode 100644 index 0000000000..8cdd63a520 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcDangerousChemicalsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcDangerousChemicalsDao.xml new file mode 100644 index 0000000000..1892256119 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcDangerousChemicalsDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml new file mode 100644 index 0000000000..98bc2f33de --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml new file mode 100644 index 0000000000..c785e28c0d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From 5fb1ed532009cd6db666d436393883a57a8e0075 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 20 Jun 2022 16:21:06 +0800 Subject: [PATCH 021/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/DataSourceConstant.java | 1 + .../data-aggregator-server/pom.xml | 27 +++++++++++++++++++ .../service/heart/impl/HeartServiceImpl.java | 3 +++ .../service/impl/CoverageServiceImpl.java | 23 ++++++++++++---- .../src/main/resources/bootstrap.yml | 5 ++++ 5 files changed, 54 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java index 8ae93cc5d4..f02e5faa46 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java @@ -37,4 +37,5 @@ public interface DataSourceConstant { String EPMET_T_DUCK = "epmettduck"; String EPMETTDUCK="epmettduck"; + String EPMET_HEART="heart"; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 1246e8e2e0..4cc34ba06f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -242,6 +242,13 @@ epmet_tduck_user EpmEt-db-UsEr + + + + + epmet_heart_user + EpmEt-db-UsEr + 0 192.168.1.140 @@ -367,6 +374,12 @@ epmet_tduck_user EpmEt-db-UsEr + + + + epmet_heart_user + EpmEt-db-UsEr + 0 192.168.1.140 @@ -492,6 +505,13 @@ epmet elink@833066 + + + + + epmet + elink@833066 + 0 192.168.10.150 @@ -617,6 +637,13 @@ epmet_tduck EpmEt-db-UsEr + + + + + epmet_heart_user + EpmEt-db-UsEr + 0 r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java index 6774ae9b0d..351bfca067 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.service.heart.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.heart.IcCommunitySelfOrganizationDao; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.service.heart.HeartService; @@ -12,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.List; +@DataSource(value = DataSourceConstant.EPMET_HEART) @Service public class HeartServiceImpl implements HeartService { 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 bd3456f43b..5e9fd31621 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 @@ -11,6 +11,7 @@ import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; @@ -145,14 +146,26 @@ public class CoverageServiceImpl implements CoverageService { return resiEntities.stream().map(re -> { // 使用楼栋的坐标补充居民的坐标信息 BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); - return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), resiBuilding.getLatitude(), resiBuilding.getLongitude()); + String buildingLatitude = null; + String buildingLongitude = null; + if (resiBuilding != null) { + buildingLatitude = resiBuilding.getLatitude(); + buildingLongitude = resiBuilding.getLongitude(); + } + return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), buildingLatitude, buildingLongitude); }).collect(Collectors.toList()); } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { // 特殊人群 List resiInfos = icResiService.listSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); return resiInfos.stream().map(re -> { BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); - return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), resiBuilding.getLatitude(), resiBuilding.getLongitude()); + String buildingLatitude = null; + String buildingLongitude = null; + if (resiBuilding != null) { + buildingLatitude = resiBuilding.getLatitude(); + buildingLongitude = resiBuilding.getLongitude(); + } + return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), buildingLatitude, buildingLongitude); }).collect(Collectors.toList()); } else if (PLACE_TYPE_EVENT.equals(placeType)) { // 难点痛点 todo @@ -181,8 +194,8 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） - - + List icHouseEntities = orgCoverageService.searchGroupRentHouseEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize); + //icHouseEntities } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { // 公共服务 @@ -193,7 +206,7 @@ public class CoverageServiceImpl implements CoverageService { } - return null; + return new ArrayList<>(); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml index 9df581e38f..aa857a1eaf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml @@ -156,6 +156,11 @@ dynamic: url: @datasource.druid.epmettduck.url@ username: @datasource.druid.epmettduck.username@ password: @datasource.druid.epmettduck.password@ + heart: + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.heart.url@ + username: @datasource.druid.heart.username@ + password: @datasource.druid.heart.password@ feign: hystrix: enabled: true From 16f3506c0218eb33e5396448766391c2bc0353b0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 20 Jun 2022 16:26:01 +0800 Subject: [PATCH 022/105] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=8F=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/IcCoverageCategoryDictListResultDTO.java | 4 ++-- .../excel/handler/IcCityManagementExcelImportListener.java | 2 +- .../excel/handler/IcPublicServiceExcelImportListener.java | 2 +- .../excel/handler/IcSuperiorResourceExcelImportListener.java | 2 +- .../com/epmet/model/DangerousChemicalsImportListener.java | 2 +- .../com/epmet/service/impl/IcCityManagementServiceImpl.java | 4 ++-- .../epmet/service/impl/IcDangerousChemicalsServiceImpl.java | 4 ++-- .../com/epmet/service/impl/IcPublicServiceServiceImpl.java | 4 ++-- .../com/epmet/service/impl/IcSuperiorResourceServiceImpl.java | 4 ++-- .../src/main/resources/mapper/IcCoverageCategoryDictDao.xml | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java index bc66b1ad5d..eaa1feac8a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java @@ -8,7 +8,7 @@ import lombok.Data; @Data public class IcCoverageCategoryDictListResultDTO { - private String categoryKey; - private String categoryName; + private String label; + private String value; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 064a322727..d43dbff14d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -110,7 +110,7 @@ public class IcCityManagementExcelImportListener implements ReadListener dictList = coverageService.dictMap(currentCustomerId, "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); datas.forEach(d -> { d.setCategory(dictMap.get(d.getCategory())); }); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java index de96036a56..9e5c855275 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java @@ -110,7 +110,7 @@ public class IcPublicServiceExcelImportListener implements ReadListener dictList = coverageService.dictMap(currentCustomerId, "public_service"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); datas.forEach(d -> { d.setCategory(dictMap.get(d.getCategory())); }); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java index 69ade8cc8d..b386d6e114 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java @@ -112,7 +112,7 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener dictList = coverageService.dictMap(currentCustomerId, "superior_resource"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); datas.forEach(d -> { d.setCategory(dictMap.get(d.getCategory())); }); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java index d5a58f174f..0540663a91 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java @@ -124,7 +124,7 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(16); //企业类别字典数据 List dictList = coverageService.dictMap(agencyInfo.getCustomerId(), "dangerous_chemicals"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); insertList.forEach(i -> { statusMap.forEach((k,v) -> { if (i.getDangerTypeName().equals(v)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java index b9a86750d9..dab12158df 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java @@ -91,7 +91,7 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); for (IcCityManagementListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); @@ -181,7 +181,7 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); for (IcCityManagementListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index db9c3f5dc0..a6d6782a36 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -102,7 +102,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); for (IcDangerousChemicalsListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); @@ -199,7 +199,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); for (IcDangerousChemicalsListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index 9131912181..46df592ea3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -91,7 +91,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); for (IcPublicServiceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); @@ -181,7 +181,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); for (IcPublicServiceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java index 873b17157e..8b6004b27b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -91,7 +91,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); for (IcSuperiorResourceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); @@ -181,7 +181,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); for (IcSuperiorResourceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml index 0bc660a561..1a41b6077a 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml @@ -6,8 +6,8 @@ + select category_name from ic_coverage_category_dict + where del_flag = '0' + AND customer_id = #{customerId} + and CATEGORY_KEY=#{categoryKey} + and PLACE_TYPE=#{placeType} + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolAttachmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolAttachmentDao.xml new file mode 100644 index 0000000000..610b640b33 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolAttachmentDao.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + update ic_enterprise_patrol_attachment + set del_flag='1', + UPDATED_TIME=now(), + UPDATED_BY={staffId} + where PATROL_ID=#{patrolId} + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml index 2d5b0ca97d..b5ccb55cbe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml @@ -3,9 +3,8 @@ - - - + + @@ -14,13 +13,27 @@ - - - - - - + + - + \ No newline at end of file From b9cd9a63c8a80936df47dfe8f3f717f0998ef051 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 20 Jun 2022 17:42:15 +0800 Subject: [PATCH 024/105] ..... --- .../com/epmet/excel/IcCityManagementExcel.java | 2 +- .../com/epmet/excel/IcPublicServiceExcel.java | 2 +- .../com/epmet/excel/IcSuperiorResourceExcel.java | 2 +- .../IcCityManagementExcelImportListener.java | 2 +- .../IcPublicServiceExcelImportListener.java | 2 +- .../IcSuperiorResourceExcelImportListener.java | 2 +- .../service/impl/IcCityManagementServiceImpl.java | 9 +++++---- .../impl/IcDangerousChemicalsServiceImpl.java | 15 ++++++++------- .../service/impl/IcPublicServiceServiceImpl.java | 9 +++++---- .../impl/IcSuperiorResourceServiceImpl.java | 9 +++++---- 10 files changed, 29 insertions(+), 25 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java index 5cc3b6556f..808b0fc116 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -31,7 +31,7 @@ public class IcCityManagementExcel { @ExcelProperty(value = "容纳人数") @ColumnWidth(20) - private Integer capacityName; + private String capacityName; @ExcelProperty(value = "地址") @ColumnWidth(25) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index 9f3728cb22..eb8e247701 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -31,7 +31,7 @@ public class IcPublicServiceExcel { @ExcelProperty(value = "容纳人数") @ColumnWidth(20) - private Integer capacityName; + private String capacityName; @ExcelProperty(value = "地址") @ColumnWidth(25) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java index 1f3b1a8667..9326adb2b4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java @@ -31,7 +31,7 @@ public class IcSuperiorResourceExcel { @ExcelProperty(value = "容纳人数") @ColumnWidth(20) - private Integer capacityName; + private String capacityName; @ExcelProperty(value = "地址") @ColumnWidth(25) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index d43dbff14d..8d48ad2888 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -74,7 +74,7 @@ public class IcCityManagementExcelImportListener implements ReadListener dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); - for (IcCityManagementListResultDTO v : list) { - if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(dictMap.get(v.getCategory())); - } + if (StringUtils.isNotBlank(resultDTO.getCategory())) { + resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index a6d6782a36..cc3b942c8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -5,6 +5,7 @@ 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.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -149,6 +150,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode()); Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); - for (IcDangerousChemicalsListResultDTO v : list) { - if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(dictMap.get(v.getCategory())); - } - if (StringUtils.isNotBlank(v.getDangerType())) { - v.setDangerTypeName(statusMap.get(v.getDangerType())); - } + if (StringUtils.isNotBlank(resultDTO.getCategory())) { + resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); + } + if (StringUtils.isNotBlank(resultDTO.getDangerType())) { + resultDTO.setDangerTypeName(statusMap.get(resultDTO.getDangerType())); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index 46df592ea3..6c6ce20264 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; 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; @@ -135,6 +136,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); - for (IcPublicServiceListResultDTO v : list) { - if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(dictMap.get(v.getCategory())); - } + if (StringUtils.isNotBlank(resultDTO.getCategory())) { + resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java index 8b6004b27b..fc862971c1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; 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; @@ -135,6 +136,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); - for (IcSuperiorResourceListResultDTO v : list) { - if (StringUtils.isNotBlank(v.getCategory())) { - v.setCategoryName(dictMap.get(v.getCategory())); - } + if (StringUtils.isNotBlank(resultDTO.getCategory())) { + resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } } From e0c09eaba354680bddfa4158341070e7e4f71b8a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 21 Jun 2022 11:08:33 +0800 Subject: [PATCH 025/105] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 12 ++++++++++++ .../IcCityManagementController.java | 2 +- .../controller/IcPublicServiceController.java | 2 +- .../IcSuperiorResourceController.java | 2 +- .../epmet/excel/IcCityManagementExcel.java | 8 ++++---- .../com/epmet/excel/IcPublicServiceExcel.java | 8 ++++---- .../epmet/excel/IcSuperiorResourceExcel.java | 6 +++--- .../IcCityManagementExcelImportListener.java | 3 +++ .../IcPublicServiceExcelImportListener.java | 3 +++ ...IcSuperiorResourceExcelImportListener.java | 3 +++ .../impl/IcCityManagementServiceImpl.java | 5 +++-- .../impl/IcPublicServiceServiceImpl.java | 5 +++-- .../impl/IcSuperiorResourceServiceImpl.java | 5 +++-- .../excel/city_management_template.xlsx | Bin 9032 -> 9069 bytes .../excel/public_service_template.xlsx | Bin 9065 -> 9096 bytes .../excel/superior_resource_template.xlsx | Bin 10434 -> 9283 bytes 16 files changed, 44 insertions(+), 20 deletions(-) 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 86417c86ea..d5bdbc67f6 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 @@ -47,4 +47,16 @@ public interface ImportTaskConstants { * 处理状态：完成，但未完全成功 */ String PROCESS_STATUS_FINISHED_FAIL = "finished_fail"; + /** + * 优势资源 + */ + String IC_SUPERIOR_RESOURCE = "ic_superior_resource"; + /** + * 公共服务 + */ + String IC_PUBLIC_SERVICE = "ic_public_service"; + /** + * 城市管理 + */ + String IC_CITY_MANAGEMENT = "ic_city_management"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java index 04862f1752..7cde94ba86 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java @@ -197,7 +197,7 @@ public class IcCityManagementController implements ResultDataResolver { // 2.生成导入任务记录 ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( - ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_CITY_MANAGEMENT), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入优势资源管理信息错误", diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java index 71f9fe324b..add08dbce3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -198,7 +198,7 @@ public class IcPublicServiceController implements ResultDataResolver { // 2.生成导入任务记录 ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( - ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_PUBLIC_SERVICE), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入优势资源管理信息错误", diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java index df66d7a734..57fb3f1d60 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java @@ -198,7 +198,7 @@ public class IcSuperiorResourceController implements ResultDataResolver { // 2.生成导入任务记录 ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( - ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_SUPERIOR_RESOURCE), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入优势资源管理信息错误", diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java index 808b0fc116..ffda552a3f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -20,12 +20,12 @@ public class IcCityManagementExcel { @NotBlank(message = "场所名称为必填项") private String name; - @ExcelProperty(value = "场所类别") + @ExcelProperty(value = "场所分类") @ColumnWidth(20) - @NotBlank(message = "场所类别为必填项") + @NotBlank(message = "场所分类为必填项") private String categoryName; - @ExcelProperty(value = "占地面积") + @ExcelProperty(value = "占地面积（平方公里）") @ColumnWidth(25) private String areaCoveredName; @@ -45,7 +45,7 @@ public class IcCityManagementExcel { @ColumnWidth(20) private String name; - @ExcelProperty("场所类别") + @ExcelProperty("场所分类") @ColumnWidth(20) private String categoryName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index eb8e247701..3b9762b677 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -20,12 +20,12 @@ public class IcPublicServiceExcel { @NotBlank(message = "场所名称为必填项") private String name; - @ExcelProperty(value = "场所类别") + @ExcelProperty(value = "场所分类") @ColumnWidth(20) - @NotBlank(message = "场所类别为必填项") + @NotBlank(message = "场所分类为必填项") private String categoryName; - @ExcelProperty(value = "占地面积") + @ExcelProperty(value = "占地面积（平方公里）") @ColumnWidth(25) private String areaCoveredName; @@ -45,7 +45,7 @@ public class IcPublicServiceExcel { @ColumnWidth(20) private String name; - @ExcelProperty("场所类别") + @ExcelProperty("场所分类") @ColumnWidth(20) private String categoryName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java index 9326adb2b4..4a6c08bd31 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcSuperiorResourceExcel.java @@ -20,12 +20,12 @@ public class IcSuperiorResourceExcel { @NotBlank(message = "场所名称为必填项") private String name; - @ExcelProperty(value = "场所类别") + @ExcelProperty(value = "场所分类") @ColumnWidth(20) @NotBlank(message = "场所类别为必填项") private String categoryName; - @ExcelProperty(value = "占地面积") + @ExcelProperty(value = "占地面积（平方公里）") @ColumnWidth(25) private String areaCoveredName; @@ -45,7 +45,7 @@ public class IcSuperiorResourceExcel { @ColumnWidth(20) private String name; - @ExcelProperty("场所类别") + @ExcelProperty("场所分类") @ColumnWidth(20) private String categoryName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 8d48ad2888..2c4b0b4546 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -71,6 +71,9 @@ public class IcCityManagementExcelImportListener implements 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 X00031AOHXWsFPPCD+Wv-000001uM*j diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/superior_resource_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/superior_resource_template.xlsx index 4b4540287db3094ae1ac0c7574a6032f87ef28e2..d9dff560d75afa998969a8371a62efca8b31d05e 100644 GIT binary patch delta 6128 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 From 8851684cd7050b5886c93d87f4f0e6dc488e0ed8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 21 Jun 2022 11:15:29 +0800 Subject: [PATCH 026/105] ... --- .../excel/handler/IcCityManagementExcelImportListener.java | 2 +- .../excel/handler/IcPublicServiceExcelImportListener.java | 2 +- .../excel/handler/IcSuperiorResourceExcelImportListener.java | 2 +- .../com/epmet/model/DangerousChemicalsImportListener.java | 2 +- .../com/epmet/service/impl/IcCityManagementServiceImpl.java | 4 ++-- .../epmet/service/impl/IcDangerousChemicalsServiceImpl.java | 4 ++-- .../com/epmet/service/impl/IcPublicServiceServiceImpl.java | 4 ++-- .../com/epmet/service/impl/IcSuperiorResourceServiceImpl.java | 4 ++-- .../src/main/resources/mapper/IcCoverageCategoryDictDao.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 2c4b0b4546..8bbd73fed0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -113,7 +113,7 @@ public class IcCityManagementExcelImportListener implements ReadListener dictList = coverageService.dictMap(currentCustomerId, "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); datas.forEach(d -> { d.setCategory(dictMap.get(d.getCategory())); }); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java index bb37890db2..b3da93cedd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java @@ -113,7 +113,7 @@ public class IcPublicServiceExcelImportListener implements ReadListener dictList = coverageService.dictMap(currentCustomerId, "public_service"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); datas.forEach(d -> { d.setCategory(dictMap.get(d.getCategory())); }); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java index 83535ffb87..7317cdc5b1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java @@ -115,7 +115,7 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener dictList = coverageService.dictMap(currentCustomerId, "superior_resource"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); datas.forEach(d -> { d.setCategory(dictMap.get(d.getCategory())); }); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java index 0540663a91..490c3b7dd9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java @@ -124,7 +124,7 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(16); //企业类别字典数据 List dictList = coverageService.dictMap(agencyInfo.getCustomerId(), "dangerous_chemicals"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); insertList.forEach(i -> { statusMap.forEach((k,v) -> { if (i.getDangerTypeName().equals(v)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java index 0b3c3999e1..198c14f01d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java @@ -92,7 +92,7 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); for (IcCityManagementListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); @@ -184,7 +184,7 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); if (StringUtils.isNotBlank(resultDTO.getCategory())) { resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index cc3b942c8e..6126741fd6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -103,7 +103,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); for (IcDangerousChemicalsListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); @@ -202,7 +202,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); if (StringUtils.isNotBlank(resultDTO.getCategory())) { resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index f6cc39b81c..4eb2af37b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -92,7 +92,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); for (IcPublicServiceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); @@ -184,7 +184,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); if (StringUtils.isNotBlank(resultDTO.getCategory())) { resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java index 4f55f0fd9b..7e324bcff0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -92,7 +92,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); for (IcSuperiorResourceListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { v.setCategoryName(dictMap.get(v.getCategory())); @@ -184,7 +184,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource"); - Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); if (StringUtils.isNotBlank(resultDTO.getCategory())) { resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml index 3a948a7a2a..8d20859b11 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml @@ -6,8 +6,8 @@ + SELECT DISTINCT + ie.ID, + ie.GRID_ID, + ie.AGENCY_ID, + ie.AGENCY_PIDS, + ie.PLACE_TYPE, + ie.PLACE_ORG_NAME, + ie.ADDRESS, + ie.LONGITUDE, + ie.LATITUDE, + ie.SCALE, + ie.PERSON_IN_CHARGE, + ie.MOBILE, + ie.SOURCE_TYPE, + ie.LATEST_RESULT, + ie.LATEST_PATROL_TIME + FROM + ic_enterprise ie + LEFT JOIN ic_enterprise_patrol_record r ON ( ie.id = r.ENTERPRISE_ID AND r.DEL_FLAG = '0' ) + WHERE + ie.DEL_FLAG = '0' + AND ( + ie.AGENCY_ID = #{staffAgencyId} + OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' ) + ) + + AND ie.GRID_ID = #{gridId} + + + AND ie.PLACE_TYPE = #{placeType} + + + AND ie.PLACE_ORG_NAME LIKE concat( '%', #{placeOrgName}, '%' ) + + + AND ie.SCALE = #{scale} + + + AND ie.MOBILE LIKE concat( '%', #{mobile}, '%' ) + + + AND ie.LATEST_RESULT = #{result} + + + AND r.DETAILED LIKE concat( '%', #{detailed}, '%' ) + + order by ie.CREATED_TIME desc + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolAttachmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolAttachmentDao.xml index 610b640b33..7fcba55fd7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolAttachmentDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolAttachmentDao.xml @@ -23,13 +23,10 @@ - - update ic_enterprise_patrol_attachment - set del_flag='1', - UPDATED_TIME=now(), - UPDATED_BY={staffId} - where PATROL_ID=#{patrolId} - + + delete from ic_enterprise_patrol_attachment + where PATROL_ID = #{patrolId} + SELECT + so.ORG_ID as agencyId, so.ORGANIZATION_NAME AS organizationName, so.CATEGORY_CODE AS categoryCode, so.ORGANIZATION_PERSON_COUNT AS organizationPersonCount, @@ -63,7 +65,7 @@ FROM ic_community_self_organization so WHERE so.DEL_FLAG = 0 - AND so.ORG_ID = #{agencyId} + AND (so.ORG_ID = #{agencyId} or so.PIDS like concat('%',#{agencyId},'%') ) AND so.CUSTOMER_ID = #{customerId} From f1f038e140260bcf3d9449b31e70ce40b30b2828 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Jun 2022 15:48:31 +0800 Subject: [PATCH 035/105] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=87=8C=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ResiVolunteerSelectDTO.java | 30 +++++++++++++ .../controller/IcResiUserController.java | 15 ++++++- .../com/epmet/service/IcResiUserService.java | 9 ++++ .../service/impl/IcResiUserServiceImpl.java | 42 ++++++++++++++++++- 4 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiVolunteerSelectDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiVolunteerSelectDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiVolunteerSelectDTO.java new file mode 100644 index 0000000000..8eca42b0f2 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiVolunteerSelectDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.result; + + +import lombok.Data; + +import java.io.Serializable; + +/** + * 当前组织下，居民信息里的志愿者列表 + * 下拉框可用 + */ +@Data +public class ResiVolunteerSelectDTO implements Serializable { + /** + * 下拉框显示值 + * 尹作梅(15764229697) + */ + private String label; + private String value; + private String icResiUserId; + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; +} 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 8e9e6a41c7..641f5725ca 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 @@ -1165,7 +1165,7 @@ public class IcResiUserController implements ResultDataResolver { /** * 获取组织下的志愿者 - * + * 居民信息里的志愿者 * @Param formDTO * @Return {@link Result>} * @Author zhaoqifeng @@ -1188,4 +1188,17 @@ public class IcResiUserController implements ResultDataResolver { public Result> getUserId(@PathVariable("icUserId") String icUserId) { return new Result>().ok(icResiUserService.getUserId(icUserId)); } + + /** + * 居民信息里的志愿者 + * 社区自组织-添加成员可用 + * @Param formDTO + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/6/16 15:22 + */ + @PostMapping("volunteer-list") + public Result> queryVolunteerList(@LoginUser TokenDto tokenDto) { + return new Result>().ok(icResiUserService.queryVolunteerList(tokenDto.getCustomerId(), tokenDto.getUserId())); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 3ef76601bc..e79dc5fc27 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -436,4 +436,13 @@ public interface IcResiUserService extends BaseService { * @Date 2022/6/16 15:30 */ List getUserId(String icResiUserId); + + /** + * 居民信息里的志愿者 + * 社区自组织-添加成员可用 + * @param customerId + * @param userId + * @return + */ + List queryVolunteerList(String customerId, 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 a7d1183196..a90c766b8f 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 @@ -2478,7 +2478,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl queryVolunteerList(String customerId, String userId) { + CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(customerId,userId); + if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"查询当前登录用户信息异常"); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getCustomerId, customerId); + wrapper.and(wq -> wq.eq(IcResiUserEntity::getAgencyId, staffInfo.getAgencyId()).or().like(IcResiUserEntity::getPids, staffInfo.getAgencyId())); + wrapper.eq(IcResiUserEntity::getIsVolunteer, NumConstant.ONE_STR); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); + //只查这几列吧 + wrapper.select(IcResiUserEntity::getId, IcResiUserEntity::getName, IcResiUserEntity::getMobile); + List list = baseDao.selectList(wrapper); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list.stream().map(item -> { + ResiVolunteerSelectDTO dto = new ResiVolunteerSelectDTO(); + dto.setValue(item.getId()); + dto.setIcResiUserId(item.getId()); + dto.setMobile(item.getMobile()); + dto.setName(item.getName()); + if (StringUtils.isNotBlank(item.getMobile())) { + dto.setLabel(item.getName().concat("(").concat(item.getMobile().concat(")"))); + } else { + dto.setLabel(item.getName()); + } + return dto; + }).collect(Collectors.toList()); + } + /** * 根据身份证获取居民角色（目前只有是否是志愿者） * From cef8191af03fe0b811b08d88e3d05a80835944a2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 21 Jun 2022 15:57:16 +0800 Subject: [PATCH 036/105] =?UTF-8?q?=E3=80=905=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E3=80=91=E5=8F=AF=E8=A7=86=E5=8C=96-=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=BF=98=E4=BA=86=E5=8A=A0pageData?= =?UTF-8?q?=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/CoverageController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 4e77d73bff..98c4885046 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,9 +1,11 @@ package com.epmet.dataaggre.controller; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.service.CoverageService; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -28,7 +30,7 @@ public class CoverageController { * @return */ @RequestMapping("dataList") - public Result> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) { + public Result> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) { List coverageTypes = input.getCoverageTypes(); List categoryKeys = input.getCategoryKeys(); if (CollectionUtils.isEmpty(coverageTypes)) { @@ -37,7 +39,8 @@ public class CoverageController { List l = coverageService.analysisDataList(coverageTypes, categoryKeys, input.getSearch(), input.getPageNo(), input.getPageSize(), input.getIsPage()); - return new Result>().ok(l); + PageInfo pageInfo = new PageInfo<>(l); + return new Result>().ok(new PageData<>(l, pageInfo.getTotal())); } } From 41f3eff2cd0251c3b575cb755cef8926ee11cc37 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 21 Jun 2022 16:48:37 +0800 Subject: [PATCH 037/105] pid --- .../com/epmet/commons/tools/dto/result/OptionResultDTO.java | 2 +- .../java/com/epmet/service/impl/CustomerGridServiceImpl.java | 1 + .../src/main/resources/mapper/CustomerGridDao.xml | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java index fa96252e3b..562e1933fa 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java @@ -23,7 +23,7 @@ public class OptionResultDTO implements Serializable { private List children; private Boolean usableFlag; private String type; - + private String pid; /** * desc:递归获取当前节点的 所有子节点 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 5e7aa468ff..431200b560 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -922,6 +922,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl Date: Tue, 21 Jun 2022 16:53:46 +0800 Subject: [PATCH 038/105] enterpriseId --- .../src/main/resources/mapper/IcEnterpriseDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3079f9fc48..3d972d79f9 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 @@ -38,7 +38,7 @@ From 6887cbfb29d927c24d7908f2b097df41d3c5cd81 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 21 Jun 2022 22:45:35 +0800 Subject: [PATCH 044/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=EF=BC=9A?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/epmetuser/IcResiUserDao.java | 6 + .../service/epmetuser/IcResiService.java | 4 + .../epmetuser/impl/IcResiServiceImpl.java | 40 +++++- .../service/govorg/GovOrgCoverageService.java | 10 ++ .../impl/GovOrgCoverageServiceImpl.java | 114 +++++++++++++++--- .../dataaggre/service/heart/HeartService.java | 3 + .../service/heart/impl/HeartServiceImpl.java | 59 +++++++-- .../service/impl/CoverageServiceImpl.java | 103 ++++++++++++++-- .../mapper/epmetuser/IcResiUserDao.xml | 15 +++ 9 files changed, 308 insertions(+), 46 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 ac78a4ae94..78e7b7d4b7 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 @@ -53,4 +53,10 @@ public interface IcResiUserDao extends BaseDao { @Param("queryPids") String queryPids, @Param("categoryKey") String categoryKey, @Param("search") String search); + + Integer countSpecialResisBySpecialType(@Param("customerId") String customerId, + @Param("agencyId") String agencyId, + @Param("queryPids") String queryPids, + @Param("categoryKey") String categoryKey, + @Param("search") String search); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java index 30c5bb1043..1900b75e89 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java @@ -22,6 +22,8 @@ public interface IcResiService { List listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search, Integer pageNo, Integer pageSize, Boolean isPage); + Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search); + /** * 使用特殊人群类别查询居民列表 * @param customerId @@ -35,4 +37,6 @@ public interface IcResiService { */ List listSpecialResisBySpecialType(String customerId, String agencyId, String queryPids, String categoryKey, String search, Integer pageNo, Integer pageSize, Boolean isPage); + + Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java index fe7844ae43..a0a66a2733 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -37,9 +37,38 @@ public class IcResiServiceImpl implements IcResiService { PageHelper.startPage(pageNo, pageSize); } + LambdaQueryWrapper query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search); + query.orderByAsc(IcResiUserEntity::getCreatedTime); + return resiUserDao.selectList(query); + } + + /** + * 根据条件查询数量 + * @param customerId + * @param agencyId + * @param queryPids + * @param categoryKey + * @param search + * @return + */ + @Override + public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) { + LambdaQueryWrapper query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search); + return resiUserDao.selectCount(query); + } + + /** + * 构造queryWrapper + * @param customerId + * @param agencyId + * @param queryPids + * @param categoryKey + * @param search + * @return + */ + LambdaQueryWrapper constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcResiUserEntity::getCustomerId, customerId); - //query.likeRight(IcResiUserEntity::getPids, queryPids); query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids)); if ("resi_xfry".equals(categoryKey)) { // 信访人员 @@ -51,8 +80,8 @@ public class IcResiServiceImpl implements IcResiService { if (StringUtils.isNotBlank(search)) { query.like(IcResiUserEntity::getName, search); } - query.orderByAsc(IcResiUserEntity::getCreatedTime); - return resiUserDao.selectList(query); + + return query; } @Override @@ -63,4 +92,9 @@ public class IcResiServiceImpl implements IcResiService { } return resiUserDao.listSpecialResisBySpecialType(customerId, agencyId, queryPids, categoryKey, search); } + + @Override + public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) { + return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index cf9bbec696..829509d160 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -38,6 +38,8 @@ public interface GovOrgCoverageService { */ Map> getMappingRelationByCoverageType(List coverageTypes, String customerId); + Integer countCityResourceEntities(String customerId, String agencyIdPath, String search, String category); + /** * 搜索城市资源 * @param customerId @@ -51,6 +53,10 @@ public interface GovOrgCoverageService { List searchCityResourceEntities(String customerId, String agencyIdPath, String search, String category, Boolean isPage, Integer pageNo, Integer pageSize); + /** + * 搜索危化企业列表数量查询 + */ + Integer countDangerousChemicalEntities(String customerId, String agencyIdPath, String search, String categoryKey); /** * 搜索危化企业列表 * @param customerId @@ -102,4 +108,8 @@ public interface GovOrgCoverageService { */ List searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize); + + Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey); + + Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index f54bdc9453..dea03c8907 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -95,6 +95,31 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { */ @Override public List searchCityResourceEntities(String customerId, String agencyIdPath, String search, String category, Boolean isPage, Integer pageNo, Integer pageSize) { + if (isPage) { + PageHelper.startPage(pageNo ,pageSize); + } + + LambdaQueryWrapper query = constructQueryWrapper(customerId, agencyIdPath, search, category); + query.orderByAsc(IcCityManagementEntity::getCreatedTime); + return cityManagementDao.selectList(query); + } + + @Override + public Integer countCityResourceEntities(String customerId, String agencyIdPath, String search, String category) { + LambdaQueryWrapper query = constructQueryWrapper(customerId, agencyIdPath, search, category); + query.orderByAsc(IcCityManagementEntity::getCreatedTime); + return cityManagementDao.selectCount(query); + } + + /** + * 构造动态查询 + * @param customerId + * @param agencyIdPath + * @param search + * @param category + * @return + */ + private LambdaQueryWrapper constructQueryWrapper(String customerId, String agencyIdPath, String search, String category) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcCityManagementEntity::getCustomerId, customerId); query.eq(IcCityManagementEntity::getCategory, category); @@ -102,12 +127,15 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { if (StringUtils.isNotBlank(search)) { query.like(IcCityManagementEntity::getName, search); } + return query; + } - if (isPage) { - PageHelper.startPage(pageNo ,pageSize); - } - query.orderByAsc(IcCityManagementEntity::getCreatedTime); - return cityManagementDao.selectList(query); + @Override + public Integer countDangerousChemicalEntities(String customerId, String agencyIdPath, String search, String categoryKey) { + + LambdaQueryWrapper query = constructDangerousChemicalQueryWrapper(customerId, agencyIdPath, search, categoryKey); + + return dangerousChemicalsDao.selectCount(query); } /** @@ -123,6 +151,19 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { @Override public List searchDangerousChemicalEntities( String customerId, String agencyIdPath, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { + + LambdaQueryWrapper query = constructDangerousChemicalQueryWrapper(customerId, agencyIdPath, search, categoryKey); + + if (isPage) { + PageHelper.startPage(pageNo ,pageSize); + } + query.orderByAsc(IcDangerousChemicalsEntity::getCreatedTime); + return dangerousChemicalsDao.selectList(query); + } + + private LambdaQueryWrapper constructDangerousChemicalQueryWrapper( + String customerId, String agencyIdPath, String search, String categoryKey) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcDangerousChemicalsEntity::getCustomerId, customerId); query.eq(IcDangerousChemicalsEntity::getCategory, categoryKey); @@ -130,12 +171,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { if (StringUtils.isNotBlank(search)) { query.like(IcDangerousChemicalsEntity::getName, search); } - - if (isPage) { - PageHelper.startPage(pageNo ,pageSize); - } - query.orderByAsc(IcDangerousChemicalsEntity::getCreatedTime); - return dangerousChemicalsDao.selectList(query); + return query; } @Override @@ -144,6 +180,18 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { return null; } + /** + * 查询公共服务个数 + * @param customerId + * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search + * @return + */ + @Override + public Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey) { + return null; + } + /** * 搜索公共服务 * @param customerId @@ -157,6 +205,25 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { @Override public List searchPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { + + LambdaQueryWrapper query = constructPublicServiceQueryWrapper(customerId, staffOrgIds, search, categoryKey); + if (isPage) { + PageHelper.startPage(pageNo ,pageSize); + } + query.orderByAsc(IcPublicServiceEntity::getCreatedTime); + return publicServiceDao.selectList(query); + } + + /** + * 构造LambdaQueryWrapper + * @param customerId + * @param staffOrgIds + * @param search + * @param categoryKey + * @return + */ + LambdaQueryWrapper constructPublicServiceQueryWrapper( + String customerId, String staffOrgIds, String search, String categoryKey) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcPublicServiceEntity::getCustomerId, customerId); query.likeRight(IcPublicServiceEntity::getAgencyIdPath, staffOrgIds); @@ -164,17 +231,28 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { if (StringUtils.isNotBlank(search)) { query.like(IcPublicServiceEntity::getName, search); } + return query; + } + + @Override + public List searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search, + String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = constructSuporiorResourceQueryWrapper(customerId, staffOrgIds, search, categoryKey); if (isPage) { PageHelper.startPage(pageNo ,pageSize); } - query.orderByAsc(IcPublicServiceEntity::getCreatedTime); - return publicServiceDao.selectList(query); + query.orderByAsc(IcSuperiorResourceEntity::getCreatedTime); + return superiorResourceDao.selectList(query); } @Override - public List searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search, - String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { + public Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey) { + LambdaQueryWrapper query = constructSuporiorResourceQueryWrapper(customerId, staffOrgIds, search, categoryKey); + return superiorResourceDao.selectCount(query); + } + + LambdaQueryWrapper constructSuporiorResourceQueryWrapper(String customerId, String staffOrgIds, String search, String categoryKey) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcSuperiorResourceEntity::getCustomerId, customerId); query.eq(IcSuperiorResourceEntity::getCategory, categoryKey); @@ -183,10 +261,6 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { query.like(IcSuperiorResourceEntity::getName, search); } - if (isPage) { - PageHelper.startPage(pageNo ,pageSize); - } - query.orderByAsc(IcSuperiorResourceEntity::getCreatedTime); - return superiorResourceDao.selectList(query); + return query; } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java index 87b09e1514..e1b4e3692b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java @@ -37,4 +37,7 @@ public interface HeartService { */ List searchPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search, Boolean isPage, Integer pageNo, Integer pageSize); + + Integer countPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search); + Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java index 187519d964..c29f54c5ff 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java @@ -39,6 +39,26 @@ public class HeartServiceImpl implements HeartService { String customerId, String agencyId, String staffOrgIds, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = constructCommunityOrgQueryWrapper( + customerId, agencyId, staffOrgIds, search, categoryKey); + + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } + query.orderByAsc(IcCommunitySelfOrganizationEntity::getCreatedTime); + return communitySelfOrganizationDao.selectList(query); + } + + @Override + public Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) { + LambdaQueryWrapper query = constructCommunityOrgQueryWrapper( + customerId, agencyId, staffOrgIds, search, categoryKey); + + return communitySelfOrganizationDao.selectCount(query); + } + + private LambdaQueryWrapper constructCommunityOrgQueryWrapper( + String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcCommunitySelfOrganizationEntity::getCustomerId, customerId); query.eq(IcCommunitySelfOrganizationEntity::getCategoryCode, categoryKey); @@ -46,12 +66,24 @@ public class HeartServiceImpl implements HeartService { if (StringUtils.isNotBlank(search)) { query.like(IcCommunitySelfOrganizationEntity::getOrganizationName, search); } + return query; + } - if (isPage) { - PageHelper.startPage(pageNo, pageSize); - } - query.orderByAsc(IcCommunitySelfOrganizationEntity::getCreatedTime); - return communitySelfOrganizationDao.selectList(query); + /** + * 联建单位数量查询 + * @param customerId + * @param agencyId + * @param staffOrgIds + * @param partyUnitType + * @param search + * @return + */ + public Integer countPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search) { + + LambdaQueryWrapper query = constructPartyUnitQueryWrapper(customerId, agencyId, staffOrgIds, partyUnitType, search); + + query.orderByAsc(IcPartyUnitEntity::getCreatedTime); + return partyUnitDao.selectCount(query); } /** @@ -70,6 +102,16 @@ public class HeartServiceImpl implements HeartService { String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = constructPartyUnitQueryWrapper(customerId, agencyId, staffOrgIds, partyUnitType, search); + + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } + query.orderByAsc(IcPartyUnitEntity::getCreatedTime); + return partyUnitDao.selectList(query); + } + + private LambdaQueryWrapper constructPartyUnitQueryWrapper(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcPartyUnitEntity::getCustomerId, customerId); query.eq(IcPartyUnitEntity::getType, partyUnitType); @@ -77,11 +119,6 @@ public class HeartServiceImpl implements HeartService { if (StringUtils.isNotBlank(search)) { query.like(IcPartyUnitEntity::getUnitName, search); } - - if (isPage) { - PageHelper.startPage(pageNo, pageSize); - } - query.orderByAsc(IcPartyUnitEntity::getCreatedTime); - return partyUnitDao.selectList(query); + return query; } } 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 ab357cac69..2d262abfa0 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 @@ -98,8 +98,14 @@ public class CoverageServiceImpl implements CoverageService { // 分页不太好分，先查出所有的数据，然后partation()吧 int start = (pageNo - 1) * pageSize; - int end = pageNo * pageSize; + int end = pageNo * pageSize; // 不包含 + // 总共查询了多少个了 + int lastTotalCount = 0; + int totalCount = 0; + boolean dataAppear = false; + + // 结果集 List rls = new ArrayList<>(); for (String coverageType : coverageTypes) { List ccm = mapping.get(coverageType); @@ -107,21 +113,49 @@ public class CoverageServiceImpl implements CoverageService { continue; } for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) { - // 执行查询 - List rl = doDataListSearch( - EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), - e.getCategoryKey(), search, 1, end, isPage); - - rls.addAll(rl); + boolean firstTimeDataAppear = false; if (!isPage) { - // 不分页的话，直接下一个category + // 不分页，查询所有 + // 检索数据 + List dataSegment = doDataListSearch( + EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), + e.getCategoryKey(), search, null, null, isPage); + rls.addAll(dataSegment); continue; } - // 要分页的话就要截取一下 - if (rls.size() >= end) { - return rls.subList(start, end); + // 查询当前category有多少个 + if (!dataAppear) { + Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), + e.getCategoryKey(), search); + + lastTotalCount = totalCount; + totalCount += tempCount; + if (totalCount > start) { + dataAppear = true; + firstTimeDataAppear = true; + } else { + continue; + } + } + + // 检索数据 + List dataSegment = doDataListSearch( + EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), + e.getCategoryKey(), search, 1, end, isPage); + + if (firstTimeDataAppear) { + rls.addAll(dataSegment.subList(start - lastTotalCount, dataSegment.size())); + } else { + rls.addAll(dataSegment); + } + + firstTimeDataAppear = false; + + // 最后，将多余的数据裁剪掉 + if (rls.size() >= pageSize) { + return rls.subList(0, pageSize); } } } @@ -143,6 +177,51 @@ public class CoverageServiceImpl implements CoverageService { } } + public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType, + String categoryKey, String search) { + + if (PLACE_TYPE_RESI.equals(placeType)) { + // 使用分类查询居民信息 + return icResiService.countResisByCategories4Coverage(customerId, agencyId, + staffOrgIds, categoryKey, search); + } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { + // 特殊人群 + return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); + } else if (PLACE_TYPE_EVENT.equals(placeType)) { + // 难点痛点 todo + } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { + // 城市资源管理 + return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey); + } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { + // 社区自组织 + return heartService.countCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey); + } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { + // 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7 + if (categoryKey.equals("pu_jgzsbm")) { + String partyUnitType = "3"; + return heartService.countPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search); + } + } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) { + // 危化企业 + return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey); + } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { + // 企事业单位巡查 todo + + + } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { + // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo + + } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { + // 公共服务 + return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey); + } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { + // 优势资源 + return orgCoverageService.countSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey); + } + + return 0; + } + /** * 执行数据查询 * @param customerId @@ -189,7 +268,7 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { // 城市资源管理 List cityResources = orgCoverageService.searchCityResourceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); - cityResources.stream() + return cityResources.stream() .map(resource -> new CoverageAnalisisDataListResultDTO(resource.getId(), categoryKey, placeType, resource.getName(), resource.getLatitude(), resource.getLongitude())) .collect(Collectors.toList()); 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 d35557b5c5..dd02ccda7f 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 @@ -52,4 +52,19 @@ order by s.CREATED_TIME asc + + + From e4072e7279d41ab23cdc5619d3545681cc65f5f9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 10:11:17 +0800 Subject: [PATCH 045/105] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E4=BA=BA=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmetuser/result/StaffSelectResDTO.java | 18 ++++++++++++++++++ .../dataaggre/controller/GovOrgController.java | 13 +++++++++++++ .../dao/epmetuser/CustomerStaffDao.java | 8 ++++++++ .../service/epmetuser/EpmetUserService.java | 7 +++++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 14 ++++++++++++++ .../service/govorg/GovOrgService.java | 9 +++++++++ .../service/govorg/impl/GovOrgServiceImpl.java | 18 ++++++++++++++++++ .../mapper/epmetuser/CustomerStaffDao.xml | 14 ++++++++++++++ 8 files changed, 101 insertions(+) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffSelectResDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffSelectResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffSelectResDTO.java new file mode 100644 index 0000000000..b8599a27dc --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffSelectResDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 工作人员下拉框 + */ +@Data +public class StaffSelectResDTO implements Serializable { + + private String label; + private String value; + private String name; + private String mobile; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 1e560103fa..134278d433 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean; +import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.*; @@ -179,6 +180,18 @@ public class GovOrgController { return new Result().ok(govOrgService.staffList(formDTO)); } + /** + * 组织下的工作人员 下拉框 + * + * @param tokenDto + * @param agencyId + * @return + */ + @PostMapping("staff-select-list/{agencyId}") + public Result> staffSelectList(@LoginUser TokenDto tokenDto, @PathVariable("agencyId") String agencyId) { + return new Result>().ok(govOrgService.staffSelectList(tokenDto.getCustomerId(), agencyId)); + } + /** * @Param formDTO * @Description 获取当前组织下的【组织添加的】工作人员 组织/部门/网格下人员列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java index de989d76e6..39f67d2af1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java @@ -20,6 +20,7 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO; import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; +import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import org.apache.ibatis.annotations.Mapper; @@ -71,4 +72,11 @@ public interface CustomerStaffDao extends BaseDao { * @author sun */ CustomerStaffDTO selectByStaffId(@Param("staffId") String staffId); + + /** + * 根据staffId查询姓名、手机号 + * @param staffIds + * @return + */ + List staffSelectList(@Param("staffIds") List staffIds); } 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 d905d12f37..dec1415a20 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 @@ -192,4 +192,11 @@ public interface EpmetUserService { * @author sun */ List getGridDateRoutineWorkList(GridLivelyFormDTO formDTO); + + /** + * 根据staffId查询姓名、手机号 + * @param staffIds + * @return + */ + List staffSelectList(List staffIds); } 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 55b7789e5d..5d6012c2ca 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 @@ -827,5 +827,19 @@ public class EpmetUserServiceImpl implements EpmetUserService { return staffPatrolRecordDao.gridDateRoutineWorkList(formDTO); } + /** + * 根据staffId查询姓名、手机号 + * + * @param staffIds + * @return + */ + @Override + public List staffSelectList(List staffIds) { + if(CollectionUtils.isEmpty(staffIds)){ + return new ArrayList<>(); + } + return customerStaffDao.staffSelectList(staffIds); + } + } 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 6b5d2d0ed4..fb77a2f5d2 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 @@ -2,6 +2,7 @@ package com.epmet.dataaggre.service.govorg; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerDepartmentDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; @@ -195,4 +196,12 @@ public interface GovOrgService { * @return */ BuildingInfoCache queryBuildingInfo(String buildingId); + + /** + * 组织下的工作人员下拉框 + * @param customerId + * @param agencyId + * @return + */ + List staffSelectList(String customerId, String agencyId); } 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 3e0363caa9..c8712fc983 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 @@ -31,6 +31,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.govorg.*; import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; +import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.govorg.*; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; @@ -1053,5 +1054,22 @@ public class GovOrgServiceImpl implements GovOrgService { return infoCache; } + /** + * 组织下的工作人员下拉框 + * + * @param customerId + * @param agencyId + * @return + */ + @Override + public List staffSelectList(String customerId, String agencyId) { + List staffIds = customerStaffAgencyDao.selectStaffList(agencyId, "agency"); + if (org.springframework.util.CollectionUtils.isEmpty(staffIds)) { + return new ArrayList<>(); + } + List resultDTOList = epmetUserService.staffSelectList(staffIds); + return resultDTOList; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml index a4ebcae961..3efcdfb3dc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml @@ -138,4 +138,18 @@ AND USER_ID = #{staffId} + \ No newline at end of file From 065d02a126fc9b58a1e38037750865c6f0d4f14a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 10:28:26 +0800 Subject: [PATCH 046/105] latestResultName --- .../epmet/dto/result/EnterpriseDetailDTO.java | 4 ++++ .../service/impl/IcEnterpriseServiceImpl.java | 19 ++++++++++++------- .../main/resources/mapper/IcEnterpriseDao.xml | 6 ++++++ 3 files changed, 22 insertions(+), 7 deletions(-) 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 f42ea2303e..2d787ab00f 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 @@ -99,6 +99,10 @@ public class EnterpriseDetailDTO implements Serializable { */ private String latestResult; + /** + * 最新巡查结果【0:合格 1:不合格】 + */ + private String latestResultName; /** * 最新检查时间 */ 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 310975f045..6bacf2fc50 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 @@ -166,23 +166,28 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl> dictMapRes=adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); + 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(dictMap.containsKey(resultDto.getScale()) ? dictMap.get(resultDto.getScale()) : StrConstant.EPMETY_STR); + if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "0".equals(enterpriseEntity.getLatestResult())) { + resultDto.setLatestResultName("合格"); + } else if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "1".equals(enterpriseEntity.getLatestResult())) { + resultDto.setLatestResultName("不合格"); + } return resultDto; } 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 3d972d79f9..d17a9b1d75 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 @@ -52,6 +52,12 @@ ie.MOBILE, ie.SOURCE_TYPE, ie.LATEST_RESULT, + ( + case when ie.LATEST_RESULT ='0'then '合格' + when ie.LATEST_RESULT='1' then '不合格' + else '' + end + )as latestResultName, ie.LATEST_PATROL_TIME FROM ic_enterprise ie From c4a098536388fcad695296500d69b0646b121844 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 22 Jun 2022 10:38:11 +0800 Subject: [PATCH 047/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=EF=BC=9A?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/IcEnterisePatrolResultDTO.java | 20 ++ .../govorg/IcEnterprisePatrolRecordDao.java | 42 +++++ .../dataaggre/dao/govproject/IcEventDao.java | 15 ++ .../IcEnterprisePatrolRecordEntity.java | 68 +++++++ .../entity/govproject/IcEventEntity.java | 178 ++++++++++++++++++ .../service/govorg/GovOrgCoverageService.java | 7 + .../impl/GovOrgCoverageServiceImpl.java | 15 +- .../service/govproject/GovProjectService.java | 21 +++ .../impl/GovProjectServiceImpl.java | 40 ++++ .../service/impl/CoverageServiceImpl.java | 50 +++-- .../govorg/IcEnterprisePatrolRecordDao.xml | 43 +++++ .../mapper/govproject/IcEventDao.xml | 6 + 12 files changed, 488 insertions(+), 17 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/IcEnterisePatrolResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcEnterprisePatrolRecordEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/IcEventEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/IcEnterisePatrolResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/IcEnterisePatrolResultDTO.java new file mode 100644 index 0000000000..bed391f2ac --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/IcEnterisePatrolResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +@Data +public class IcEnterisePatrolResultDTO { + private String enterpriseId; + private String patrolId; + private String customerId; + private String gridId; + private String agencyId; + private String agencyPids; + private String placeType; + private String placeOrgName; + private String address; + private String longitude; + private String latitude; + private String mobile; + private String sourceType; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java new file mode 100644 index 0000000000..d6f5c83879 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java @@ -0,0 +1,42 @@ +package com.epmet.dataaggre.dao.govorg; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; +import com.epmet.dataaggre.entity.govorg.IcEnterprisePatrolRecordEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 企事业单位巡查表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-17 + */ +@Mapper +public interface IcEnterprisePatrolRecordDao extends BaseDao { + /** + * 企事业单位巡查计数 + * @param customerId + * @param staffOrgIds + * @param search + * @param categoryKey + * @return + */ + Integer countEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId, + @Param("staffOrgIds") String staffOrgIds, @Param("search") String search, + @Param("categoryKey") String categoryKey); + + /** + * 企事业单位巡查列表 + * @param customerId + * @param staffOrgIds + * @param search + * @param categoryKey + * @return + */ + List listEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId, + @Param("staffOrgIds") String staffOrgIds, @Param("search") String search, + @Param("categoryKey") String categoryKey); +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java new file mode 100644 index 0000000000..c2305c3afc --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java @@ -0,0 +1,15 @@ +package com.epmet.dataaggre.dao.govproject; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.govproject.IcEventEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件管理表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-17 + */ +@Mapper +public interface IcEventDao extends BaseDao { +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcEnterprisePatrolRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcEnterprisePatrolRecordEntity.java new file mode 100644 index 0000000000..3096cf1d6c --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcEnterprisePatrolRecordEntity.java @@ -0,0 +1,68 @@ +package com.epmet.dataaggre.entity.govorg; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 企事业单位巡查表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-17 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_enterprise_patrol_record") +public class IcEnterprisePatrolRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 企事业单位id + */ + private String enterpriseId; + + /** + * 巡查时间 + */ + private Date patrolTime; + + /** + * 工作人员id + */ + private String staffId; + + /** + * 工作人员姓名 + */ + private String staffName; + + /** + * 工作人员手机号 + */ + private String mobile; + + /** + * 检查结果【0:合格 1:不合格】 + */ + private String result; + + /** + * 隐患明细 + */ + private String detailed; + + /** + * 拟复查时间 + */ + private Date reviewTime; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/IcEventEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/IcEventEntity.java new file mode 100644 index 0000000000..935894e098 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/IcEventEntity.java @@ -0,0 +1,178 @@ +package com.epmet.dataaggre.entity.govproject; + +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-05-17 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_event") +public class IcEventEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 事件所属的网格Id + */ + private String gridId; + + /** + * 网格的所属组织 + */ + private String agencyId; + + /** + * 网格的所有组织Id + */ + private String gridPids; + + /** + * 报事的人【居民端/pc端居民Id】可为空 + */ + private String reportUserId; + + /** + * 报事人姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 反映渠道【字典表】 + */ + private String sourceType; + + /** + * 发生时间 + */ + private Date happenTime; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 纬度 + */ + private String latitude; + + /** + * 经度 + */ + private String longitude; + + /** + * 地址 + */ + private String address; + + /** + * 处理中：processing；已办结：closed_case + */ + private String status; + + /** + * 办结时间 + */ + private Date closeCaseTime; + + /** + * 0:已回复 1:已转项目 2:已转需求 + */ + private String operationType; + + /** + * 项目、需求ID + */ + private String operationId; + + /** + * 事件是否被阅读过;1已读；针对报事人待处理列表 + */ + private Integer readFlag; + + /** + * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; + */ + private Integer redDot; + + /** + * 工作端的红点:展示1；不展示：0；【居民报事、回复更新为1】 + */ + private Integer govRedDot; + + /** + * 最近一次操作时间（回复、立项、转需求、办结更新此列） + */ + private Date latestOperatedTime; + + /** + * 是否解决：已解决 resolved，未解决 un_solved + */ + private String resolveStatus; + + /** + * 结案说明 + */ + private String closeRemark; + + /** + * 评论人 + */ + private String commentUserId; + + /** + * 评论内容 + */ + private String satisfaction; + + /** + * 评论时间 + */ + private Date commentTime; + + /** + * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； + auto_passed: 自动通过； + review：结果不确定，需要人工审核； + block: 结果违规； + rejected：人工审核驳回; + approved：人工审核通过） + */ + private String auditStatus; + + /** + * 审核理由 + */ + private String auditReason; + + /** + * 是否标记难点堵点 0:否 1：是 + */ + private String difficultPoint; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index 829509d160..ea5c2d0f87 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.service.govorg; +import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import lombok.AllArgsConstructor; @@ -112,4 +113,10 @@ public interface GovOrgCoverageService { Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey); Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey); + + Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey); + + List listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, + String search, String categoryKey, Boolean isPage, Integer pageNo, + Integer pageSize); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index dea03c8907..6545bd5e8c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.govorg.*; +import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.github.pagehelper.PageHelper; @@ -36,7 +37,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { private IcSuperiorResourceDao superiorResourceDao; @Autowired - private IcHouseDao icHouseDao; + private IcEnterprisePatrolRecordDao enterprisePatrolRecordDao; /** * 根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map @@ -263,4 +264,16 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { return query; } + + @Override + public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) { + return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); + } + + @Override + public List listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, + String search, String categoryKey, Boolean isPage, + Integer pageNo, Integer pageSize) { + return enterprisePatrolRecordDao.listEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index cb72d62d07..44ec60c4cd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -4,6 +4,8 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; +import com.epmet.dataaggre.entity.govproject.IcEventEntity; +import com.sun.org.apache.xpath.internal.operations.Bool; import java.util.LinkedList; import java.util.List; @@ -100,4 +102,23 @@ public interface GovProjectService { * @return */ List getIssueProjectFirstCategory(List issueIds); + + /** + * 数量 + * @param staffOrgIds + * @param isDifficultPoint 是否是难点堵点 + * @return + */ + Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint); + + /** + * 搜索事件 + * @param staffOrgIds + * @param search + * @param isDifficultPoint 是否是难点堵点 + * @return + */ + List searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, + Boolean isPage, Integer pageNo, Integer pageSize); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 3c4ea9f65c..d3299b50fb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.service.govproject.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.CustomerIdConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -18,6 +19,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.govproject.IcEventDao; import com.epmet.dataaggre.dao.govproject.ProjectDao; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; @@ -31,6 +33,7 @@ import com.epmet.dataaggre.dto.govproject.ResiEventReportOrgDTO; import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; +import com.epmet.dataaggre.entity.govproject.IcEventEntity; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; @@ -82,6 +85,8 @@ public class GovProjectServiceImpl implements GovProjectService { private EpmetUserService epmetUserService; @Autowired private LoginUserUtil loginUserUtil; + @Autowired + private IcEventDao icEventDao; /** * @Description 查询项目信息 @@ -644,4 +649,39 @@ public class GovProjectServiceImpl implements GovProjectService { return projectDao.selectProjectIssueCategory(issueIds); } + @Override + public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint) { + LambdaQueryWrapper query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint); + return icEventDao.selectCount(query); + } + + @Override + public List searchIcEventEntities(String customerId, String staffOrgIds, String search, + Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint); + return icEventDao.selectList(query); + } + + /** + * 构造事件查询 + * @param customerId + * @param staffOrgIds + * @param search + * @param difficultPoint 是否是难点堵点 + * @return + */ + private LambdaQueryWrapper constructIcEventQueryWrapper(String customerId, String staffOrgIds, + String search, Boolean difficultPoint) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcEventEntity::getCustomerId, customerId); + query.likeRight(IcEventEntity::getGridPids, staffOrgIds); + if (StringUtils.isNotBlank(search)) { + query.like(IcEventEntity::getName, search); + } + if (difficultPoint != null) { + query.eq(IcEventEntity::getDifficultPoint, difficultPoint); + } + + return query; + } } 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 2d262abfa0..c675998c18 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 @@ -8,14 +8,17 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dataaggre.entity.govorg.*; +import com.epmet.dataaggre.entity.govproject.IcEventEntity; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.heart.HeartService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -44,6 +47,9 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private HeartService heartService; + @Autowired + private GovProjectService govProjectService; + /** * 场所类型常量 */ @@ -53,7 +59,7 @@ public class CoverageServiceImpl implements CoverageService { public static final String PLACE_TYPE_CITY_MANAGEMENT= "city_management"; public static final String PLACE_TYPE_COMUNITY_ORG= "community_org"; public static final String PLACE_TYPE_DANGEROUS_CHEMICALS= "dangerous_chemicals"; - public static final String PLACE_TYPE_ENTERPRISE_PARTROL= "enterprise_partrol"; + public static final String PLACE_TYPE_ENTERPRISE_PARTROL= "enterprise_patrol"; public static final String PLACE_TYPE_GROUP_RENT= "group_rent"; public static final String PLACE_TYPE_PUBLIC_SERVICE= "public_service"; public static final String PLACE_TYPE_SUPERIOR_RESOURCE= "superior_resource"; @@ -188,7 +194,8 @@ public class CoverageServiceImpl implements CoverageService { // 特殊人群 return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); } else if (PLACE_TYPE_EVENT.equals(placeType)) { - // 难点痛点 todo + // 难点痛点 + return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true); } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { // 城市资源管理 return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey); @@ -205,9 +212,8 @@ public class CoverageServiceImpl implements CoverageService { // 危化企业 return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey); } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { - // 企事业单位巡查 todo - - + // 企事业单位巡查 + return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo @@ -263,18 +269,24 @@ public class CoverageServiceImpl implements CoverageService { return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), buildingLatitude, buildingLongitude); }).collect(Collectors.toList()); } else if (PLACE_TYPE_EVENT.equals(placeType)) { - // 难点痛点 todo - + // 难点痛点 + List icEventEntities = govProjectService.searchIcEventEntities( + customerId, staffOrgIds, search, true, isPage, pageNo, pageSize); + return icEventEntities.stream() + .map(e -> new CoverageAnalisisDataListResultDTO(e.getId(), categoryKey, placeType, e.getName(), e.getLatitude(), e.getLongitude())) + .collect(Collectors.toList()); } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { // 城市资源管理 - List cityResources = orgCoverageService.searchCityResourceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + List cityResources = orgCoverageService.searchCityResourceEntities( + customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return cityResources.stream() .map(resource -> new CoverageAnalisisDataListResultDTO(resource.getId(), categoryKey, placeType, resource.getName(), resource.getLatitude(), resource.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { // 社区自组织 - List l = heartService.searchCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + List l = heartService.searchCommunityOrgEntities( + customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream() .map(org -> new CoverageAnalisisDataListResultDTO(org.getId(), categoryKey, placeType, org.getOrganizationName(), org.getLatitude(), org.getLongitude())) .collect(Collectors.toList()); @@ -282,20 +294,24 @@ public class CoverageServiceImpl implements CoverageService { // 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7 if (categoryKey.equals("pu_jgzsbm")) { String partyUnitType = "3"; - List l = heartService.searchPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize); + List l = heartService.searchPartyUnitEntities( + customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize); return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getUnitName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } return new ArrayList<>(); } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) { // 危化企业 - List l = orgCoverageService.searchDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + List l = orgCoverageService.searchDangerousChemicalEntities( + customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { - // 企事业单位巡查 todo - - + // 企事业单位巡查 + List list = orgCoverageService.listEnterprisePatrol( + customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + return list.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getPatrolId(), categoryKey, placeType, dc.getPlaceOrgName(), dc.getLatitude(), dc.getLongitude())) + .collect(Collectors.toList()); } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo //select h.id, b.LATITUDE, b.LONGITUDE, concat(nei.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME, u.UNIT_NAME) @@ -311,12 +327,14 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { // 公共服务 - List l = orgCoverageService.searchPublicServiceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + List l = orgCoverageService.searchPublicServiceEntities( + customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { // 优势资源 - List l = orgCoverageService.searchSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + List l = orgCoverageService.searchSuporiorResourceEntities( + customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml new file mode 100644 index 0000000000..f84d232363 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml new file mode 100644 index 0000000000..ad5afc48d2 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 47b85ac7f854169ecd0f55f78bc1cd4f72a1656d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 10:40:39 +0800 Subject: [PATCH 048/105] resultName --- .../com/epmet/dto/result/EnterprisePatrolResultDTO.java | 5 +++++ .../main/resources/mapper/IcEnterprisePatrolRecordDao.xml | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java index a81ae678d0..1983e80168 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java @@ -45,6 +45,11 @@ public class EnterprisePatrolResultDTO implements Serializable { */ private String result; + /** + * 检查结果【0:合格 1:不合格】 + */ + private String resultName; + /** * 隐患明细 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml index b5ccb55cbe..4c35a0eecf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml @@ -11,6 +11,7 @@ + @@ -26,6 +27,12 @@ r.STAFF_NAME, r.MOBILE, r.RESULT, + ( + case when r.RESULT ='0'then '合格' + when r.RESULT='1' then '不合格' + else '' + end + )as RESULT_NAME, IFNULL( r.DETAILED, '' ) AS DETAILED, r.REVIEW_TIME FROM From 9ef3eab95ed88fd7bbd47f383eaebd6b8e7a4ed5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 22 Jun 2022 11:07:54 +0800 Subject: [PATCH 049/105] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.20__add_dict.sql | 12 +++ .../db/migration/V0.0.23__create_ic_table.sql | 100 ++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.20__add_dict.sql create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.23__create_ic_table.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.20__add_dict.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.20__add_dict.sql new file mode 100644 index 0000000000..d5803ece5d --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.20__add_dict.sql @@ -0,0 +1,12 @@ + +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 ('1000000000000000024', 'ic_danger_type', '危化品种类', '', '24', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17: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 ('4100000000000000000', '1000000000000000024', '爆炸品', '00', '0', '', '0', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17: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 ('4100000000000000001', '1000000000000000024', '压缩气体和液化气体', '01', '0', '', '1', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17: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 ('4100000000000000002', '1000000000000000024', '易燃液体', '02', '0', '', '2', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17: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 ('4100000000000000003', '1000000000000000024', '易燃固体、自燃物品和遇湿易燃物品', '03', '0', '', '3', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17: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 ('4100000000000000004', '1000000000000000024', '氧化剂和有机过氧化物', '04', '0', '', '4', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17: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 ('4100000000000000005', '1000000000000000024', '有毒品', '05', '0', '', '5', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17: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 ('4100000000000000006', '1000000000000000024', '放射性物品', '06', '0', '', '6', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17: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 ('4100000000000000007', '1000000000000000024', '腐蚀品', '07', '0', '', '7', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27'); + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.23__create_ic_table.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.23__create_ic_table.sql new file mode 100644 index 0000000000..f3f93075ba --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.23__create_ic_table.sql @@ -0,0 +1,100 @@ + +CREATE TABLE `ic_city_management` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '所属组织机构Id', + `AGENCY_ID_PATH` varchar(256) NOT NULL COMMENT 'agencyId的所有上级，包含自己', + `SOURCE_TYPE` varchar(64) NOT NULL COMMENT '来源【新增:add 导入:import 】', + `NAME` varchar(64) NOT NULL COMMENT '场所名称', + `CATEGORY` varchar(64) NOT NULL COMMENT '场所分类【字典表ic_coverage_category_dict key:city_management】', + `AREA_COVERED` varchar(32) DEFAULT '0' COMMENT '占地面积，单位平方公里', + `CAPACITY` int(6) DEFAULT '0' COMMENT '容纳人数', + `ADDRESS` varchar(256) NOT NULL COMMENT '地址', + `LONGITUDE` varchar(64) DEFAULT NULL COMMENT '经度', + `LATITUDE` varchar(64) DEFAULT NULL COMMENT '纬度', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) 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=DYNAMIC COMMENT='城市管理图层'; + +-- ---------------------------- +-- Table structure for ic_dangerous_chemicals +-- ---------------------------- +CREATE TABLE `ic_dangerous_chemicals` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '所属组织机构Id', + `AGENCY_ID_PATH` varchar(256) NOT NULL COMMENT 'agencyId的所有上级，包含自己', + `SOURCE_TYPE` varchar(64) NOT NULL COMMENT '来源【新增:add 导入:import 】', + `NAME` varchar(64) NOT NULL COMMENT '企业名称', + `CATEGORY` varchar(64) NOT NULL COMMENT '企业类型【字典表ic_coverage_category_dict key:dangerous_chemicals】', + `SAFE_DISTANCE` varchar(32) DEFAULT '0' COMMENT '周边安全距离，单位公里', + `DANGER_TYPE` varchar(32) DEFAULT '0' COMMENT '危化品种类【字典表 ic_danger_type】', + `PRINCIPAL_NAME` varchar(64) DEFAULT NULL COMMENT '负责人姓名', + `PRINCIPAL_MOBILE` varchar(32) DEFAULT NULL COMMENT '负责人电话', + `ADDRESS` varchar(256) NOT NULL COMMENT '经营地址', + `LONGITUDE` varchar(64) DEFAULT NULL COMMENT '经度', + `LATITUDE` varchar(64) DEFAULT NULL COMMENT '纬度', + `REMARK` varchar(512) DEFAULT NULL COMMENT '备注', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) 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=DYNAMIC COMMENT='重点危化品企业'; + +-- ---------------------------- +-- Table structure for ic_public_service +-- ---------------------------- +CREATE TABLE `ic_public_service` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '所属组织机构Id', + `AGENCY_ID_PATH` varchar(256) NOT NULL COMMENT 'agencyId的所有上级，包含自己', + `SOURCE_TYPE` varchar(64) NOT NULL COMMENT '来源【新增:add 导入:import 】', + `NAME` varchar(64) NOT NULL COMMENT '场所名称', + `CATEGORY` varchar(64) NOT NULL COMMENT '场所分类【字典表ic_coverage_category_dict key:public_service】', + `AREA_COVERED` varchar(32) DEFAULT '0' COMMENT '占地面积，单位平方公里', + `CAPACITY` int(6) DEFAULT '0' COMMENT '容纳人数', + `ADDRESS` varchar(256) NOT NULL COMMENT '地址', + `LONGITUDE` varchar(64) DEFAULT NULL COMMENT '经度', + `LATITUDE` varchar(64) DEFAULT NULL COMMENT '纬度', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) 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=DYNAMIC COMMENT='公共服务图层'; + +-- ---------------------------- +-- Table structure for ic_superior_resource +-- ---------------------------- +CREATE TABLE `ic_superior_resource` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '所属组织机构Id', + `AGENCY_ID_PATH` varchar(256) NOT NULL COMMENT 'agencyId的所有上级，包含自己', + `SOURCE_TYPE` varchar(64) NOT NULL COMMENT '来源【新增:add 导入:import 】', + `NAME` varchar(64) NOT NULL COMMENT '场所名称', + `CATEGORY` varchar(64) NOT NULL COMMENT '场所分类【字典表ic_coverage_category_dict key:superior_resource】', + `AREA_COVERED` varchar(32) DEFAULT '0' COMMENT '占地面积，单位平方公里', + `CAPACITY` int(6) DEFAULT '0' COMMENT '容纳人数', + `ADDRESS` varchar(256) NOT NULL COMMENT '地址', + `LONGITUDE` varchar(64) DEFAULT NULL COMMENT '经度', + `LATITUDE` varchar(64) DEFAULT NULL COMMENT '纬度', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) 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=DYNAMIC COMMENT='优势资源管理'; From 90d8bc7d6ac136c3961cd9a9f43cfb0ab4fa44c6 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 22 Jun 2022 14:16:26 +0800 Subject: [PATCH 050/105] =?UTF-8?q?house=E6=88=BF=E5=B1=8B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/entity/IcHouseEntity.java | 10 ++++++++++ .../db/migration/V0.0.24__houseAddResiNumber.sql | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index a535667426..08fc8036a5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -42,6 +42,11 @@ public class IcHouseEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属组织的PIDS，包括agency，grid + */ + private String orgIdPath; + /** * 小区id */ @@ -117,4 +122,9 @@ public class IcHouseEntity extends BaseEpmetEntity { */ private String houseCode; private String houseQrcodeUrl; + + /** + * 居住人数 + */ + private String resiNumber; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql new file mode 100644 index 0000000000..503de780a3 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql @@ -0,0 +1,5 @@ +alter table ic_house + add column RESI_NUMBER int(2) comment '居住人数' after OWNER_ID_CARD; + +alter table ic_house + add column ORG_ID_PATH varchar(256) comment '房屋所属父级列表。目前包括机关+网格' after CUSTOMER_ID; \ No newline at end of file From a2570217f5a7b704f91fa4691101ef76e96db33d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 22 Jun 2022 14:45:53 +0800 Subject: [PATCH 051/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=EF=BC=9A?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90=EF=BC=8C=E5=BE=85=E8=81=94?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoverageAnalisisDataListResultDTO.java | 5 + .../entity/govorg/IcHouseEntity.java | 9 ++ .../service/govorg/GovOrgCoverageService.java | 22 ++++- .../impl/GovOrgCoverageServiceImpl.java | 52 ++++++++++- .../impl/GovProjectServiceImpl.java | 3 + .../service/impl/CoverageServiceImpl.java | 92 +++++++++++++------ 6 files changed, 152 insertions(+), 31 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java index 2d526227d5..fd566cb191 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java @@ -15,6 +15,11 @@ public class CoverageAnalisisDataListResultDTO { */ private String categoryKey; + /** + * 类别名称 + */ + private String categoryName; + /** * 场所类型 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java index 8f02451776..2982cee72f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java @@ -42,6 +42,11 @@ public class IcHouseEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属组织的PIDS，包括agency，grid + */ + private String orgIdPath; + /** * 小区id */ @@ -117,4 +122,8 @@ public class IcHouseEntity extends BaseEpmetEntity { */ private String houseCode; private String houseQrcodeUrl; + /** + * 居住人数 + */ + private String resiNumber; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index ea5c2d0f87..334e674f75 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.service.govorg; +import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; @@ -81,8 +82,8 @@ public interface GovOrgCoverageService { * @param pageSize * @return */ - List searchGroupRentHouseEntities(String customerId, String agencyIdPath, String search, String categoryKey, - Boolean isPage, Integer pageNo, Integer pageSize); + List searchByResiNumber(String customerId, String agencyIdPath, String search, Integer resiNumberGreaterThan, + Boolean isPage, Integer pageNo, Integer pageSize); /** * 搜索公共服务 @@ -119,4 +120,21 @@ public interface GovOrgCoverageService { List listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize); + + /** + * 通过居民数量等条件查询房屋数量 + * @param customerId + * @param staffOrgIds + * @param search + * @param resiNumberBiggerThan 查询居住人数大于多少的房屋 + * @return + */ + Integer countByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan); + + /** + * 查询客户下，指定分类key对应的对象数据 + * @param categoryKey + * @return + */ + IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index 6545bd5e8c..f00359057f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -1,7 +1,9 @@ package com.epmet.dataaggre.service.govorg.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.govorg.*; import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; @@ -39,6 +41,23 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { @Autowired private IcEnterprisePatrolRecordDao enterprisePatrolRecordDao; + @Autowired + private IcHouseDao ichousedao; + + /** + * 查询客户下，指定分类key对应的对象数据 + * @param categoryKey + * @return + */ + @Override + public IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey) { + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcCoverageCategoryDictEntity::getCategoryKey, categoryKey); + queryWrapper.eq(IcCoverageCategoryDictEntity::getCustomerId, customerId); + return coverageCategoryDictDao.selectOne(queryWrapper); + } + /** * 根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map * @param categoryKeys @@ -176,9 +195,13 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { } @Override - public List searchGroupRentHouseEntities(String customerId, String agencyIdPath, String search, String categoryKey, + public List searchByResiNumber(String customerId, String agencyIdPath, String search, Integer resiNumberGreaterThan, Boolean isPage, Integer pageNo, Integer pageSize) { - return null; + LambdaQueryWrapper query = constructHouseByResiNumber(customerId, agencyIdPath, search, resiNumberGreaterThan); + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } + return ichousedao.selectList(query); } /** @@ -190,7 +213,8 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { */ @Override public Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey) { - return null; + LambdaQueryWrapper query = constructPublicServiceQueryWrapper(customerId, staffOrgIds, search, categoryKey); + return publicServiceDao.selectCount(query); } /** @@ -274,6 +298,28 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { public List listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } return enterprisePatrolRecordDao.listEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); } + + @Override + public Integer countByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan) { + return ichousedao.selectCount(constructHouseByResiNumber(customerId, staffOrgIds, search, resiNumberBiggerThan)); + } + + /** + * 为"根据居住人数查询房屋"构造条件 + */ + private LambdaQueryWrapper constructHouseByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcHouseEntity::getCustomerId, customerId); + query.likeRight(IcHouseEntity::getOrgIdPath, staffOrgIds); + if (StringUtils.isNotBlank(search)) { + query.like(IcHouseEntity::getHouseName, search); // todo 这个字段要么丰富一下，要么建立新字段用于查询 + } + query.ge(IcHouseEntity::getResiNumber, resiNumberBiggerThan); + return query; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index d3299b50fb..de4c2c2bc5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -659,6 +659,9 @@ public class GovProjectServiceImpl implements GovProjectService { public List searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize) { LambdaQueryWrapper query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint); + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } return icEventDao.selectList(query); } 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 c675998c18..62c1f5f1e6 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 @@ -183,6 +183,16 @@ public class CoverageServiceImpl implements CoverageService { } } + /** + * 计算数据条数 + * @param customerId + * @param agencyId + * @param staffOrgIds + * @param placeType + * @param categoryKey + * @param search + * @return + */ public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType, String categoryKey, String search) { @@ -215,8 +225,8 @@ public class CoverageServiceImpl implements CoverageService { // 企事业单位巡查 return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { - // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo - + // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定 + return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5); } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { // 公共服务 return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey); @@ -238,12 +248,18 @@ public class CoverageServiceImpl implements CoverageService { * @param search 关键词 * @return */ - public List doDataListSearch(String customerId, String agencyId, String staffOrgIds, String placeType, String categoryKey, String search, + public List doDataListSearch(String customerId, String agencyId, String staffOrgIds, + String placeType, String categoryKey, String search, Integer pageNo, Integer pageSize,Boolean isPage) { + // 根据categoryKey查询类别名称 + IcCoverageCategoryDictEntity categoryDict = orgCoverageService.selectByCategoryKey(categoryKey); + if (PLACE_TYPE_RESI.equals(placeType)) { // 使用分类查询居民信息 - List resiEntities = icResiService.listResisByCategories4Coverage(customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); + List resiEntities = icResiService.listResisByCategories4Coverage( + customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); + return resiEntities.stream().map(re -> { // 使用楼栋的坐标补充居民的坐标信息 BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); @@ -253,11 +269,15 @@ public class CoverageServiceImpl implements CoverageService { buildingLatitude = resiBuilding.getLatitude(); buildingLongitude = resiBuilding.getLongitude(); } - return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), buildingLatitude, buildingLongitude); + return new CoverageAnalisisDataListResultDTO( + re.getId(), categoryKey, categoryDict.getCategoryName(), placeType, re.getName(), buildingLatitude, buildingLongitude); + }).collect(Collectors.toList()); } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { // 特殊人群 - List resiInfos = icResiService.listSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); + List resiInfos = icResiService.listSpecialResisBySpecialType( + customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); + return resiInfos.stream().map(re -> { BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); String buildingLatitude = null; @@ -266,37 +286,48 @@ public class CoverageServiceImpl implements CoverageService { buildingLatitude = resiBuilding.getLatitude(); buildingLongitude = resiBuilding.getLongitude(); } - return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), buildingLatitude, buildingLongitude); + return new CoverageAnalisisDataListResultDTO( + re.getId(), categoryKey, categoryDict.getCategoryName(), placeType, re.getName(), buildingLatitude, buildingLongitude); + }).collect(Collectors.toList()); } else if (PLACE_TYPE_EVENT.equals(placeType)) { // 难点痛点 List icEventEntities = govProjectService.searchIcEventEntities( customerId, staffOrgIds, search, true, isPage, pageNo, pageSize); + return icEventEntities.stream() - .map(e -> new CoverageAnalisisDataListResultDTO(e.getId(), categoryKey, placeType, e.getName(), e.getLatitude(), e.getLongitude())) + .map(e -> new CoverageAnalisisDataListResultDTO( + e.getId(), categoryKey, categoryDict.getCategoryName(), placeType, e.getName(), e.getLatitude(), e.getLongitude())) .collect(Collectors.toList()); + } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { // 城市资源管理 List cityResources = orgCoverageService.searchCityResourceEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return cityResources.stream() - .map(resource -> new CoverageAnalisisDataListResultDTO(resource.getId(), categoryKey, placeType, resource.getName(), resource.getLatitude(), resource.getLongitude())) + .map(resource -> new CoverageAnalisisDataListResultDTO( + resource.getId(), categoryKey, categoryDict.getCategoryName(), placeType, resource.getName(), resource.getLatitude(), resource.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { // 社区自组织 List l = heartService.searchCommunityOrgEntities( customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + return l.stream() - .map(org -> new CoverageAnalisisDataListResultDTO(org.getId(), categoryKey, placeType, org.getOrganizationName(), org.getLatitude(), org.getLongitude())) + .map(org -> new CoverageAnalisisDataListResultDTO( + org.getId(), categoryKey, categoryDict.getCategoryName(), placeType, org.getOrganizationName(), org.getLatitude(), org.getLongitude())) .collect(Collectors.toList()); + } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { // 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7 if (categoryKey.equals("pu_jgzsbm")) { String partyUnitType = "3"; List l = heartService.searchPartyUnitEntities( customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize); - return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getUnitName(), dc.getLatitude(), dc.getLongitude())) + + return l.stream() + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getUnitName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } return new ArrayList<>(); @@ -304,38 +335,47 @@ public class CoverageServiceImpl implements CoverageService { // 危化企业 List l = orgCoverageService.searchDangerousChemicalEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); - return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) + + return l.stream() + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); + } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { // 企事业单位巡查 List list = orgCoverageService.listEnterprisePatrol( customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); - return list.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getPatrolId(), categoryKey, placeType, dc.getPlaceOrgName(), dc.getLatitude(), dc.getLongitude())) + + return list.stream() + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getPatrolId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getPlaceOrgName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); + } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { - // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo - //select h.id, b.LATITUDE, b.LONGITUDE, concat(nei.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME, u.UNIT_NAME) - //from ic_house h - //inner join ic_neighbor_hood nei on (h.NEIGHBOR_HOOD_ID = nei.ID and nei.DEL_FLAG='0') - //inner join ic_building b on (h.BUILDING_ID = b.ID and b.DEL_FLAG='0') - //inner join ic_building_unit u on (h.BUILDING_UNIT_ID = u.ID and u.DEL_FLAG='0') - //List houses = orgCoverageService.searchGroupRentHouseEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize); - //return houses.stream().map(h -> { - // new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, placeType, h.getName(), h.getLatitude(), h.getLongitude()); - //}) - // .collect(Collectors.toList()); + // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定 + List houses = orgCoverageService.searchByResiNumber(customerId, staffOrgIds, search, 5, isPage, pageNo, pageSize); + return houses.stream().map(h -> { + BuildingInfoCache buildingInfo = govOrgService.queryBuildingInfo(h.getBuildingId()); + String latitude = null; + String longitude = null; + if (buildingInfo != null) { + latitude = buildingInfo.getLatitude(); + longitude = buildingInfo.getLongitude(); + } + return new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, categoryDict.getCategoryName(), placeType, h.getHouseName(), latitude, longitude); + }).collect(Collectors.toList()); } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { // 公共服务 List l = orgCoverageService.searchPublicServiceEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); - return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) + return l.stream() + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { // 优势资源 List l = orgCoverageService.searchSuporiorResourceEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); - return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) + return l.stream() + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } return new ArrayList<>(); From 420dde575a223a4902b2324f2a5bd9525963bb73 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 22 Jun 2022 14:55:03 +0800 Subject: [PATCH 052/105] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=94=E5=BE=84=E6=B7=BB=E5=8A=A0orgIdPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/ImportGeneralDTO.java | 2 ++ .../java/com/epmet/controller/HouseController.java | 2 -- .../java/com/epmet/model/ImportHouseInfoListener.java | 5 +++++ .../java/com/epmet/service/impl/HouseServiceImpl.java | 11 +++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index ca5408d581..8f4783e7e7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -28,6 +28,8 @@ public class ImportGeneralDTO implements Serializable { private String pid; private String pids; + private String orgIdPath; + /** * 网格名、ID */ 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 6e99cd25f7..da97859fb9 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 @@ -170,8 +170,6 @@ public class HouseController implements ResultDataResolver { //效验数据 ValidatorUtils.validateEntity(formDTO, IcHouseAddFormDTO.AddShowGroup.class); String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; - houseService.addHouse(customerId, formDTO); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 2d9bb999e8..c3bbe3dc76 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -3,6 +3,7 @@ package com.epmet.model; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; @@ -237,6 +238,10 @@ public class ImportHouseInfoListener extends AnalysisEventListener { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(n.getGridId()); + n.setOrgIdPath(gridInfo.getPids().concat(":").concat(gridInfo.getId())); + }); // 根据单元ID_doorName查询已存在的 List ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList()); List existHouses = icBuildingDao.selectExistHouse(ids); 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 e329260f69..1c042a9285 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 @@ -20,6 +20,7 @@ import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; 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.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -147,6 +148,16 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { areaCode = numberAfterFillZero(areaCode, NumConstant.TWELVE); icHouseDTO.setHouseCode(createHouseCode(customerId, formDTO.getBuildingId(), areaCode)); } + // 补充orgIdPath + IcNeighborHoodEntity icNeighborHoodEntity = icNeighborHoodDao.selectById(icHouseDTO.getNeighborHoodId()); + if (null == icNeighborHoodEntity){ + throw new EpmetException("小区不存在："+icHouseDTO.getNeighborHoodId()); + } + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(icNeighborHoodEntity.getGridId()); + if (null == gridInfo){ + throw new EpmetException("网格信息不存在："+icNeighborHoodEntity.getId()); + } + icHouseDTO.setOrgIdPath(gridInfo.getPids().concat(":").concat(gridInfo.getId())); icHouseDao.insert(icHouseDTO); IcHouseEntity entity = new IcHouseEntity(); entity.setId(icHouseDTO.getId()); From bf5ef36c9b51669faaf7e71c18f75550a7bcd973 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 14:56:57 +0800 Subject: [PATCH 053/105] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E5=BE=85=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 1 + .../controller/IcEnterpriseController.java | 81 ++++++++-- .../epmet/excel/EnterpriseImportExcelDTO.java | 106 +++++++++++++ .../IcEnterpriseExcelImportListener.java | 136 +++++++++++++++++ .../epmet/service/IcEnterpriseService.java | 4 + .../service/impl/IcEnterpriseServiceImpl.java | 139 +++++++++++++++++- .../IcTripReportExcelImportListener.java | 2 +- 7 files changed, 456 insertions(+), 13 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java 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 d5bdbc67f6..1f7d8420ab 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -20,6 +20,7 @@ public interface ImportTaskConstants { String BIZ_TYPE_ATTENTION_TRIP_REPORT = "attention_vaccination"; String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member"; String BIZ_TYPE_IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals"; + String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise"; /** * 核酸检测 */ 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 4c06fae489..8ffd1c54e7 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 @@ -5,23 +5,28 @@ 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.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; 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.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.*; 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.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.EnterpriseDetailDTO; import com.epmet.dto.result.EnterprisePatrolResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.EnterpriseExportExcelDTO; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcEnterpriseService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -29,17 +34,17 @@ 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.io.PrintWriter; import java.net.URLEncoder; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.nio.file.Path; +import java.util.*; /** @@ -51,11 +56,12 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("enterprise") -public class IcEnterpriseController { +public class IcEnterpriseController implements ResultDataResolver { @Autowired private IcEnterpriseService icEnterpriseService; - + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; /** * 企事业单位巡查】新增/编辑 * @@ -221,4 +227,59 @@ public class IcEnterpriseController { public Result> patrolList(@PathVariable("enterpriseId") String enterpriseId) { return new Result>().ok(icEnterpriseService.patrolList(enterpriseId)); } + + /** + * + * @param tokenDto + * @param file + * @return + */ + @PostMapping("import") + public Result importExcel(@LoginUser TokenDto tokenDto, 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_enterprise", "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_ENTERPRISE); + importTaskForm.setOriginFileName(originalFilename); + + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "excel导入企事业单位错误", + "企事业单位导入失败"); + + // 3.执行导入 + icEnterpriseService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); + return new Result(); + } } 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 new file mode 100644 index 0000000000..e707674fef --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -0,0 +1,106 @@ +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; + + +/** + * 企事业单位导入 + */ +@Data +public class EnterpriseImportExcelDTO { + + /** + * 场所类型名称 + */ + @NotBlank(message = "场所类型不能为空") + @ExcelProperty(value = "*场所类型") + private String placeTypeName; + + + @NotBlank(message = "场所区域不能为空") + @ExcelProperty(value = "*场所区域") + private String gridName; + + /** + * 场所名称 + */ + @NotBlank(message = "场所名称不能为空") + @ExcelProperty(value = "*场所名称") + private String placeOrgName; + + /** + * 场所地址 + */ + @NotBlank(message = "场所地址不能为空") + @ExcelProperty(value = "*场所地址") + private String address; + + /** + * 规模名称 字典value,场所规模【 + * 0:10人以下 + * 1:10-20人 + * 2:21-40人 + * 3:41-100人 + * 4:100人以上】 + */ + @NotBlank(message = "规模不能为空") + @ExcelProperty(value = "*规模") + private String scaleName; + + /** + * 场所负责人 + */ + @NotBlank(message = "负责人不能为空") + @ExcelProperty(value = "*负责人") + private String personInCharge; + + /** + * 负责人电话 + */ + @NotBlank(message = "联系电话不能为空") + @ExcelProperty(value = "*联系电话") + private String mobile; + + @Data + public static class ErrorRow { + + @ColumnWidth(20) + @ExcelProperty(value = "场所类型") + private String placeTypeName; + + @ColumnWidth(20) + @ExcelProperty(value = "场所区域") + private String gridName; + + @ColumnWidth(20) + @ExcelProperty(value = "场所名称") + private String placeOrgName; + + /** + * 场所地址 + */ + @ColumnWidth(30) + @ExcelProperty(value = "场所地址") + private String address; + + @ColumnWidth(20) + @ExcelProperty(value = "规模") + private String scaleName; + + @ColumnWidth(20) + @ExcelProperty(value = "负责人") + private String personInCharge; + + @ColumnWidth(20) + @ExcelProperty(value = "联系电话") + private String mobile; + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } +} 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 new file mode 100644 index 0000000000..a8e149d199 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java @@ -0,0 +1,136 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.constant.StrConstant; +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.entity.IcEnterpriseEntity; +import com.epmet.excel.EnterpriseImportExcelDTO; +import com.epmet.service.impl.IcEnterpriseServiceImpl; +import lombok.extern.slf4j.Slf4j; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Slf4j +public class IcEnterpriseExcelImportListener implements ReadListener { + //最大条数阈值 + public static final int MAX_THRESHOLD = 200; + private String currentCustomerId; + /** + * 当前操作用户 + */ + private CustomerStaffInfoCacheResult staffInfo; + private IcEnterpriseServiceImpl icEnterpriseServiceImpl; + private Map placeTypeMap; + private Map scaleMap; + private Map gridMap; + //数据 + private List datas = new ArrayList<>(); + + //错误项列表 + private List errorRows = new ArrayList<>(); + + + public IcEnterpriseExcelImportListener(String currentCustomerId, + CustomerStaffInfoCacheResult staffInfoCacheResult, + IcEnterpriseServiceImpl icEnterpriseService, + Map placeTypeMap, + Map scaleMap, + Map gridMap) { + this.currentCustomerId = currentCustomerId; + this.staffInfo = staffInfoCacheResult; + this.icEnterpriseServiceImpl = icEnterpriseService; + this.placeTypeMap=placeTypeMap; + this.scaleMap=scaleMap; + this.gridMap=gridMap; + } + + @Override + public void invoke(EnterpriseImportExcelDTO data, AnalysisContext context) { + + try { + // 不能为空先校验数据 + ValidatorUtils.validateEntity(data); + + // 去除前后空格 + // todo + // 根据网格名是否能找到网格id + // todo + if(!placeTypeMap.containsKey(data.getPlaceTypeName())){ + throw new ValidateException(String.format("%s场所类型不存在",data.getPlaceTypeName())); + } + if(!scaleMap.containsKey(data.getScaleName())){ + throw new ValidateException(String.format("%s规模不存在",data.getScaleName())); + } + IcEnterpriseEntity enterpriseEntity = ConvertUtils.sourceToTarget(data, IcEnterpriseEntity.class); + enterpriseEntity.setCustomerId(currentCustomerId); + //网格id + enterpriseEntity.setGridId("todo"); + + enterpriseEntity.setAgencyId(staffInfo.getAgencyId()); + enterpriseEntity.setAgencyPids(staffInfo.getAgencyPIds()); + //场所类型 + enterpriseEntity.setPlaceType(placeTypeMap.get(data.getPlaceTypeName())); + enterpriseEntity.setLongitude(StrConstant.EPMETY_STR); + enterpriseEntity.setLatitude(StrConstant.EPMETY_STR); + //规模 + enterpriseEntity.setScale(scaleMap.get(data.getScaleName())); + enterpriseEntity.setSourceType("import"); + datas.add(enterpriseEntity); + + 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)); + } + EnterpriseImportExcelDTO.ErrorRow errorRow = new EnterpriseImportExcelDTO.ErrorRow(); + errorRow.setPlaceTypeName(data.getPlaceTypeName()); + errorRow.setGridName(data.getGridName()); + errorRow.setPlaceOrgName(data.getPlaceOrgName()); + errorRow.setAddress(data.getAddress()); + errorRow.setScaleName(data.getScaleName()); + errorRow.setPersonInCharge(data.getPersonInCharge()); + errorRow.setMobile(data.getMobile()); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + icEnterpriseServiceImpl.insertBatch(datas); + } finally { + datas.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } +} 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 168a7002f4..f7a29df4ce 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 @@ -9,6 +9,8 @@ import com.epmet.dto.result.EnterpriseDetailDTO; import com.epmet.dto.result.EnterprisePatrolResultDTO; import com.epmet.entity.IcEnterpriseEntity; +import java.nio.file.Path; + /** * 企事业单位表 * @@ -64,4 +66,6 @@ public interface IcEnterpriseService extends BaseService { * @return */ PageData list(EnterprisePageFormDTO formDTO); + + void execAsyncExcelImport(Path fileSavePath, String taskId, String customerId, String userId); } \ 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 6bacf2fc50..e1dd9cd54b 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,8 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +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; @@ -9,13 +11,16 @@ import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; 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.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.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.IcCoverageCategoryDictDao; import com.epmet.dao.IcEnterpriseDao; import com.epmet.dao.IcEnterprisePatrolAttachmentDao; @@ -23,25 +28,46 @@ import com.epmet.dao.IcEnterprisePatrolRecordDao; 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.EnterpriseDetailDTO; import com.epmet.dto.result.EnterprisePatrolResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcEnterpriseEntity; import com.epmet.entity.IcEnterprisePatrolAttachmentEntity; import com.epmet.entity.IcEnterprisePatrolRecordEntity; +import com.epmet.excel.EnterpriseImportExcelDTO; +import com.epmet.excel.handler.IcEnterpriseExcelImportListener; import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; +import com.epmet.service.CoverageService; import com.epmet.service.IcEnterpriseService; 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; 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.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; /** * 企事业单位表 @@ -49,6 +75,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-17 */ +@Slf4j @Service public class IcEnterpriseServiceImpl extends BaseServiceImpl implements IcEnterpriseService { @Autowired @@ -59,6 +86,13 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); Map dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>(); @@ -234,12 +272,109 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + @Async + @Override + public void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId) { + try { + //获取当前登录用户所属组织id + CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(customerId,userId); + + List dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode()); + Map placeTypeMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); + //todo + Map scaleMap=new HashMap<>(); + Map gridMap=new HashMap<>(); + IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this,placeTypeMap,scaleMap,gridMap); + + EasyExcel.read(filePath.toFile(), EnterpriseImportExcelDTO.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, EnterpriseImportExcelDTO.ErrorRow.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(importTaskId); + 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(importTaskId); + 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(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + log.error("method exception", e); + } + } + } + + } + + private CustomerStaffInfoCacheResult queryCurrentStaff(String customerId, String userId) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询工作人员缓存信息异常", EpmetErrorCode.SERVER_ERROR.getMsg()); + } + return staffInfo; + } + } \ No newline at end of file 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 20e9ed3dc5..2831eb532c 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 @@ -27,7 +27,7 @@ public class IcTripReportExcelImportListener implements ReadListener Date: Wed, 22 Jun 2022 15:22:02 +0800 Subject: [PATCH 054/105] =?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 --- .../resources/mapper/IcDangerousChemicalsDao.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml index c9d2242132..e6286d8446 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml @@ -10,13 +10,15 @@ source_type sourceType, `name` name, category category, - area_covered areaCovered, - CONCAT(area_covered,'平方公里') areaCoveredName, - capacity capacity, - CONCAT(capacity,'人') capacityName, + safe_distance safeDistance, + CONCAT(safe_distance,'公里') safeDistanceName, + danger_type dangerType, + principal_name principalName, + principal_mobile principalMobile, address address, longitude longitude, - latitude latitude + latitude latitude, + remark remark FROM ic_dangerous_chemicals WHERE From b181bdb5f95135e619e14540c71f1a231b9ead33 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 16:15:22 +0800 Subject: [PATCH 055/105] =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/ObjectUtil.java | 66 +++++++++++++++++++ .../IcEnterpriseExcelImportListener.java | 14 ++-- .../service/impl/IcEnterpriseServiceImpl.java | 27 ++++---- 3 files changed, 90 insertions(+), 17 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ObjectUtil.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ObjectUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ObjectUtil.java new file mode 100644 index 0000000000..fbecab75ee --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ObjectUtil.java @@ -0,0 +1,66 @@ +package com.epmet.commons.tools.utils; + +import java.util.*; +import java.lang.reflect.Field; + +public class ObjectUtil { + /** + * 对象字符串属性去空格 + */ + public static void objectToTrim(Object object) { + Map map = new HashMap<>(); + Field[] fields = getAllFields(object); + for (Field field : fields){ + String type = field.getType().getCanonicalName(); + if ("java.lang.String".equals(type)){ + field.setAccessible(true); + Object getObject = null; + + try { + getObject = field.get(object); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + + if (getObject != null) { + String trim = getObject.toString().replace(" ",""); + map.put(field.getName(), trim); + } + } + } + + for (Field field : fields) { + if (map.get(field.getName()) != null){ + String s = map.get(field.getName()); + field.setAccessible(true); + try { + field.set(object, s); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 获取子类和父类所有字段信息 + */ + private static Field[] getAllFields(Object object) { + Class clazz = object.getClass(); + + List fieldsList = new ArrayList<>(); // 保存属性对象数组到列表 + while (clazz != null) { // 遍历所有父类字节码对象 + Field[] declaredFields = clazz.getDeclaredFields(); // 获取字节码对象的属性对象数组 + fieldsList.add(declaredFields); + + clazz = clazz.getSuperclass(); // 获得父类的字节码对象 + } + + List allFields = new ArrayList<>(); + for (Field[] fields : fieldsList) { + allFields.addAll(Arrays.asList(fields)); + } + + return allFields.toArray(new Field[0]); + } +} 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 a8e149d199..338e159b49 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 @@ -7,6 +7,7 @@ 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.ObjectUtil; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.entity.IcEnterpriseEntity; import com.epmet.excel.EnterpriseImportExcelDTO; @@ -57,11 +58,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)); - //todo - Map scaleMap=new HashMap<>(); - Map gridMap=new HashMap<>(); + //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<>(); + //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)); + IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this,placeTypeMap,scaleMap,gridMap); EasyExcel.read(filePath.toFile(), EnterpriseImportExcelDTO.class, listener).headRowNumber(2).sheet(0).doRead(); From 2aaae66132a306a17c241b6e34b5082a87800c70 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 16:17:47 +0800 Subject: [PATCH 056/105] * --- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9264 -> 9394 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 d3ade2c3fa8dd136f9b5aa83f913f4aff2068fac..9f99fa2b22b0220bd8b2f343ac26550dfc110a16 100644 GIT binary patch delta 4939 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 Date: Wed, 22 Jun 2022 16:37:23 +0800 Subject: [PATCH 057/105] =?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 --- .../com/epmet/service/impl/IcDangerousChemicalsServiceImpl.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/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index 069a321fb9..0d58aaaf7c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -104,7 +104,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode()); Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 - List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), "dangerous_chemicals"); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); for (IcDangerousChemicalsListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { From e7411df73fb1cd188d7a130d69f31d6279693100 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 22 Jun 2022 16:52:42 +0800 Subject: [PATCH 058/105] =?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 --- .../com/epmet/controller/IcDangerousChemicalsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java index d7679b31fa..9a21e23b78 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java @@ -141,7 +141,7 @@ public class IcDangerousChemicalsController { formDTO.setPageNo(NumConstant.ONE); formDTO.setPageSize(NumConstant.TEN_THOUSAND); try { - String fileName = "优势资源管理" + DateUtils.format(new Date()) + ".xlsx"; + String fileName = "重点危化管理" + DateUtils.format(new Date()) + ".xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcDangerousChemicalsExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; From 33883d0896fca9b5a9c05d0d1c3738c21e6c697b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 22 Jun 2022 16:55:35 +0800 Subject: [PATCH 059/105] =?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 --- .../com/epmet/controller/IcCityManagementController.java | 6 +++--- .../com/epmet/controller/IcPublicServiceController.java | 8 ++++---- .../epmet/controller/IcSuperiorResourceController.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java index 7cde94ba86..eeec23cb96 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcCityManagementController.java @@ -138,7 +138,7 @@ public class IcCityManagementController implements ResultDataResolver { formDTO.setPageNo(NumConstant.ONE); formDTO.setPageSize(NumConstant.TEN_THOUSAND); try { - String fileName = "优势资源管理" + DateUtils.format(new Date()) + ".xlsx"; + String fileName = "城市管理" + DateUtils.format(new Date()) + ".xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcCityManagementExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; @@ -200,8 +200,8 @@ public class IcCityManagementController implements ResultDataResolver { ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_CITY_MANAGEMENT), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), - "excel导入优势资源管理信息错误", - "导入势资源管理信息失败"); + "excel导入城市管理信息错误", + "导入城市管理信息失败"); // 3.执行导入 icCityManagementService.importExcel(fileSavePath, rstData.getTaskId()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java index add08dbce3..92b2624172 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -139,7 +139,7 @@ public class IcPublicServiceController implements ResultDataResolver { formDTO.setPageNo(NumConstant.ONE); formDTO.setPageSize(NumConstant.TEN_THOUSAND); try { - String fileName = "优势资源管理" + DateUtils.format(new Date()) + ".xlsx"; + String fileName = "公共服务管理" + DateUtils.format(new Date()) + ".xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPublicServiceExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; @@ -179,7 +179,7 @@ public class IcPublicServiceController implements ResultDataResolver { fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); } catch (IOException e) { String errorMsg = ExceptionUtils.getErrorStackTrace(e); - log.error("【优势资源管理导入】创建临时存储文件失败:{}", errorMsg); + log.error("【公共服务管理导入】创建临时存储文件失败:{}", errorMsg); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); } @@ -201,8 +201,8 @@ public class IcPublicServiceController implements ResultDataResolver { ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_PUBLIC_SERVICE), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), - "excel导入优势资源管理信息错误", - "导入势资源管理信息失败"); + "excel导入公共服务管理信息错误", + "导入公共服务管理信息失败"); // 3.执行导入 icPublicServiceService.importExcel(fileSavePath, rstData.getTaskId()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java index 57fb3f1d60..147a185197 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcSuperiorResourceController.java @@ -202,7 +202,7 @@ public class IcSuperiorResourceController implements ResultDataResolver { ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入优势资源管理信息错误", - "导入势资源管理信息失败"); + "导入优势资源管理信息失败"); // 3.执行导入 icSuperiorResourceService.importExcel(fileSavePath, rstData.getTaskId()); From 54b18d72b991779fdc64829233a789535bf33eeb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 22 Jun 2022 17:02:57 +0800 Subject: [PATCH 060/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E3=80=82?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86house=E7=9A=84fullname=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=A3=80=E7=B4=A2=E3=80=82=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=88=BF=E5=B1=8Badd=E3=80=81update?= =?UTF-8?q?=E3=80=81import=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=94=9F?= =?UTF-8?q?=E6=88=90fullname=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/govorg/IcHouseEntity.java | 5 +++ .../impl/GovOrgCoverageServiceImpl.java | 2 +- .../service/impl/CoverageServiceImpl.java | 3 +- .../main/java/com/epmet/dto/IcHouseDTO.java | 5 +++ .../java/com/epmet/dto/ImportGeneralDTO.java | 2 ++ .../java/com/epmet/entity/IcHouseEntity.java | 5 +++ .../epmet/model/ImportHouseInfoListener.java | 1 + .../com/epmet/service/IcHouseService.java | 6 ++++ .../epmet/service/impl/HouseServiceImpl.java | 2 ++ .../service/impl/IcHouseServiceImpl.java | 34 ++++++++++++++++--- .../migration/V0.0.24__houseAddResiNumber.sql | 5 ++- 11 files changed, 63 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java index 2982cee72f..757def979a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java @@ -72,6 +72,11 @@ public class IcHouseEntity extends BaseEpmetEntity { */ private String houseName; + /** + * 全名:小区，楼栋，单元，房屋 + */ + private String fullName; + /** * 门牌号 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index f00359057f..12e1e789e7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -317,7 +317,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { query.eq(IcHouseEntity::getCustomerId, customerId); query.likeRight(IcHouseEntity::getOrgIdPath, staffOrgIds); if (StringUtils.isNotBlank(search)) { - query.like(IcHouseEntity::getHouseName, search); // todo 这个字段要么丰富一下，要么建立新字段用于查询 + query.like(IcHouseEntity::getFullName, search); } query.ge(IcHouseEntity::getResiNumber, resiNumberBiggerThan); return query; 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 62c1f5f1e6..6a1341a785 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 @@ -360,7 +360,8 @@ public class CoverageServiceImpl implements CoverageService { latitude = buildingInfo.getLatitude(); longitude = buildingInfo.getLongitude(); } - return new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, categoryDict.getCategoryName(), placeType, h.getHouseName(), latitude, longitude); + String houseName = StringUtils.isNotBlank(h.getFullName()) ? h.getFullName() : h.getHouseName(); + return new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, categoryDict.getCategoryName(), placeType, houseName, latitude, longitude); }).collect(Collectors.toList()); } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { 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 42163539ce..f3221c4f69 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 @@ -71,6 +71,11 @@ public class IcHouseDTO implements Serializable { */ private String houseName; + /** + * 全名:小区，楼栋，单元，房屋 + */ + private String fullName; + /** * 门牌号 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 8f4783e7e7..df0f6b0530 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -147,6 +147,8 @@ public class ImportGeneralDTO implements Serializable { private String houseName; + private String fullName; + private String customerId; private Boolean existStatus = false; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 08fc8036a5..7c8eeee13d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -72,6 +72,11 @@ public class IcHouseEntity extends BaseEpmetEntity { */ private String houseName; + /** + * 全名:小区，楼栋，单元，房屋 + */ + private String fullName; + /** * 门牌号 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index c3bbe3dc76..812792b964 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -241,6 +241,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(n.getGridId()); n.setOrgIdPath(gridInfo.getPids().concat(":").concat(gridInfo.getId())); + n.setFullName(icHouseService.getFullName(n.getNeighborHoodId(), n.getBuildingId(), n.getBuildingUnitId(), n.getDoorName())); }); // 根据单元ID_doorName查询已存在的 List ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList()); 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 161aad6c4e..f0ded0429e 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 @@ -136,4 +136,10 @@ public interface IcHouseService extends BaseService { * @date 2022/6/1/0001 16:21 */ IcHouseDTO getByHouseCode(String houseCode); + + /** + * 房屋全名：小区、楼栋、单元、房间号 + * @return + */ + String getFullName(String neighborHoodId, String buildingId, String unitId, String doorName); } \ No newline at end of file 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 1c042a9285..7b551f0515 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 @@ -142,6 +142,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { IcHouseEntity icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); icHouseDTO.setCustomerId(customerId); icHouseDTO.setHouseName(getHouseName(formDTO)); + icHouseDTO.setFullName(icHouseService.getFullName(formDTO.getNeighborHoodId(), formDTO.getBuildingId(), formDTO.getBuildingUnitId(), formDTO.getDoorName())); //获取所属组织地区码 String areaCode = icNeighborHoodDao.getAreaCode(formDTO.getNeighborHoodId()); if (StringUtils.isNotBlank(areaCode)) { @@ -202,6 +203,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { icHouseDTO.setRentName(HouseRentFlagEnums.getTypeValue(formDTO.getRentFlag())); //设置 icHouseDTO.setHouseName(getHouseName(formDTO)); + icHouseDTO.setFullName(icHouseService.getFullName(formDTO.getNeighborHoodId(), formDTO.getBuildingId(), formDTO.getBuildingUnitId(), formDTO.getDoorName())); houseChangeRecord(formDTO.getHouseId(), customerId, icHouseDTO); icHouseService.update(icHouseDTO); //删除房屋缓存 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 ef99e35c94..59557eae92 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 @@ -16,16 +16,19 @@ 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.dao.IcBuildingDao; +import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dao.IcHouseDao; -import com.epmet.dto.IcHouseDTO; -import com.epmet.dto.IcResiCategoryStatsConfigDTO; -import com.epmet.dto.IcResiUserDTO; -import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dao.IcNeighborHoodDao; +import com.epmet.dto.*; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; +import com.epmet.entity.IcBuildingEntity; +import com.epmet.entity.IcBuildingUnitEntity; import com.epmet.entity.IcHouseEntity; +import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseRentFlagEnums; import com.epmet.enums.HouseTypeEnums; @@ -61,6 +64,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl u.getNeighborHoodName()).orElse(""); + String buildingName = Optional.ofNullable(building).map(u -> u.getBuildingName()).orElse(""); + String unitName = Optional.ofNullable(unit).map(u -> u.getUnitNum().concat("单元")).orElse(""); + return new StringBuilder().append(neighborhoodName).append(buildingName).append(unitName).append(doorName).toString(); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql index 503de780a3..e3fe09cd0f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.24__houseAddResiNumber.sql @@ -2,4 +2,7 @@ alter table ic_house add column RESI_NUMBER int(2) comment '居住人数' after OWNER_ID_CARD; alter table ic_house - add column ORG_ID_PATH varchar(256) comment '房屋所属父级列表。目前包括机关+网格' after CUSTOMER_ID; \ No newline at end of file + add column ORG_ID_PATH varchar(256) comment '房屋所属父级列表。目前包括机关+网格' after CUSTOMER_ID; + +alter table ic_house + add column FULL_NAME varchar(64) comment '全名。小区、楼栋、单元、房屋' after DOOR_NAME; \ No newline at end of file From 98b68bc66d342fbf779d2592123b68cf6aa4bcaf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 17:53:38 +0800 Subject: [PATCH 061/105] 140 --- .../controller/IcEnterpriseController.java | 2 +- .../epmet/excel/EnterpriseImportExcelDTO.java | 22 +++++++++---------- .../IcEnterpriseExcelImportListener.java | 1 + .../service/impl/IcEnterpriseServiceImpl.java | 2 +- 4 files changed, 14 insertions(+), 13 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 8ffd1c54e7..de8db9cc56 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 @@ -235,7 +235,7 @@ public class IcEnterpriseController implements ResultDataResolver { * @return */ @PostMapping("import") - public Result importExcel(@LoginUser TokenDto tokenDto, MultipartFile file) { + public Result importExcel(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) { String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); // 1.暂存文件 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 e707674fef..c3a666b4ba 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 @@ -17,26 +17,26 @@ public class EnterpriseImportExcelDTO { * 场所类型名称 */ @NotBlank(message = "场所类型不能为空") - @ExcelProperty(value = "*场所类型") + @ExcelProperty(value = "场所类型") private String placeTypeName; @NotBlank(message = "场所区域不能为空") - @ExcelProperty(value = "*场所区域") + @ExcelProperty(value = "场所区域") private String gridName; /** * 场所名称 */ @NotBlank(message = "场所名称不能为空") - @ExcelProperty(value = "*场所名称") + @ExcelProperty(value = "场所名称") private String placeOrgName; /** * 场所地址 */ @NotBlank(message = "场所地址不能为空") - @ExcelProperty(value = "*场所地址") + @ExcelProperty(value = "场所地址") private String address; /** @@ -48,43 +48,43 @@ public class EnterpriseImportExcelDTO { * 4:100人以上】 */ @NotBlank(message = "规模不能为空") - @ExcelProperty(value = "*规模") + @ExcelProperty(value = "规模") private String scaleName; /** * 场所负责人 */ @NotBlank(message = "负责人不能为空") - @ExcelProperty(value = "*负责人") + @ExcelProperty(value = "负责人") private String personInCharge; /** * 负责人电话 */ @NotBlank(message = "联系电话不能为空") - @ExcelProperty(value = "*联系电话") + @ExcelProperty(value = "联系电话") private String mobile; @Data public static class ErrorRow { @ColumnWidth(20) - @ExcelProperty(value = "场所类型") + @ExcelProperty(value = "1场所类型") private String placeTypeName; @ColumnWidth(20) - @ExcelProperty(value = "场所区域") + @ExcelProperty(value = "2场所区域") private String gridName; @ColumnWidth(20) - @ExcelProperty(value = "场所名称") + @ExcelProperty(value = "3场所名称") private String placeOrgName; /** * 场所地址 */ @ColumnWidth(30) - @ExcelProperty(value = "场所地址") + @ExcelProperty(value = "4场所地址") private String address; @ColumnWidth(20) 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 338e159b49..5263746016 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 @@ -12,6 +12,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.entity.IcEnterpriseEntity; import com.epmet.excel.EnterpriseImportExcelDTO; import com.epmet.service.impl.IcEnterpriseServiceImpl; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; 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 c4fb9441bd..9b0fbb171c 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 @@ -313,7 +313,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl Date: Wed, 22 Jun 2022 19:04:20 +0800 Subject: [PATCH 062/105] =?UTF-8?q?=E5=AF=BC=E5=85=A5end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/EnterpriseImportExcelDTO.java | 8 ++++---- .../excel/handler/IcEnterpriseExcelImportListener.java | 8 ++++---- .../com/epmet/service/impl/IcEnterpriseServiceImpl.java | 4 ++-- 3 files changed, 10 insertions(+), 10 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 c3a666b4ba..8507192422 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 @@ -69,22 +69,22 @@ public class EnterpriseImportExcelDTO { public static class ErrorRow { @ColumnWidth(20) - @ExcelProperty(value = "1场所类型") + @ExcelProperty(value = "场所类型") private String placeTypeName; @ColumnWidth(20) - @ExcelProperty(value = "2场所区域") + @ExcelProperty(value = "场所区域") private String gridName; @ColumnWidth(20) - @ExcelProperty(value = "3场所名称") + @ExcelProperty(value = "场所名称") private String placeOrgName; /** * 场所地址 */ @ColumnWidth(30) - @ExcelProperty(value = "4场所地址") + @ExcelProperty(value = "场所地址") private String address; @ColumnWidth(20) 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 5263746016..65b5cda5f0 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 @@ -12,7 +12,6 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.entity.IcEnterpriseEntity; import com.epmet.excel.EnterpriseImportExcelDTO; import com.epmet.service.impl.IcEnterpriseServiceImpl; -import lombok.Data; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; @@ -57,19 +56,20 @@ public class IcEnterpriseExcelImportListener implements ReadListener gridMap=gridList.stream().collect(Collectors.toMap(GridListResultDTO::getGridName,GridListResultDTO::getGridId)); - IcEnterpriseExcelImportListener listener = new IcEnterpriseExcelImportListener(customerId,staffInfo, this,placeTypeMap,scaleMap,gridMap); - EasyExcel.read(filePath.toFile(), EnterpriseImportExcelDTO.class, listener).headRowNumber(2).sheet(0).doRead(); + 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; String errorDesFileUrl = null; From e46c88fc4f826111391bb7dac97cb46132a687bb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 22 Jun 2022 21:43:21 +0800 Subject: [PATCH 063/105] =?UTF-8?q?if=5Fhouse=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=A1=A5=E5=85=85orgIdPath=E7=9A=84=E6=8E=A5=E5=8F=A3:POST=20/?= =?UTF-8?q?gov/org/agency/orgIdPathInit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/HouseController.java | 10 +++++ .../java/com/epmet/service/HouseService.java | 2 + .../epmet/service/impl/HouseServiceImpl.java | 45 +++++++++++++++++++ 3 files changed, 57 insertions(+) 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 da97859fb9..0e556df1ea 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 @@ -569,4 +569,14 @@ public class HouseController implements ResultDataResolver { return houseService.getHomeInfoByHouseCode(dto); } + /** + * 初始化房屋的组织ID路径 + * @return + */ + @PostMapping("orgIdPathInit") + public Result orgIdPathInit() { + houseService.orgIdPathInit(); + return new Result(); + } + } 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 04c0fc819c..a5c940b0c1 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 @@ -173,4 +173,6 @@ public interface HouseService { * @return com.epmet.commons.tools.utils.Result */ Result getHomeInfoByHouseCode(HouseInfoFormDTO dto); + + void orgIdPathInit(); } 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 7b551f0515..f6a79dde4f 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 @@ -5,6 +5,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; import com.alibaba.excel.read.metadata.ReadSheet; 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.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -1082,5 +1083,49 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { return new Result().ok(house); } + @Override + public void orgIdPathInit() { + // 循环查询所有没有fullname字段的数据 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcHouseEntity::getId, "1508686441788137474"); + //query.isNull(IcHouseEntity::getOrgIdPath); + //query.last(" limit 1000 "); + + while (true) { + List houses2Dispose = icHouseDao.selectList(query); + + if (org.apache.commons.collections4.CollectionUtils.isEmpty(houses2Dispose)) { + break; + } + + houses2Dispose.stream().forEach(h -> { + IcNeighborHoodDTO neighborhood = neighborHoodService.get(h.getNeighborHoodId()); + ArrayList pidList = new ArrayList<>(); + recureAppendParentAgencyId(neighborhood.getAgencyId(), pidList); + String orgIdPath = String.join(":", pidList); + + // 更新 + IcHouseEntity house = new IcHouseEntity(); + house.setId(h.getId()); + house.setOrgIdPath(orgIdPath); + + icHouseDao.updateById(house); + }); + } + } + /** + * 递归拼接orgIdPath + * @param agencyId + * @param result + */ + private void recureAppendParentAgencyId(String agencyId, List result) { + result.add(0, agencyId); + CustomerAgencyEntity agency = customerAgencyDao.selectById(agencyId); + String pid = agency.getPid(); + if (StringUtils.isBlank(pid) || "0".equals(pid)) { + return; + } + recureAppendParentAgencyId(pid, result); + } } From 1453be01ca4f232e4bcbc9bdf4d2b4d8353d7cf6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 08:55:31 +0800 Subject: [PATCH 064/105] =?UTF-8?q?=E5=8E=BB=E6=8E=89*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/EnterpriseImportExcelDTO.java | 8 ++++---- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9394 -> 9288 bytes 2 files changed, 4 insertions(+), 4 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 c3a666b4ba..8507192422 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 @@ -69,22 +69,22 @@ public class EnterpriseImportExcelDTO { public static class ErrorRow { @ColumnWidth(20) - @ExcelProperty(value = "1场所类型") + @ExcelProperty(value = "场所类型") private String placeTypeName; @ColumnWidth(20) - @ExcelProperty(value = "2场所区域") + @ExcelProperty(value = "场所区域") private String gridName; @ColumnWidth(20) - @ExcelProperty(value = "3场所名称") + @ExcelProperty(value = "场所名称") private String placeOrgName; /** * 场所地址 */ @ColumnWidth(30) - @ExcelProperty(value = "4场所地址") + @ExcelProperty(value = "场所地址") private String address; @ColumnWidth(20) 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 9f99fa2b22b0220bd8b2f343ac26550dfc110a16..7e9d449639668020c3871ed92d10a3096075c46b 100644 GIT binary patch delta 4584 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 delta 4684 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 I%>OF?1=^?5dH?_b From 45170c05ff9ec74cb18efc2d2d5db99cee43eca9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Jun 2022 09:32:57 +0800 Subject: [PATCH 065/105] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=86=85=E5=B1=85?= =?UTF-8?q?=E6=B0=91=20=E6=80=BB=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 24 ++++ .../result/HouseIcResiUserCountResultDTO.java | 46 ++++++++ .../java/com/epmet/dao/IcResiUserDao.java | 21 ++-- .../mq/listener/ICWarnStatsEventListener.java | 107 ++++++++++++++---- .../com/epmet/service/IcResiUserService.java | 9 +- .../service/impl/IcResiUserServiceImpl.java | 48 +++++++- .../main/resources/mapper/IcResiUserDao.xml | 3 + 7 files changed, 221 insertions(+), 37 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserCountResultDTO.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 89e8a70ab3..31b8e903f8 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 @@ -777,4 +777,28 @@ public class RedisKeys { } return rootPrefix.concat("lock:").concat(methodName); } + + /** + * desc:获取更新 房屋内有居民数量的key + * @param customerId + * @return + */ + public static String getUpdateHouseResiNumer(String customerId) { + if (StringUtils.isBlank(customerId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("updateHouseResiNumber:").concat(customerId); + } + + /** + * desc:获取更新 房屋内有居民数量 线程的key + * @param customerId + * @return + */ + public static String updateIcHouseResiNumberThread(String customerId) { + if (StringUtils.isBlank(customerId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("updateHouseResiNumber:thread:").concat(customerId); + } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserCountResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserCountResultDTO.java new file mode 100644 index 0000000000..4c974bd10b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserCountResultDTO.java @@ -0,0 +1,46 @@ +/** + * 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.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 房屋内居民总数结果 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-26 + */ +@Data +public class HouseIcResiUserCountResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 房间内总人数 + */ + private Integer resiNumber; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index f145fadd97..8b201da55d 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 @@ -363,11 +363,18 @@ public interface IcResiUserDao extends BaseDao { @Param("customerId") String customerId); /** - * @describe: 通过身份证号查询实体类 - * @author wangtong - * @date 2022/6/13 17:32 - * @params [idCard, customerId] - * @return com.epmet.entity.IcResiUserEntity - */ - IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + * @return com.epmet.entity.IcResiUserEntity + * @describe: 通过身份证号查询实体类 + * @author wangtong + * @date 2022/6/13 17:32 + * @params [idCard, customerId] + */ + IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); + + /** + * desc:获取客户内 每个房屋内的居民数 + * @param customerId + * @return + */ + List getResiUserCountGroupHomeId(@Param("customerId") String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java index ee9c4e47b3..4ea3eb92b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java @@ -11,6 +11,7 @@ import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.SystemMessageType; import com.epmet.service.IcNatService; +import com.epmet.service.IcResiUserService; import com.epmet.service.StatsResiWarnService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -26,10 +27,10 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** - * @Description 负能平台-客户居民信息变动监听器 * @author wxz + * @Description 负能平台-居民信息变动监听器 * @date 2021.10.13 15:21:48 -*/ + */ @Slf4j public class ICWarnStatsEventListener implements MessageListenerConcurrently { @@ -37,6 +38,7 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently { private RedisUtils redisUtils; + @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { @@ -57,34 +59,25 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently { // msg即为消息体 // tags为SystemMessageType.java中的项，为具体的操作，此处拿到tags，判断是创建还是变更，来做响应的后续操作即可 String msg = new String(messageExt.getBody()); - log.info("msg is {}",msg); + log.info("msg is {}", msg); String topic = messageExt.getTopic(); String tags = messageExt.getTags(); String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL); logger.info("【开放数据事件监听器】-居民信息变动-收到消息内容:{},操作:{}", msg, tags); IcResiUserAddMQMsg obj = JSON.parseObject(msg, IcResiUserAddMQMsg.class); - log.info("obj is {}",JSON.toJSONString(obj)); - DistributedLock distributedLock = null; - RLock lock = null; + log.info("obj is {}", JSON.toJSONString(obj)); try { - distributedLock = SpringContextUtils.getBean(DistributedLock.class); - lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()), - 30L, 30L, TimeUnit.SECONDS); - //待执行方法 - SpringContextUtils.getBean(StatsResiWarnService.class).resiWarn(obj.getCustomerId()); - //根据居民Id更新 核酸检测的是否居民状态 - updateIcNatResiFlag(tags, obj); + if (!resiWarnStats(obj)||!updateIcNatResiFlag(tags, obj)||!updateIcHouseResiNumber(obj)){ + } } catch (RenException e) { // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 - logger.error("【开放数据事件监听器】-客户居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + logger.error("【开放数据事件监听器】-居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); } catch (Exception e) { // 不是我们自己抛出的异常，可以让MQ重试 - logger.error("【开放数据事件监听器】-客户居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + logger.error("【开放数据事件监听器】-居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); throw e; - } finally { - distributedLock.unLock(lock); } if (StringUtils.isNotBlank(pendingMsgLabel)) { @@ -96,31 +89,97 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently { } } + private boolean resiWarnStats(IcResiUserAddMQMsg obj) { + DistributedLock distributedLock = null; + RLock lock = null; + try { + if (StringUtils.isBlank(obj.getCustomerId())) { + log.warn("resiWarnStats param is error"); + return true; + } + distributedLock = SpringContextUtils.getBean(DistributedLock.class); + lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()), + 30L, 30L, TimeUnit.SECONDS); + SpringContextUtils.getBean(StatsResiWarnService.class).resiWarn(obj.getCustomerId()); + log.debug("【居民信息变动】resiWarnStats param customerId:{}", JSON.toJSONString(obj)); + + } catch (Exception e) { + log.error("resiWarnStats exception", e); + return false; + } finally { + if (distributedLock != null){ + distributedLock.unLock(lock); + } + } + return true; + } + + /** + * desc:根据客户id更新 每个房屋内居民的总数 + * @param obj + * @return + * @remark 因为使用了线程 所以结果不用关心 + */ + private boolean updateIcHouseResiNumber(IcResiUserAddMQMsg obj) { + DistributedLock distributedLock = null; + RLock lock = null; + try { + if (StringUtils.isBlank(obj.getCustomerId())) { + log.warn("updateIcHouseResiNumber param is error"); + return true; + } + distributedLock = SpringContextUtils.getBean(DistributedLock.class); + lock = distributedLock.getLock(String.format("lock:update_house_resi_number:%s", obj.getCustomerId()), + 30L, 30L, TimeUnit.SECONDS); + SpringContextUtils.getBean(IcResiUserService.class).updateIcHouseResiNumber(obj.getCustomerId()); + log.debug("【居民信息变动】updateIcHouseResiNumber param customerId & icResiUserId:{}", JSON.toJSONString(obj)); + } catch (Exception e) { + log.error("updateIcHouseResiNumber exception", e); + return false; + } finally { + if (distributedLock != null){ + distributedLock.unLock(lock); + } + } + return true; + } + /** * desc:根据居民Id更新 核酸检测的是否居民状态(只有新增和删除时调用) - * @param tags + * @param tags * @param obj + * @return */ - private void updateIcNatResiFlag(String tags, IcResiUserAddMQMsg obj) { + private boolean updateIcNatResiFlag(String tags, IcResiUserAddMQMsg obj) { + DistributedLock distributedLock = null; + RLock lock = null; try { - if (StringUtils.isBlank(obj.getCustomerId())||StringUtils.isBlank(obj.getIcResiUser())){ + if (StringUtils.isBlank(obj.getCustomerId()) || StringUtils.isBlank(obj.getIcResiUser())) { log.warn("updateIcNatResiFlag param is error"); - return; + return true; } + distributedLock = SpringContextUtils.getBean(DistributedLock.class); + lock = distributedLock.getLock(String.format("lock:ic_nat_resi_flag:%s", obj.getCustomerId()), + 30L, 30L, TimeUnit.SECONDS); if (SystemMessageType.IC_RESI_USER_ADD.equals(tags) || SystemMessageType.IC_RESI_USER_DEL.equals(tags)) { Integer effectRow = SpringContextUtils.getBean(IcNatService.class).updateIsResiFlag(obj.getCustomerId(), obj.getIcResiUser()); - log.debug("updateIcNatResiFlag effectRow:{},param customerId & icResiUserId:{}", effectRow, JSON.toJSONString(obj)); + log.debug("【居民信息变动】updateIcNatResiFlag effectRow:{},param customerId & icResiUserId:{}", effectRow, JSON.toJSONString(obj)); } } catch (Exception e) { log.error("updateIcNatResiFlag exception", e); + return false; + } finally { + if (distributedLock != null){ + distributedLock.unLock(lock); + } } + return true; } /** - * @description - * * @param pendingMsgLabel * @return + * @description * @author wxz * @date 2021.10.14 16:32:32 */ 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 e79dc5fc27..699d98b2fb 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 @@ -335,7 +335,7 @@ public interface IcResiUserService extends BaseService { SyncResiResDTO checkUser(String customerId, String idCard, String agencyId); /** - * desc:条件获取居民基础信息 + * desc:条件获取居民基础信息 按照房屋分组 * * @param formDTO * @return @@ -445,4 +445,11 @@ public interface IcResiUserService extends BaseService { * @return */ List queryVolunteerList(String customerId, String userId); + + /** + * desc:根据客户Id 更新房屋的 居民人数 + * @param customerId + * @return + */ + void updateIcHouseResiNumber(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 a90c766b8f..51abe39977 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 @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.bean.ResiExportBaseInfoData; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; +import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; @@ -56,12 +57,12 @@ import com.epmet.dto.form.*; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.IcResiDemandDictDTO; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.*; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; -import com.epmet.dto.result.demand.OptionDTO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -85,6 +86,8 @@ import java.sql.Timestamp; import java.text.NumberFormat; import java.util.*; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; @@ -129,10 +132,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); @@ -2576,6 +2579,41 @@ public class IcResiUserServiceImpl extends BaseServiceImpl o = (Future) redisUtils.get(threadKey); + if (o != null){ + //如果是自己的 则取消就行了 + //o.cancel(true); + log.info("updateIcHouseResiNumber 任务取消"); + } + }*/ + + Future submit = executorService.submit(() -> { + int pageNo = 1; + int pageSize = NumConstant.TEN_THOUSAND; + Page houseReisCountListPage = null; + String key = RedisKeys.getUpdateHouseResiNumer(customerId); + redisUtils.delete(key); + do { + houseReisCountListPage = PageHelper.startPage(pageNo++, pageSize, false) + .doSelectPage(() -> baseDao.getResiUserCountGroupHomeId(customerId)); + System.out.println(houseReisCountListPage.getResult().size()); + List result = houseReisCountListPage.getResult(); + for (HouseIcResiUserCountResultDTO o: result){ + redisUtils.leftPush(key,o); + } + + } while (houseReisCountListPage.getResult().size() == pageSize); + log.info("updateIcHouseResiNumber 执行完毕"); + //distributedLock.unLock(lock); + }); + redisUtils.set(threadKey,submit); + } + /** * 根据身份证获取居民角色（目前只有是否是志愿者） * diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index edb2455bee..84fc723e61 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1132,4 +1132,7 @@ AND customer_id = #{customerId} AND DEL_FLAG = '0' + From d0013450633ef4b3fa1e3d4b347c9c0d8f3bed02 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Jun 2022 09:47:42 +0800 Subject: [PATCH 066/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8Btotal=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CoverageController.java | 8 +-- .../dataaggre/service/CoverageService.java | 5 +- .../service/impl/CoverageServiceImpl.java | 50 ++++++++++++------- 3 files changed, 40 insertions(+), 23 deletions(-) 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 98c4885046..27563e2134 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 @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; /** @@ -34,13 +35,12 @@ public class CoverageController { List coverageTypes = input.getCoverageTypes(); List categoryKeys = input.getCategoryKeys(); if (CollectionUtils.isEmpty(coverageTypes)) { - return new Result(); + return new Result().ok(new PageData<>(new ArrayList<>(), 0)); } - List l = coverageService.analysisDataList(coverageTypes, categoryKeys, + PageData page = coverageService.analysisDataList(coverageTypes, categoryKeys, input.getSearch(), input.getPageNo(), input.getPageSize(), input.getIsPage()); - PageInfo pageInfo = new PageInfo<>(l); - return new Result>().ok(new PageData<>(l, pageInfo.getTotal())); + return new Result>().ok(page); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java index 446afa9e48..8734dcabd2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.service; +import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import java.util.List; @@ -17,6 +18,6 @@ public interface CoverageService { * @param pageSize 页面大小 * @return */ - List analysisDataList(List coverageTypes, List categoryKeys, - String search, Integer pageNo, Integer pageSize, Boolean isPage); + PageData analysisDataList(List coverageTypes, List categoryKeys, + String search, Integer pageNo, Integer pageSize, Boolean isPage); } \ No newline at end of file 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 6a1341a785..890665efe0 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 @@ -3,6 +3,7 @@ package com.epmet.dataaggre.service.impl; 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.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; @@ -75,8 +76,8 @@ public class CoverageServiceImpl implements CoverageService { * @return */ @Override - public List analysisDataList(List coverageTypes, List categoryKeys, - String search, Integer pageNo, Integer pageSize, Boolean isPage) { + public PageData analysisDataList(List coverageTypes, List categoryKeys, + String search, Integer pageNo, Integer pageSize, Boolean isPage) { String customerId = EpmetRequestHolder.getLoginUserCustomerId(); String staffId = EpmetRequestHolder.getLoginUserId(); @@ -109,8 +110,16 @@ public class CoverageServiceImpl implements CoverageService { // 总共查询了多少个了 int lastTotalCount = 0; int totalCount = 0; + + // 是否出现要展示的数据 boolean dataAppear = false; + // 是否是第一次出现需要展示的数据 + boolean firstTimeDataAppear = false; + + // 数据是否够了，够了就不再查询数据 + boolean isDataEnough = false; + // 结果集 List rls = new ArrayList<>(); for (String coverageType : coverageTypes) { @@ -119,7 +128,11 @@ public class CoverageServiceImpl implements CoverageService { continue; } for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) { - boolean firstTimeDataAppear = false; + + Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), + e.getCategoryKey(), search); + lastTotalCount = totalCount; + totalCount += tempCount; if (!isPage) { // 不分页，查询所有 @@ -131,19 +144,18 @@ public class CoverageServiceImpl implements CoverageService { continue; } - // 查询当前category有多少个 - if (!dataAppear) { - Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), - e.getCategoryKey(), search); - - lastTotalCount = totalCount; - totalCount += tempCount; - if (totalCount > start) { + if (totalCount > start) { + if (!dataAppear) { dataAppear = true; firstTimeDataAppear = true; - } else { - continue; } + } else { + continue; + } + + if (isDataEnough) { + // 数据够了，则不再查询数据列表，只检索数量，用于分页条显示 + continue; } // 检索数据 @@ -153,19 +165,23 @@ public class CoverageServiceImpl implements CoverageService { if (firstTimeDataAppear) { rls.addAll(dataSegment.subList(start - lastTotalCount, dataSegment.size())); + firstTimeDataAppear = false; } else { rls.addAll(dataSegment); } - firstTimeDataAppear = false; - // 最后，将多余的数据裁剪掉 if (rls.size() >= pageSize) { - return rls.subList(0, pageSize); + isDataEnough = true; } } } - return rls; + + if (isPage && rls.size() >= pageSize) { + return new PageData<>(rls.subList(0, pageSize), totalCount); + } else { + return new PageData<>(rls, totalCount); + } } /** From 32e319716c3879fff430d20f90616a81878624e5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 09:49:17 +0800 Subject: [PATCH 067/105] =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=B7=A1=E6=9F=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 --- .../controller/IcEnterpriseController.java | 4 +-- .../epmet/service/IcEnterpriseService.java | 2 +- .../service/impl/IcEnterpriseServiceImpl.java | 31 ++++++++++++++----- .../service/impl/IcPlaceOrgServiceImpl.java | 2 +- .../main/resources/mapper/IcEnterpriseDao.xml | 2 +- 5 files changed, 28 insertions(+), 13 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 de8db9cc56..3bd4afd921 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 @@ -159,8 +159,8 @@ public class IcEnterpriseController implements ResultDataResolver { * @return */ @PostMapping("delete/{enterpriseId}") - public Result delete(@PathVariable("enterpriseId") String enterpriseId) { - icEnterpriseService.delete(enterpriseId); + public Result delete(@LoginUser TokenDto tokenDto,@PathVariable("enterpriseId") String enterpriseId) { + icEnterpriseService.delete(enterpriseId,tokenDto.getCustomerId(),tokenDto.getUserId()); return new Result(); } 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 f7a29df4ce..82057fb0cd 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 @@ -58,7 +58,7 @@ public interface IcEnterpriseService extends BaseService { * @param enterpriseId * @return */ - void delete(String enterpriseId); + void delete(String enterpriseId,String customerId,String userId); /** * 企事业单位列表 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 77065e457e..d07e944c98 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; @@ -116,7 +117,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId,origin.getEnterpriseId()); + if (NumConstant.ZERO == enterprisePatrolRecordDao.selectCount(queryWrapper)) { + baseDao.updateLatestPatrol(origin.getEnterpriseId(),null,StrConstant.EPMETY_STR,currentUserId); + } } /** @@ -234,10 +243,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl From 6a1f38b627bb6e53498d3fe7eea2d3c1edd06b20 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Jun 2022 09:55:02 +0800 Subject: [PATCH 068/105] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=9A=84=E6=B2=A1=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/IcHouseService.java | 44 +--------------- .../service/impl/IcHouseServiceImpl.java | 50 ++----------------- 2 files changed, 5 insertions(+), 89 deletions(-) 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 f0ded0429e..10e0c9234c 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 @@ -2,7 +2,6 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.dto.result.OptionResultDTO; -import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; @@ -12,7 +11,6 @@ import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.entity.IcHouseEntity; import java.util.List; -import java.util.Map; /** * 房屋信息 @@ -22,26 +20,6 @@ import java.util.Map; */ public interface IcHouseService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2021-10-25 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2021-10-25 - */ - List list(Map params); - /** * 单条查询 * @@ -52,16 +30,6 @@ public interface IcHouseService extends BaseService { */ IcHouseDTO get(String id); - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2021-10-25 - */ - void save(IcHouseDTO dto); - /** * 默认更新 * @@ -72,16 +40,6 @@ public interface IcHouseService extends BaseService { */ void update(IcHouseDTO dto); - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2021-10-25 - */ - void delete(String[] ids); - /** * @Description 获取楼栋房屋列表 * @Param formDTO @@ -142,4 +100,4 @@ public interface IcHouseService extends BaseService { * @return */ String getFullName(String neighborHoodId, String buildingId, String unitId, String doorName); -} \ No newline at end of file +} 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 59557eae92..61792e822b 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 @@ -1,18 +1,14 @@ 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.baomidou.mybatisplus.core.toolkit.Wrappers; 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.OptionResultDTO; 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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -20,7 +16,10 @@ import com.epmet.dao.IcBuildingDao; import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dao.IcHouseDao; import com.epmet.dao.IcNeighborHoodDao; -import com.epmet.dto.*; +import com.epmet.dto.IcHouseDTO; +import com.epmet.dto.IcResiCategoryStatsConfigDTO; +import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; @@ -32,7 +31,6 @@ import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseRentFlagEnums; import com.epmet.enums.HouseTypeEnums; -import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.redis.IcHouseRedis; @@ -61,8 +59,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcHouseDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcHouseDTO.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 IcHouseDTO get(String id) { IcHouseEntity entity = baseDao.selectById(id); @@ -122,13 +93,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Thu, 23 Jun 2022 10:05:03 +0800 Subject: [PATCH 069/105] =?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 --- .../src/main/resources/mapper/IcDangerousChemicalsDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml index e6286d8446..541d673d24 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml @@ -38,6 +38,9 @@ AND category = #{category} + + AND danger_type = #{dangerType} + ORDER BY created_time DESC From 4cf4b98b0c30cce33ec44f60c3c0546325e3da51 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 10:16:58 +0800 Subject: [PATCH 070/105] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9C=BA=E6=89=80?= =?UTF-8?q?=E6=97=B6=E8=8E=B7=E5=8F=96=E4=B8=8B=E6=9C=80=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcEnterpriseServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 d07e944c98..8c8dcaecff 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 @@ -120,6 +120,14 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, enterpriseEntity.getId()).orderByDesc(IcEnterprisePatrolRecordEntity::getCreatedTime).last("limit 1"); + IcEnterprisePatrolRecordEntity latestPatrol = enterprisePatrolRecordDao.selectOne(queryWrapper); + if (null != latestPatrol) { + enterpriseEntity.setLatestResult(latestPatrol.getResult()); + enterpriseEntity.setLatestPatrolTime(latestPatrol.getPatrolTime()); + } baseDao.updateById(enterpriseEntity); } return enterpriseEntity.getId(); From 8e35cc20bf0dc05d97ecf587f79d31f254d1736b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Jun 2022 10:21:24 +0800 Subject: [PATCH 071/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A4=9A=E7=BA=BF=E7=A8=8B=E6=8F=90=E9=AB=98=E6=95=88?= =?UTF-8?q?=E7=8E=87=EF=BC=9B/resi-brief=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8D=95=E4=BD=8D=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/impl/CoverageServiceImpl.java | 7 ++++--- .../java/com/epmet/dto/result/IcResiUserBriefDTO.java | 9 +++++++++ .../com/epmet/service/impl/IcResiUserServiceImpl.java | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) 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 890665efe0..604b46dda8 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 @@ -276,7 +276,7 @@ public class CoverageServiceImpl implements CoverageService { List resiEntities = icResiService.listResisByCategories4Coverage( customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); - return resiEntities.stream().map(re -> { + return resiEntities.parallelStream().map(re -> { // 使用楼栋的坐标补充居民的坐标信息 BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); String buildingLatitude = null; @@ -285,6 +285,7 @@ public class CoverageServiceImpl implements CoverageService { buildingLatitude = resiBuilding.getLatitude(); buildingLongitude = resiBuilding.getLongitude(); } + log.info("hhh"); return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, categoryDict.getCategoryName(), placeType, re.getName(), buildingLatitude, buildingLongitude); @@ -294,7 +295,7 @@ public class CoverageServiceImpl implements CoverageService { List resiInfos = icResiService.listSpecialResisBySpecialType( customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); - return resiInfos.stream().map(re -> { + return resiInfos.parallelStream().map(re -> { BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); String buildingLatitude = null; String buildingLongitude = null; @@ -368,7 +369,7 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定 List houses = orgCoverageService.searchByResiNumber(customerId, staffOrgIds, search, 5, isPage, pageNo, pageSize); - return houses.stream().map(h -> { + return houses.parallelStream().map(h -> { BuildingInfoCache buildingInfo = govOrgService.queryBuildingInfo(h.getBuildingId()); String latitude = null; String longitude = null; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index 056acbc584..c9a0160aed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -76,4 +76,13 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { */ private List houseUserList; + /** + * 人户状况 + */ + private String rhzk; + + /** + * 工作单位 + */ + private String gzdw; } 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 51abe39977..decd30dfc6 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 @@ -1412,6 +1412,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Thu, 23 Jun 2022 10:21:30 +0800 Subject: [PATCH 072/105] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.25__icenterpise.sql | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.25__icenterpise.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.25__icenterpise.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.25__icenterpise.sql new file mode 100644 index 0000000000..c347e0cbe8 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.25__icenterpise.sql @@ -0,0 +1,69 @@ +CREATE TABLE `ic_enterprise` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格Id【场所区域】', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '网格所属的组织Id', + `AGENCY_PIDS` varchar(256) DEFAULT NULL COMMENT 'agency_id的所有上级', + `PLACE_TYPE` varchar(64) NOT NULL COMMENT '场所类型：来源于ic_coverage_category_dict', + `PLACE_ORG_NAME` varchar(64) NOT NULL COMMENT '场所名称', + `ADDRESS` varchar(256) NOT NULL COMMENT '场所地址', + `LONGITUDE` varchar(64) DEFAULT NULL COMMENT '经度', + `LATITUDE` varchar(64) DEFAULT NULL COMMENT '纬度', + `SCALE` varchar(128) 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) NOT NULL COMMENT '场所负责人', + `MOBILE` varchar(11) NOT NULL COMMENT '负责人电话', + `SOURCE_TYPE` varchar(64) NOT NULL COMMENT '来源【新增:add 导入:import 】', + `LATEST_RESULT` varchar(2) DEFAULT '' COMMENT '最新巡查结果【0:合格 1:不合格】', + `LATEST_PATROL_TIME` datetime DEFAULT 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`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='企事业单位表'; + + +CREATE TABLE `ic_enterprise_patrol_record` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `ENTERPRISE_ID` varchar(64) NOT NULL COMMENT '企事业单位id', + `PATROL_TIME` datetime NOT NULL COMMENT '巡查时间', + `STAFF_ID` varchar(64) NOT NULL COMMENT '工作人员id', + `STAFF_NAME` varchar(64) NOT NULL COMMENT '工作人员姓名', + `MOBILE` varchar(64) NOT NULL COMMENT '工作人员手机号', + `RESULT` varchar(2) NOT NULL COMMENT '巡查结果【0:合格 1:不合格】', + `DETAILED` varchar(512) DEFAULT NULL COMMENT '隐患明细', + `REVIEW_TIME` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP 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 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='企事业单位巡查表'; + + + +CREATE TABLE `ic_enterprise_patrol_attachment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `PATROL_ID` varchar(64) NOT NULL COMMENT '服务记录id,服务项目id', + `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名', + `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', + `ATTACHMENT_TYPE` varchar(64) NOT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', + `ATTACHMENT_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='企事业单位巡查附件表(目前只上传图片)'; \ No newline at end of file From e6053d25d79a7318da8fd497e112e98c0a256879 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 10:28:06 +0800 Subject: [PATCH 073/105] converagedict --- .../db/migration/V0.0.26__converagedict.sql | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.26__converagedict.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.26__converagedict.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.26__converagedict.sql new file mode 100644 index 0000000000..420c476db6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.26__converagedict.sql @@ -0,0 +1,67 @@ +CREATE TABLE `ic_coverage_category_dict` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT 'default；或者customerId', + `CATEGORY_KEY` varchar(32) NOT NULL COMMENT '类别key', + `CATEGORY_NAME` varchar(255) NOT NULL COMMENT '名称', + `PLACE_TYPE` varchar(32) DEFAULT NULL COMMENT '所属场所类型。社区自组织：community_org;优势资源:superior_resource;城市管理：city_management；重点危化企业：dangerous_chemicals；公共服务：public_service；特殊人群：special_resi；居民：resi；联建单位：party_unit；群租房：group_rent；事件(包括难点堵点)：event；企事业单位巡查：enterprise_patrol；', + `COVERAGE_TYPE` varchar(10) DEFAULT NULL COMMENT '所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层', + `SORT` int(11) DEFAULT NULL COMMENT '排序', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) 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='五大图层类别字典表'; + + +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('07a0a8de30dd8456f1870a1741e5b4c4', 'default', 'ep_lssd', '零售商店（来源企事业单位巡查）', 'enterprise_patrol', 'csgl', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('093a5577095a3638e7e6c8c6c920e8d0', 'default', 'sr_rfqck', '人房汽车库', 'superior_resource', 'yjcl', 8, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('0c7b40b38bd35ed89ce0130c6e704c0c', 'default', 'shequjiaozheng', '社区矫正', 'special_resi', 'zhzl', 4, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('0eca6889444417c3f2a778f229abf41a', 'default', 'sr_tyc', '体育场', 'superior_resource', 'yjcl', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('0ef500646ea5a0ebb38f0ae2f836e417', 'default', 'buliangqingshaonian', '不良青少年', 'special_resi', 'zhzl', 3, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('0f988841571d2e4afcba883afd9974d5', 'default', 'yjdw', '应急队伍', 'community_org', 'yjcl', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('195bbc27440d3abd7f69eea91cdf60f1', 'default', 'lyjlb', '老友俱乐部', 'community_org', 'yjcl', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1e51a52f1527246daf7840ec38912b45', 'default', 'ep_gwylcs', '歌舞娱乐场所', 'enterprise_patrol', 'aqsc', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('28997e303edb86daea625f734c8f017b', 'default', 'sr_gc', '广场', 'superior_resource', 'yjcl', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('45bc9a851db61a65817bf5c5f6368d0c', 'default', 'sr_ggld', '公共绿地', 'superior_resource', 'yjcl', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('488f7ae48acabdcf849f8d7ae2d92c43', 'default', 'ps_jjz', '急救站', 'public_service', 'ggfw', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4ccb2ca7ae1ae347022a7142f35710d0', 'default', 'ep_mrxycs', '美容洗浴场所', 'enterprise_patrol', 'aqsc', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5406fee68a7ed5fee1107d82acad4982', 'default', 'whdw', '文化队伍', 'community_org', 'yjcl', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('550fc32040b3b2eb9ab61aa8ba508458', 'default', 'dc_jqz', '加气站', 'dangerous_chemicals', 'aqsc', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('59f5869872130e17295032266815fa32', 'default', 'sr_yjy', '影剧院', 'superior_resource', 'yjcl', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('67f28e477d64dbba67896410b4209732', 'default', 'ps_wss', '卫生所（室）', 'public_service', 'ggfw', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6c6790441a194dc4c71cd3ecc734d9a0', 'default', 'pu_jgzsbm', '机关直属部门（来源联建单位）', 'party_unit', 'yjcl', 10, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('72d4b41e70d0099bebda1627aa8cef17', 'default', 'dc_jzgd', '建筑工地', 'dangerous_chemicals', 'aqsc', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('75a70d0fbac1abb44d790fb66d37ec29', 'default', 'cm_cjsc', '超级市场', 'city_management', 'csgl', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('76bb777ebda757dec40ab841c8bf52e8', 'default', 'xiejiaorenyuan', '邪教人员', 'special_resi', 'zhzl', 2, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('7db567f70cd93dc4e9dc9a74a1982e30', 'default', 'lwh', '楼委会', 'community_org', 'yjcl', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('80e483641815cc55fdf90e04d23457bd', 'default', 'cm_nmsc', '农贸市场', 'city_management', 'csgl', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('83c933ce13df36180b02d6edd055f53c', 'default', 'sr_djc', '度假村', 'superior_resource', 'yjcl', 7, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('88d1ab9131db2031138300563b7a0be3', 'default', 'resi_szry', '失智人员', 'resi', 'ggfw', 0, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('8a929fe6bd98c8319ef717bf52644324', 'default', 'ps_mzb', '门诊部', 'public_service', 'ggfw', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('8ce8a8ee5fed31e60c251897794662ce', 'default', 'cm_bhsc', '百货商场', 'city_management', 'csgl', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('8efac6162d40cb69cf4c72d4de86f6d5', 'default', 'ps_lyy', '疗养院', 'public_service', 'ggfw', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('8f98e6e4c6b6f399d1670196e12762e6', 'default', 'gr_czw', '出租的房屋，住的人口超过5人属于群租房（是个规定）', 'group_rent', 'aqsc', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('90bf628e45a88c6695f4b6a47379b02e', 'default', 'zhaoshizhaohuojingshenbing', '肇事肇祸精神病', 'special_resi', 'zhzl', 5, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('913569d0d327ce7d51a108ad4b9fa5b8', 'default', 'ep_yy', '医院（来源企事业单位巡查）', 'enterprise_patrol', 'ggfw', 6, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('962cee919ca831587b65d17e242f359b', 'default', 'ep_lg', '旅馆', 'enterprise_patrol', 'yjcl', 9, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('9e0fda438e96cb7ccc0c95afcd6b3091', 'default', 'resi_xfry', '信访人员', 'resi', 'zhzl', 0, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('a6e7d2be933d94450c1eac20975c3254', 'default', 'ep_xx', '学校（来源企事业单位巡查）', 'enterprise_patrol', 'ggfw', 5, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('a71afa09b5afc279ffb0e14b7637e8ba', 'default', 'sr_xfz', '消防站', 'superior_resource', 'yjcl', 9, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('a790078bf1e507ee4143b178956a6660', 'default', 'dc_whpdw', '危化品单位', 'dangerous_chemicals', 'aqsc', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('ab5c7adfd20e8791c2ac4a0dc3a913e2', 'default', 'ep_cycs', '餐饮场所', 'enterprise_patrol', 'aqsc', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('b4773dbde111040129f616d64917e6a3', 'default', 'sr_jzz', '救助站', 'superior_resource', 'yjcl', 6, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('b63dcb8abeebef94defc4a428148a4d7', 'default', 'ep_wb', '网吧', 'enterprise_patrol', 'aqsc', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('c4f92ca3e985c2ddd259843e0e06be69', 'default', 'ps_zs', '诊所', 'public_service', 'ggfw', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('c6a5d9456f6b2f9a2baee1e515b30f17', 'default', 'ep_scjgqy', '生产加工企业', 'enterprise_patrol', 'aqsc', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('cb27f89d903937cd5b716f50be96e966', 'default', 'dc_jyz', '加油站', 'dangerous_chemicals', 'aqsc', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('cb694000b9cf8c5af9061a809237bfb7', 'default', 'zaxld', '治安巡逻队', 'community_org', 'yjcl', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('cea8b4af8e996b8d49a501fe21e0fa74', 'default', 'sr_gy', '公园', 'superior_resource', 'yjcl', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('d3aa4af87d1cdc9fec9df22f8c13c3ad', 'default', 'other', '其他', 'community_org', 'yjcl', 5, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('d9393e37d7f8527f9d337ee80f126464', 'default', 'dc_yqhjz', '油气合建站', 'dangerous_chemicals', 'aqsc', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('ddef1d1babb1b25e3f86fdc58f4e3f81', 'default', 'xidurenyuan', '吸毒人员', 'special_resi', 'zhzl', 6, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('e8b5b9fa49369996825e449862d7f417', 'default', 'event_tdnd', '痛点难点', 'event', 'csgl', 0, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('eedf77bbfee5c08bb121c3ca94f9df76', 'default', 'resi_snry', '失能人员', 'resi', 'ggfw', 0, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO `epmet_gov_org`.`ic_coverage_category_dict` (`ID`, `CUSTOMER_ID`, `CATEGORY_KEY`, `CATEGORY_NAME`, `PLACE_TYPE`, `COVERAGE_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('f286cb6e38905289d9ae3a24c0727b4c', 'default', 'anzhibangjiao', '安置帮教', 'special_resi', 'zhzl', 1, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); \ No newline at end of file From 18ef454c809d66e4c8be676e8f1d121878e59d8f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Jun 2022 10:34:26 +0800 Subject: [PATCH 074/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=9D=E5=A7=8B=E5=8C=96=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=AD=97=E5=85=B8=EF=BC=8C=E9=82=A3=E5=B0=B1=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=86=E7=B1=BB=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 604b46dda8..1738ddabd6 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 @@ -87,9 +87,15 @@ public class CoverageServiceImpl implements CoverageService { if (CollectionUtils.isNotEmpty(categoryKeys)) { // 有分类keys，使用分类keys查询，使用coverageTypes分组 mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys, customerId); + if (mapping == null || mapping.size() == 0) { + mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys, "default"); + } } else { // 没有分类keys，使用coverageTypes直接查询 mapping = orgCoverageService.getMappingRelationByCoverageType(coverageTypes, customerId); + if (mapping == null || mapping.size() == 0) { + mapping = orgCoverageService.getMappingRelationByCoverageType(categoryKeys, "default"); + } } // 2.循环coverageTypes，使用key到map中查询(为了顺序)，得到categoryKeys列表之后，根据实际情况做相应的查询 From f8296135f3fe5da38f0f1d8216f9500673c64899 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 10:57:20 +0800 Subject: [PATCH 075/105] xiugai --- .../main/java/com/epmet/controller/IcEnterpriseController.java | 3 +++ 1 file changed, 3 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 3bd4afd921..3cadda4cf2 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 @@ -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.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; @@ -69,6 +70,7 @@ public class IcEnterpriseController implements ResultDataResolver { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("addOrUpdate") public Result addOrUpdate(@LoginUser TokenDto tokenDto, @RequestBody EnterpriseFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -195,6 +197,7 @@ public class IcEnterpriseController implements ResultDataResolver { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("addorupdate-patrol") public Result addOrUpdatePatrol(@LoginUser TokenDto tokenDto, @RequestBody EnterprisePatrolFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From 9dbc03fe7f1aa44809010d1b8c90449625bf3a7f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 11:20:42 +0800 Subject: [PATCH 076/105] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=9C=80=E5=A4=9A500=EF=BC=8C=E5=9C=BA=E6=89=80=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9C=80=E5=A4=9A100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java | 2 +- .../main/java/com/epmet/dto/form/EnterprisePatrolFormDTO.java | 2 +- .../src/main/resources/db/migration/V0.0.27__placeorgname.sql | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.27__placeorgname.sql 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 ff483014ba..61f8470c60 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 @@ -48,7 +48,7 @@ public class EnterpriseFormDTO implements Serializable { * 场所名称 */ @NotBlank(message = "场所名称不能为空", groups = {AddShow.class}) - @Length(max = 50, message = "场所名称最多输入50字", groups = {AddShow.class}) + @Length(max = 100, message = "场所名称最多输入50字", groups = {AddShow.class}) private String placeOrgName; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePatrolFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePatrolFormDTO.java index 564653e88a..1a9d13957a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePatrolFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePatrolFormDTO.java @@ -63,7 +63,7 @@ public class EnterprisePatrolFormDTO implements Serializable { /** * 隐患明细 */ - @Length(max = 50, message = "隐患明细500字以内", groups = {AddShow.class}) + @Length(max = 500, message = "隐患明细500字以内", groups = {AddShow.class}) private String detailed; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.27__placeorgname.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.27__placeorgname.sql new file mode 100644 index 0000000000..c2c0125b63 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.27__placeorgname.sql @@ -0,0 +1 @@ +alter table ic_enterprise MODIFY COLUMN PLACE_ORG_NAME VARCHAR(128)not null COMMENT '场所名称'; \ No newline at end of file From d196b50cbfee272a69b2b5e83d552d72c115c768 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Jun 2022 14:04:46 +0800 Subject: [PATCH 077/105] =?UTF-8?q?=E8=A2=AB=E5=87=BA=E7=A7=9F=E8=BD=A6?= =?UTF-8?q?=E6=BA=85=E8=A3=A4=E8=84=9A=E4=B8=8A=E6=B0=B4=E4=BA=86...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 1 - .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) 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 1738ddabd6..e83db193ad 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 @@ -291,7 +291,6 @@ public class CoverageServiceImpl implements CoverageService { buildingLatitude = resiBuilding.getLatitude(); buildingLongitude = resiBuilding.getLongitude(); } - log.info("hhh"); return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, categoryDict.getCategoryName(), placeType, re.getName(), buildingLatitude, buildingLongitude); 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 f6a79dde4f..774504302e 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 @@ -1087,9 +1087,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { public void orgIdPathInit() { // 循环查询所有没有fullname字段的数据 LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(IcHouseEntity::getId, "1508686441788137474"); - //query.isNull(IcHouseEntity::getOrgIdPath); - //query.last(" limit 1000 "); + //query.eq(IcHouseEntity::getId, "1508686441788137474"); + query.isNull(IcHouseEntity::getOrgIdPath); + query.last(" limit 1000 "); while (true) { List houses2Dispose = icHouseDao.selectList(query); From d153c426ce6c1f558c758727961a8b19c36c4fbe Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Jun 2022 14:45:12 +0800 Subject: [PATCH 078/105] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96house=20orgIdPath=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/HouseServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 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 774504302e..ba9cb5e146 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 @@ -1100,8 +1100,18 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { houses2Dispose.stream().forEach(h -> { IcNeighborHoodDTO neighborhood = neighborHoodService.get(h.getNeighborHoodId()); + if (neighborhood == null) { + log.warn("为house初始化orgIdPath失败，指定ID的小区未找到。小区id:{}, 房屋id:{}", h.getNeighborHoodId(), h.getId()); + return; + } ArrayList pidList = new ArrayList<>(); - recureAppendParentAgencyId(neighborhood.getAgencyId(), pidList); + try { + recureAppendParentAgencyId(neighborhood.getAgencyId(), pidList); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.warn(errorMsg); + return; + } String orgIdPath = String.join(":", pidList); // 更新 @@ -1122,6 +1132,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { private void recureAppendParentAgencyId(String agencyId, List result) { result.add(0, agencyId); CustomerAgencyEntity agency = customerAgencyDao.selectById(agencyId); + if (agency == null) { + throw new EpmetException(String.format("为house初始化orgIdPath失败，agency为号到。agencyId:%s", agencyId)); + } String pid = agency.getPid(); if (StringUtils.isBlank(pid) || "0".equals(pid)) { return; From d09f7eace03d7e83d5722f1ad42a63db72c75226 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 23 Jun 2022 14:46:42 +0800 Subject: [PATCH 079/105] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=87=8D=E5=90=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcCityManagementExcelImportListener.java | 34 ++++++++++++++++- .../IcPublicServiceExcelImportListener.java | 34 ++++++++++++++++- ...IcSuperiorResourceExcelImportListener.java | 37 +++++++++++++++++-- .../impl/IcCityManagementServiceImpl.java | 4 +- .../impl/IcPublicServiceServiceImpl.java | 5 ++- .../impl/IcSuperiorResourceServiceImpl.java | 4 +- 6 files changed, 110 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 8bbd73fed0..91199dfde1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -2,10 +2,12 @@ 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.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.IcCityManagementDao; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.entity.IcCityManagementEntity; import com.epmet.excel.IcCityManagementExcel; @@ -13,9 +15,11 @@ import com.epmet.service.CoverageService; import com.epmet.service.impl.IcCityManagementServiceImpl; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -42,14 +46,19 @@ public class IcCityManagementExcelImportListener implements ReadListener otherRows = new ArrayList<>(); private IcCityManagementServiceImpl IcCityManagementServiceImpl; private CoverageService coverageService; + private IcCityManagementDao icCityManagementDao; + //存放当前组织下已存在的场所信息 + private Map existMap = null; - public IcCityManagementExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, IcCityManagementServiceImpl IcCityManagementServiceImpl, CoverageService coverageService) { + public IcCityManagementExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, + IcCityManagementServiceImpl IcCityManagementServiceImpl, CoverageService coverageService, IcCityManagementDao icCityManagementDao) { this.currentUserId = currentUserId; this.currentCustomerId = currentCustomerId; this.currentAgencyId = currentAgencyId; this.currentAgencyPids = currentAgencyPids; this.IcCityManagementServiceImpl = IcCityManagementServiceImpl; this.coverageService = coverageService; + this.icCityManagementDao = icCityManagementDao; } @Override @@ -59,6 +68,15 @@ public class IcCityManagementExcelImportListener implements ReadListener getExistMap(String agencyId) { + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcCityManagementEntity::getAgencyId, agencyId); + List entityList = icCityManagementDao.selectList(tWrapper); + Map existMap = new HashMap<>(16); + if (CollectionUtils.isNotEmpty(entityList)) { + existMap = entityList.stream().collect(Collectors.toMap(IcCityManagementEntity::getName, IcCityManagementEntity::getId, (v1, v2) -> v1)); + } + return existMap; + } + /** * 执行持久化 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java index b3da93cedd..b03764be92 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java @@ -2,10 +2,12 @@ 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.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.IcPublicServiceDao; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.entity.IcPublicServiceEntity; import com.epmet.excel.IcPublicServiceExcel; @@ -13,9 +15,11 @@ import com.epmet.service.CoverageService; import com.epmet.service.impl.IcPublicServiceServiceImpl; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -42,14 +46,19 @@ public class IcPublicServiceExcelImportListener implements ReadListener otherRows = new ArrayList<>(); private IcPublicServiceServiceImpl IcPublicServiceServiceImpl; private CoverageService coverageService; + private IcPublicServiceDao icPublicServiceDao; + //存放当前组织下已存在的场所信息 + private Map existMap = null; - public IcPublicServiceExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, IcPublicServiceServiceImpl IcPublicServiceServiceImpl, CoverageService coverageService) { + public IcPublicServiceExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, + IcPublicServiceServiceImpl IcPublicServiceServiceImpl, CoverageService coverageService, IcPublicServiceDao icPublicServiceDao) { this.currentUserId = currentUserId; this.currentCustomerId = currentCustomerId; this.currentAgencyId = currentAgencyId; this.currentAgencyPids = currentAgencyPids; this.IcPublicServiceServiceImpl = IcPublicServiceServiceImpl; this.coverageService = coverageService; + this.icPublicServiceDao = icPublicServiceDao; } @Override @@ -59,6 +68,15 @@ public class IcPublicServiceExcelImportListener implements ReadListener getExistMap(String agencyId) { + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcPublicServiceEntity::getAgencyId, agencyId); + List entityList = icPublicServiceDao.selectList(tWrapper); + Map existMap = new HashMap<>(16); + if (CollectionUtils.isNotEmpty(entityList)) { + existMap = entityList.stream().collect(Collectors.toMap(IcPublicServiceEntity::getName, IcPublicServiceEntity::getId, (v1, v2) -> v1)); + } + return existMap; + } + /** * 执行持久化 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java index 7317cdc5b1..178809ef42 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java @@ -2,22 +2,24 @@ 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.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.IcSuperiorResourceDao; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; -import com.epmet.dto.result.IcSuperiorResourceListResultDTO; import com.epmet.entity.IcSuperiorResourceEntity; import com.epmet.excel.IcSuperiorResourceExcel; import com.epmet.service.CoverageService; import com.epmet.service.impl.IcSuperiorResourceServiceImpl; 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.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -44,14 +46,20 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener otherRows = new ArrayList<>(); private IcSuperiorResourceServiceImpl icSuperiorResourceServiceImpl; private CoverageService coverageService; + private IcSuperiorResourceDao icSuperiorResourceDao; + //存放当前组织下已存在的场所信息 + private Map existMap = null; - public IcSuperiorResourceExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, IcSuperiorResourceServiceImpl icSuperiorResourceServiceImpl, CoverageService coverageService) { + + public IcSuperiorResourceExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids, + IcSuperiorResourceServiceImpl icSuperiorResourceServiceImpl, CoverageService coverageService, IcSuperiorResourceDao icSuperiorResourceDao) { this.currentUserId = currentUserId; this.currentCustomerId = currentCustomerId; this.currentAgencyId = currentAgencyId; this.currentAgencyPids = currentAgencyPids; this.icSuperiorResourceServiceImpl = icSuperiorResourceServiceImpl; this.coverageService = coverageService; + this.icSuperiorResourceDao = icSuperiorResourceDao; } @Override @@ -61,6 +69,15 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener getExistMap(String agencyId) { + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcSuperiorResourceEntity::getAgencyId, agencyId); + List entityList = icSuperiorResourceDao.selectList(tWrapper); + Map existMap = new HashMap<>(16); + if (CollectionUtils.isNotEmpty(entityList)) { + existMap = entityList.stream().collect(Collectors.toMap(IcSuperiorResourceEntity::getName, IcSuperiorResourceEntity::getId, (v1, v2) -> v1)); + } + return existMap; + } + /** * 执行持久化 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java index 198c14f01d..526ef118cc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java @@ -74,6 +74,8 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl Date: Thu, 23 Jun 2022 14:56:39 +0800 Subject: [PATCH 080/105] =?UTF-8?q?houseEntity.resiNumber=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java | 2 +- .../src/main/java/com/epmet/entity/IcHouseEntity.java | 2 +- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java index 757def979a..c098192f01 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java @@ -130,5 +130,5 @@ public class IcHouseEntity extends BaseEpmetEntity { /** * 居住人数 */ - private String resiNumber; + private Integer resiNumber; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 7c8eeee13d..25a02ec5fd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -131,5 +131,5 @@ public class IcHouseEntity extends BaseEpmetEntity { /** * 居住人数 */ - private String resiNumber; + private Integer resiNumber; } 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 c55f985fc5..d9c2936019 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 @@ -24,6 +24,7 @@ + From 1c8e4c809e7aec9a43c75b13ba773ca35cce1a49 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Jun 2022 14:59:40 +0800 Subject: [PATCH 081/105] =?UTF-8?q?houseEntity.resiNumber=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.28__houseResiNumberAdjust.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.28__houseResiNumberAdjust.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.28__houseResiNumberAdjust.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.28__houseResiNumberAdjust.sql new file mode 100644 index 0000000000..32da1ee720 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.28__houseResiNumberAdjust.sql @@ -0,0 +1 @@ +alter table ic_house modify RESI_NUMBER int(2) default 0; \ No newline at end of file From 297cfa92f2dda18d329bfe2f2534ece69cf9829c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Jun 2022 15:00:52 +0800 Subject: [PATCH 082/105] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E5=86=85=E7=9A=84=E5=B1=85=E6=B0=91=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 12 +---- .../epmet/feign/GovOrgOpenFeignClient.java | 9 ++++ .../GovOrgOpenFeignClientFallback.java | 6 +++ .../epmet/controller/IcHouseController.java | 11 +++++ .../main/java/com/epmet/dao/IcHouseDao.java | 46 +++++++++++-------- .../com/epmet/service/IcHouseService.java | 8 ++++ .../service/impl/IcHouseServiceImpl.java | 26 +++++++++++ .../src/main/resources/mapper/IcHouseDao.xml | 5 ++ .../java/com/epmet/dao/IcResiUserDao.java | 2 +- .../mq/listener/ICWarnStatsEventListener.java | 4 +- .../service/impl/IcResiUserServiceImpl.java | 37 +++++---------- .../main/resources/mapper/IcResiUserDao.xml | 4 +- 12 files changed, 112 insertions(+), 58 deletions(-) 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 31b8e903f8..b9795ef8dc 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 @@ -790,15 +790,5 @@ public class RedisKeys { return rootPrefix.concat("updateHouseResiNumber:").concat(customerId); } - /** - * desc:获取更新 房屋内有居民数量 线程的key - * @param customerId - * @return - */ - public static String updateIcHouseResiNumberThread(String customerId) { - if (StringUtils.isBlank(customerId)){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); - } - return rootPrefix.concat("updateHouseResiNumber:thread:").concat(customerId); - } + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 60419614fc..9c018aa171 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -12,6 +12,7 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -672,4 +673,12 @@ public interface GovOrgOpenFeignClient { */ @PostMapping("/gov/org/house/getHomeInfoByHouseCode") Result getHomeInfoByHouseCode(CommonHouseFormDTO dto); + + /** + * desc:根据房屋id更新 屋内的居民数量 + * @param paramList + * @return + */ + @PostMapping("/gov/org/ichouse/updateIcHouseResiNumber") + Result updateIcHouseResiNumber(List> paramList); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 23054533c7..85110205e0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -10,6 +10,7 @@ import com.epmet.dto.result.*; import com.epmet.feign.GovOrgOpenFeignClient; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -431,4 +432,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHomeInfoByHouseCode", dto); } + @Override + public Result updateIcHouseResiNumber(List> paramList) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "updateIcHouseResiNumber", paramList); + } + } 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 e6f1522353..f7f7ef5b33 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 @@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** @@ -94,4 +95,14 @@ public class IcHouseController { public Result getByHouseCode(@PathVariable("houseCode") String houseCode){ return new Result().ok(icHouseService.getByHouseCode(houseCode)); } + + /** + * desc:更新房屋的屋内居民数 + * @param paramList houseId:'123',resiNumber:20 + * @return + */ + @PostMapping("updateIcHouseResiNumber") + public Result updateIcHouseResiNumber(@RequestBody List> paramList){ + return new Result().ok(icHouseService.updateIcHouseResiNumber(paramList)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 8efb45cf92..1d43ba521e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -147,29 +148,38 @@ public interface IcHouseDao extends BaseDao { List selectBatchHouseCodeAndUrl(@Param("customerId") String customerId); /** - * @describe: 通过客户id查询 - * @author wangtong - * @date 2022/6/7 18:36 - * @params [customerId] - * @return com.epmet.dto.result.IcHouseQrcodeConfigDTO - */ + * @return com.epmet.dto.result.IcHouseQrcodeConfigDTO + * @describe: 通过客户id查询 + * @author wangtong + * @date 2022/6/7 18:36 + * @params [customerId] + */ CustomerOrgParameterEntity selectByCustomerId(@Param("customerId") String customerId, @Param("preKey") String preKey); /** - * @describe: 工作端-通过房屋编码获取房屋信息 - * @author wangtong - * @date 2022/6/9 15:23 - * @params [houseCode] - * @return com.epmet.dto.result.HouseInfoResultDTO - */ + * @return com.epmet.dto.result.HouseInfoResultDTO + * @describe: 工作端-通过房屋编码获取房屋信息 + * @author wangtong + * @date 2022/6/9 15:23 + * @params [houseCode] + */ HouseInfoResultDTO selectHomeInfoByHouseCode(@Param("houseCode") String houseCode); /** - * @describe: 根据筛选获取需要下载的一户一码信息 - * @author wangtong - * @date 2022/6/13 16:34 - * @params [formDTO] - * @return java.util.List - */ + * @return java.util.List + * @describe: 根据筛选获取需要下载的一户一码信息 + * @author wangtong + * @date 2022/6/13 16:34 + * @params [formDTO] + */ List searchHouseZipList(IcHouseListFormDTO formDTO); + + /** + * desc:更新房屋的屋内居民数 + * + * @param paramList houseId:'123',resiNumber:20 + * @return + */ + Integer updateIcHouseResiNumber(@Param("paramList") List> paramList); + } 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 10e0c9234c..5dd3b221f4 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 @@ -11,6 +11,7 @@ import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.entity.IcHouseEntity; import java.util.List; +import java.util.Map; /** * 房屋信息 @@ -100,4 +101,11 @@ public interface IcHouseService extends BaseService { * @return */ String getFullName(String neighborHoodId, String buildingId, String unitId, String doorName); + + /** + * desc:更新房屋的屋内居民数 + * @param paramList houseId:'123',resiNumber:20 + * @return + */ + Integer updateIcHouseResiNumber(List> paramList); } 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 61792e822b..6ab786976b 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 @@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -274,4 +275,29 @@ public class IcHouseServiceImpl extends BaseServiceImpl u.getUnitNum().concat("单元")).orElse(""); return new StringBuilder().append(neighborhoodName).append(buildingName).append(unitName).append(doorName).toString(); } + + @Override + public Integer updateIcHouseResiNumber(List> paramList) { + if (CollectionUtils.isEmpty(paramList)){ + log.warn("updateIcHouseResiNumber param is empty"); + return 0; + } + IcHouseEntity entity = new IcHouseEntity(); + + AtomicInteger effects = new AtomicInteger(0); + paramList.forEach(o->{ + Object houseId = o.get("houseId"); + Object resiNumber = o.get("resiNumber"); + if (houseId == null || resiNumber == null){ + return; + } + entity.setId(houseId.toString()); + + entity.setResiNumber(resiNumber.toString()); + int i = baseDao.updateById(entity); + effects.incrementAndGet(); + }); + return effects.get(); + // return baseDao.updateIcHouseResiNumber(paramList); + } } 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 c55f985fc5..c750f98353 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 @@ -521,5 +521,10 @@ #{id} ) + + + UPDATE ic_house SET RESI_NUMBER = #{item.resiNumber} where ID = #{item.houseId} and DEL_FLAG = '0' + + 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 8b201da55d..3c7025f28c 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 @@ -376,5 +376,5 @@ public interface IcResiUserDao extends BaseDao { * @param customerId * @return */ - List getResiUserCountGroupHomeId(@Param("customerId") String customerId); + List> getResiUserCountGroupHomeId(@Param("customerId") String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java index 4ea3eb92b5..e74c011246 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.rocketmq.constants.MQUserPropertys; import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg; import com.epmet.commons.tools.distributedlock.DistributedLock; +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.RedisKeys; @@ -69,7 +71,7 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently { log.info("obj is {}", JSON.toJSONString(obj)); try { if (!resiWarnStats(obj)||!updateIcNatResiFlag(tags, obj)||!updateIcHouseResiNumber(obj)){ - + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败,等待重新消费"); } } catch (RenException e) { // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 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 decd30dfc6..0186481855 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,12 +19,12 @@ package com.epmet.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.bean.ResiExportBaseInfoData; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; -import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; @@ -60,7 +60,10 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.*; import com.epmet.excel.support.ExportResiUserItemDTO; -import com.epmet.feign.*; +import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.feign.EpmetHeartOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; import com.github.pagehelper.Page; @@ -109,8 +112,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); @@ -2583,37 +2580,27 @@ public class IcResiUserServiceImpl extends BaseServiceImpl o = (Future) redisUtils.get(threadKey); - if (o != null){ - //如果是自己的 则取消就行了 - //o.cancel(true); - log.info("updateIcHouseResiNumber 任务取消"); - } - }*/ Future submit = executorService.submit(() -> { int pageNo = 1; int pageSize = NumConstant.TEN_THOUSAND; - Page houseReisCountListPage = null; + Page> houseReisCountListPage = null; String key = RedisKeys.getUpdateHouseResiNumer(customerId); redisUtils.delete(key); do { houseReisCountListPage = PageHelper.startPage(pageNo++, pageSize, false) .doSelectPage(() -> baseDao.getResiUserCountGroupHomeId(customerId)); System.out.println(houseReisCountListPage.getResult().size()); - List result = houseReisCountListPage.getResult(); - for (HouseIcResiUserCountResultDTO o: result){ - redisUtils.leftPush(key,o); - } + List> result = houseReisCountListPage.getResult(); + Result effectRowResult = govOrgOpenFeignClient.updateIcHouseResiNumber(result); + if (effectRowResult == null || !effectRowResult.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"调用org服务失败"); + } + log.debug("updateIcHouseResiNumber org effectRowResult:{}",JSON.toJSONString(effectRowResult)); } while (houseReisCountListPage.getResult().size() == pageSize); log.info("updateIcHouseResiNumber 执行完毕"); - //distributedLock.unLock(lock); }); - redisUtils.set(threadKey,submit); } /** 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 84fc723e61..032d74f02b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1132,7 +1132,7 @@ AND customer_id = #{customerId} AND DEL_FLAG = '0' - + select HOME_ID houseId,count(1) resiNumber from ic_resi_user WHERE CUSTOMER_ID = #{customerId} and DEL_FLAG = '0' AND `status` = '0' group by HOME_ID From 887f304ada614586cd1ed5b7be37984d03743c18 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Jun 2022 15:01:45 +0800 Subject: [PATCH 083/105] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E5=86=85=E7=9A=84=E5=B1=85=E6=B0=91=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 6ab786976b..f111a90b82 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 @@ -293,7 +293,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Thu, 23 Jun 2022 16:20:32 +0800 Subject: [PATCH 084/105] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=86=85=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcEnterpriseDao.java | 2 ++ .../IcEnterpriseExcelImportListener.java | 34 ++++++++++++++----- .../service/impl/IcEnterpriseServiceImpl.java | 8 ++++- .../main/resources/mapper/IcEnterpriseDao.xml | 12 +++++++ 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java index d2d1d19318..40bdde151e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java @@ -30,4 +30,6 @@ public interface IcEnterpriseDao extends BaseDao { * @return */ List selectList(EnterprisePageFormDTO formDTO); + + List selectForUniqueName(@Param("gridId") String gridId, @Param("placeOrgName") String placeOrgName, @Param("enterpriseId") String enterpriseId); } \ No newline at end of file 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 65b5cda5f0..f4174470aa 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 @@ -2,6 +2,7 @@ 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.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -13,6 +14,7 @@ import com.epmet.entity.IcEnterpriseEntity; import com.epmet.excel.EnterpriseImportExcelDTO; import com.epmet.service.impl.IcEnterpriseServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; import java.util.List; @@ -31,9 +33,9 @@ public class IcEnterpriseExcelImportListener implements ReadListener placeTypeMap; private Map scaleMap; private Map gridMap; - //数据 - private List datas = new ArrayList<>(); - + //要插入的数据 + private List insertDatas = new ArrayList<>(); + private List updateDatas = new ArrayList<>(); //错误项列表 private List errorRows = new ArrayList<>(); @@ -84,10 +86,25 @@ public class IcEnterpriseExcelImportListener implements ReadListener originList=icEnterpriseServiceImpl.selectForUniqueName(enterpriseEntity.getGridId(),enterpriseEntity.getPlaceOrgName(),null); + if(CollectionUtils.isEmpty(originList)){ + enterpriseEntity.setSourceType("import"); + insertDatas.add(enterpriseEntity); + }else{ + IcEnterpriseEntity origin=originList.get(NumConstant.ZERO); + enterpriseEntity.setId(origin.getId()); + enterpriseEntity.setSourceType(origin.getSourceType()); + updateDatas.add(enterpriseEntity); + } + + + if (insertDatas.size() == MAX_THRESHOLD) { + execPersist(); + } + if (updateDatas.size() == MAX_THRESHOLD) { execPersist(); } } catch (Exception e) { @@ -122,9 +139,10 @@ public class IcEnterpriseExcelImportListener implements ReadListener selectForUniqueName(String gridId, String placeOrgName, String enterpriseId) { + return baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId); + } } \ No newline at end of file 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 6e55808261..6a315a60db 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 @@ -91,4 +91,16 @@ order by ie.CREATED_TIME desc + + \ No newline at end of file From 2ea49d358340d10277b1d08d424b44cb9fce4d20 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 16:29:42 +0800 Subject: [PATCH 085/105] 1 --- .../excel/handler/IcEnterpriseExcelImportListener.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 f4174470aa..ac55be4e46 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 @@ -139,10 +139,16 @@ public class IcEnterpriseExcelImportListener implements ReadListener Date: Thu, 23 Jun 2022 17:44:14 +0800 Subject: [PATCH 086/105] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E5=86=85=E7=9A=84=E5=B1=85=E6=B0=91=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 f111a90b82..fc94c50b8f 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 @@ -293,7 +293,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Thu, 23 Jun 2022 17:53:08 +0800 Subject: [PATCH 087/105] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E4=B8=80=E9=81=8D=E5=9B=BE=E5=B1=82=E5=88=86=E7=B1=BB=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E5=85=B8=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.29__rewriteCategoryDict.sql | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.29__rewriteCategoryDict.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.29__rewriteCategoryDict.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.29__rewriteCategoryDict.sql new file mode 100644 index 0000000000..7c6708fbe1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.29__rewriteCategoryDict.sql @@ -0,0 +1,52 @@ +delete from ic_coverage_category_dict; + + +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('07a0a8de30dd8456f1870a1741e5b4c4', 'default', 'ep_lssd', '零售商店', 'enterprise_patrol', 'csgl', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('093a5577095a3638e7e6c8c6c920e8d0', 'default', 'sr_rfqck', '人房汽车库', 'superior_resource', 'yjcl', 8, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('0c7b40b38bd35ed89ce0130c6e704c0c', 'default', 'shequjiaozheng', '社区矫正', 'special_resi', 'zhzl', 4, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('0eca6889444417c3f2a778f229abf41a', 'default', 'sr_tyc', '体育场', 'superior_resource', 'yjcl', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('0ef500646ea5a0ebb38f0ae2f836e417', 'default', 'buliangqingshaonian', '不良青少年', 'special_resi', 'zhzl', 3, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('0f988841571d2e4afcba883afd9974d5', 'default', 'yjdw', '应急队伍', 'community_org', 'yjcl', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('195bbc27440d3abd7f69eea91cdf60f1', 'default', 'lyjlb', '老友俱乐部', 'community_org', 'yjcl', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('1e51a52f1527246daf7840ec38912b45', 'default', 'ep_gwylcs', '歌舞娱乐场所', 'enterprise_patrol', 'aqsc', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('28997e303edb86daea625f734c8f017b', 'default', 'sr_gc', '广场', 'superior_resource', 'yjcl', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('45bc9a851db61a65817bf5c5f6368d0c', 'default', 'sr_ggld', '公共绿地', 'superior_resource', 'yjcl', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('488f7ae48acabdcf849f8d7ae2d92c43', 'default', 'ps_jjz', '急救站', 'public_service', 'ggfw', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('4ccb2ca7ae1ae347022a7142f35710d0', 'default', 'ep_mrxycs', '美容洗浴场所', 'enterprise_patrol', 'aqsc', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('5406fee68a7ed5fee1107d82acad4982', 'default', 'whdw', '文化队伍', 'community_org', 'yjcl', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('550fc32040b3b2eb9ab61aa8ba508458', 'default', 'dc_jqz', '加气站', 'dangerous_chemicals', 'aqsc', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('59f5869872130e17295032266815fa32', 'default', 'sr_yjy', '影剧院', 'superior_resource', 'yjcl', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('67f28e477d64dbba67896410b4209732', 'default', 'ps_wss', '卫生所（室）', 'public_service', 'ggfw', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('6c6790441a194dc4c71cd3ecc734d9a0', 'default', 'pu_jgzsbm', '机关直属部门', 'party_unit', 'yjcl', 10, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('72d4b41e70d0099bebda1627aa8cef17', 'default', 'dc_jzgd', '建筑工地', 'dangerous_chemicals', 'aqsc', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('75a70d0fbac1abb44d790fb66d37ec29', 'default', 'cm_cjsc', '超级市场', 'city_management', 'csgl', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('76bb777ebda757dec40ab841c8bf52e8', 'default', 'xiejiaorenyuan', '邪教人员', 'special_resi', 'zhzl', 2, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('7db567f70cd93dc4e9dc9a74a1982e30', 'default', 'lwh', '楼委会', 'community_org', 'yjcl', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('80e483641815cc55fdf90e04d23457bd', 'default', 'cm_nmsc', '农贸市场', 'city_management', 'csgl', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('83c933ce13df36180b02d6edd055f53c', 'default', 'sr_djc', '度假村', 'superior_resource', 'yjcl', 7, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('88d1ab9131db2031138300563b7a0be3', 'default', 'resi_szry', '失智人员', 'resi', 'ggfw', 0, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('8a929fe6bd98c8319ef717bf52644324', 'default', 'ps_mzb', '门诊部', 'public_service', 'ggfw', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('8ce8a8ee5fed31e60c251897794662ce', 'default', 'cm_bhsc', '百货市场', 'city_management', 'csgl', 1, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('8efac6162d40cb69cf4c72d4de86f6d5', 'default', 'ps_lyy', '疗养院', 'public_service', 'ggfw', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('8f98e6e4c6b6f399d1670196e12762e6', 'default', 'gr_czw', '群租房', 'group_rent', 'aqsc', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('90bf628e45a88c6695f4b6a47379b02e', 'default', 'zhaoshizhaohuojingshenbing', '肇事肇祸精神病', 'special_resi', 'zhzl', 5, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('913569d0d327ce7d51a108ad4b9fa5b8', 'default', 'ep_yy', '医院', 'enterprise_patrol', 'ggfw', 6, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('962cee919ca831587b65d17e242f359b', 'default', 'ep_lg', '旅馆', 'enterprise_patrol', 'yjcl', 9, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('9e0fda438e96cb7ccc0c95afcd6b3091', 'default', 'resi_xfry', '信访人员', 'resi', 'zhzl', 0, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('a6e7d2be933d94450c1eac20975c3254', 'default', 'ep_xx', '学校', 'enterprise_patrol', 'ggfw', 5, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('a71afa09b5afc279ffb0e14b7637e8ba', 'default', 'sr_xfz', '消防站', 'superior_resource', 'yjcl', 9, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('a790078bf1e507ee4143b178956a6660', 'default', 'dc_whpdw', '危化品单位', 'dangerous_chemicals', 'aqsc', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('ab5c7adfd20e8791c2ac4a0dc3a913e2', 'default', 'ep_cycs', '餐饮场所', 'enterprise_patrol', 'aqsc', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('b4773dbde111040129f616d64917e6a3', 'default', 'sr_jzz', '救助站', 'superior_resource', 'yjcl', 6, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('b63dcb8abeebef94defc4a428148a4d7', 'default', 'ep_wb', '网吧', 'enterprise_patrol', 'aqsc', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('c4f92ca3e985c2ddd259843e0e06be69', 'default', 'ps_zs', '诊所', 'public_service', 'ggfw', 2, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('c6a5d9456f6b2f9a2baee1e515b30f17', 'default', 'ep_scjgqy', '生产加工企业', 'enterprise_patrol', 'aqsc', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('cb27f89d903937cd5b716f50be96e966', 'default', 'dc_jyz', '加油站', 'dangerous_chemicals', 'aqsc', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('cb694000b9cf8c5af9061a809237bfb7', 'default', 'zaxld', '治安巡逻队', 'community_org', 'yjcl', 4, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('cea8b4af8e996b8d49a501fe21e0fa74', 'default', 'sr_gy', '公园', 'superior_resource', 'yjcl', 0, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('d3aa4af87d1cdc9fec9df22f8c13c3ad', 'default', 'other', '其他', 'community_org', 'yjcl', 5, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('d9393e37d7f8527f9d337ee80f126464', 'default', 'dc_yqhjz', '油气合建站', 'dangerous_chemicals', 'aqsc', 3, '0', 0, 'APP_USER', '2022-06-17 17:09:00', 'APP_USER', '2022-06-17 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('ddef1d1babb1b25e3f86fdc58f4e3f81', 'default', 'xidurenyuan', '吸毒人员', 'special_resi', 'zhzl', 6, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('e8b5b9fa49369996825e449862d7f417', 'default', 'event_tdnd', '痛点难点', 'event', 'csgl', 0, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('eedf77bbfee5c08bb121c3ca94f9df76', 'default', 'resi_snry', '失能人员', 'resi', 'ggfw', 0, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); +INSERT INTO epmet_gov_org.ic_coverage_category_dict (ID, CUSTOMER_ID, CATEGORY_KEY, CATEGORY_NAME, PLACE_TYPE, COVERAGE_TYPE, SORT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES ('f286cb6e38905289d9ae3a24c0727b4c', 'default', 'anzhibangjiao', '安置帮教', 'special_resi', 'zhzl', 1, '0', 0, 'wxz', '2022-06-16 17:09:00', 'wxz', '2022-06-16 17:09:00'); \ No newline at end of file From 62ad74cb8e1e0fe8f35058972240c43db556fd42 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Jun 2022 21:42:19 +0800 Subject: [PATCH 088/105] =?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/enterprise_patrol_import_tem.xlsx | Bin 9288 -> 9284 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 7e9d449639668020c3871ed92d10a3096075c46b..283b41c0954d12bcd1d3f2a323b54b4b545db889 100644 GIT binary patch delta 4598 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 A8~^|S From 8304a32c3f0bd51c377058829e5073cdac6cb506 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 24 Jun 2022 13:50:10 +0800 Subject: [PATCH 089/105] =?UTF-8?q?=E5=9B=BE=E5=B1=82=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovOrgOpenFeignClient.java | 7 ++++ .../GovOrgOpenFeignClientFallback.java | 5 +++ .../epmet/controller/CoverageController.java | 6 ++++ .../epmet/dao/IcCoverageCategoryDictDao.java | 2 ++ .../com/epmet/service/CoverageService.java | 2 ++ .../service/impl/CoverageServiceImpl.java | 9 +++++ .../mapper/IcCoverageCategoryDictDao.xml | 35 +++++++++++++++++++ .../epmet/service/impl/IcFormServiceImpl.java | 7 ++++ 8 files changed, 73 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 129ad33c57..b7c17a255d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -688,4 +688,11 @@ public interface GovOrgOpenFeignClient { */ @PostMapping("/gov/org/ichouse/updateIcHouseResiNumber") Result updateIcHouseResiNumber(List> paramList); + + /** + * 五大图层类别字典表客户初始化 + * @Author sun + */ + @PostMapping("/gov/org/coverage/dictinit/{customerId}") + Result dictInit(@PathVariable(value = "customerId") String customerId); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 649c984f55..0a8e690f38 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -440,4 +440,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "updateIcHouseResiNumber", paramList); } + @Override + public Result dictInit(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "dictInit", customerId); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java index 1f10aeec14..6289049eae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java @@ -40,4 +40,10 @@ public class CoverageController { return new Result>().ok(coverageService.dictMap(tokenDto.getCustomerId(), placeType)); } + @PostMapping("dictinit/{customerId}") + public Result dictInit(@PathVariable("customerId") String customerId) { + coverageService.dictInit(customerId); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java index 44339e4e9b..58534b44bb 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java @@ -20,4 +20,6 @@ public interface IcCoverageCategoryDictDao extends BaseDao dictMap(@Param("customerId") String customerId, @Param("placeType") String placeType); String selectCategoryName(@Param("customerId") String customerId, @Param("placeType") String placeType, @Param("categoryKey") String categoryKey); + + void dictInit(String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java index 4375ebd85b..a3e18d8d6c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java @@ -15,4 +15,6 @@ public interface CoverageService { List categoryList(List coverageTypeList); List dictMap(String customerId, String placeType); + + void dictInit(String customerId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java index b188a91dfd..632d9537fb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java @@ -69,4 +69,13 @@ public class CoverageServiceImpl implements CoverageService { List resultList = coverageCategoryDictDao.dictMap(customerId, placeType); return resultList; } + + @Override + public void dictInit(String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcCoverageCategoryDictEntity::getCustomerId, customerId); + coverageCategoryDictDao.delete(query); + coverageCategoryDictDao.dictInit(customerId); + + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml index 8d20859b11..dce1591d30 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml @@ -3,6 +3,41 @@ + + INSERT INTO ic_coverage_category_dict ( + id, + customer_id, + category_key, + category_name, + place_type, + coverage_type, + sort, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) SELECT + MD5(UUID()), + #{customerId}, + category_key, + category_name, + place_type, + coverage_type, + sort, + del_flag, + revision, + 'APP_USER', + NOW(), + 'APP_USER', + NOW() + FROM + ic_coverage_category_dict + WHERE + del_flag = '0' + AND customer_id = 'default' + - - UPDATE ic_house SET RESI_NUMBER = #{item.resiNumber} where ID = #{item.houseId} and DEL_FLAG = '0' - + UPDATE ic_house SET RESI_NUMBER = #{resiNumber} where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0' From 273d5b1df77a0d5cd82a5c62fbf38d3b701aac32 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 27 Jun 2022 14:10:54 +0800 Subject: [PATCH 099/105] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E5=86=85=E5=B1=85=E6=B0=91=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java | 2 +- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 0cfbc42a7b..a2213ed024 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -174,7 +174,7 @@ public interface IcHouseDao extends BaseDao { List searchHouseZipList(IcHouseListFormDTO formDTO); /** - * desc:更新房屋的屋内居民数 不更新 更新时间和更新人以及 resiNumber没有变化的 记录 + * desc:更新房屋的屋内居民数 及更新时间 不更新 更新人以及 resiNumber没有变化的 记录 * * @param houseId, * @param resiNumber 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 89772e9a57..d0dd039a7f 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 @@ -523,7 +523,7 @@ ) - UPDATE ic_house SET RESI_NUMBER = #{resiNumber} where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0' + UPDATE ic_house SET RESI_NUMBER = #{resiNumber}, UPDATED_TIME = NOW() where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0' From 64420ea040d679ec328832796e3196e18a94836e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 27 Jun 2022 16:57:58 +0800 Subject: [PATCH 100/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E5=B1=85=E6=B0=91=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=9D=90=E6=A0=87=EF=BC=8C=E5=B0=B1=E6=98=AF?= =?UTF-8?q?=E7=94=A8=E8=B7=9F=E7=BB=84=E7=BB=87=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/govorg/CustomerAgencyEntity.java | 10 ++++ .../service/govorg/GovOrgService.java | 8 +++ .../govorg/impl/GovOrgServiceImpl.java | 9 +++- .../service/impl/CoverageServiceImpl.java | 54 ++++++++++--------- 4 files changed, 56 insertions(+), 25 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java index 171e01198f..79ede44c2a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java @@ -123,4 +123,14 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { * 联系电话 */ private String mobile; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; } 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 fb77a2f5d2..140b909a71 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 @@ -9,6 +9,7 @@ import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; +import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -204,4 +205,11 @@ public interface GovOrgService { * @return */ List staffSelectList(String customerId, String agencyId); + + /** + * 查询跟组织信息 + * @param customerId + * @return + */ + CustomerAgencyEntity getRootAgencyByCustomerId(String customerId); } 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 c8712fc983..0c2533a7c9 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 @@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dingtalk.api.request.OapiRobotSendRequest; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.Constant; @@ -1071,5 +1072,11 @@ public class GovOrgServiceImpl implements GovOrgService { return resultDTOList; } - + @Override + public CustomerAgencyEntity getRootAgencyByCustomerId(String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(CustomerAgencyEntity::getCustomerId, customerId); + query.eq(CustomerAgencyEntity::getPid, "0"); // 跟组织的pid为"0" + return customerAgencyDao.selectOne(query); + } } 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 94ff39aef4..319ef4de72 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 @@ -79,8 +79,10 @@ public class CoverageServiceImpl implements CoverageService { public PageData analysisDataList(List coverageTypes, List categoryKeys, String search, Integer pageNo, Integer pageSize, Boolean isPage) { + // 获取跟组织的坐标 String customerId = EpmetRequestHolder.getLoginUserCustomerId(); String staffId = EpmetRequestHolder.getLoginUserId(); + CustomerAgencyEntity rootAgency = govOrgService.getRootAgencyByCustomerId(customerId); // 1.根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map Map> mapping; @@ -145,7 +147,7 @@ public class CoverageServiceImpl implements CoverageService { // 检索数据 List dataSegment = doDataListSearch( EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), - e.getCategoryKey(), search, null, null, isPage); + e.getCategoryKey(), search, null, null, isPage, rootAgency); rls.addAll(dataSegment); continue; } @@ -167,7 +169,7 @@ public class CoverageServiceImpl implements CoverageService { // 检索数据 List dataSegment = doDataListSearch( EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), - e.getCategoryKey(), search, 1, end, isPage); + e.getCategoryKey(), search, 1, end, isPage, rootAgency); if (firstTimeDataAppear) { rls.addAll(dataSegment.subList(start - lastTotalCount, dataSegment.size())); @@ -272,7 +274,8 @@ public class CoverageServiceImpl implements CoverageService { */ public List doDataListSearch(String customerId, String agencyId, String staffOrgIds, String placeType, String categoryKey, String search, - Integer pageNo, Integer pageSize,Boolean isPage) { + Integer pageNo, Integer pageSize,Boolean isPage, + CustomerAgencyEntity rootAgency) { // 根据categoryKey查询类别名称 IcCoverageCategoryDictEntity categoryDict = orgCoverageService.selectByCategoryKey(categoryKey); @@ -284,16 +287,11 @@ public class CoverageServiceImpl implements CoverageService { return resiEntities.parallelStream().map(re -> { // 使用楼栋的坐标补充居民的坐标信息 - BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); - String buildingLatitude = null; - String buildingLongitude = null; - if (resiBuilding != null) { - buildingLatitude = resiBuilding.getLatitude(); - buildingLongitude = resiBuilding.getLongitude(); - } + String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency); + return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? re.getName() : null, - buildingLatitude, buildingLongitude); + coordinates[0], coordinates[1]); }).collect(Collectors.toList()); } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { @@ -302,16 +300,11 @@ public class CoverageServiceImpl implements CoverageService { customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); return resiInfos.parallelStream().map(re -> { - BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); - String buildingLatitude = null; - String buildingLongitude = null; - if (resiBuilding != null) { - buildingLatitude = resiBuilding.getLatitude(); - buildingLongitude = resiBuilding.getLongitude(); - } + String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency); + return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - isPage ? re.getName() : null, buildingLatitude, buildingLongitude); + isPage ? re.getName() : null, coordinates[0], coordinates[1]); }).collect(Collectors.toList()); } else if (PLACE_TYPE_EVENT.equals(placeType)) { @@ -416,16 +409,29 @@ public class CoverageServiceImpl implements CoverageService { } /** - * 楼栋信息 + * 获取用户的坐标信息 * @param resiId * @param buildingId + * @param rootAgency 跟组织，用于备选，从其中获取坐标 * @return */ - private BuildingInfoCache getBuildingInfo(String resiId, String buildingId) { + private String[] getUserCoordinates(String resiId, String buildingId, CustomerAgencyEntity rootAgency) { + String longitude = null; + String latitude = null; + BuildingInfoCache resiBuilding = govOrgService.queryBuildingInfo(buildingId); - if (resiBuilding == null) { - log.warn("居民信息所属楼栋信息未找到。居民id:{},楼栋id:{}", resiId, buildingId); + if (resiBuilding != null) { + longitude = resiBuilding.getLongitude(); + latitude = resiBuilding.getLatitude(); + } else { + log.error("居民信息所属楼栋信息未找到。居民id:{},楼栋id:{}", resiId, buildingId); + } + + if (StringUtils.isAnyBlank(longitude, latitude)) { + // 楼栋没有坐标，那就取跟组织的 + longitude = rootAgency.getLongitude(); + latitude = rootAgency.getLatitude(); } - return resiBuilding; + return new String[]{longitude, latitude}; } } \ No newline at end of file From e3c09121400a37f8da9e5696eb5b6375b34acce9 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 27 Jun 2022 17:09:34 +0800 Subject: [PATCH 101/105] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E7=BB=8F=E7=BA=AC=E5=BA=A6=E5=8F=8D=E4=BA=86?= =?UTF-8?q?=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/service/impl/CoverageServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 319ef4de72..fcba049932 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 @@ -291,7 +291,7 @@ public class CoverageServiceImpl implements CoverageService { return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? re.getName() : null, - coordinates[0], coordinates[1]); + coordinates[1], coordinates[0]); }).collect(Collectors.toList()); } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { @@ -304,7 +304,7 @@ public class CoverageServiceImpl implements CoverageService { return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - isPage ? re.getName() : null, coordinates[0], coordinates[1]); + isPage ? re.getName() : null, coordinates[1], coordinates[0]); }).collect(Collectors.toList()); } else if (PLACE_TYPE_EVENT.equals(placeType)) { From 80fe97ff517a3f6f0b4516e1f6997a81826b0438 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Jun 2022 10:36:24 +0800 Subject: [PATCH 102/105] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEnterpriseDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6a315a60db..0a3d9a321a 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 @@ -89,7 +89,7 @@ AND r.DETAILED LIKE concat( '%', #{detailed}, '%' ) - order by ie.CREATED_TIME desc + order by ie.CREATED_TIME desc,ie.id desc select count(1) from ic_enterprise e - inner join ic_enterprise_patrol_record r on (e.ID = r.ENTERPRISE_ID) where e.CUSTOMER_ID = #{customerId} and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%') and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%')) and e.PLACE_TYPE = #{categoryKey} and e.DEL_FLAG = '0' - and r.DEL_FLAG = '0' \ No newline at end of file From 8f7df98a28f6f9a3831f04c575fb33e3073a2af8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Jun 2022 15:21:29 +0800 Subject: [PATCH 105/105] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B750=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.30__enterprise_mobile.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.30__enterprise_mobile.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.30__enterprise_mobile.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.30__enterprise_mobile.sql new file mode 100644 index 0000000000..acb0ed507e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.30__enterprise_mobile.sql @@ -0,0 +1 @@ +alter table ic_enterprise MODIFY COLUMN MOBILE VARCHAR(64) NOT NULL COMMENT '负责人电话'; \ No newline at end of file