From d3efbff8f05d05d90f345f7404f7a848383fa8f4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 14 六月 2025 23:27:57 +0800
Subject: [PATCH] 新增加司机双方数据接口
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNode.java | 31 +++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/EditStaffNodeRequest.java | 36 +++-
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/StaffNodeInfo.java | 32 +++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/ResetPwdRequest.java | 4
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNodeRequest.java | 8
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 209 +++++++++++++++++++------
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java | 13
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java | 2
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GetStaffNodeRequest.java | 4
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java | 16 +
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/DeleteStafNodeRequest.java | 4
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java | 7
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 69 ++++++-
13 files changed, 323 insertions(+), 112 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index f79de75..f1d80eb 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -11,6 +11,7 @@
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -20,12 +21,16 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
+import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNode;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNodeRequest;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
@@ -64,35 +69,43 @@
@Autowired
private ITLineService itLineService;
-
+
@Autowired
private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
+
@Resource
private DriverTrainMapper driverTrainMapper;
-
+
@Resource
private DriverPunishMapper driverPunishMapper;
-
+
@Autowired
- private RedisUtil redisUtil;
-
+ private RedisTemplate redisTemplate;
+
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
-
-
-
+
+ @Autowired
+ private ITCompanyService itCompanyService;
+
+ @Autowired
+ private ITDriverServiceService itDriverServiceService;
+
@Autowired
private ITComplaintService tComplaintService;
-
+
+ @Autowired
+ private IUserService userService;
+
/**
* 跳转投诉页面
+ *
* @return
*/
@RequestMapping("complaint")
- public String complaint(Model model,Integer driverId) {
-
- model.addAttribute("id",driverId);
+ public String complaint(Model model, Integer driverId) {
+
+ model.addAttribute("id", driverId);
return PREFIX + "tComplaint.html";
}
@@ -633,28 +646,52 @@
if (1 == authState){
type = 5;
tDriver.setAuthState(2);
-
+
new Thread(new Runnable() {
@Override
public void run() {
- if(pushMinistryOfTransport){//上传数据
+ if (pushMinistryOfTransport) {//上传数据
pushMinistryOfTransportUtil.baseInfoCompanyStat();
pushMinistryOfTransportUtil.baseInfoDriver(id);
pushMinistryOfTransportUtil.baseInfoDriverApp(id);
}
}
}).start();
- }else{
+ } else {
type = 6;
tDriver.setAuthState(4);
}
-
- Map<String,String> map = new HashMap<>();
+
+ Map<String, String> map = new HashMap<>();
map.put("uid", String.valueOf(tDriver.getId()));
map.put("type", String.valueOf(type));
String result = HttpRequestUtil.postRequest(PushURL.driver_auth_url, map);
- System.out.println("司机注册审核发送短信 :【driverId="+tDriver.getId().toString()+"】,调用接口:"+result);
-
+ System.out.println("司机注册审核发送短信 :【driverId=" + tDriver.getId().toString() + "】,调用接口:" + result);
+ //审核通过，在中台添加司机账号
+ if (2 == tDriver.getAuthState()) {
+ ShiroUser user = ShiroExtUtil.getUser();
+ Integer objectId = user.getObjectId();
+ TCompany tCompany = itCompanyService.selectById(objectId);
+ User user1 = userService.selectById(user.getId());
+ SaveStaffNodeRequest request = new SaveStaffNodeRequest();
+ request.setMobile(user1.getPhone());
+ request.setEntercode(tCompany.getEnterCode());
+ request.setEmpName(tDriver.getName());
+ request.setEmpNickname(tDriver.getName());
+ request.setLoginNo(tDriver.getPhone());
+ request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
+ request.setMphone(tDriver.getPhone());
+ request.setEmail("qyt@qyt.com");
+ request.setDeptId(0);
+ request.setPositionId(1);
+ request.setSuperLevel(0);
+ request.setHideMobile(0);
+ SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
+ TCompany tCompany1 = itCompanyService.selectById(tDriver.getCompanyId());
+ tDriver.setEmpId(saveStaffNode.getEmpId());
+ tDriver.setEntercode(tCompany1.getEnterCode());
+ tDriver.setEnterId(Long.valueOf(tCompany1.getEnterCode()));
+ }
tDriverService.updateById(tDriver);
}
return SUCCESS_TIP;
@@ -728,23 +765,47 @@
tDriver.setInsertTime(new Date());
tDriver.setInsertUser(ShiroExtUtil.getUser().getId());
// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
-
+
tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
-
+ //审核通过，在中台添加司机账号
+ if (2 == tDriver.getAuthState()) {
+ ShiroUser user = ShiroExtUtil.getUser();
+ Integer objectId = user.getObjectId();
+ TCompany tCompany = itCompanyService.selectById(objectId);
+ User user1 = userService.selectById(user.getId());
+ SaveStaffNodeRequest request = new SaveStaffNodeRequest();
+ request.setMobile(user1.getPhone());
+ request.setEntercode(tCompany.getEnterCode());
+ request.setEmpName(tDriver.getName());
+ request.setEmpNickname(tDriver.getName());
+ request.setLoginNo(tDriver.getPhone());
+ request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
+ request.setMphone(tDriver.getPhone());
+ request.setEmail("qyt@qyt.com");
+ request.setDeptId(0);
+ request.setPositionId(1);
+ request.setSuperLevel(0);
+ request.setHideMobile(0);
+ SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
+ TCompany tCompany1 = itCompanyService.selectById(tDriver.getCompanyId());
+ tDriver.setEmpId(saveStaffNode.getEmpId());
+ tDriver.setEntercode(tCompany1.getEnterCode());
+ tDriver.setEnterId(Long.valueOf(tCompany1.getEnterCode()));
+ }
tDriverService.insert(tDriver);
-
+
//添加经营业务
String[] serverArray = serverBox.split(",");
- for (int i=0;i<serverArray.length;i++){
+ for (int i = 0; i < serverArray.length; i++) {
TDriverService service = new TDriverService();
service.setDriverId(tDriver.getId());
service.setType(Integer.valueOf(serverArray[i]));
tDriverServiceService.insert(service);
-
- if (3 == Integer.valueOf(serverArray[i])){
+
+ if (3 == Integer.valueOf(serverArray[i])) {
//添加线路
- if (SinataUtil.isNotEmpty(lineStr)){
- addLine(lineStr,tDriver.getId());
+ if (SinataUtil.isNotEmpty(lineStr)) {
+ addLine(lineStr, tDriver.getId());
}
}
}
@@ -781,10 +842,10 @@
TDriver driver = tDriverService.selectById(tDriverId);
driver.setFlag("3");
tDriverService.updateById(driver);
- String value = redisUtil.getValue("DRIVER_" + driver.getPhone());
- redisUtil.remove(value);
- redisUtil.remove("DRIVER_" + driver.getId());
- redisUtil.remove("DRIVER_" + driver.getPhone());
+ String value = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone());
+ redisTemplate.delete(value);
+ redisTemplate.delete("DRIVER_" + driver.getId());
+ redisTemplate.delete("DRIVER_" + driver.getPhone());
return SUCCESS_TIP;
}
/**
@@ -811,19 +872,45 @@
new Thread(new Runnable() {
@Override
public void run() {
- if(pushMinistryOfTransport){//上传数据
+ if (pushMinistryOfTransport) {//上传数据
pushMinistryOfTransportUtil.baseInfoCompanyStat();
pushMinistryOfTransportUtil.baseInfoDriver(driverId);
}
}
}).start();
-
- String value = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
- redisUtil.remove(value);
- redisUtil.remove("DRIVER_" + tDriver.getId());
- redisUtil.remove("DRIVER_" + tDriver.getPhone());
+
+ String value = (String) redisTemplate.opsForValue().get("DRIVER_" + tDriver.getPhone());
+ redisTemplate.delete(value);
+ redisTemplate.delete("DRIVER_" + tDriver.getId());
+ redisTemplate.delete("DRIVER_" + tDriver.getPhone());
}
tDriver.setRemark(remark);
+ //审核通过，在中台添加司机账号
+ if (2 == tDriver.getAuthState()) {
+ ShiroUser user = ShiroExtUtil.getUser();
+ Integer objectId = user.getObjectId();
+ TCompany tCompany = itCompanyService.selectById(objectId);
+ User user1 = userService.selectById(user.getId());
+ SaveStaffNodeRequest request = new SaveStaffNodeRequest();
+ request.setMobile(user1.getPhone());
+ request.setEntercode(tCompany.getEnterCode());
+ request.setEmpName(tDriver.getName());
+ request.setEmpNickname(tDriver.getName());
+ request.setLoginNo(tDriver.getPhone());
+ request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
+ request.setMphone(tDriver.getPhone());
+ request.setEmail("qyt@qyt.com");
+ request.setDeptId(0);
+ request.setPositionId(1);
+ request.setSuperLevel(0);
+ request.setHideMobile(0);
+ SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
+ TCompany tCompany1 = itCompanyService.selectById(tDriver.getCompanyId());
+ tDriver.setEmpId(saveStaffNode.getEmpId());
+ tDriver.setEntercode(tCompany1.getEnterCode());
+ tDriver.setEnterId(Long.valueOf(tCompany1.getEnterCode()));
+ }
+
tDriverService.updateById(tDriver);
}
return SUCCESS_TIP;
@@ -1286,14 +1373,40 @@
driver.setInsertTime(new Date());
driver.setAddType(2);
driver.setAddObjectId(ShiroExtUtil.getUser().getObjectId());
- if(SinataUtil.isNotEmpty(eight)){
+ if (SinataUtil.isNotEmpty(eight)) {
driver.setDriverAddress(eight);
}
+
+ //审核通过，在中台添加司机账号
+ if (2 == driver.getAuthState()) {
+ ShiroUser user = ShiroExtUtil.getUser();
+ Integer objectId = user.getObjectId();
+ TCompany tCompany = itCompanyService.selectById(objectId);
+ User user1 = userService.selectById(user.getId());
+ SaveStaffNodeRequest saveStaffNodeRequest = new SaveStaffNodeRequest();
+ saveStaffNodeRequest.setMobile(user1.getPhone());
+ saveStaffNodeRequest.setEntercode(tCompany.getEnterCode());
+ saveStaffNodeRequest.setEmpName(driver.getName());
+ saveStaffNodeRequest.setEmpNickname(driver.getName());
+ saveStaffNodeRequest.setLoginNo(driver.getPhone());
+ saveStaffNodeRequest.setEmpSex(driver.getSex() == 1 ? "男" : "女");
+ saveStaffNodeRequest.setMphone(driver.getPhone());
+ saveStaffNodeRequest.setEmail("qyt@qyt.com");
+ saveStaffNodeRequest.setDeptId(0);
+ saveStaffNodeRequest.setPositionId(1);
+ saveStaffNodeRequest.setSuperLevel(0);
+ saveStaffNodeRequest.setHideMobile(0);
+ SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(saveStaffNodeRequest);
+ TCompany tCompany1 = itCompanyService.selectById(driver.getCompanyId());
+ driver.setEmpId(saveStaffNode.getEmpId());
+ driver.setEntercode(tCompany1.getEnterCode());
+ driver.setEnterId(Long.valueOf(tCompany1.getEnterCode()));
+ }
tDriverService.insert(driver);
-
-
+
+
//添加快车服务模式
- if ("是".equals(eleven)){
+ if ("是".equals(eleven)) {
TDriverService service = new TDriverService();
service.setDriverId(driver.getId());
service.setType(1);
@@ -1826,16 +1939,8 @@
}
return SUCCESS_TIP;
}
-
-
-
-
- @Autowired
- private ITCompanyService itCompanyService;
-
- @Autowired
- private ITDriverServiceService itDriverServiceService;
-
+
+
/**
* 验证是否可以字符转为整数
* @param str
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 9b919c2..0162c2c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -1,14 +1,14 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
/**
* <p>
@@ -276,19 +276,34 @@
* 添加司机的分公司/加盟商ID
*/
private Integer addObjectId;
-
+
private Double activityMoney;
-
+
private Double laveActivityMoney;
-
+ /**
+ * 中台员工ID
+ */
+ @TableField("empId")
+ private Long empId;
+ /**
+ * 中台员工所属企业ID
+ */
+ @TableField("enterId")
+ private Long enterId;
+ /**
+ * 中台员工所属企业编号
+ */
+ @TableField("entercode")
+ private String entercode;
+
public Double getActivityMoney() {
return activityMoney;
}
-
+
public void setActivityMoney(Double activityMoney) {
this.activityMoney = activityMoney;
}
-
+
public Double getLaveActivityMoney() {
return laveActivityMoney;
}
@@ -808,25 +823,49 @@
public void setLaveBusinessMoney(Double laveBusinessMoney) {
this.laveBusinessMoney = laveBusinessMoney;
}
-
+
public Double getBusinessMoney() {
return businessMoney;
}
-
+
public void setBusinessMoney(Double businessMoney) {
this.businessMoney = businessMoney;
}
-
+
+ public Long getEmpId() {
+ return empId;
+ }
+
+ public void setEmpId(Long empId) {
+ this.empId = empId;
+ }
+
+ public Long getEnterId() {
+ return enterId;
+ }
+
+ public void setEnterId(Long enterId) {
+ this.enterId = enterId;
+ }
+
+ public String getEntercode() {
+ return entercode;
+ }
+
+ public void setEntercode(String entercode) {
+ this.entercode = entercode;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
}
-
+
@Override
public String toString() {
return "TDriver{" +
- "id=" + id +
- ", account=" + account +
+ "id=" + id +
+ ", account=" + account +
", jobNumber=" + jobNumber +
", phone=" + phone +
", password=" + password +
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 b9ec866..2366416 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
@@ -27,7 +28,7 @@
* @param request
* @return
*/
- public static Boolean saveStaffNode(SaveStaffNodeRequest request){
+ public static SaveStaffNode saveStaffNode(SaveStaffNodeRequest request){
//请求路径
String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/saveStaffNode";
//私钥文件
@@ -46,7 +47,7 @@
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- contentMap.put("content", JSON.toJSONString(request));
+ contentMap.put("content", new Gson().toJson(request));
log.info("【企业增加员工】请求地址:" + url);
log.info("【企业增加员工】请求参数:" + JSON.toJSONString(contentMap));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
@@ -63,7 +64,8 @@
log.error("【企业增加员工】失败:" + object.toJSONString());
throw new RuntimeException("【企业增加员工】失败:" + object.toJSONString());
}
- return true;
+ SaveStaffNode saveStaffNode = jsonObject.getObject("object", SaveStaffNode.class);
+ return saveStaffNode;
}
@@ -91,7 +93,7 @@
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- contentMap.put("content", JSON.toJSONString(request));
+ contentMap.put("content", new Gson().toJson(request));
log.info("【企业修改员工信息】请求地址:" + url);
log.info("【企业修改员工信息】请求参数:" + JSON.toJSONString(contentMap));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
@@ -137,7 +139,7 @@
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- contentMap.put("content", JSON.toJSONString(request));
+ contentMap.put("content", new Gson().toJson(request));
log.info("【企业删除人员】请求地址:" + url);
log.info("【企业删除人员】请求参数:" + JSON.toJSONString(contentMap));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
@@ -182,7 +184,7 @@
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- contentMap.put("content", JSON.toJSONString(request));
+ contentMap.put("content", new Gson().toJson(request));
log.info("【根据员工ID获取人员信息】请求地址:" + url);
log.info("【根据员工ID获取人员信息】请求参数:" + JSON.toJSONString(contentMap));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "GET", skprivateKeyFile, timeStamp, contentMap);
@@ -199,7 +201,7 @@
log.error("【根据员工ID获取人员信息】失败:" + object.toJSONString());
throw new RuntimeException("【根据员工ID获取人员信息】失败:" + object.toJSONString());
}
- StaffNodeInfo staffNodeInfo = jsonObject.getObject("object", StaffNodeInfo.class);
+ StaffNodeInfo staffNodeInfo = object.getObject("data", StaffNodeInfo.class);
return staffNodeInfo;
}
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
index c22ba80..bdc9694 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
@@ -187,7 +188,7 @@
map.put(SystemParameterNames.getMessage_id(), messageId);
map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- map.put("content", JSON.toJSONString(request));
+ map.put("content", new Gson().toJson(request));
log.info("【修改企业基本信息】请求地址:" + url);
log.info("【修改企业基本信息】请求参数:" + JSON.toJSONString(map));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "GET", skprivateKeyFile, timeStamp, map);
@@ -196,7 +197,7 @@
String status = jsonObject.getString("status");
if (!"0".equals(status)) {
log.error("【修改企业基本信息】请求失败:" + result);
- throw new RuntimeException("【修改企业基本信息】请求失败:" + result);
+ return false;
}
return true;
}
@@ -228,7 +229,7 @@
map.put(SystemParameterNames.getMessage_id(), messageId);
map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- map.put("content", JSON.toJSONString(request));
+ map.put("content", new Gson().toJson(request));
log.info("【创建企业】请求地址:" + url);
log.info("【创建企业】请求参数:" + JSON.toJSONString(map));
@@ -238,13 +239,13 @@
String retCode = jsonObject.getString("retCode");
if (!"0".equals(retCode)) {
log.error("【创建企业】请求失败:" + result);
- throw new RuntimeException("【创建企业】请求失败:" + result);
+ return null;
}
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("【创建企业】请求失败:" + result);
+ return null;
}
return object.getObject("data", CreateEnterprise.class);
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
index b2e3a7c..bff8650 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
@@ -13,7 +13,7 @@
/**
* 私钥地址
*/
- String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
+ String privateKeyPath = "E:\\IDEA Workspaces\\QianYunTong\\private_key_test.pem";
/**
* 消费者账号
*/
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
index 26a2353..6dfe5af 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
@@ -99,7 +100,7 @@
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- contentMap.put("content", JSON.toJSONString(request));
+ contentMap.put("content", new Gson().toJson(request));
log.info("【根据手机号注册用户】请求地址:" + url);
log.info("【根据手机号注册用户】请求参数:" + JSON.toJSONString(contentMap));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
@@ -145,7 +146,7 @@
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- contentMap.put("content", JSON.toJSONString(request));
+ contentMap.put("content", new Gson().toJson(request));
log.info("【易信用户修改密码】请求地址:" + url);
log.info("【易信用户修改密码】请求参数:" + JSON.toJSONString(contentMap));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
@@ -191,7 +192,7 @@
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
- contentMap.put("content", JSON.toJSONString(request));
+ contentMap.put("content", new Gson().toJson(request));
log.info("【易信重置密码】请求地址:" + url);
log.info("【易信重置密码】请求参数:" + JSON.toJSONString(contentMap));
String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/DeleteStafNodeRequest.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/DeleteStafNodeRequest.java
index 36ae77d..0115407 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/DeleteStafNodeRequest.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/DeleteStafNodeRequest.java
@@ -2,14 +2,12 @@
import lombok.Data;
-import java.util.HashMap;
-
/**
* @author zhibing.pu
* @Date 2025/6/6 16:39
*/
@Data
-public class DeleteStafNodeRequest extends HashMap<String, Object> {
+public class DeleteStafNodeRequest {
/**
* 人员ID
*/
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/EditStaffNodeRequest.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/EditStaffNodeRequest.java
index 193de7d..9d3e3eb 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/EditStaffNodeRequest.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/EditStaffNodeRequest.java
@@ -2,34 +2,48 @@
import lombok.Data;
-import java.util.HashMap;
-
/**
* @author zhibing.pu
* @Date 2025/6/6 16:32
*/
@Data
-public class EditStaffNodeRequest extends HashMap<String, Object> {
+public class EditStaffNodeRequest {
/**
* 人员ID
*/
- private Long empId;
+ private Integer empId;
+ /**
+ * 操作人手机号
+ */
+ private String mobile;
+ /**
+ * 操作人企业ID
+ */
+ private String entercode;
/**
* 企业ID
*/
- private String enterNum;
+ private Long enterId;
+ /**
+ * 人员显示名
+ */
+ private String empName;
/**
* 人员显示名
*/
private String empNickname;
/**
+ * 手机号
+ */
+ private String mphone;
+ /**
+ * 登录账号
+ */
+ private String loginNo;
+ /**
* 人员性别（男\女）
*/
private String empSex;
- /**
- * 人员手机号
- */
- private String mphone;
/**
* 人员邮箱
*/
@@ -37,11 +51,11 @@
/**
* 员工所属部门ID多个部门英文; 分割
*/
- private String deptIds;
+ private Integer deptId;
/**
* 员工职务ID
*/
- private Long positionId;
+ private Integer positionId;
/**
* 员工职务名称，如不知道ID可以直接传入名称
*/
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GetStaffNodeRequest.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GetStaffNodeRequest.java
index 8d996ae..aab260b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GetStaffNodeRequest.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GetStaffNodeRequest.java
@@ -2,14 +2,12 @@
import lombok.Data;
-import java.util.HashMap;
-
/**
* @author zhibing.pu
* @Date 2025/6/6 16:42
*/
@Data
-public class GetStaffNodeRequest extends HashMap<String, Object> {
+public class GetStaffNodeRequest {
/**
* 人员ID
*/
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/ResetPwdRequest.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/ResetPwdRequest.java
index 7a78d62..7af096c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/ResetPwdRequest.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/ResetPwdRequest.java
@@ -17,10 +17,6 @@
*/
private String password;
/**
- * 加密类型，例如：aesbase64
- */
- private String encryptType;
- /**
* 验证码
*/
private String code;
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNode.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNode.java
new file mode 100644
index 0000000..13dfef3
--- /dev/null
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNode.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.modular.system.util.qianyuntong.model;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2025/6/14 14:10
+ */
+@Data
+public class SaveStaffNode {
+ /**
+ * 人员ID
+ */
+ private Long empId;
+ /**
+ * 员工名称
+ */
+ private String empName;
+ /**
+ * 员工昵称
+ */
+ private String empNickname;
+ /**
+ * 手机号
+ */
+ private String mphone;
+ /**
+ * 登录账号
+ */
+ private String loginNo;
+}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNodeRequest.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNodeRequest.java
index 049daa3..2f7cc63 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNodeRequest.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/SaveStaffNodeRequest.java
@@ -2,14 +2,12 @@
import lombok.Data;
-import java.util.HashMap;
-
/**
* @author zhibing.pu
* @Date 2025/6/6 16:22
*/
@Data
-public class SaveStaffNodeRequest extends HashMap<String, Object> {
+public class SaveStaffNodeRequest {
/**
* 操作人手机号
*/
@@ -45,11 +43,11 @@
/**
* 员工所属部分ID
*/
- private String deptIds;
+ private Integer deptId;
/**
* 员工职务ID
*/
- private Long positionId;
+ private Integer positionId;
/**
* 员工职务名称
*/
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/StaffNodeInfo.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/StaffNodeInfo.java
index 9996a77..84383c5 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/StaffNodeInfo.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/StaffNodeInfo.java
@@ -13,9 +13,21 @@
*/
private Integer empId;
/**
+ * 主要号码
+ */
+ private String mainMphone;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
* 企业ID
*/
private String enterNum;
+ /**
+ * 加密企业名称
+ */
+ private String empNameEncode;
/**
* 人员名称
*/
@@ -37,13 +49,25 @@
*/
private String mphone;
/**
- * 人员邮箱
+ * 人员邮箱加密
+ */
+ private String mainEmailEncode;
+ /**
+ * 所属企业id
+ */
+ private Long enterId;
+ /**
+ * 唯一编号
+ */
+ private String onconuuid;
+ /**
+ * 邮箱
*/
private String email;
/**
* 员工所属部门ID多个部门英文; 分割
*/
- private String deptIds;
+ private Integer deptId;
/**
* 员工职位ID
*/
@@ -60,4 +84,8 @@
* 隐藏手机号 1 是 0 否
*/
private Integer hideMobile;
+ /**
+ * 有效状态（0=否，1=是）
+ */
+ private String isValid;
}
--
Gitblit v1.7.1