shilei
/
E10-secondev-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
main
shilei 1 year ago
parent 86f712144e
commit c51450e1d6
6 changed files with 568 additions and 546 deletions
Show Stats Download Patch File Download Diff File

85
src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
Unescape Escape View File

@ -197,44 +197,44 @@ public class HrmSelfHelpController {
}
@GetMapping("/testSapi15")
@WeaPermission(publicPermission = true)
public WeaResult<Object> testSapi15(HttpServletRequest request){
//com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","testSapi15");
try {
String tablename = "uf_nj_cyqltjb" ;
dataMap.put("tablename",tablename);
Map<String,Object> dMap = jucailinPortalUtils.getChatGroup(tenant_key,tablename);
dataMap.putAll(dMap);
} catch (Exception e) {
e.printStackTrace();
log.error("testSapi14:"+e);
dataMap.put("count","-1");
}
return WeaResult.success(dataMap);
}
@GetMapping("/testSapi16")
@WeaPermission(publicPermission = true)
public WeaResult<Object> testSapi16(HttpServletRequest request){
//com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","testSapi16");
try {
String tablename = "uf_nj_pjmrdlhhsl" ;
dataMap.put("tablename",tablename);
Map<String,Object> dMap = jucailinPortalUtils.getChatDay(tenant_key,tablename);
dataMap.putAll(dMap);
} catch (Exception e) {
e.printStackTrace();
log.error("testSapi14:"+e);
dataMap.put("count","-1");
}
return WeaResult.success(dataMap);
}
// @GetMapping("/testSapi15")
// @WeaPermission(publicPermission = true)
// public WeaResult<Object> testSapi15(HttpServletRequest request){
// //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
// Map<String,Object> dataMap = new HashMap<String,Object>();
// dataMap.put("test","testSapi15");
// try {
// String tablename = "uf_nj_cyqltjb" ;
// dataMap.put("tablename",tablename);
// Map<String,Object> dMap = jucailinPortalUtils.getChatGroup(tenant_key,tablename);
// dataMap.putAll(dMap);
// } catch (Exception e) {
// e.printStackTrace();
// log.error("testSapi14:"+e);
// dataMap.put("count","-1");
// }
// return WeaResult.success(dataMap);
// }
//
//
// @GetMapping("/testSapi16")
// @WeaPermission(publicPermission = true)
// public WeaResult<Object> testSapi16(HttpServletRequest request){
// //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
// Map<String,Object> dataMap = new HashMap<String,Object>();
// dataMap.put("test","testSapi16");
// try {
// String tablename = "uf_nj_pjmrdlhhsl" ;
// dataMap.put("tablename",tablename);
// Map<String,Object> dMap = jucailinPortalUtils.getChatDay(tenant_key,tablename);
// dataMap.putAll(dMap);
// } catch (Exception e) {
// e.printStackTrace();
// log.error("testSapi14:"+e);
// dataMap.put("count","-1");
// }
// 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);
}
}

1
src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java
Unescape Escape View File

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

7
src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java
Unescape Escape View File

@ -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);

6
src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java
Unescape Escape View File

@ -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);

1015
src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save