From 5d83c7c88736204c13853db45404fd9ef73d5a92 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Jun 2022 15:06:39 +0800 Subject: [PATCH 1/5] =?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 2/5] =?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 3/5] =?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 zyN^#r(84R{F`8zXssu1rf2^QitIVD+C8DRK*Q5_dMZAJkUMd&%({jWARt-bm35|y| zi+MHA8DoZ|(F-la`|T5c8KrO-O^k3rNf^1!$7kBy&&of7VngPSNMWbySd4<#JA?8t zFgxgszgK@22Gwrv=(R8u$2w=8Wymc=XJN74`Me$9;V|q;dyQ$!FW)@k6wmTw7@Ulk z!xLquK0|hk6D&mA0G0+1#~lFRx01lFdLOS+5)X=3%0#bR5o?7d#haD$*R1(mz6j@+ zniVug`R+;uG{qS>4fb_@*O9;*|CW1rf$F#{(54r&dorKhxs^S?DdtLSvET3x01j^2F^Jt zqnwTQnl&#PDSU}OsJEMz^lq}cQAYD8ypXTtl1EN%Y0?#!b)yL5m)uAWy&?ELz9xkq z<=mYN8`j}-qOG&N3_ZiAqf>01InLehz#iJ_6SB5`_4?*{lokV2YrMcT5igyPQ1xe# z|7%-#`u}a=|7BbF=Z*g1ljA-TaIrMAHG32dE082l%)>xHkQ4lh#Qq}tN&Itr-`7^O zC*nbG#oO}N+G~wB-KFB7gsT@`p>e~Ml#e2Qr)T{J!@ZH5UZ4qQuv#=Q*J=_Nxa37Q z2P+$(|IuKTTPhv$3W>x?lTjttx_^Lz+1LPZkp6XblF_Qm^Ei z6aj1-8%Gyf!J#q$Ah>m@{(V!^tx|0QWF)x`tJ7_lbBEa6 zMV?`|&F9Izc{D4N)z%|!0*r(_$c-}$N{`M@284O@$rNQmxb??)| z^Or?Mud=d*uh-9xSHUtOn{7IroUrP_$FK_0bwYF#ZUhE8N+O@D9x8I%3+PC{{ z!*&Tj=kU5Z2a9Bh_+E`}`u{lUd9u7}`Jzh((Am`-`K(2NDX?z4V`k(yr9HKmPP(T? zl>O4}!@=+jEIcl^#e^cIgWOci1msX~Pjm zmdVlwgI6Oxi(*?dT<&-U8rC=Ok!uq^=(?G_m~2s0W>5}MWfD4%R%CZ8I}oPO(0wJ_ zk!pywy-2$xOgR=8Jut(NUoiPZj-1sQPfWHBCq2)5NjR@U{o<%PCIlt0IQSM`l`(pH zLLs+j-6;gq8uk`_a7N0BcQY_@7YQLXmd#9Gq(}V23p+=x%J?%Pazj1HRoi| z6qp4T(>^^ISmzokyCxaihBhkaAm2;Yrv(V9www|y4ZHO(ul6*0qH6SbVI7FjO$u=W z?M-HIcA0lt#oIM4@BAw#(!ZU|Pp=nX2g{ds8~UwGZ62Dg9(#+^kqq(mhKpx+z;Na` zKm-qg4EP;ANrsIti`_UB48Kyw*2eUw-i8c#;O8NO4!I2YA|=1_W9s)oFA$zrfg8HO z+D<)Pw^Q1s?}*Gf_svS>WmBc_@q&%oAqZ;w+hA z)#J{-69#RNzt#Mvp;b%5#KL&-Qmwoi!rDyZOUPPhW63Jdjv=J9gRMArIKwl~61>^Z zgFfl0OV|pfkR?YddBp){h4WFnee3T&uNSz*D(C>Bo!-lB4Q!Fp7-O&G@_*j)v~01e zm>*7jex^njrG?M={LNiVuaq;2Tj`vrsw%zZPNvK4h8vVTji`2icE>)6Fb%<{SS4B= zNh*&k9N8@U%a?S(zR*1ijLj$0xe29W;(!fOYPo*RVOFrHYB@!kjx7@O*G%eZSZ&Yg z0kMz!fYm{0xQ`0W?75Vg{xG5AbzN6#=?27QOtZ)zg`&H$>=i6-QG+mTYONUpC@_wq zijrlX0**9luxre|mva`1yNylPaL;uysIfs#-8837U~yxk<{i7Ua(G1 zWUFb(TEEU(WXPN`+MYX@Zm-9ZrmgT@9jK>*2|Mc2*rtmL(;Qx}@-{^)bC@TaBfb52 z5gdrqY2=`V8XjnSE-uOGFq~F0H4HU;EZ;1!WNC<+tF(Ph#cG{&ww5UFcLhQNX~-iI zl&@ZhCh80|Br;a&HRdj<=*uko*Y=Y6p3+i@c=^7(?bP(SNmgO#FS~TCn{`B()HD#L zH1Obd7CF}4^aIdpVCM2OLa#TKk8SmX;PVWc>$T*3-ER4es?S#@H~k8{3V*bTrf{4e z9DtTDQWEMAJqR*q7ZH|K>~vVZJnJT{f#v2S&HldA`yOsf_hJB1yo0c@tR&CbOkD7( zB#gm9vtJIc{Uu(U)tG1U#(AH9A$n33 z=VbdZ%xJD$N?ur_g~)(Z(y-eyqz+-G*Z#@O*DmUim43&?{Ec!AWj<&NH}^0N?Abtz zu0ZkjWkCXQ*RNtIu}7*j)69+6Y*ioz!dO5lMo8Q4SsZpaiEyp>Ha=f5lV(F{m=ULS zoq4&jrB|x(}?o$kNJPW=CA_Qd9Vr z%aTW4hul3s+swVcRBmD+6M0r^SMoIKHsRW@jJ`q!it$^0nE61%g~d}@U^?_}Ws@PI zE+uvK&OeQSmBUEe`wN`VhrIlWbUqxM@mPV^pxG30bwly;~0cRGi?z%>&0gk8AQkID|RwogALXc*X zfxMUXl&}Mt+)xpb1JW_%W?iX~{3XC=$8uWIe#=^-(#qBNRQ>bIbM!)DDd_onz0aY< zz1A#i@ER@@GRGzS-)<)ZZD`w`%MBNBo_euR$6Gcfnyc%*F_atY=ltr1vosM_<%2OI zuM8LoUFS!7!-^SPh&mvtH}7hnlXx8L_d3=Eir8milMo_j^U0!wv=HnT<6hIpO2Bzs z@FK~uD{5=tey5_PKtu*hlhI1tb$*($@7!&X*G2bnXi3^}BL^{UHI zY-PVwm8w0gpQ$_5LU&-zereQ@HUxqqGXyh23rs}*G7$>uUPq4}i9&#nnPe-bnzYs| z2Z5N|3z5cXf*HkrJshI1#vg^=W8@A^!rNGGSbZ?PKQ))4>VlA>T6jkn7tMb_Kgand zINQXzOT1ZhW6co3FV-yNed&RfAwP4)c>hFi&SaF`<$HB??59Mb`ub*j_9S zQ`HZ4Fft)7T{QrKhC;VSw9Bm`6fT9O-Z*{}+d`eQwRo9F(s(9nmN&j}wvJw7!`f2J zv=|##fk#yqZ5B2JQBxdGO_IetP>6@oJa7-jk<&to^XjFQwB?#ymkP{=KmsOWIZW7y zN9<8OR{oH0CPLOrq(($dZ}Db93r4z(DRV}amA4aJ#PF|K(MvLILOXA;&@~k(7_H7( zKgl35rP`dxGJeh>XNZc>wbgjijt8D5Oq;F^l00q7QE?K-b(0z!w>84h$cN~W8SJX) z=B2<8MtUXZ5&Z%x1e?P(o^4Q(*cOYUL1SiQ^jXGAAu;YqU6(mAX+r2IZ%Z>$x}ygW zmwVMgT!V*VRqf|%h0to^RrBGRzMwmie)EK$$NC5V$@$}eGE)8Rg8WU8T_E2f)2qke2LIw8yoFC} zc?lOL1b}((mX+!gkMXjf-TAqnG=q;5!Z)*hIKQu3ASR;q_`rKbJ0=O15j7YqDHn~C zMIQ=9(JQTY(&Zc|BykmrnnC1s_@2EFialKRJ>L6qiFcUkfBB?{QUNm-vq5@XWe2D( z*_cpWxuQQgtK4_T_p(4rJ6f+oZhz<{5%_IS*VceZ)6=jr)+8JlKkf(?o`d$oOc4*^ zE7ui_7M+3Od|{uf@J++T!DZoy-rjWgXn2tf4*R6>LJNZ|5kc>(ugze-3QCuJ^UT{* z*3F_rS|+KjfEmoK{5kj;jDcKc*)dsldL|mO>@5EiZy1&WNy@~5)42E7pzK@E+w=>g zTm|848*#cWxDgtRGzXxpBz$LKScvKMr7GL#+Sn?A8)dY$3bFD!IfT->`0RB8(ObLlRk%Iz68^@SQ<8?B*qDH03;9C}k#Pg+oKDS02!a~}Xh&X()7 z=L?1w8Y2LCYxLUQGuClZ8UUpWXJc6QQtIvTU@DIwjIFnG2z?lMREAm3+ z=aOoQ{LTQQEIyqO9KjBz_+ZH-PZCL&Kp5)U1pf@s!7WcR-gH<-Qo&Qh+bwOU)|6qx zMk*smzs*d%XW0M%We6vIhzc_j3w1IK@TgPrjZ?A~cc)0pau}ItLSLsE-wYe&Kt}*3 zQvL=%cXR{~oj-MVzI;MQ0mDj6OSgraN|AhbSgKeiF)UIEmh4oEqZm^pKjt9-1CoPI z1j1!X4pz1fj!3$Pw)UlbnB31tCQe_uu=wJH9GtpH$9K=(5OS)c-iyBf#+&+dG#rM( zUJ5MAk<0{?b-uv*6hD@!=6XMd=Qb*|MJ3%~7?aPtLFSB9bo*3DUSp04PAc4(5Xr z>so<1;YgKRt20cplc|>+GTMFlY|v#IOYmPEi7rc{A&bC9r&&Q`vZIPj zQ^TyXqfkTn>v-!l$q_a=7lGi z`Tpzrg4Fn%O8@qv)$Os-@xpzdxuy*>@9`U|zU^1t%yqsj(A=rE)eH7%6>NF>{&{vHz~D;@TT?Dr4ur7P=kWFd z$JgJxsj;93u8=Q5T0*M56YT2iTelM<;6vz44nNVBs|W9vYSy+b$}Yl=%L#hEijAbz zwZysfO$f3K53+ zK9cIz4S+s=BwU6C@+c}eWX2vX5yq(IUA%dtq!#kgIZ#sQrLjoAQy5ht^_{Y+37P zC{HzqF6ic+6XTnZ;0?jVITk>?o{!1|N4Nleg4N`Vm5<`S{Gpr+TXv>woeaY_F7opTViSeh5YijYCt}o(nqJw?%X4=uurC?$C z#+_V+hY#K5!^_IenNg&4LsL|v7S?s!9hp-5bwOlN)H$P9qG0f5S7-dBPVKNPe+YH% z?j3-mzh^DkQ<%#@*6D<~)ct?Q@?Yna{{$!bz7mzRdGh5(x3{=|f-4pFxEP`JwA@q-}TmFL%ED5cb7RfjcNw>>_JY z>ZbeIbO|f+Cl3qqNMoffCj-t3jw44eUk_NR7kWlIhZ7wE(BXSO?C!$K%^D?L!3mf+ zGO*SgennjCTyDvf%XtZM+Y%PqLrU9A8x}fmL8~66-3BNF=4m@x`0)M4NIRToE4S_S ztiv?@c-j7LTbEIxg>$e>OMC-ffG%#e0a){W*$6R%aL?yBVc{D3&bj!z)HnTH``R2` zgT74X9yCDYbS{E6UtZOi0j&N4sn^L0+(5SN7^9EWDQkUfZ&J?oSk2r2bei^_FqF>s z4uRy}L?4puIuiDFE@pNv25O!TX3lyKPN6Pw*skjVtE6kR_y!zyrFSI^kS~RknN_yo zK70$2>_PKH4sAc|5v4|l`8c5n=+E*#&=rBrE2wx4M{RnX_Z zVCp1~#!TXhtHvQGLaD5TO-O=LD4sLyi$Y(3+N498fK=V>m{725#SIMe8_JA($_}%1 z=yv#_mL>opQ^}_4>lXwk_Db=Smi%QKT2cnn!BsD#(V-NF3WfsswM5qFxjYx{kVJ-6 zLMHie9@F6C;1I73_m0AYnB3!nAX6qE51h0Y4rc2!I^h|}1^w!%Gqs-j^5ij%h43oH zIvP3rv4GBSOg}*~GvMx9KA&`Dy~PyXenVI14gGG8p$r5A4PvCPVy$q`Xfbublb+~^ zNC7#eE;8QUYN);XH}Iv1EOz8kS>$j{Y8|T$)BFK+&XAX8-}k_C+BP$ObBSIhQdVPM z`kBS&d`qmB&nx1a+UXW1WbV2GZ$J0%``>&yb|mw=FNAmkiT!gE`&IMvSWEYcf_MT! zet&hP{70Sr67at}qXz-M%7@0ue!HeWJALe&9yoq=diod7&&BlLI(t~HzuH5s(nI@O zS<|2WJuYl|ApX@K?cdq{Rp#^Nn1hxtHk1Ay8o<_KT#s0_?zo`JkZBJ?xCY!D2e}_?LR!;V>yqbrQdQy zN&Y!@dMx4bN#Jh@g_yr2{B{ZJM2t37Bq>X(KenE$Gg`E%rtt7IN{e`&4$KX`xF%sd|c<23$n zDLU|f4gX&w_<8%8)c-%1VsUSs_j~5w=J8X?&vdX75auC@x!)wPAQJA!OaORz`ya3w 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 4/5] =?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 5/5] =?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;