diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 3f434e01da..69713f1908 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -187,6 +187,12 @@
651f02d71ed3f123dfb584b8bf0f4d8b
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -225,6 +231,12 @@
651f02d71ed3f123dfb584b8bf0f4d8b
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -258,6 +270,12 @@
wx3d1372029eb816a3
651f02d71ed3f123dfb584b8bf0f4d8b
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -295,6 +313,12 @@
wx3d1372029eb816a3
651f02d71ed3f123dfb584b8bf0f4d8b
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java b/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java
index ddd5d69769..c7ef8cf380 100644
--- a/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java
+++ b/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java
@@ -26,7 +26,6 @@ import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.SetOperations;
-import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.List;
@@ -39,7 +38,8 @@ import java.util.Set;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
-@Component
+//@Component 2020-11-17目前小程序升级都是从 公众号升级 所有这种方式 暂时用不到了
+@Deprecated
public class CustomerAppWxServiceUtil implements ApplicationRunner {
private static Logger logger = LogManager.getLogger(CustomerAppWxServiceUtil.class);
diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml
index 2306d2da5b..d8526d89e6 100644
--- a/epmet-auth/src/main/resources/bootstrap.yml
+++ b/epmet-auth/src/main/resources/bootstrap.yml
@@ -113,7 +113,7 @@ wx:
# secret: @oper.wx.ma.secret@
# token: #微信小程序消息服务器配置的token
# aesKey: #微信小程序消息服务器配置的EncodingAESKey
-# msgDataFormat: JSON
+ # msgDataFormat: JSON
appId:
# 党群e事通-居民端小程序配置appId
resi: @resi.wx.ma.appId@
@@ -121,3 +121,8 @@ wx:
gov: @gov.wx.ma.appId@
# 党群e事通-运营端小程序配置的appId
#oper: @oper.wx.ma.appId@
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-auth/src/main/resources/logback-spring.xml b/epmet-auth/src/main/resources/logback-spring.xml
index af12b174e0..734c4114a1 100644
--- a/epmet-auth/src/main/resources/logback-spring.xml
+++ b/epmet-auth/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index a3ba8dfd3b..aca412e6df 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -110,6 +110,7 @@ public enum EpmetErrorCode {
OPER_CUSTOMER_FOOTBAR_EXISTS(8712, "footbar已存在"),
OPER_CUSTOMER_FOOTBAR_NOT_FOUND(8713, "footbar不存在"),
OPER_EXT_APP_SECRET_RESET_FAIL(8714, "秘钥更新失败"),
+ USER_LIST_ROLES_BY_KEY_FAIL(8715, "根据角色key查询角色列表失败"),
// 党建声音 前端提示 88段
DRAFT_CONTENT_IS_NULL(8801, "至少需要添加一个段落"),
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
index d69f319d7b..8b5a691891 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
@@ -43,7 +43,6 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
@@ -60,8 +59,14 @@ import java.util.Set;
*/
@Slf4j
public class HttpClientManager {
- private static int connectionTimeout = 3000;// 连接超时时间,毫秒
- private static int soTimeout = 10000;// 读取数据超时时间，毫秒
+ // 连接超时时间,毫秒
+ private static int connectionTimeout = 5000;
+ // 读取数据超时时间，毫秒
+ private static int soTimeout = 20000;
+ private static String HEADER_CONTENT_TYPE = "Content-Type";
+ private static String HEADER_APPLICATION_JSON = "application/json;charset=utf-8";
+ private static String UTF8 = "utf-8";
+ private static String HEADER_APPLICATION_FORM_URL_ENCODED = "application/x-www-form-urlencoded;charset=utf-8";
/**
* HttpClient对象
*/
@@ -116,13 +121,14 @@ public class HttpClientManager {
try {
HttpPost httppost = new HttpPost(url);
httppost.setConfig(requestConfig);
- httppost.addHeader("Content-Type", "application/x-www-form-urlencoded charset=utf-8");
+
+ httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_FORM_URL_ENCODED);
List list = new ArrayList();
for (String key : paramsMap.keySet()) {
list.add(new BasicNameValuePair(key, String.valueOf(paramsMap.get(key))));
}
- UrlEncodedFormEntity urlEncodedFormEntity = new UrlEncodedFormEntity(list, "utf-8");
+ UrlEncodedFormEntity urlEncodedFormEntity = new UrlEncodedFormEntity(list, UTF8);
httppost.setEntity(urlEncodedFormEntity);
return execute(httppost, false);
@@ -146,9 +152,9 @@ public class HttpClientManager {
try {
HttpPost httppost = new HttpPost(url);
httppost.setConfig(requestConfig);
- httppost.addHeader("Content-Type", "application/json; charset=utf-8");
+ httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
if (StringUtils.isNotEmpty(jsonStrParam)) {
- StringEntity se = new StringEntity(jsonStrParam, "utf-8");
+ StringEntity se = new StringEntity(jsonStrParam, UTF8);
httppost.setEntity(se);
}
return execute(httppost, false);
@@ -164,14 +170,14 @@ public class HttpClientManager {
try {
HttpPost httppost = new HttpPost(url);
httppost.setConfig(requestConfig);
- httppost.addHeader("Content-Type", "application/json; charset=utf-8");
+ httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
if (null != headerMap){
headerMap.forEach((k,v) -> {
httppost.addHeader(k,v);
});
}
if (StringUtils.isNotEmpty(jsonStrParam)) {
- StringEntity se = new StringEntity(jsonStrParam, "utf-8");
+ StringEntity se = new StringEntity(jsonStrParam, UTF8);
httppost.setEntity(se);
}
return execute(httppost, false);
@@ -221,9 +227,9 @@ public class HttpClientManager {
try {
HttpPost httppost = new HttpPost(url);
httppost.setConfig(requestConfig);
- httppost.addHeader("Content-Type", "application/json");
+ httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
if (StringUtils.isNotEmpty(jsonStrParam)) {
- StringEntity se = new StringEntity(jsonStrParam, "utf-8");
+ StringEntity se = new StringEntity(jsonStrParam, UTF8);
httppost.setEntity(se);
}
return execute(httppost, true);
@@ -249,9 +255,9 @@ public class HttpClientManager {
try {
String stringToSign = timestamp + "\n" + secret;
Mac mac = Mac.getInstance("HmacSHA256");
- mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
- byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
- String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
+ mac.init(new SecretKeySpec(secret.getBytes(UTF8), "HmacSHA256"));
+ byte[] signData = mac.doFinal(stringToSign.getBytes(UTF8));
+ String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), UTF8);
DingTalkTextMsg msg = new DingTalkTextMsg();
msg.setContent(content);
url = url.concat("×tamp=" + timestamp + "&sign=" + sign);
@@ -275,9 +281,9 @@ public class HttpClientManager {
try {
String stringToSign = timestamp + "\n" + secret;
Mac mac = Mac.getInstance("HmacSHA256");
- mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
- byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
- String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
+ mac.init(new SecretKeySpec(secret.getBytes(UTF8), "HmacSHA256"));
+ byte[] signData = mac.doFinal(stringToSign.getBytes(UTF8));
+ String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), UTF8);
log.info("sign为："+sign);
url = url.concat("×tamp=" + timestamp + "&sign=" + sign);
log.info("发送url："+url);
@@ -383,9 +389,9 @@ public class HttpClientManager {
try {
HttpPost httppost = new HttpPost(url);
httppost.setConfig(requestConfig);
- httppost.addHeader("Content-Type", "application/json");
+ httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
if (StringUtils.isNotEmpty(json)) {
- StringEntity se = new StringEntity(json, "utf-8");
+ StringEntity se = new StringEntity(json, UTF8);
httppost.setEntity(se);
}
return executeToByte(httppost);
diff --git a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
index 98583c8f3c..2ee22426f6 100644
--- a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
+++ b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
@@ -131,6 +131,12 @@ public class InternalAuthProcessor extends AuthProcessor {
* @return
*/
private boolean needAuth(String requestUri) {
+ for (String url : cpProperty.getInternalAuthUrlsWhiteList()) {
+ if (antPathMatcher.match(url, requestUri)) {
+ return false;
+ }
+ }
+
for (String url : cpProperty.getInternalAuthUrls()) {
if (antPathMatcher.match(url, requestUri)) {
return true;
diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java b/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java
index 4b801182fa..3442dea612 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java
@@ -22,6 +22,11 @@ public class CpProperty {
*/
private List internalAuthUrls;
+ /**
+ * 内部认证url白名单
+ */
+ private List internalAuthUrlsWhiteList;
+
/**
* 对外部应用开放的url列表
*/
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index ad698b4d8a..53ec286911 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -439,6 +439,10 @@ epmet:
- /resi/home/**
- /data/report/**
+ # 内部认证url白名单(在白名单中的，就不会再校验登录了)
+ internalAuthUrlsWhiteList:
+ - /epmetuser/customerstaff/customerlist
+
# 外部应用认证，使用AccessToken等头进行认证
externalOpenUrls:
- /data/report/**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ProjectLatestOperationResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ProjectLatestOperationResultDTO.java
index 12750903d1..f1ee458fa0 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ProjectLatestOperationResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ProjectLatestOperationResultDTO.java
@@ -17,4 +17,8 @@ public class ProjectLatestOperationResultDTO implements Serializable {
private String projectId;
private String operationName;
+
+ private Integer costTime;
+
+ private String title;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
index 5bd0c89103..12e6151f3f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
@@ -61,6 +61,15 @@ public interface FactOriginGroupMainDailyDao extends BaseDao
+ * @author wangc
+ * @date 2020.11.17 09:56
+ */
+ List selectAllGroupByCustomerId(@Param("customerId") String customerId);
+
/**
* @param customerId
* @return
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index 062c651aaf..ebbbe5e84b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -180,12 +180,12 @@ public interface FactOriginProjectMainDailyDao extends BaseDao
* @author wangc
* @date 2020.09.28 10:19
*/
- List selectDifficultyBaseInfo(@Param("customerId")String customerId,@Param("list")List list);
+ List selectDifficultyBaseInfo(@Param("customerId")String customerId,@Param("thresholdValue") Integer thresholdValue);
/**
* @Description 查询评价周期内新立的项目，是为了增量新增难点赌点的图片库
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenDifficultyDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
index 2b66e785bb..3d90291cba 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
@@ -91,4 +91,13 @@ public interface ScreenDifficultyDataDao extends BaseDao list);
int insertBatchImg(@Param("list") List list);
+
+ /**
+ * @Description 根据客户Id查出全部的难点赌点的项目Id和网格Id，因为需要比对全部的信息然后删除因为删除网格而导致的垃圾数据
+ * @param customerId
+ * @return java.util.List
+ * @author wangc
+ * @date 2020.11.17 09:33
+ */
+ List selectAllDifficultyByCustomerId(@Param("customerId")String customerId);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
index 2e15e2aea1..3d4526a0fe 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
@@ -103,14 +103,5 @@ public interface ProjectDao extends BaseDao {
*/
String selectParameterValueByKey(@Param("customerId") String customerId);
- /**
- * @Description 得到超过阈值滞留的项目Id集合
- * 规定只要项目的任何一个负责人(被流转到的，自始至终不管有没有处理)超过了自定义或默认的滞留时间就算难点赌点
- * @param customerId
- * @param exclude
- * @return java.util.List
- * @author wangc
- * @date 2020.11.06 14:14
- */
- List selectOvertimeProjectIds(@Param("customerId") String customerId,@Param("exclude") List exclude,@Param("value") Integer value);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
index 79e2f51b48..37e130e678 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
@@ -153,15 +153,4 @@ public interface ProjectProcessDao extends BaseDao {
* @date 2020.09.28 14:45
*/
List selectLatestOperation(@Param("list") List list,@Param("customerId") String customerId);
-
- /**
- * @Description 查找项目标题
- * @param list
- * @return java.util.List
- * @author wangc
- * @date 2020.09.28 14:45
- */
- List selectProjectTitle(@Param("list") List list,@Param("customerId") String customerId);
-
-
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index 8f1c0631f7..8b7e1ae06c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -248,12 +248,12 @@ public interface FactOriginProjectMainDailyService extends BaseService
* @author wangc
* @date 2020.09.28 10:23
*/
- List getDifficultyBaseInfo(String customerId , List list);
+ List getDifficultyBaseInfo(String customerId ,Integer thresholdValue);
/**
* @Description 得到评价周期内新立项的id
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index 21caf5f319..bdc82b519d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -237,15 +237,15 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl
* @author wangc
* @date 2020.09.28 10:23
*/
@Override
- public List getDifficultyBaseInfo(String customerId, List list) {
- if(CollectionUtils.isEmpty(list)) return null;
- return baseDao.selectDifficultyBaseInfo(customerId,list);
+ public List getDifficultyBaseInfo(String customerId, Integer thresholdValue) {
+
+ return baseDao.selectDifficultyBaseInfo(customerId,thresholdValue);
}
/**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java
index cd04bc123e..dedb5bc3a3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java
@@ -66,7 +66,7 @@ public class GroupExtractServiceImpl implements GroupExtractService {
/**
* @param param
* @return
- * @Description 业务抽取 - 小组祥光
+ * @Description 业务抽取 - 小组
* @author wangc
* @date 2020.09.18 21:07
**/
@@ -88,22 +88,31 @@ public class GroupExtractServiceImpl implements GroupExtractService {
List memberList = new LinkedList<>();
if (!CollectionUtils.isEmpty(originGroupData)) {
List gridList = dimGridService.getGridAttributes(param.getCustomerId(),originGroupData.stream().map(FactOriginGroupMainDailyDTO::getGridId).distinct().collect(Collectors.toList()));
- List missingGroups = new LinkedList<>();
+
if (!CollectionUtils.isEmpty(gridList)) {
Map gridMap =
gridList.stream().collect(Collectors.toMap(GridAttributesResultDTO::getGridId, Function.identity(), (key1, key2) -> key2));
-
+ //剔除本次要更新数据中的垃圾数据
for(Iterator iter = originGroupData.iterator();
+ iter.hasNext();){
+ FactOriginGroupMainDailyDTO pointer = iter.next();
+ if(null == gridMap.get(pointer.getGridId()))iter.remove();
+
+ }
+ //记录全量中的垃圾数
+ List missingGroups = new LinkedList<>();
+ List population = factOriginGroupMainDailyDao.selectAllGroupByCustomerId(param.getCustomerId());
+ if(!CollectionUtils.isEmpty(population)){
+ for(Iterator iter = population.iterator();
iter.hasNext();){
FactOriginGroupMainDailyDTO pointer = iter.next();
if(null == gridMap.get(pointer.getGridId())){
missingGroups.add(pointer.getId());
- iter.remove();
}
}
-
- originGroupData.forEach(group -> {
+ }
+ originGroupData.forEach(group -> {
GridAttributesResultDTO attr = gridMap.get(group.getGridId());
if (null != attr) {
group.setAgencyId(attr.getAgencyId());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
index 5077794d49..452edc9665 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
@@ -16,7 +16,6 @@ import com.epmet.dto.issue.IssueDTO;
import com.epmet.dto.party.PartyMemberDTO;
import com.epmet.dto.project.FinishOrgDTO;
import com.epmet.dto.project.ProcessInfoDTO;
-import com.epmet.dto.project.ProjectOrgRelationDTO;
import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
import com.epmet.dto.result.WorkDayResultDTO;
import com.epmet.dto.topic.ResiTopicDTO;
@@ -42,8 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collector;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -123,6 +124,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
}
//获取项目信息
List projectList = projectService.getProjectInfo(customerId, dateString);
+ factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
if (!CollectionUtils.isEmpty(projectList)) {
//提取议题ID
List issueIds = projectList.stream().map(ProjectDTO::getOriginId).collect(Collectors.toList());
@@ -193,7 +195,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
}));
//插入数据
if (!list.isEmpty()) {
- factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
factOriginProjectMainDailyService.insertBatch(list);
}
}
@@ -368,8 +369,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
path =path.substring(NumConstant.ZERO,path.length() - NumConstant.ONE);
}
entity.setPids(path);
- }else{
- log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}",process.getAgencyId(),process.getPids());
+ } else {
+ log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}", process.getAgencyId(), process.getPids());
entity.setPid(NumConstant.ZERO_STR);
entity.setPids("");
}
@@ -378,8 +379,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
return entity;
}).collect(Collectors.toList()));
+ factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
if (!logList.isEmpty()) {
- factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
factOriginProjectLogDailyService.insertBatch(logList);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
index 53aebc29cb..2f6f0b6a44 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.project.result.ProjectLatestOperationResultDTO;
import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
@@ -77,8 +78,7 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
//2.查询出客户下网格的相关信息
List gridList = customerGridService.queryGridInfoList(param.getCustomerId());
- Map gridMap = new HashMap<>();
- gridList.forEach(grid -> {gridMap.put(grid.getGridId(),grid);});
+ Map gridMap = gridList.stream().collect(Collectors.toMap(GridInfoDTO :: getGridId,a -> a,(o, n) -> o));
//3.查询出客户下用户的累计积分(累计值，没有时间概念，否则需要查询积分明细计算出评价周期末的得分)
Map pointMap = userPointService.getUserPointMap(param.getCustomerId());
@@ -99,6 +99,9 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
Map scoreMap = cpcIndexCalculateService.getCpcScore(param.getCustomerId(),dateId);
+ //剔除垃圾数据
+ registeredUsers.removeIf(user -> null == gridMap.get(user.getGridId()));
+
//5.整合数据
if(!CollectionUtils.isEmpty(registeredUsers)){
registeredUsers.forEach(user -> {
@@ -118,24 +121,8 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
user.setDataEndTime(finalDateId);
});
-
}
-
- //6.存入数据库
- //不按照时间删除，每次插入之前将该客户下的所有历史数据清空
- //过滤 统计维度中没有的数据
- Set gridIdSet = new HashSet<>();
- List newInsertList = registeredUsers.stream()
- .filter(o -> {
- if (StringUtils.isBlank(o.getGridName())) {
- gridIdSet.add(o.getGridId());
- return false;
- } else {
- return true;
- }
- }).collect(Collectors.toList());
- log.warn("userScoreDataHub grids:{} not in DimGrid", JSON.toJSONString(gridIdSet));
- screenPartyUserRankDataService.dataClean(newInsertList, param.getCustomerId());
+ screenPartyUserRankDataService.dataClean(registeredUsers, param.getCustomerId());
}
/**
@@ -147,42 +134,51 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
**/
@Override
public void difficultyDataHub(ScreenCentralZoneDataFormDTO param) {
-
- //查询难点赌点中有无已结案的项目，若有则保留
- List existed = screenDifficultyDataService.selectExistedInfo(param.getCustomerId());
-
//查询数据
- List difficulties = factOriginProjectMainDailyService.getDifficultyBaseInfo(param.getCustomerId(),projectService.getOvertimeProjectByParameter(param.getCustomerId(),existed));
+ List difficulties = factOriginProjectMainDailyService.getDifficultyBaseInfo(param.getCustomerId(),projectService.getOvertimeProjectByParameter(param.getCustomerId()));
if(CollectionUtils.isEmpty(difficulties)) return;
+
+ //2.查询出客户下网格的相关信息
+ List gridList = customerGridService.queryGridInfoList(param.getCustomerId());
+ Map gridMap = gridList.stream().collect(Collectors.toMap(GridInfoDTO :: getGridId,a -> a,(o, n) -> o));
+
+ //剔除垃圾数据(本次需要更新的数据集)
+ //for(Iterator iter = difficulties.iterator(); iter.hasNext();){
+ // ScreenDifficultyDataEntity pointer = iter.next();
+ // if(null == gridMap.get(pointer.getOrgId())){
+ // iter.remove();
+ // }
+ //}
+ difficulties.removeIf( diff -> null == gridMap.get(diff.getOrgId()));
+
List projectIds = difficulties.stream().map(ScreenDifficultyDataEntity :: getEventId).distinct().collect(Collectors.toList());
//最近一次操作
- Map latestOperationMap = projectProcessService.getLatestOperation(projectIds,param.getCustomerId());
- //标题
- Map titleMap = projectProcessService.getProjectTitle(projectIds,param.getCustomerId());
- boolean isOperationNull = CollectionUtils.isEmpty(latestOperationMap) ? true : false;
- boolean isTitleNull = CollectionUtils.isEmpty(titleMap) ? true : false;
+ Map latestOperationMap = projectProcessService.getLatestOperation(projectIds,param.getCustomerId());
//图片
List projectSourceMap = factOriginProjectMainDailyService.getNewProject(param.getCustomerId(),projectIds);
Map> imgMap =
topicService.getTopicImgs(projectSourceMap);
- boolean isImgNull = CollectionUtils.isEmpty(imgMap) ? true : false;
+
Map contentMap = topicService.getTopicContent(projectSourceMap);
- boolean isContentNull = CollectionUtils.isEmpty(contentMap) ? true : false;
+
difficulties.forEach( diff -> {
- if(!isImgNull) {
+ if(!CollectionUtils.isEmpty(imgMap)) {
List figureList = imgMap.get(diff.getEventId());
diff.setEventImgUrl(CollectionUtils.isEmpty(figureList) ? "" : figureList.get(NumConstant.ZERO).getEventImgUrl());
}
- if(!isContentNull) {
+ if(!CollectionUtils.isEmpty(contentMap)) {
diff.setEventContent(contentMap.get(diff.getEventId()));
}
- if(!isOperationNull){
- diff.setLatestOperateDesc(latestOperationMap.get(diff.getEventId()));
- }
- if(!isTitleNull){
- diff.setEventTitle(titleMap.get(diff.getEventId()));
+ if(! CollectionUtils.isEmpty(latestOperationMap)){
+ ProjectLatestOperationResultDTO oper = latestOperationMap.get(diff.getEventId());
+ if(null != oper){
+ diff.setLatestOperateDesc(oper.getOperationName());
+ diff.setEventTitle(oper.getTitle());
+ diff.setEventCostTime(oper.getCostTime());
+ }
}
+
diff.setDataEndTime(DateUtils.getBeforeNDay(NumConstant.ONE));
});
List imgList = new LinkedList<>();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenDifficultyDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenDifficultyDataService.java
index 3c6dec0673..235dfe856a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenDifficultyDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenDifficultyDataService.java
@@ -51,4 +51,12 @@ public interface ScreenDifficultyDataService extends BaseService difficulties, List imgs);
+ /**
+ * @Description 根据客户Id查出全部的难点赌点的项目Id和网格Id，因为需要比对全部的信息然后删除因为删除网格而导致的垃圾数据
+ * @param customerId
+ * @return java.util.List
+ * @author wangc
+ * @date 2020.11.17 09:31
+ */
+ List getAllDifficultyByCustomerId(String customerId);
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyUserRankDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyUserRankDataService.java
index 99ce30dc0c..ea844971a9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyUserRankDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyUserRankDataService.java
@@ -40,5 +40,4 @@ public interface ScreenPartyUserRankDataService extends BaseService dataList,String customerId);
-
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java
index c539114666..66873e1b6d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java
@@ -54,15 +54,30 @@ public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl difficulties, List imgs) {
+ List orient = baseDao.selectAllDifficultyByCustomerId(customerId);
+ if(!CollectionUtils.isEmpty(orient)){
+ baseDao.deleteBatchDifficultyImg(orient.stream().map(ScreenDifficultyDataEntity::getEventId).distinct().collect(Collectors.toList()));
+ }
+ baseDao.deleteBatchDifficulty(customerId,null);
+
if (!CollectionUtils.isEmpty(difficulties)) {
- baseDao.deleteBatchDifficulty(customerId, difficulties.stream().map(ScreenDifficultyDataEntity::getEventId).distinct().collect(Collectors.toList()));
baseDao.insertBatch(difficulties);
}
if (!CollectionUtils.isEmpty(imgs)) {
- baseDao.deleteBatchDifficultyImg(imgs.stream().map(ScreenDifficultyImgDataEntity::getEventId).distinct().collect(Collectors.toList()));
baseDao.insertBatchImg(imgs);
}
-
baseDao.updateTime(customerId, DateUtils.getBeforeNDay(NumConstant.ONE));
}
+
+ /**
+ * @Description 根据客户Id查出全部的难点赌点的项目Id和网格Id，因为需要比对全部的信息然后删除因为删除网格而导致的垃圾数据
+ * @param customerId
+ * @return java.util.List
+ * @author wangc
+ * @date 2020.11.17 09:31
+ */
+ @Override
+ public List getAllDifficultyByCustomerId(String customerId) {
+ return baseDao.selectAllDifficultyByCustomerId(customerId);
+ }
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
index 49bd23a77b..36409f2927 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
@@ -120,20 +120,9 @@ public interface ProjectProcessService extends BaseService
* @Description 获得项目最新操作
* @param list
* @param customerId
- * @return java.util.Map
+ * @return
* @author wangc
* @date 2020.09.28 14:44
*/
- Map getLatestOperation(List list, String customerId);
-
- /**
- * @Description 获取项目标题
- * @param list
- * @param customerId
- * @return java.util.Map
- * @author wangc
- * @date 2020.10.27 14:34
- */
- Map getProjectTitle(Listlist ,String customerId);
-
+ Map getLatestOperation(List list, String customerId);
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
index e707c0a64c..2dc0e88aa6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
@@ -104,10 +104,9 @@ public interface ProjectService extends BaseService {
* @Description 得到超过阈值滞留的项目Id集合
* 规定只要项目的任何一个负责人(被流转到的，自始至终不管有没有处理)超过了自定义或默认的滞留时间就算难点赌点
* @param customerId
- * @param exclude
* @return java.util.List
* @author wangc
* @date 2020.11.06 14:14
*/
- List getOvertimeProjectByParameter(String customerId,List exclude);
+ Integer getOvertimeProjectByParameter(String customerId);
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
index 13552085b8..09d3d2f652 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
@@ -117,36 +117,17 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl
+ * @return
* @author wangc
* @date 2020.09.28 14:44
*/
@Override
- public Map getLatestOperation(List list, String customerId) {
+ public Map getLatestOperation(List list, String customerId) {
List operations = baseDao.selectLatestOperation(list,customerId);
if(CollectionUtils.isEmpty(operations)){
return Collections.EMPTY_MAP;
}else{
- return operations.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,ProjectLatestOperationResultDTO :: getOperationName));
+ return operations.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,o->o,(a,n)-> a));
}
}
-
- /**
- * @Description 获取项目标题
- * @param list
- * @param customerId
- * @return java.util.Map
- * @author wangc
- * @date 2020.10.27 14:34
- */
- @Override
- public Map getProjectTitle(List list, String customerId) {
- List titles = baseDao.selectProjectTitle(list,customerId);
- if(CollectionUtils.isEmpty(titles)){
- return Collections.EMPTY_MAP;
- }else{
- return titles.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,ProjectLatestOperationResultDTO :: getOperationName));
- }
- }
-
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
index 23461db970..5ba8ea04d6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
@@ -86,16 +86,15 @@ public class ProjectServiceImpl extends BaseServiceImpl
* @author wangc
* @date 2020.11.06 14:14
*/
@Override
- public List getOvertimeProjectByParameter(String customerId, List exclude) {
+ public Integer getOvertimeProjectByParameter(String customerId) {
String parameter = baseDao.selectParameterValueByKey(customerId);
if(StringUtils.isBlank(parameter)) parameter = baseDao.selectParameterValueByKey("default");
- return baseDao.selectOvertimeProjectIds(customerId, exclude, StringUtils.isBlank(parameter) ? NumConstant.FIVE : Integer.parseInt(parameter));
+ return StringUtils.isBlank(parameter) ? NumConstant.FIVE : Integer.parseInt(parameter);
}
}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index c2c75be60f..2717a8cb5e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -38,6 +38,18 @@
CUSTOMER_ID = #{customerId}
+
+
+
DELETE FROM
fact_origin_group_main_daily
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index baa6a83d25..1ea4b350fd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -331,7 +331,7 @@
( project.PROJECT_STATUS = 'pending', '处理中', '已结案' ) AS eventStatusDesc,
IFNULL(relation.reOrg,0) AS eventReOrg,
IFNULL(handleCount.HandledCount,0) AS eventHandledCount,
- IFNULL(costTime.costTime,0) AS eventCostTime ,
+
gridInfo.allParentIds
FROM
fact_origin_project_main_daily project
@@ -382,34 +382,36 @@
GROUP BY
PROJECT_ID
) handleCount ON project.ID = handleCount.PROJECT_ID
- LEFT JOIN (
- SELECT
- main.ID AS PROJECT_ID,
- TIMESTAMPDIFF(
- MINUTE,
- str_to_date( main.DATE_ID, '%Y%m%d' ),
- IF
- ( main.IS_RESOLVED = 'resolved', time.HANDLED_DATE, NOW( ) )
- ) AS costTime
- FROM
- fact_origin_project_main_daily main
- LEFT JOIN fact_origin_project_org_period_daily time ON main.ID = time.PROJECT_ID
- AND time.DEL_FLAG = '0'
- AND time.OPERATION = 'close'
- WHERE
- main.DEL_FLAG = '0'
- AND main.CUSTOMER_ID = #{customerId}
- GROUP BY
- main.ID
- ) costTime ON project.ID = costTime.PROJECT_ID
WHERE
project.DEL_FLAG = '0'
AND project.CUSTOMER_ID = #{customerId}
-
-
- project.ID = #{projectId}
-
-
+ AND project.ID IN (
+
+
+ SELECT DISTINCT
+ period.project_id
+ FROM
+ fact_origin_project_org_period_daily period
+ LEFT JOIN
+ (
+
+ SELECT
+
+ project.ID AS projectId,
+ IF(project.project_status = 'closed',period.handled_date,NOW()) AS finishDate
+
+ FROM fact_origin_project_main_daily project LEFT JOIN fact_origin_project_org_period_daily period
+ ON project.ID = period.project_id AND period.del_flag = '0' AND period.customer_id = #{customerId}
+ AND period.operation = 'close'
+ WHERE project.customer_id = #{customerId} AND project.del_flag = '0'
+ ) projectFinishDate ON projectFinishDate.projectId = period.project_id
+
+ WHERE
+ period.del_flag = '0'
+ AND period.customer_id = #{customerId}
+ AND TIMESTAMPDIFF( DAY, period.informed_date, projectFinishDate.finishDate) > #{thresholdValue}
+ )
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml
index c56a4e85ab..100a2c29dd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml
@@ -219,4 +219,14 @@
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
index de792f46db..08c8d78d5b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -106,45 +106,4 @@
and PARAMETER_KEY ='detention_days'
-
-
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
index efa7b82bb4..3236a09bea 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
@@ -268,9 +268,11 @@
-
-
\ No newline at end of file
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 c5f2f8bdab..46e103344a 100644
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@@ -130,6 +130,13 @@
producerService/producer/sendMsg
202007161443499985fa2d397436d10356542134c8f008c48
52d9d9b0e7d0eb5b8b81c205b579e07c
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -169,6 +176,13 @@
producerService/producer/sendMsg
202007161443499985fa2d397436d10356542134c8f008c48
52d9d9b0e7d0eb5b8b81c205b579e07c
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -206,6 +220,13 @@
producerService/producer/sendMsg
20200804181646184507453a2e9aab76edc550405f80920af
96d788191a10ff57a125157183413004
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -240,6 +261,13 @@
producerService/producer/sendMsg
202008141820598348026098a1b5dd0bc63a1e2418e275d1b
7ce17f65826539ff3e8616dccd4b70fc
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
index e521fd36ff..83b7ee086a 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
@@ -125,4 +125,9 @@ elink:
appId: @elink.mq.appId@ #项目接入亿联云的应用Id
token: @elink.mq.token@ #项目接入亿联云的应用token 相当于secret
host: @elink.mq.host@ #亿联云消息网关服务地址
- sendMsgPath: @elink.mq.sendMsgPath@ #发送消息路径
\ No newline at end of file
+ sendMsgPath: @elink.mq.sendMsgPath@ #发送消息路径
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
index e7ed94b8fc..fa8dd97a46 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
index 6f2c432d23..f8ff8b712c 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
@@ -197,6 +197,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -229,6 +236,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -261,6 +275,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -294,6 +315,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
index a1948620e3..55f2ba49f8 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
@@ -97,4 +97,9 @@ ribbon:
pagehelper:
helper-dialect: mysql
- reasonable: false
\ No newline at end of file
+ reasonable: false
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
index ec4a9fc8e0..6f14b27477 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
index 72cbbdaaf8..4488897fcf 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@@ -98,10 +98,14 @@ feign:
client:
config:
default:
- loggerLevel: BASIC
+ loggerLevel: FULL
httpclient:
enabled: true
+logging:
+ level:
+ com.epmet: debug
+
hystrix:
command:
default:
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index 594f25e502..89291741a5 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -171,6 +171,13 @@
8
10
30
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -209,6 +216,12 @@
8
10
30
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -247,6 +260,12 @@
8
10
30
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -282,6 +301,12 @@
8
10
30
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
index 0ccb3c1213..dcdcaab913 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
@@ -126,4 +126,9 @@ thread:
corePoolSize: @thread.pool.core-pool-size@
maxPoolSize: @thread.pool.max-pool-size@
queueCapacity: @thread.pool.queue-capacity@
- keepAlive: @thread.pool.keep-alive@
\ No newline at end of file
+ keepAlive: @thread.pool.keep-alive@
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
index 7ead25dd02..ee1f62a8ef 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
index ffb777fe7c..3934ecd31a 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
@@ -149,6 +149,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -181,6 +188,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -213,6 +226,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -242,6 +261,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
index 115f991f57..a6d32431be 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
@@ -128,4 +128,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
index a5edb3b691..22c774cac7 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index c6918855a7..f9cd95ca91 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -208,6 +208,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -240,6 +247,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -272,6 +285,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -305,6 +324,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
index fb128323d5..400d4810ed 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
@@ -133,4 +133,9 @@ third:
- https://epmet-ext7.elinkservice.cn
- https://epmet-ext8.elinkservice.cn
- https://epmet-ext9.elinkservice.cn
- - https://epmet-ext10.elinkservice.cn
\ No newline at end of file
+ - https://epmet-ext10.elinkservice.cn
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
index fc91993807..610146dec5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java
new file mode 100644
index 0000000000..85b9e9d68d
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class AccessConfigAdd4RoletFormDTO {
+ @NotBlank(message = "角色Key不能为空")
+ private String roleKey;
+
+ @NotBlank(message = "操作Key不能为空")
+ private String operationKey;
+
+ private List scopeKeys;
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
index ec11eaa26f..76a7886947 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
@@ -12,6 +12,7 @@ import oracle.jdbc.proxy.annotation.Post;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Set;
@@ -116,4 +117,22 @@ public class AccessConfigController {
return new Result();
}
+ /**
+ * @Description 给角色添加操作权限和操作范围
+ * @return
+ * @author wxz
+ * @date 2020.11.17 17:41
+ */
+ @PostMapping("add-ope-and-scopes-4role")
+ public Result addOpeAndScopes4Role(@RequestBody AccessConfigAdd4RoletFormDTO form) {
+ ValidatorUtils.validateEntity(form);
+ String roleKey = form.getRoleKey();
+ String operationKey = form.getOperationKey();
+ List scopeKeys = form.getScopeKeys();
+
+ accessConfigService.addOpeAndScopes4Role(roleKey, operationKey, scopeKeys);
+ return new Result();
+ }
+
+
}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
index 3fc28b675f..508f3ad45f 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
@@ -25,4 +25,6 @@ public interface AccessConfigService {
List listOpeDefaultScopes4Role(String roleKey, String operationKey);
void saveOpeDefaultScopes(String roleKey, String operationKey, List scopeKeys);
+
+ void addOpeAndScopes4Role(String roleKey, String operationKey, List scopeKeys);
}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
index 7b635cedf0..79d35436a8 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
@@ -2,12 +2,14 @@ package com.epmet.service.impl;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.*;
import com.epmet.dto.result.*;
import com.epmet.entity.OperationScopeDefaultEntity;
import com.epmet.entity.RoleOperationDefaultEntity;
import com.epmet.entity.RoleOperationEntity;
import com.epmet.entity.RoleScopeEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.redis.RoleOpeScopeRedis;
import com.epmet.service.AccessConfigService;
import org.slf4j.Logger;
@@ -41,6 +43,9 @@ public class AccessConfigServiceImpl implements AccessConfigService {
@Autowired
private OperationScopeDefaultDao operationScopeDefaultDao;
+ @Autowired
+ private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
@Override
public List listOpesByRole(String roleId) {
return roleOperationDao.listOpesForAccessConfig(roleId);
@@ -196,4 +201,56 @@ public class AccessConfigServiceImpl implements AccessConfigService {
operationScopeDefaultDao.insert(entity);
}
}
+
+ /**
+ * @Description 给角色添加操作权限和操作范围
+ * @return
+ * @author wxz
+ * @date 2020.11.17 17:41
+ */
+ @Override
+ public void addOpeAndScopes4Role(String roleKey, String operationKey, List scopeKeys) {
+ Result> rolesResult = epmetUserOpenFeignClient.listRolesByRoleKey(roleKey);
+ if (!rolesResult.success()) {
+ String msg = "调用user服务，根据key查询角色列表失败";
+ throw new RenException(EpmetErrorCode.USER_LIST_ROLES_BY_KEY_FAIL.getCode(), msg, msg,
+ RenException.MessageMode.CODE_INTERNAL_EXTERNAL.CODE_INTERNAL_EXTERNAL);
+ }
+
+ List roles = rolesResult.getData();
+ List roleIds2Add = roles.stream().map(GovStaffRoleResultDTO::getRoleId).collect(Collectors.toList());
+ addOpeAndScopes4Role(roleIds2Add, operationKey, scopeKeys);
+ }
+
+ /**
+ * @Description 将默认的角色操作和范围同步给具体的角色
+ * @return
+ * @author wxz
+ * @date 2020.11.17 17:38
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void addOpeAndScopes4Role(List roleIds, String operationKey, List scopeKeys) {
+ for (String roleId : roleIds) {
+ // 只给没有添加该权限的用户赋予该权限，已经添加了和添加了又取消的不操作
+ RoleOperationEntity roleOpe = roleOperationDao.getRoleOpe(roleId, operationKey);
+ if (roleOpe == null) {
+ // 没有该操作，则添加
+ RoleOperationEntity roleOperation = new RoleOperationEntity();
+ roleOperation.setOperationKey(operationKey);
+ roleOperation.setRoleId(roleId);
+ roleOperationDao.insert(roleOperation);
+ }
+ for (String scopeKey : scopeKeys) {
+ // 没有的话则添加
+ RoleScopeEntity roleScopeInDb = roleScopeDao.getByRoleIdAndOpeKey(roleId, operationKey, scopeKey);
+ if (roleScopeInDb == null) {
+ RoleScopeEntity roleScopeEntity = new RoleScopeEntity();
+ roleScopeEntity.setOperationKey(operationKey);
+ roleScopeEntity.setRoleId(roleId);
+ roleScopeEntity.setScopeKey(scopeKey);
+ roleScopeDao.insert(roleScopeEntity);
+ }
+ }
+ }
+ }
}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
index e8a2685e37..6fcc5979f5 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
@@ -119,3 +119,7 @@ pagehelper:
helper-dialect: mysql
reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+#feign 日志需要该配置
+logging:
+ level:
+ com.epmet: debug
\ No newline at end of file
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 494a417395..c822e7e308 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -112,6 +112,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -138,6 +144,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -164,6 +176,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -190,6 +208,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
index 6b8729cd4e..003760840c 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
@@ -74,4 +74,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
index 780a8cd3a6..dbf5cf299c 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 93d9f0334c..0b00f44d12 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -146,7 +146,7 @@
false
https://epmet-dev.elinkservice.cn/api/epmetscan/api
-
+
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
@@ -183,7 +183,7 @@
false
https://epmet-dev.elinkservice.cn/api/epmetscan/api
-
+
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
@@ -253,6 +253,13 @@
true
https://epmet-open.elinkservice.cn/api/epmetscan/api
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
index e523016b91..39f6c8b80c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
@@ -114,4 +114,10 @@ openapi:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
+
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
index a8dbb17134..7ef4d70dbc 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml
index 54f3b8e225..00baee29cf 100644
--- a/epmet-module/gov-mine/gov-mine-server/pom.xml
+++ b/epmet-module/gov-mine/gov-mine-server/pom.xml
@@ -136,6 +136,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -160,6 +166,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -184,6 +196,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -205,6 +223,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
index f19d228c96..c49ee432c1 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
@@ -94,3 +94,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
index a03a6843bd..80e1ea56e2 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 5c6f53c739..ecfdb329f1 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -150,6 +150,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -182,6 +188,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -215,6 +227,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -244,6 +262,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
index 4657c30354..8651e49ce2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
@@ -130,4 +130,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
index e05ed7a188..24d44d88f9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 06ec668460..0dc357dada 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -157,6 +157,13 @@
false
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -190,6 +197,12 @@
false
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -223,6 +236,12 @@
true
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -253,6 +272,13 @@
true
https://epmet-open.elinkservice.cn/api/epmetscan/api
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
index 31d7d1ef6d..58ec92257b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
@@ -114,4 +114,9 @@ openapi:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
index c4e23d9fe9..8a9462ce2b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml
index 1c80814b41..f6b5b7d0a3 100644
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-server/pom.xml
@@ -132,6 +132,12 @@
false
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -165,6 +171,12 @@
false
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -198,6 +210,12 @@
true
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -228,6 +246,13 @@
true
https://epmet-open.elinkservice.cn/api/epmetscan/api
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
index 8e85f694ed..6bf735a325 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
@@ -114,4 +114,9 @@ openapi:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
index e9ef5d3b60..da83651e0c 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml
index f78794d104..4a9152e2d0 100644
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-server/pom.xml
@@ -119,6 +119,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -151,6 +157,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -183,6 +195,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -212,6 +230,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
index b7cbcbe1af..34a3d56ae9 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
@@ -117,4 +117,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
index f12b007132..d0829fae23 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 8535f16485..a721c86f4f 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -140,6 +140,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -172,6 +178,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -204,6 +216,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -236,6 +254,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
index 422a4459a9..7b14f2cad1 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
@@ -123,4 +123,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
index 68c16e906e..0c531843f6 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/CustomerAppDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerAppDao.xml
similarity index 100%
rename from epmet-module/oper-crm/oper-crm-server/src/main/resources/CustomerAppDao.xml
rename to epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerAppDao.xml
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index 20f7861056..a36f6d46d1 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -123,6 +123,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -155,6 +161,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -187,6 +199,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -216,6 +234,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
index 14755776eb..b6cb0ffbb8 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
@@ -117,4 +117,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
index de2aa4d947..d02b4bffb3 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 43552aa943..86ccf538e0 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -148,6 +148,13 @@
false
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -181,6 +188,13 @@
false
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -213,6 +227,13 @@
true
https://epmet-dev.elinkservice.cn/api/epmetscan/api
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -242,6 +263,13 @@
true
https://epmet-open.elinkservice.cn/api/epmetscan/api
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 34c110bd2d..1dfff6faa7 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -18,7 +18,6 @@
package com.epmet.modules.topic.service.impl;
-
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -75,9 +74,9 @@ import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO;
import com.epmet.resi.group.dto.topic.ResiTopicDTO;
import com.epmet.resi.group.dto.topic.TopicInfoDTO;
-import com.epmet.resi.group.dto.topic.form.*;
import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO;
import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
+import com.epmet.resi.group.dto.topic.form.*;
import com.epmet.resi.group.dto.topic.result.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -1156,48 +1155,49 @@ public class ResiTopicServiceImpl extends BaseServiceImpl issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo);
+ if (issueResult == null || !issueResult.success() || StringUtils.isBlank(issueResult.getData())) {
+ throw new RenException(ModuleConstant.CREATE_ISSUE_ERROR);
+ }
//5.修改话题shiftIssue字段
- if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){
- ResiTopicEntity topic2Upd = new ResiTopicEntity();
- topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
- topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
- topic2Upd.setShiftIssue(Boolean.TRUE);
- topic2Upd.setIssueId(issueResult.getData());
- topic2Upd.setUpdatedTime(now);
- int topicResult = baseDao.updateOne(topic2Upd);
- //6.新增话题操作记录
- if(topicResult == NumConstant.ONE) {
- ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
- operation.setCreatedTime(now);
- operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
- operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
- operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
- int operationResult = resiTopicOperationDao.insertOneByParams(operation);
- if(operationResult != NumConstant.ONE){
- logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
- }
- }
- //7.更新组统计信息 议题数量+1
- resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
- if(null != groupCache && null != groupCache.getGroupStatisticalInfo()){
- groupCache.getGroupStatisticalInfo().setTotalIssues(
- null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
- : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
- );
- resiGroupRedis.set(groupCache);
- }
- logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+ ResiTopicEntity topic2Upd = new ResiTopicEntity();
+ topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
+ topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
+ topic2Upd.setShiftIssue(Boolean.TRUE);
+ topic2Upd.setIssueId(issueResult.getData());
+ topic2Upd.setUpdatedTime(now);
+ int topicResult = baseDao.updateOne(topic2Upd);
+ //6.新增话题操作记录
+ if (topicResult == NumConstant.ONE) {
+ ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
+ operation.setCreatedTime(now);
+ operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
+ operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
+ operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
+ int operationResult = resiTopicOperationDao.insertOneByParams(operation);
+ if (operationResult != NumConstant.ONE) {
+ logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
+ }
+ }
+ //7.更新组统计信息 议题数量+1
+ resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
+ if (null != groupCache && null != groupCache.getGroupStatisticalInfo()) {
+ groupCache.getGroupStatisticalInfo().setTotalIssues(
+ null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
+ : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
+ );
+ resiGroupRedis.set(groupCache);
}
+ logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
}
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index 094c58bda7..9fa1359bdf 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -327,5 +327,7 @@ public interface ModuleConstant extends Constant {
String FIELD_OPERATION_TYPE = "OPERATION_TYPE";
- String CLOSED_TOPIC_REASON_PREFIX="话题已关闭：";
+ String CLOSED_TOPIC_REASON_PREFIX = "话题已关闭：";
+
+ String CREATE_ISSUE_ERROR = "创建议题失败";
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
index 6f73407d1a..d836a237c2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
@@ -125,4 +125,9 @@ openapi:
url: @openapi.scan.server.url@
method:
imgSyncScan: /imgSyncScan
- textSyncScan: /textSyncScan
\ No newline at end of file
+ textSyncScan: /textSyncScan
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
index 40fb0f8615..6c992be86b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index 098b7a0ba5..1282b2f3e8 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -140,6 +140,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -172,6 +178,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -204,6 +216,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -233,6 +251,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
index ed94f661c3..836ea9f4ca 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
@@ -118,4 +118,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
index 936ac0df8c..174beb8e91 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml
index a44a834c35..61c2a76ffe 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@@ -98,6 +98,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -124,6 +130,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -150,6 +162,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -173,6 +191,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
index 58e251be5b..479945892d 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
@@ -70,3 +70,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
index 39a130d7e1..be2d2c27e7 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml
index d43f84aaa6..dac75fd41b 100644
--- a/epmet-module/resi-home/resi-home-server/pom.xml
+++ b/epmet-module/resi-home/resi-home-server/pom.xml
@@ -116,6 +116,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -140,6 +146,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -164,6 +176,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -185,6 +203,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
index afb7ab3e38..3c5dee1515 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
@@ -69,3 +69,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
index a53039bc12..81dec45754 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index 96597e773c..f68f226c46 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -140,6 +140,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -163,6 +169,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -186,6 +198,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -206,6 +224,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
index 6e5eb54cc2..eff0b2bbb3 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
@@ -97,3 +97,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
index ffa4fdd447..2893426200 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 74088b3ac0..63d0d5e4bf 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -146,6 +146,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -178,6 +185,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -210,6 +224,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -239,6 +260,14 @@
true
+
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
index a2118ff3a3..62322c11c8 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
@@ -117,4 +117,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
index 02b45f2efc..ce07d2963b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml
index 9985f3c6a5..4a1a3a18dc 100644
--- a/epmet-module/resi-voice/resi-voice-server/pom.xml
+++ b/epmet-module/resi-voice/resi-voice-server/pom.xml
@@ -102,6 +102,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -126,6 +133,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -150,6 +164,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -174,6 +195,14 @@
false
+
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
index 03891ed01a..589e4fb19e 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
@@ -65,3 +65,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
index 98bc0a986b..c6e86ca128 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index c77bafe339..b80b8a843e 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -104,6 +104,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -129,6 +135,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -150,6 +162,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -175,6 +193,14 @@
false
+
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
index 84000daee9..2c2a29d61a 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
+++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
@@ -77,3 +77,8 @@ aliyun:
regionId: cn-shanghai
bizType: epmet_img_text
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
+
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml b/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
index d244b6fa2a..9d2ad51e14 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
+++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index e7fda8ad3e..7eeef44d42 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -334,4 +334,13 @@ public interface EpmetUserOpenFeignClient {
*/
@PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
Result getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
+
+ /**
+ * @Description 根据角色key查询具有该key的所有角色列表
+ * @return
+ * @author wxz
+ * @date 2020.11.17 16:20
+ */
+ @PostMapping("/epmetuser/govstaffrole/list-roles-by-rolekey/{role-key}")
+ Result> listRolesByRoleKey(@PathVariable("role-key") String roleKey);
}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 9e0c973463..a76e847ff4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -225,4 +225,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
public Result getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
}
+
+ @Override
+ public Result> listRolesByRoleKey(String roleKey) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey);
+ }
}
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 61c5b17203..385f86164d 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -155,6 +155,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -187,6 +193,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -219,6 +231,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -248,6 +266,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
index 81a79972c0..40cab6cb5a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
@@ -100,4 +100,16 @@ public class GovStaffRoleController {
return new Result();
}
+ /**
+ * @Description 根据角色key查询具有该key的所有角色列表
+ * @return
+ * @author wxz
+ * @date 2020.11.17 16:20
+ */
+ @PostMapping("list-roles-by-rolekey/{role-key}")
+ public Result> listRolesByRoleKey(@PathVariable("role-key") String roleKey) {
+ List roles = govStaffRoleService.listRolesByRoleKey(roleKey);
+ return new Result>().ok(roles);
+ }
+
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
index aab3c4ae30..f7875d63d5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
@@ -75,4 +75,6 @@ public interface GovStaffRoleDao extends BaseDao {
int updateColumnsById(@Param("roleId") String roleId, @Param("roleName") String roleName);
int updateSortById(@Param("roleId") String roleId, @Param("sort") int sort);
+
+ List listRolesByRoleKey(@Param("roleKey") String roleKey);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
index ef513d0ac7..d0f6b2def7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
@@ -75,4 +75,6 @@ public interface UserWechatDao extends BaseDao{
**/
List selectResiAndStrangerInfo(@Param("userIds") List userIds, @Param("realName")String realName);
+ //临时用下in
+ List selectNotInUserBaseInfoTemp();
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
index eef3e6f0b0..346fad61b2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
@@ -138,4 +138,6 @@ public interface GovStaffRoleService extends BaseService {
int updateRole(String roleId, String roleName);
void saveSortOrder(List roleIdList);
+
+ List listRolesByRoleKey(String roleKey);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
index 6a22460731..726be2370d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
@@ -222,4 +222,15 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl listRolesByRoleKey(String roleKey) {
+ return govStaffRoleDao.listRolesByRoleKey(roleKey);
+ }
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 7143b7d171..326e74912d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -166,7 +166,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl userWechatDTOList=userWechatDao.selectAll();
+ List userWechatDTOList=userWechatDao.selectNotInUserBaseInfoTemp();
List userIdList=new ArrayList<>();
for(UserWechatDTO userWechatDTO:userWechatDTOList){
userIdList.add(userWechatDTO.getUserId());
@@ -202,12 +202,12 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index 1a8c27b7d0..40539c565f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -103,4 +103,12 @@
)
+
+
+
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index fc345f9fd2..0aa445acfa 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -42,34 +42,28 @@
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
index 98a5c58075..5797e95eef 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
@@ -115,4 +115,24 @@
ORDER BY
base.REAL_NAME , wechat.NICKNAME
+
+
+