Browse Source

新增内蒙会话内容存档

anderx 5 months ago
parent
commit
131f21d90d

+ 1 - 1
src/main/java/com/kede/common/dao/ChatMsgUserMapper.java

@@ -81,7 +81,7 @@ public interface ChatMsgUserMapper {
      */
     int deleteById(Integer id);
 
-    ChatMsgUser selectByUserId(@Param("userId")String userId,@Param("provinceType")Integer provinceType);
+    ChatMsgUser selectByUserId(@Param("id")String id,@Param("provinceType")Integer provinceType);
 
     List<ChatMsgUser> getUserList(@Param("type")Integer type,@Param("provinceType")Integer provinceType);
 

+ 1 - 1
src/main/java/com/kede/common/task/ConversationContentTask.java

@@ -51,7 +51,7 @@ public class ConversationContentTask {
         Integer count = 0;
         // type=0 湖南,1=内蒙
 
-        for (int type = 0; type < 1; type++) {
+        for (int type = 0; type < 2; type++) {
             //循环获取数据,每次100条,count不足100条时最后一次循序
             while (count < pageLimit) {
 

+ 6 - 5
src/main/java/com/kede/wechat/service/impl/ConversationContentServiceImpl.java

@@ -132,7 +132,7 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
         }else if (type==1){
             corpId = nmCorpid;
             secret = nmSecret;
-            priKey = nmAppSecret;
+            priKey = hnPriKey;
         }
 
         System.out.println(Finance.Init(sdk, corpId, secret));
@@ -423,17 +423,17 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
             //获取redis缓存数据
             Map<String,String> accessMap = (Map<String, String>) redisTemplate.opsForValue().get("NM_ACCESS_TOKEN");
             if (accessMap == null){
-                logger.debug("getAccessToken无缓存从接口获取");
+                logger.debug("NMgetAccessToken无缓存从接口获取");
                 Map<String, String> map = getAccessMap(corpId, secret);
                 //新增redis缓存数据
                 redisTemplate.opsForValue().set("NM_ACCESS_TOKEN",map);
                 accessToken = map.get("accessToken");
             }else {
-                logger.debug("getAccessToken有缓存从缓存获取");
+                logger.debug("NMgetAccessToken有缓存从缓存获取");
                 accessToken = accessMap.get("accessToken");
                 Long expireDate = Long.valueOf(accessMap.get("expireDate"));
                 if (expireDate < System.currentTimeMillis()){
-                    logger.debug("getAccessToken缓存已过期从接口获取");
+                    logger.debug("NMgetAccessToken缓存已过期从接口获取");
                     Map<String, String> map = getAccessMap(corpId, secret);
                     accessToken = map.get("accessToken");
                     //新增redis缓存数据
@@ -589,8 +589,9 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
             map.put ("code", maps.get("code"));
             chatMsgUser = new ChatMsgUser();
             chatMsgUser.setUserId(userId);
-            chatMsgUser.setType(type);
+            chatMsgUser.setType(type2);
             chatMsgUser.setCreateTime(new Date());
+            chatMsgUser.setProvinceType(type);
             if (StringUtils.isNotBlank(userName)){
                 chatMsgUser.setName(userName);
                 map.put("name",userName);

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -24,7 +24,7 @@ conversationContent.app.secret=FuAa0cUlqKYzBMUZZFzp3F0CEZpzcgQlI9HoXIqnlbk
 
 #内蒙
 conversationContent.nm.corpid=wwaa78a19344c15b33
-conversationContent.nm.secret=0k4XYuHUl4QB8QTB6cAOSaRIX00ur1Vyjjz4p_REP_k
+conversationContent.nm.secret=HT9kNtQJkA7OyClC6RPT6VuJpKQ4hbn1qHeM4i5ixYQ
 conversationContent.nm.app.secret=GNS2Q8YmZ25mM626aQcaCIHbG2sSnAUDe_w4qAyL9jA
 
 #\u68C0\u6D4B\u6570\u636E\u5E93\u94FE\u63A5\u662F\u5426\u6709\u6548\uFF0C\u5FC5\u987B\u914D\u7F6E