From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 fc5a234..88e4bb9 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
@@ -24,7 +24,7 @@
@Slf4j
public class EmployeeUtil {
- private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();;
+ private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
public static void main(String[] args) {
// SaveStaffNodeRequest request = new SaveStaffNodeRequest();
@@ -58,7 +58,7 @@
* @param request
* @return
*/
- public static Boolean editStaffNode(EditStaffNodeRequest request){
+ public static ResultUtil editStaffNode(EditStaffNodeRequest request){
//请求路径
String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/editStaffNode";
//私钥文件
@@ -86,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();
}
@@ -132,7 +135,10 @@
String retCode = jsonObject.getString("retCode");
if (!"0".equals(retCode)) {
log.error("【企业删除人员】请求失败:" + result);
- return ResultUtil.error("【企业删除人员】请求失败:" + 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");
@@ -214,20 +220,23 @@
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);
- return ResultUtil.error("【企业增加员工】请求失败:" + result);
+ log.error("【企业增加员工】请求失败:{}", 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());
+ log.error("【企业增加员工】失败:{}", object.toJSONString());
return ResultUtil.error("【企业增加员工】失败:" + object.getString("desc"));
}
SaveStaffNode saveStaffNode = object.getObject("data", SaveStaffNode.class);
--
Gitblit v1.7.1