#E10-27# 处理预发布环境报错

src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java

@@ -197,44 +197,44 @@ public class HrmSelfHelpController {
     }
 
 
-    @GetMapping("/testSapi15")
+//    @GetMapping("/testSapi15")
-    @WeaPermission(publicPermission = true)
+//    @WeaPermission(publicPermission = true)
-    public WeaResult<Object> testSapi15(HttpServletRequest request){
+//    public WeaResult<Object> testSapi15(HttpServletRequest request){
-        //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
+//        //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
-        Map<String,Object> dataMap = new HashMap<String,Object>();
+//        Map<String,Object> dataMap = new HashMap<String,Object>();
-        dataMap.put("test","testSapi15");
+//        dataMap.put("test","testSapi15");
-        try {
+//        try {
-            String tablename = "uf_nj_cyqltjb" ;
+//            String tablename = "uf_nj_cyqltjb" ;
-            dataMap.put("tablename",tablename);
+//            dataMap.put("tablename",tablename);
-            Map<String,Object> dMap = jucailinPortalUtils.getChatGroup(tenant_key,tablename);
+//            Map<String,Object> dMap = jucailinPortalUtils.getChatGroup(tenant_key,tablename);
-            dataMap.putAll(dMap);
+//            dataMap.putAll(dMap);
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            e.printStackTrace();
+//            e.printStackTrace();
-            log.error("testSapi14:"+e);
+//            log.error("testSapi14:"+e);
-            dataMap.put("count","-1");
+//            dataMap.put("count","-1");
-        }
+//        }
-        return WeaResult.success(dataMap);
+//        return WeaResult.success(dataMap);
-    }
+//    }
-
+//
-
+//
-    @GetMapping("/testSapi16")
+//    @GetMapping("/testSapi16")
-    @WeaPermission(publicPermission = true)
+//    @WeaPermission(publicPermission = true)
-    public WeaResult<Object> testSapi16(HttpServletRequest request){
+//    public WeaResult<Object> testSapi16(HttpServletRequest request){
-        //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
+//        //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
-        Map<String,Object> dataMap = new HashMap<String,Object>();
+//        Map<String,Object> dataMap = new HashMap<String,Object>();
-        dataMap.put("test","testSapi16");
+//        dataMap.put("test","testSapi16");
-        try {
+//        try {
-            String tablename = "uf_nj_pjmrdlhhsl" ;
+//            String tablename = "uf_nj_pjmrdlhhsl" ;
-            dataMap.put("tablename",tablename);
+//            dataMap.put("tablename",tablename);
-            Map<String,Object> dMap = jucailinPortalUtils.getChatDay(tenant_key,tablename);
+//            Map<String,Object> dMap = jucailinPortalUtils.getChatDay(tenant_key,tablename);
-            dataMap.putAll(dMap);
+//            dataMap.putAll(dMap);
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            e.printStackTrace();
+//            e.printStackTrace();
-            log.error("testSapi14:"+e);
+//            log.error("testSapi14:"+e);
-            dataMap.put("count","-1");
+//            dataMap.put("count","-1");
-        }
+//        }
-        return WeaResult.success(dataMap);
+//        return WeaResult.success(dataMap);
-    }
+//    }
 
 //    @GetMapping("/testSapi30")
 //    @WeaPermission(publicPermission = true)
@@ -1379,10 +1379,10 @@ public class HrmSelfHelpController {
                                 List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
                                 if(!recordList.isEmpty()){
                                     log.error("!recordList.isEmpty()");
-                                    jucailinPortalUtils.updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename);
+                                    chatGroupUtils.updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId);
                                 }else{
                                     log.error("recordList.isEmpty()");
-                                    jucailinPortalUtils.insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename);
+                                    chatGroupUtils.insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename);
                                 }
                             }
                         }
@@ -1437,9 +1437,10 @@ public class HrmSelfHelpController {
                                 Map<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
                                 List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
                                 if(!recordList.isEmpty()){
-                                    jucailinPortalUtils.updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename);
+
+                                    chatDayUtils.updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId);
                                 }else{
-                                    jucailinPortalUtils.insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename);
+                                    chatDayUtils.insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename);
                                 }
                             }
 

src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java

@@ -26,7 +26,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 
-@Slf4j
 @RestController
 @RequestMapping("/api/secondev/njjucailin/portal")
 public class JucailinPortalController {

src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java

@@ -7,7 +7,6 @@ import com.weaver.common.distribution.genid.IdGenerator;
 import com.weaver.em.msg.api.entity.Request;
 import com.weaver.em.msg.api.entity.Response;
 import com.weaver.framework.rpc.annotation.RpcReference;
-import com.weaver.seconddev.cm.rpcutil.HrmCommonRpcUtil;
 import com.weaver.teams.domain.user.SimpleEmployee;
 import com.weaver.teams.security.context.UserContext;
 import org.apache.commons.lang3.StringUtils;
@@ -31,7 +30,7 @@ public class ChatDayUtils {
     private DatabaseUtils databaseUtils;
 
     @Autowired
-    private HrmCommonRpcUtil hrmCommonRpcUtil;
+    private JucailinPortalUtils jucailinPortalUtils;
 
     public Map<String,Object> getChatDay(String tenant_key, String tablename,String pageSize,String pageNum){
         Map<String,Object> dataMap = new HashMap<String,Object>();
@@ -152,7 +151,7 @@ public class ChatDayUtils {
             long generate = IdGenerator.generate();
             log.error("insertChatDayDate-generate:"+generate+" userid:"+userid+" amount"+amount+" employeeId:"+employeeId);
 
-            SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(userid);
+            SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid));
             String username = user.getUsername();
             String name = user.getName();
             log.error("username:"+username);
@@ -216,7 +215,7 @@ public class ChatDayUtils {
 //            sqlparam.add(sqlParamEntity);
 //            Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
 
-            SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(userid);
+            SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid));
             String username = user.getUsername();
             String name = user.getName();
             log.error("username:"+username);

src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java

@@ -35,7 +35,7 @@ public class ChatGroupUtils {
     private DatabaseUtils databaseUtils;
 
     @Autowired
-    private HrmCommonRpcUtil hrmCommonRpcUtil;
+    private JucailinPortalUtils jucailinPortalUtils;
 
     /***
      *
@@ -164,7 +164,7 @@ public class ChatGroupUtils {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
 
-            SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(userid);
+            SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid));
             String username = user.getUsername();
             String name = user.getName();
             log.error("username:"+username);
@@ -213,7 +213,7 @@ public class ChatGroupUtils {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
 
-            SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(userid);
+            SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid));
             String username = user.getUsername();
             String name = user.getName();
             log.error("username:"+username);