Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -112,4 +112,7 @@ public interface StrConstant {
     String NO = "否";
 
     String ELLIPSIS="......";
+
+    String BRACKET_LEFT="(";
+    String BRACKET_RIGNT=")";
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java

@@ -10,4 +10,5 @@ public class IcResiInfoResultDTO {
     private String id;
     private String name;
     private String buildId;
+    private String idNum;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java

@@ -135,8 +135,6 @@ public interface GovOrgCoverageService {
      */
     IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey);
 
-    List<IcCoverageCategoryDictEntity> listCoverageCategoryEntities(String coverageType);
-
     /**
      * Desc: 根据客户ID和数据类型获取字典对应的url
      * @param customerId

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -14,36 +14,31 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.dataaggre.constant.OrgConstant;
-import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
-import com.epmet.dataaggre.constant.OrgConstant;
 import com.epmet.dataaggre.constant.TableConstant;
+import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
 import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
 import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
-import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2;
-import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dataaggre.entity.govorg.*;
 import com.epmet.dataaggre.entity.govproject.IcEventEntity;
 import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
 import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
+import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity;
 import com.epmet.dataaggre.enums.MenusEnums;
 import com.epmet.dataaggre.redis.GovCustomerMenuRedis;
-import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity;
 import com.epmet.dataaggre.service.CoverageService;
 import com.epmet.dataaggre.service.epmetuser.IcResiService;
 import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import com.epmet.dataaggre.service.heart.HeartService;
+import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService;
 import com.epmet.dto.GovMenuDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -492,7 +487,8 @@ public class CoverageServiceImpl implements CoverageService {
                 String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency);
 
                 return new CoverageAnalisisDataListResultDTO(
-                        re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? re.getName() : null,
+                        re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
+                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT),
                         coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
@@ -506,7 +502,8 @@ public class CoverageServiceImpl implements CoverageService {
 
                 return new CoverageAnalisisDataListResultDTO(
                         re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
-                        isPage ? re.getName() : null, coordinates[1], coordinates[0]);
+                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdNum()).concat(StrConstant.BRACKET_RIGNT),
+                        coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
         } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) {

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -38,7 +38,7 @@
 
     <!--根据特殊人群类别查询居民列表-->
     <select id="listSpecialResisBySpecialType" resultType="com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO">
-        select resi.id, resi.BUILD_ID, resi.NAME
+        select resi.id, resi.BUILD_ID, resi.NAME,resi.ID_CARD as idNum
         from ic_resi_user resi
                  inner join ic_special s on (resi.ID = s.IC_RESI_USER)
         where resi.CUSTOMER_ID = #{customerId}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -100,6 +100,22 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
      * 积分
      */
     private Integer score;
+
+    /**
+     * 同步状态【已同步:sync  未同步:not_sync】
+     */
+    private String syncType;
+
+    /**
+     * 部门ID customer_department.id
+     */
+    private String deptId;
+
+    /**
+     * 部门下工作人员Id
+     */
+    private String deptStaffId;
+
     /**
      * 社区自组织人员
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -63,7 +63,10 @@
             so.LATITUDE AS latitude,
             so.ADDRESS as address,
             so.ID as orgId,
-            so.remark
+            so.remark,
+            so.sync_type AS syncType,
+            so.dept_id AS deptId,
+            so.dept_staff_id AS deptStaffId
         FROM ic_community_self_organization so
         WHERE so.DEL_FLAG = 0
             <if test="null != agencyId and agencyId != '' ">

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java

@@ -109,4 +109,11 @@ public class CustomerDepartmentDTO implements Serializable {
      */
     private String mobile;
 
+    /**
+     * 职能部门:  duty
+     * 联建单位:  party_unit
+     * 社会自组织:  community_org
+     */
+    private String deptType;
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerIdDTO.java

@@ -24,4 +24,11 @@ public class CustomerIdDTO implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 职能部门:  duty
+     * 联建单位:  party_unit
+     * 社会自组织:  community_org
+     */
+    private String deptType;
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java

@@ -73,4 +73,11 @@ public class DepartmentDetailResultDTO implements Serializable {
      */
     private String mobile = "";
 
+    /**
+     * 职能部门:  duty
+     * 联建单位:  party_unit
+     * 社会自组织:  community_org
+     */
+    private String deptType = "";
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java

@@ -59,4 +59,12 @@ public class DepartmentListResultDTO implements Serializable {
      */
     private String mobile = "";
     private String areaCode;
+
+    /**
+     * 职能部门:  duty
+     * 联建单位:  party_unit
+     * 社会自组织:  community_org
+     */
+    private String deptType;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java

@@ -79,4 +79,12 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity {
 	 * 联系电话
 	 */
 	private String mobile;
+
+	/**
+	 * 职能部门:  duty
+	 * 联建单位:  party_unit
+	 * 社会自组织:  community_org
+	 */
+	private String deptType;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@@ -154,6 +154,10 @@ public class DepartmentServiceImpl implements DepartmentService {
         Result result = new Result();
         //1:判断当前部门下是否存在工作人员，不存在的可以删除
         CustomerDepartmentEntity entity = customerDepartmentDao.selectById(formDTO.getDepartmentId());
+        if (null != entity && ("party_unit".equals(entity.getDeptType()) || "community_org".equals(entity.getDeptType()))) {
+            String msg = String.format("当前部门为%s同步数据，不允许删除", ("party_unit".equals(entity.getDeptType()) ? "联建单位" : "社会自组织"));
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
+        }
         if (null != entity && entity.getTotalUser() > NumConstant.ZERO) {
             result.setCode(EpmetErrorCode.NOT_DEL_DEPARTMENT.getCode());
             result.setMsg(EpmetErrorCode.NOT_DEL_DEPARTMENT.getMsg());
@@ -245,6 +249,10 @@ public class DepartmentServiceImpl implements DepartmentService {
     public Result addDepartmentStaff(TokenDto tokenDto,AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
 
         CustomerIdDTO customerIdDTO = customerDepartmentDao.selectCustomerIdByDepartmentId(addDepartmentStaffFormDTO.getDepartmentId());
+        if (null != customerIdDTO && ("party_unit".equals(customerIdDTO.getDeptType()) || "community_org".equals(customerIdDTO.getDeptType()))) {
+            String msg = String.format("当前部门为%s同步数据，不允许添加工作人员", ("party_unit".equals(customerIdDTO.getDeptType()) ? "联建单位" : "社会自组织"));
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
+        }
         for (String userId : addDepartmentStaffFormDTO.getSelectedList()) {
             CustomerStaffDepartmentEntity customerStaffDepartmentEntity = new CustomerStaffDepartmentEntity();
             customerStaffDepartmentEntity.setDepartmentId(addDepartmentStaffFormDTO.getDepartmentId());

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -27,7 +27,8 @@
             IFNULL(code,'')AS 'code',
             IFNULL(contacts,'')AS 'contacts',
             IFNULL(mobile,'')AS 'mobile',
-            IFNULL(AREA_CODE,'')AS areaCode
+            IFNULL(AREA_CODE,'')AS areaCode,
+            IFNULL(DEPT_TYPE,'')AS deptType
         FROM customer_department
         WHERE del_flag = '0'
         AND agency_id = #{agencyId}
@@ -46,7 +47,8 @@
     <!-- 根据部门id查询customerId -->
     <select id="selectCustomerIdByDepartmentId" resultType="com.epmet.dto.CustomerIdDTO">
         SELECT
-	        customer_id AS customerId
+	        customer_id AS customerId,
+	        dept_type AS deptType
         FROM
             customer_department
         WHERE