Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectDTO.java

@@ -90,6 +90,21 @@ public class ProjectDTO implements Serializable {
      */
 	private String orgIdPath;
 
+	/**
+	 * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
     /**
      * 删除标识:0.未删除 1.已删除
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectEntity.java

@@ -83,4 +83,19 @@ public class ProjectEntity extends BaseEpmetEntity {
      */
 	private String orgIdPath;
 
+	/**
+	 * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java

@@ -80,4 +80,19 @@ public class ProjectEntity extends BaseEpmetEntity {
      */
 	private String orgIdPath;
 
+	/**
+	 * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -83,10 +84,17 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 							meta.setProjectCreateTime(projectInfo.getCreatedTime());
 							meta.setProjectTitle(projectInfo.getTitle());
 							meta.setOrigin(projectInfo.getOrigin());
-							//直接立项的话 项目内容是项目背景
+							//直接立项的话 项目内容是项目背景 经纬度添加
 							if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(projectInfo.getOrigin())){
 								meta.setProjectContent(projectInfo.getBackGround());
 								meta.setLinkName(projectInfo.getCreatedBy());
+								if (StringUtils.isNotBlank(projectInfo.getLocateDimension())){
+									meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension()));
+								}
+								if (StringUtils.isNotBlank(projectInfo.getLocateLongitude())){
+									meta.setLongitude(new BigDecimal(projectInfo.getLocateLongitude()));
+								}
+								meta.setProjectAddress(projectInfo.getLocateAddress());
 							}
 							return meta;
 				})).collect(Collectors.toList());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.service.user.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
@@ -748,35 +749,36 @@ public class UserServiceImpl implements UserService {
     public void fillScreenProjectData(List<ScreenProjectDataDTO> list) {
         List<String> topicUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(o.getOrigin()))
                 .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(topicUserIdList)){
-            return;
+        Map<String, ScreenProjectDataDTO> topicUserMap = new HashMap<>();
+        if (!CollectionUtils.isEmpty(topicUserIdList)){
+            List<ScreenProjectDataDTO> collection = userDao.selectScreenProjectData(topicUserIdList);
+            logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(collection),topicUserIdList);
+            topicUserMap = collection.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getTopicId,o->o,(o1,o2)->o1));
         }
-        List<ScreenProjectDataDTO> collection = userDao.selectScreenProjectData(topicUserIdList);
-        Map<String, ScreenProjectDataDTO> topicUserMap = collection.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getTopicId,o->o,(o1,o2)->o1));
-       /* if(!CollectionUtils.isEmpty(collection)){
-            list.stream().flatMap(target -> collection.stream().filter(res -> StringUtils.equals(target.getLinkName(),res.getTopicId()))
-            .map(merge -> {
-                target.setLinkName(merge.getLinkName());
-                target.setLinkMobile(merge.getLinkMobile());
-                return target;}));
-        }*/
+
+
         List<String> staffUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(o.getOrigin()))
                 .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(topicUserIdList)){
-            return;
+
+        Map<String, ScreenProjectDataDTO> staffMap = new HashMap<>();
+        if (!CollectionUtils.isEmpty(staffUserIdList)){
+            List<ScreenProjectDataDTO> staffList = userDao.selectStaffInfo(staffUserIdList);
+            logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(staffList),staffUserIdList);
+            staffMap = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1));
         }
-        List<ScreenProjectDataDTO> staffList = userDao.selectStaffInfo(staffUserIdList);
-        Map<String, ScreenProjectDataDTO> collect = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1));
-        list.forEach(project->{
-            ScreenProjectDataDTO userDTO = collect.get(project.getLinkName());
-            if (userDTO == null){
+
+        for (ScreenProjectDataDTO project : list) {
+            ScreenProjectDataDTO userDTO = staffMap.get(project.getLinkName());
+            if (userDTO == null) {
                 userDTO = topicUserMap.get(project.getLinkName());
             }
-            if (userDTO != null){
+            if (userDTO != null) {
+                logger.info("fillScreenProjectData every user data:{}", JSON.toJSONString(userDTO));
                 project.setLinkName(userDTO.getLinkName());
                 project.setLinkMobile(userDTO.getLinkMobile());
             }
-        });
+        }
+        logger.info("fillScreenProjectData result list:{}", JSON.toJSONString(list));
     }
 
     /**

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

@@ -3,6 +3,8 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
@@ -47,6 +49,8 @@ public class StaffServiceImpl implements StaffService {
 	private StaffTransferRecordService staffTransferRecordService;
 	@Autowired
 	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+	@Autowired
+	private RedisUtils redisUtils;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -255,6 +259,11 @@ public class StaffServiceImpl implements StaffService {
 		staffTransferRecordDTO.setAgencyId(fromDTO.getAgencyId());
 		staffTransferRecordDTO.setRemarks(fromDTO.getRemarks());
 		staffTransferRecordService.save(staffTransferRecordDTO);
+		//2021.6.7  添加逻辑-人员调动删除token  sun  start
+		//8.清除可能存在的工作人员登陆token
+		String key = RedisKeys.getCpUserKey("gov", "wxmp", fromDTO.getStaffId());
+		redisUtils.delete(key);
+		//2021.6.7  添加逻辑-人员调动删除token  sun  end
 	}
 
 	/**

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java

@@ -90,6 +90,21 @@ public class ProjectDTO implements Serializable {
      */
 	private String orgIdPath;
 
+	/**
+	 * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
     /**
      * 删除标识:0.未删除 1.已删除
      */

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java

@@ -28,6 +28,12 @@ public class ProjectApprovalFormDTO implements Serializable {
     @NotBlank(message = "内部备注不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
     @Length(max=1000,message = "内部备注不能超过1000位",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
     private String internalRemark;
+    //定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+    private String locateAddress;
+    //定位经度
+    private String locateLongitude;
+    //定位纬度
+    private String locateDimension;
 
     public interface ApprovalCategory extends CustomerClientShowGroup {}
 

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java

@@ -73,6 +73,19 @@ public class ProjectDetailResultDTO implements Serializable {
 	 */
 	private List<String> platformIds;
 
+	/**
+	 * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+	 * */
+	private String locateAddress;
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
 	public ProjectDetailResultDTO() {
 		this.processable = false;
 		this.isSend = false;

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java

@@ -83,4 +83,19 @@ public class ProjectEntity extends BaseEpmetEntity {
      */
 	private String orgIdPath;
 
+	/**
+	 * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -1011,6 +1011,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		projectEntity.setTitle(issueDTO.getIssueTitle());
 		projectEntity.setStatus(ProjectConstant.PENDING);
 		projectEntity.setOrgIdPath(issueDTO.getOrgIdPath());
+		projectEntity.setLocateAddress(null == formDTO.getTopicDTO().getAddress() ? "" : formDTO.getTopicDTO().getAddress());
+		projectEntity.setLocateLongitude(null == formDTO.getTopicDTO().getLongitude() ? "" : formDTO.getTopicDTO().getLongitude());
+		projectEntity.setLocateDimension(null == formDTO.getTopicDTO().getDimension() ? "" : formDTO.getTopicDTO().getDimension());
 		baseDao.insert(projectEntity);
 
 		//3:项目处理进展表新增数据

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -359,6 +359,9 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		projectEntity.setBackGround(formDTO.getBackGround());
 		projectEntity.setStatus(ProjectConstant.PENDING);
 		projectEntity.setOrgIdPath(loginUser.getOrgIdPath());
+		projectEntity.setLocateAddress(null == formDTO.getLocateAddress() ? "" : formDTO.getLocateAddress());
+		projectEntity.setLocateLongitude(null == formDTO.getLocateLongitude() ? "" : formDTO.getLocateLongitude());
+		projectEntity.setLocateDimension(null == formDTO.getLocateDimension() ? "" : formDTO.getLocateDimension());
 		projectService.insert(projectEntity);
 
 		//3-2.项目进展表新增第一个节点数据

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql

@@ -0,0 +1,24 @@
+ALTER TABLE `project`
+ADD COLUMN `LOCATE_ADDRESS`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]' AFTER `ORG_ID_PATH`,
+ADD COLUMN `LOCATE_LONGITUDE`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位经度' AFTER `LOCATE_ADDRESS`,
+ADD COLUMN `LOCATE_DIMENSION`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`;
+
+
+
+UPDATE
+    project a,
+    (
+        SELECT
+            locate_address a,
+            locate_longitude b,
+            locate_dimension c,
+            issue_id d
+        FROM epmet_resi_group.resi_topic
+    ) b
+SET
+    a.locate_address = b.a,
+    a.locate_longitude = b.b,
+    a.locate_dimension = b.c
+WHERE
+    a.origin = 'issue'
+AND a.origin_id = b.d

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql

@@ -0,0 +1,19 @@
+update project set locate_address = NULL,locate_longitude = NULL,locate_dimension = NULL;
+
+UPDATE
+    project a,
+    (
+        SELECT
+            address a,
+            longitude b,
+            dimension c,
+            issue_id d
+        FROM epmet_resi_group.resi_topic
+    ) b
+SET
+    a.locate_address = b.a,
+    a.locate_longitude = b.b,
+    a.locate_dimension = b.c
+WHERE
+    a.origin = 'issue'
+AND a.origin_id = b.d;

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -128,6 +128,9 @@
                p.ORIGIN AS "origin",
                p.ORIGIN_ID AS "originId",
                p.STATUS AS "projectStatus",
+               p.locate_address AS "locateAddress",
+               p.locate_longitude AS "locateLongitude",
+               p.locate_dimension AS "locateDimension",
                IFNULL(pp.PUBLIC_REPLY, '无') AS "publicReply",
                IFNULL(pp.INTERNAL_REMARK, '无') AS "internalRemark"
         FROM project p