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

epmet-admin/epmet-admin-server/pom.xml

@@ -99,7 +99,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -129,7 +129,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-auth/pom.xml

@@ -123,7 +123,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -157,7 +157,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-gateway/pom.xml

@@ -95,7 +95,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -164,7 +164,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@@ -175,7 +175,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -203,7 +203,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-demo/epmet-demo-server/pom.xml

@@ -121,7 +121,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -151,7 +151,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -112,7 +112,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -142,7 +142,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java

@@ -27,6 +27,11 @@ public class MymessageResultDTO implements Serializable {
 	/**
 	 * 消息内容
 	 */
+	private String messageContent;
+
+	/**
+	 * 已读标记
+	 */
 	private String readFlag;
 
 	/**

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -133,7 +133,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -163,7 +163,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -137,7 +137,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -167,7 +167,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-org/gov-org-server/pom.xml

@@ -112,7 +112,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -142,7 +142,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-access/oper-access-server/pom.xml

@@ -108,7 +108,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -138,7 +138,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -107,7 +107,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -137,7 +137,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -101,7 +101,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -131,7 +131,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-group/resi-group-server/pom.xml

@@ -113,7 +113,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>1</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -143,7 +143,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>1</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -565,7 +565,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		sorceObject.setGroupId(groupDTO.getId());
 		sorceObject.setGroupState(groupDTO.getState());
 		SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
-		sorceObject.setLatestTopicPublishDate(format.format(groupDTO.getLatestTopicPublishDate()));
+		if(null!=groupDTO.getLatestTopicPublishDate()){
+			sorceObject.setLatestTopicPublishDate(format.format(groupDTO.getLatestTopicPublishDate()));
+		}
 		sorceObject.setGroupStatisticalInfo(statisticalObjct);
 		return sorceObject;
 	}

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -119,7 +119,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -149,7 +149,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java

@@ -0,0 +1,16 @@
+package com.epmet.resi.mine.dto.from;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/14 11:01
+ */
+@Data
+public class ReadMessageFromDTO implements Serializable {
+	private static final long serialVersionUID = 1116253566756531198L;
+	private String messageId;
+}

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -125,7 +125,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -155,7 +155,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java

@@ -7,8 +7,12 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
 import com.epmet.modules.message.service.UserMessageService;
+import com.epmet.resi.mine.dto.from.ReadMessageFromDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -40,18 +44,16 @@ public class UserMessageController {
 	}
 
 	/**
-	 * @param tokenDto
-	 * @param messageId
+	 * @param fromDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
 	 * @Description 单条消息标记为已读
 	 * @Date 2020/3/29 21:05
 	 **/
 	@PostMapping("readmsg")
-	public Result readMessage(@LoginUser TokenDto tokenDto,
-							  @RequestParam("messageId") String messageId) {
+	public Result readMessage(@RequestBody ReadMessageFromDTO fromDTO) {
 		//逻辑待实现
-		return userMessageService.readMessage(messageId);
+		return userMessageService.readMessage(fromDTO.getMessageId());
 	}
 
 	/**

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -124,7 +124,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -154,7 +154,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -105,4 +105,19 @@ public interface PartyMemberConstant {
 	 * 审核状态 未通过
 	 */
 	String REJECTED = "rejected";
+
+	/**
+	 * 网格ID
+	 */
+	String ALL = " all";
+
+	/**
+	 * 认证成功
+	 */
+	String CONFIRM_SUCCESS = "0";
+
+	/**
+	 * 认证失败
+	 */
+	String CONFIRM_FAILED = "1";
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -164,14 +164,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
 
 			//自动认证失败
-			partyMemberInfoEntity.setConfirmResult("1");
+			partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_FAILED);
 			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
 			} else {
 				partymemberInfoService.updateById(partyMemberInfoEntity);
 			}
 
-
 			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode());
 			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg());
 		} else {
@@ -179,17 +178,26 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
 
 			//自动认证成功
-			partyMemberInfoEntity.setConfirmResult("0");
+			partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_SUCCESS);
 			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
 			} else {
 				partymemberInfoService.updateById(partyMemberInfoEntity);
 			}
 
+			//人工审核数据状态设为通过
+			PartymemberConfirmManualDTO partymemberConfirmManualDTO =
+					partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfoDTO.getId());
+			if (null != partymemberConfirmManualDTO) {
+				partymemberConfirmManualDTO.setAuditStatus(PartyMemberConstant.APPROVED);
+				partymemberConfirmManualService.updateById(ConvertUtils.sourceToTarget(partymemberConfirmManualDTO,
+						PartymemberConfirmManualEntity.class));
+			}
+
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setCustomerId(partyMemberInfoDTO.getCustomerId());
-			userRole.setGridId("all");
+			userRole.setGridId(PartyMemberConstant.ALL);
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
 			userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
 			userRole.setApp(partyMemberInfoDTO.getApp());

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -40,6 +40,7 @@
             pi.CUSTOMER_ID = #{customerId}
           AND pi.GRID_ID = #{gridId}
           AND pi.USER_ID = #{userId}
+          AND pi.CONFIRM_RESULT = '1'
           AND pi.DEL_FLAG = 0
           AND ( pcm.AUDIT_STATUS = 'under_auditting' OR pi.ORGANIZATION_TYPE IS NULL )
     </select>

epmet-user/epmet-user-server/pom.xml

@@ -115,7 +115,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -145,7 +145,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->