diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml
index 164c8818ee..815564766a 100644
--- a/epmet-admin/epmet-admin-server/pom.xml
+++ b/epmet-admin/epmet-admin-server/pom.xml
@@ -215,7 +215,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index ecbc653143..d14d863674 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -301,7 +301,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 988a4c4708..0daeb04b68 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -391,7 +391,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java
index 5386febe19..8dc9102b84 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java
@@ -54,6 +54,8 @@ public class CategoryProjectResultDTO implements Serializable {
//二级分类code
@JsonIgnore
private String categoryCode;
+
+ private String topicId;
}
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index fcda33f71b..1246e8e2e0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -494,7 +494,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
index 17d16fd72d..39b9184284 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
@@ -39,15 +39,15 @@ import java.util.List;
public interface IssueDao extends BaseDao {
/**
- * @Description 查询议题【表决中、已关闭】
+ * @Description 查询议题【表决中、已关闭】
* @Param gridIds
* @author zxc
* @date 2020/12/25 下午2:19
*/
- List issueStatusClosedOrVoting(@Param("gridIds") List gridIds, @Param("issueStatus")String issueStatus);
+ List issueStatusClosedOrVoting(@Param("gridIds") List gridIds, @Param("issueStatus") String issueStatus);
/**
- * @Description 查询已转项目议题
+ * @Description 查询已转项目议题
* @Param gridIds
* @author zxc
* @date 2020/12/25 下午5:27
@@ -72,7 +72,7 @@ public interface IssueDao extends BaseDao {
**/
List selectClosedListGov(ClosedIssueListFormDTO fromDTO);
- Integer selectIssueCount(@Param("gridIds") List gridIds,@Param("issueType")String issueType);
+ Integer selectIssueCount(@Param("gridIds") List gridIds, @Param("issueType") String issueType);
List selectShiftProjectIssueList(@Param("customerId") String customerId, @Param("gridId") String gridId);
@@ -81,4 +81,12 @@ public interface IssueDao extends BaseDao {
* @author sun
**/
List getCategoryList(@Param("customerId") String customerId, @Param("level") String level, @Param("isDisable") String isDisable);
-}
\ No newline at end of file
+
+ /**
+ * desc:根据议题id获取对应的话题id
+ *
+ * @param ids
+ * @return
+ */
+ List selectIssueTopicIdType(@Param("ids") List ids);
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
index 3e87ea18d3..93001af72b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
@@ -52,4 +52,11 @@ public interface GovIssueService {
* @author sun
**/
List categoryList(String customerId, String level, String isDisable);
+
+ /**
+ * desc:根据id 获取议题的话题的话题Id
+ * @param collect
+ * @return
+ */
+ List selectIssueTopicIdType(List collect);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
index 5556d2d3f0..761adb17b2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
@@ -333,4 +333,13 @@ public class GovIssueServiceImpl implements GovIssueService {
return issueDao.getCategoryList(customerId, level, isDisable);
}
+ @Override
+ public List selectIssueTopicIdType(List ids) {
+ List dtoList = issueDao.selectIssueTopicIdType(ids);
+ if (CollectionUtils.isEmpty(dtoList)){
+ return new ArrayList<>();
+ }
+ return dtoList;
+ }
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index 6cd219c759..3c4ea9f65c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -13,6 +13,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
@@ -23,7 +24,6 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO;
import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO;
import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO;
import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
import com.epmet.dataaggre.dto.govproject.ProjectDTO;
import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO;
import com.epmet.dataaggre.dto.govproject.ResiEventDTO;
@@ -80,6 +80,8 @@ public class GovProjectServiceImpl implements GovProjectService {
private EvaluationIndexService evaluationIndexService;
@Autowired
private EpmetUserService epmetUserService;
+ @Autowired
+ private LoginUserUtil loginUserUtil;
/**
* @Description 查询项目信息
@@ -415,13 +417,13 @@ public class GovProjectServiceImpl implements GovProjectService {
formDTO.setToDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1));
//1.查询客户下分类信息
List categoryList = govIssueService.categoryList(formDTO.getCustomerId(), null, null);
- List categoreCodeList = categoryList.stream().filter(ca -> ca.getParentCategoryCode().equals(formDTO.getCategoryCode())).map(m -> m.getCategoryCode()).collect(Collectors.toList());
+ List categoreCodeList = categoryList.stream().filter(ca -> ca.getParentCategoryCode().equals(formDTO.getCategoryCode())).map(IssueProjectCategoryDictDTO::getCategoryCode).collect(Collectors.toList());
formDTO.setCategoreCodeList(categoreCodeList);
//2.查询组织及下级截止某一天的某个一级分类下的项目列表
PageInfo result =
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> projectDao.categoryProjectList(formDTO));
- if (org.springframework.util.CollectionUtils.isEmpty(result.getList())) {
+ if (CollectionUtils.isEmpty(result.getList())) {
return resultDTO;
}
resultDTO.setTotal((int) result.getTotal());
@@ -431,7 +433,7 @@ public class GovProjectServiceImpl implements GovProjectService {
List list = projectDao.getCategoryList(projectIds);
//4.查询来源事件的项目上报的组织信息
- List eventIds = result.getList().stream().filter(re -> "resi_event".equals(re.getOrigin())).map(m -> m.getOriginId()).collect(Collectors.toList());
+ List eventIds = result.getList().stream().filter(re -> "resi_event".equals(re.getOrigin())).map(CategoryProjectResultDTO.Project::getOriginId).collect(Collectors.toList());
List eventOrgList = projectDao.getEventOrgList(eventIds);
Map eventMap = eventOrgList.stream().collect(Collectors.toMap(ResiEventReportOrgDTO::getResiEventId, Function.identity()));
@@ -439,11 +441,19 @@ public class GovProjectServiceImpl implements GovProjectService {
List eventUser = projectDao.getEventList(projectIds);
List topicUser = projectDao.getTopicUser(projectIds);
+ //市北客户查询 下议题区分下来源 设置topicId
+ Map issueTopicSourceMap = new HashMap<>();
+ if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(loginUserUtil.getLoginUserCustomerId())){
+ issueTopicSourceMap = govIssueService.selectIssueTopicIdType(result.getList().stream()
+ .filter(re -> "issue".equals(re.getOrigin()))
+ .map(CategoryProjectResultDTO.Project::getOriginId)
+ .collect(Collectors.toList())).stream().collect(Collectors.toMap(IssueInfoDTO::getIssueId,IssueInfoDTO::getTopicId));
+ }
+
//5.封装数据
//组织或网格id->组织或网格名称
Map map = new HashMap<>();
- result.getList().forEach(re -> {
- //所属组织
+ for (CategoryProjectResultDTO.Project re : result.getList()) {//所属组织
if ("issue".equals(re.getOrigin())) {
if (map.containsKey(re.getGridId())) {
re.setOrgName(map.get(re.getGridId()));
@@ -454,6 +464,9 @@ public class GovProjectServiceImpl implements GovProjectService {
map.put(re.getGridId(), gridInfo.getGridName());
}
}
+ //市北议题来源的设置话题Id
+ re.setTopicId(issueTopicSourceMap.get(re.getOriginId()));
+
} else if ("agency".equals(re.getOrigin())) {
if (map.containsKey(re.getAgencyId())) {
re.setOrgName(map.get(re.getAgencyId()));
@@ -518,7 +531,7 @@ public class GovProjectServiceImpl implements GovProjectService {
re.setUserId(to.getUserId());
}
});
- });
+ }
resultDTO.setList(result.getList());
return resultDTO;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
index 90ecda4b20..495473205c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
@@ -139,5 +139,20 @@
ORDER BY category_code
+
-
\ No newline at end of file
+
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 02ad0b512b..73a47a912b 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -297,7 +297,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 9c8296ac5d..d10408d251 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -550,7 +550,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 3bc6b5969d..8b33031420 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -139,7 +139,7 @@ public class DataReportingServiceImpl implements DataReportingService {
//根据入参,获取项目
long start = System.currentTimeMillis();
List projectList = screenProjectDataService.getProjectList(formDTO.getCustomerId(), formDTO.getProjectId(), formDTO.getPageNo(), formDTO.getPageSize());
- log.error("事件上报-查询项目列表耗时:{}ms",System.currentTimeMillis()-start);
+ log.info("事件上报-查询项目列表耗时:{}ms",System.currentTimeMillis()-start);
//项目列表为空,返回空数组
if(CollectionUtils.isEmpty(projectList)) {
return Collections.emptyList();
@@ -197,7 +197,7 @@ public class DataReportingServiceImpl implements DataReportingService {
return dto;
}).collect(Collectors.toList());
}
- log.error("事件上报-组装数据耗时:{}ms",System.currentTimeMillis()-start);
+ log.info("事件上报-组装数据耗时:{}ms",System.currentTimeMillis()-start);
return list.stream().collect(collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(EventInfoResultDTO::getId))), ArrayList::new));
}
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
index 3788524034..e83d67b9d0 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
@@ -253,7 +253,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml
index 400a0e8bd2..4fd20dca7f 100644
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@@ -224,7 +224,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
index 03635124a5..8a38624e35 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
@@ -172,7 +172,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
index 2e8fd3eb4d..30ff3e0292 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
@@ -304,7 +304,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index 6c28a40408..bc2955d8b7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -268,7 +268,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml
index fc5373ffa4..751cb9a23f 100644
--- a/epmet-module/epmet-job/epmet-job-server/pom.xml
+++ b/epmet-module/epmet-job/epmet-job-server/pom.xml
@@ -222,7 +222,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index d0612f54c3..fef8b6bded 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -279,7 +279,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
index 52fe8232f5..951ea10bce 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
@@ -229,7 +229,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml
index c4ba5c5eec..47de506c6b 100644
--- a/epmet-module/epmet-point/epmet-point-server/pom.xml
+++ b/epmet-module/epmet-point/epmet-point-server/pom.xml
@@ -245,7 +245,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index e5d38357ba..e991b981f3 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -317,7 +317,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml
index f2c316e2b2..ddeab2c6c4 100644
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@@ -209,7 +209,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 2bf2f0c36a..fa921c4400 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -191,7 +191,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 22379d5ff8..3fc58dc8a2 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -259,7 +259,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml
index 5824180535..484ae11334 100644
--- a/epmet-module/gov-mine/gov-mine-server/pom.xml
+++ b/epmet-module/gov-mine/gov-mine-server/pom.xml
@@ -209,7 +209,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 58c87df115..b4a6ef92e1 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -303,7 +303,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index d1ef8e9a71..5b54fd759d 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -286,7 +286,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml
index efbfd5972f..b841e6f0c8 100644
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-server/pom.xml
@@ -218,7 +218,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
index ffdb4111be..2dd8408185 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
@@ -230,7 +230,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml
index f9a1dae768..823111ea48 100644
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-server/pom.xml
@@ -204,7 +204,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index cf05318c5c..b85e21d911 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -249,7 +249,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index 5e6fd306d9..e1803ba56f 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -231,7 +231,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 996f76418e..5260d57e47 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -292,7 +292,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index d91ec026ef..19f3f71eb9 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -225,7 +225,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml
index 81f5589cb1..8ecca5fe37 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@@ -177,7 +177,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml
index d43d8cae62..c4fa8d2560 100644
--- a/epmet-module/resi-home/resi-home-server/pom.xml
+++ b/epmet-module/resi-home/resi-home-server/pom.xml
@@ -199,7 +199,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index 5f1ad1d554..8d2ae439e5 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -216,7 +216,7 @@
test
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index ad6ff19910..0aa5915d98 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -254,7 +254,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml
index c3a22b9347..f2e494aa7f 100644
--- a/epmet-module/resi-voice/resi-voice-server/pom.xml
+++ b/epmet-module/resi-voice/resi-voice-server/pom.xml
@@ -175,7 +175,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index b6fab98b41..bd236cc3ee 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -176,7 +176,7 @@
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 2a820d978b..00db6d99ec 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -318,7 +318,7 @@
elink@833066
0
- r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
+ 192.168.10.150
6379
EpmEtrEdIs!q@w