From 8399270e3f12301ddf143c87bec9ca1be7b54ff0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 11:05:18 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java | 133 +++++++++++++++++++++++++++++++-------------
1 files changed, 93 insertions(+), 40 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
index bdc9694..047bb3f 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
@@ -5,6 +5,7 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
+import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +24,8 @@
@Slf4j
public class EnterpriseUtil {
+ private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
+
/**
* 根据社会信用代码判断企业是否已存在
@@ -32,11 +35,11 @@
*/
public static CheckEnterExist checkEnterExistByEnterIdCardNo(String uscc) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/check_enter_exist_by_enterIdCardNo";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/check_enter_exist_by_enterIdCardNo";
//私钥文件
- 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> map = new HashMap<>();
@@ -47,8 +50,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", "{\"uscc\":\"" + uscc + "\"}");
log.info("【根据社会信用代码判断企业是否已存在】请求地址:" + url);
log.info("【根据社会信用代码判断企业是否已存在】请求参数:" + JSON.toJSONString(map));
@@ -58,13 +61,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());
+ return null;
}
return jsonObject.getObject("object", CheckEnterExist.class);
}
@@ -78,11 +81,11 @@
*/
public static CheckEnterExist checkEnterNameExist(String enterName) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/checkEnterNameExist";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/checkEnterNameExist";
//私钥文件
- 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> map = new HashMap<>();
@@ -93,8 +96,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", "{\"enterName\":\"" + enterName + "\"}");
log.info("【根据企业名称判断企业是否已存在】请求地址:" + url);
log.info("【根据企业名称判断企业是否已存在】请求参数:" + JSON.toJSONString(map));
@@ -104,13 +107,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());
+ return null;
}
return jsonObject.getObject("object", CheckEnterExist.class);
}
@@ -124,11 +127,11 @@
*/
public static EnterpriseInfo getEnterpriseDetail(String enter_code) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getEnterpriseDetail";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getEnterpriseDetail";
//私钥文件
- 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> map = new HashMap<>();
@@ -139,8 +142,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", "{\"enter_code\":\"" + enter_code + "\"}");
log.info("【查询企业详情】请求地址:" + url);
log.info("【查询企业详情】请求参数:" + JSON.toJSONString(map));
@@ -150,13 +153,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());
+ return null;
}
EnterpriseInfo enterpriseInfo = jsonObject.getObject("object", EnterpriseInfo.class);
return enterpriseInfo;
@@ -171,11 +174,11 @@
*/
public static Boolean modifyEnterpriseInfo(ModifyEnterpriseInfoRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyEnterpriseInfo";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/modifyEnterpriseInfo";
//私钥文件
- 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> map = new HashMap<>();
@@ -186,8 +189,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", new Gson().toJson(request));
log.info("【修改企业基本信息】请求地址:" + url);
log.info("【修改企业基本信息】请求参数:" + JSON.toJSONString(map));
@@ -197,26 +200,25 @@
String status = jsonObject.getString("status");
if (!"0".equals(status)) {
log.error("【修改企业基本信息】请求失败:" + result);
- return false;
+ throw new RuntimeException("【修改企业基本信息】请求失败:" + result);
}
return true;
}
-
/**
- * 创建企业
+ * 删除企业信息
*
- * @param request
+ * @param enterNum 企业编号
+ * @param operator 管理员手机号码
* @return
*/
- public static CreateEnterprise createEnterprise(CreateEnterpriseRequest request) {
+ public static boolean delEnterprise(String enterNum, String operator) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createEnterprise";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/delCompany";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
- String content = "";//业务参数
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> map = new HashMap<String, Object>();
@@ -227,8 +229,59 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
+ map.put("content", "{\"enterNum\":\"" + enterNum + "\",\"operator\":\"" + operator + "\"}");
+
+ log.info("【删除企业信息】请求地址:" + url);
+ log.info("【删除企业信息】请求参数:" + JSON.toJSONString(map));
+ String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, map);
+ log.info("【删除企业信息】请求结果:" + result);
+ JSONObject jsonObject = JSON.parseObject(result);
+ String retCode = jsonObject.getString("retCode");
+ if (!"0".equals(retCode)) {
+ log.error("【删除企业信息】请求失败:" + result);
+ throw new RuntimeException("【删除企业信息】请求失败:" + result);
+ }
+ JSONObject object = jsonObject.getJSONObject("object");
+ String status = object.getString("status");
+ if (!"0".equals(status)) {
+ log.error("【删除企业信息】请求失败:" + object.toJSONString());
+ throw new RuntimeException("【删除企业信息】请求失败:" + object.toJSONString());
+ }
+ return true;
+ }
+
+ public static void main(String[] args) {
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist("成都喜望科技有限公司");
+ System.out.println(checkEnterExist);
+ }
+
+ /**
+ * 创建企业
+ *
+ * @param request
+ * @return
+ */
+ public static CreateEnterprise createEnterprise(CreateEnterpriseRequest request) {
+ //请求路径
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/createEnterprise";
+ //私钥文件
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
+ //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
+ String appKey = qianYunTongConfig.getAppkey();//appkey
+ Map<String, String> headers = new HashMap<>();
+ headers.put("Content-Type", "application/json");
+ Map<String, Object> map = new HashMap<String, Object>();
+ Date nowdate = new Date();
+ SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss");
+
+ String timeStamp = date.format(nowdate);
+ String messageId = UUID.randomUUID().toString().replaceAll("-", "");
+ map.put(SystemParameterNames.getAppKey(), appKey);
+ map.put(SystemParameterNames.getMessage_id(), messageId);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", new Gson().toJson(request));
log.info("【创建企业】请求地址:" + url);
@@ -239,13 +292,13 @@
String retCode = jsonObject.getString("retCode");
if (!"0".equals(retCode)) {
log.error("【创建企业】请求失败:" + result);
- return null;
+ throw new RuntimeException("【创建企业】请求失败:" + result);
}
JSONObject object = jsonObject.getJSONObject("object");
String status = object.getString("status");
if (!"0".equals(status)) {
- log.error("【创建企业】请求失败:" + result);
- return null;
+ log.error("【创建企业】请求失败:" + object.toJSONString());
+ throw new RuntimeException("【创建企业】请求失败:" + object.toJSONString());
}
return object.getObject("data", CreateEnterprise.class);
}
--
Gitblit v1.7.1