From 1c40baaf9ca0183945b9881d11ceed5aeebc8290 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:44 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java | 101 +++++++++++++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 42 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
index 1965dcf..28c2683 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
@@ -5,6 +5,8 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +24,7 @@
@Slf4j
public class EmployeeUtil {
+ private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
public static void main(String[] args) {
// SaveStaffNodeRequest request = new SaveStaffNodeRequest();
@@ -42,11 +45,11 @@
- DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
- deleteStafNodeRequest.setEmpId(11451968L);
- deleteStafNodeRequest.setEntercode("981100006318563");
- deleteStafNodeRequest.setMobile("13688394165");
- EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
+// DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
+// deleteStafNodeRequest.setEmpId(11451968L);
+// deleteStafNodeRequest.setEntercode("981100006318563");
+// deleteStafNodeRequest.setMobile("13688394165");
+// EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
}
@@ -55,13 +58,13 @@
* @param request
* @return
*/
- public static Boolean editStaffNode(EditStaffNodeRequest request){
+ public static ResultUtil editStaffNode(EditStaffNodeRequest request){
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/editStaffNode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/editStaffNode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -72,8 +75,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【企业修改员工信息】请求地址:" + url);
log.info("【企业修改员工信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -83,15 +86,18 @@
String retCode = jsonObject.getString("retCode");
if (!"0".equals(retCode)) {
log.error("【企业修改员工信息】请求失败:" + result);
- throw new RuntimeException("【企业修改员工信息】请求失败:" + result);
+ String retMsg = jsonObject.getString("retMsg");
+ retMsg = retMsg.substring(retMsg.indexOf("{"));
+ jsonObject = JSON.parseObject(retMsg);
+ return ResultUtil.error("【企业修改员工信息】请求失败:" + jsonObject.getString("msg"));
}
JSONObject object = jsonObject.getJSONObject("object");
String status = object.getString("status");
if (!"0".equals(status)) {
log.error("【企业修改员工信息】失败:" + object.toJSONString());
- throw new RuntimeException("【企业修改员工信息】失败:" + object.toJSONString());
+ return ResultUtil.error("【企业修改员工信息】失败:" + object.toJSONString());
}
- return true;
+ return ResultUtil.success();
}
@@ -100,13 +106,13 @@
* @param request
* @return
*/
- public static Boolean ecrmDeleteStafNode(DeleteStafNodeRequest request){
+ public static ResultUtil ecrmDeleteStafNode(DeleteStafNodeRequest request){
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/ecrmDeleteStafNode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/ecrmDeleteStafNode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
String content = "";//业务参数
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
@@ -118,8 +124,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【企业删除人员】请求地址:" + url);
log.info("【企业删除人员】请求参数:" + JSON.toJSONString(contentMap));
@@ -129,15 +135,18 @@
String retCode = jsonObject.getString("retCode");
if (!"0".equals(retCode)) {
log.error("【企业删除人员】请求失败:" + result);
- throw new RuntimeException("【企业删除人员】请求失败:" + result);
+ String retMsg = jsonObject.getString("retMsg");
+ retMsg = retMsg.substring(retMsg.indexOf("{"));
+ jsonObject = JSON.parseObject(retMsg);
+ return ResultUtil.error("【企业删除人员】请求失败:" + jsonObject.getString("msg"));
}
JSONObject object = jsonObject.getJSONObject("object");
String status = object.getString("status");
if (!"0".equals(status)) {
log.error("【企业删除人员】失败:" + object.toJSONString());
- throw new RuntimeException("【企业删除人员】失败:" + object.toJSONString());
+ return ResultUtil.error("【企业删除人员】失败:" + object.getString("desc"));
}
- return true;
+ return ResultUtil.success();
}
@@ -148,11 +157,11 @@
*/
public static StaffNodeInfo getStaffNode(GetStaffNodeRequest request){
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getStaffNode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getStaffNode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -163,8 +172,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【根据员工ID获取人员信息】请求地址:" + url);
log.info("【根据员工ID获取人员信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -191,13 +200,13 @@
* @param request
* @return
*/
- public static SaveStaffNode saveStaffNode(SaveStaffNodeRequest request){
+ public static ResultUtil<SaveStaffNode> saveStaffNode(SaveStaffNodeRequest request){
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/saveStaffNode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/saveStaffNode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -208,26 +217,34 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
- log.info("【企业增加员工】请求地址:" + url);
- log.info("【企业增加员工】请求参数:" + JSON.toJSONString(contentMap));
+ log.info("【企业增加员工】请求地址:{}", url);
+ log.info("【企业增加员工】请求参数:{}", JSON.toJSONString(contentMap));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
- log.info("【企业增加员工】请求结果:" + result);
+ log.info("【企业增加员工】请求结果:{}", result);
JSONObject jsonObject = JSON.parseObject(result);
String retCode = jsonObject.getString("retCode");
if (!"0".equals(retCode)) {
- log.error("【企业增加员工】请求失败:" + result);
- throw new RuntimeException("【企业增加员工】请求失败:" + result);
+ log.error("【企业增加员工】请求失败:{}", result);
+ String retMsg = jsonObject.getString("retMsg");
+ if(retMsg.contains("员工昵称已存在")){
+ request.setEmpName(request.getEmpName() + Double.valueOf(Math.random() * 100).intValue());
+ request.setEmpNickname(request.getEmpName());
+ return saveStaffNode(request);
+ }
+ retMsg = retMsg.substring(retMsg.indexOf("{"));
+ jsonObject = JSON.parseObject(retMsg);
+ return ResultUtil.error("【企业增加员工】请求失败:" + jsonObject.getString("msg"));
}
JSONObject object = jsonObject.getJSONObject("object");
String status = object.getString("status");
if (!"0".equals(status)) {
- log.error("【企业增加员工】失败:" + object.toJSONString());
- throw new RuntimeException("【企业增加员工】失败:" + object.toJSONString());
+ log.error("【企业增加员工】失败:{}", object.toJSONString());
+ return ResultUtil.error("【企业增加员工】失败:" + object.getString("desc"));
}
SaveStaffNode saveStaffNode = object.getObject("data", SaveStaffNode.class);
- return saveStaffNode;
+ return ResultUtil.success(saveStaffNode);
}
}
--
Gitblit v1.7.1