weiloong_zhang/zhyManagement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

正式环境迁移

Browse Source
This commit is contained in:
itzhang 2025-06-28 17:40:38 +08:00
parent 0b333d98ea
commit ece3e48078
6 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/management/constant/ERPURLConstant.java
View File

@ -1,6 +1,6 @@
package com.management.constant;
public class ERPURLConstant {
public static final String ERP_URL = "http://192.168.31.158:8022";//erp地址
public static final String ERP_URL = "https://lxr2.zhydsp.cn:40448";//erp地址
public static final String ACCOUNT_ID = "2246658461007874048";//erp地址
}

2
src/main/java/com/management/controller/BankInfoController.java
View File

@ -70,7 +70,7 @@ public class BankInfoController {
deptReq.put("pageSize", 1999);
//开始获取金蝶token
String accessToken = new KDTokenController().getKDAccessToken();
String accessToken = new KDTokenController().getKDAccessTokenTest();
if (accessToken == null || accessToken.equals("")) {
log.info("金蝶token为空或不存在");

6
src/main/java/com/management/controller/DeptController.java
View File

@ -78,7 +78,7 @@ public class DeptController {
deptReq.put("pageNo", 1);
deptReq.put("pageSize", 1999);
String accessToken = new KDTokenController().getKDAccessToken();
String accessToken = new KDTokenController().getKDAccessTokenTest();
if (accessToken == null || accessToken.equals("")) {
log.info("金蝶token为空或不存在");
@ -318,7 +318,7 @@ public class DeptController {
deptReq.put("pageNo", 1);
deptReq.put("pageSize", 1000);
String accessToken = new KDTokenController().getKDAccessToken();
String accessToken = new KDTokenController().getKDAccessTokenTest();
if (accessToken == null || accessToken.equals("")) {
log.info("金蝶token为空或不存在");
@ -537,7 +537,7 @@ public class DeptController {
deptReq.put("pageNo", 1);
deptReq.put("pageSize", 1000);
String accessToken = kdTokenController.getKDAccessToken();
String accessToken = kdTokenController.getKDAccessTokenTest();
if (accessToken == null || accessToken.equals("")) {
log.info("金蝶token为空或不存在");

178
src/main/java/com/management/controller/KDTokenController.java
View File

@ -87,7 +87,7 @@ public class KDTokenController {
* @return java.lang.String
* @Author weiloong_zhang
*/
public String getKDAccessToken() {
public String getKDAccessTokenTest() {
log.info("开始获取金蝶accessToken");
//用来接收token的字符串
@ -145,43 +145,43 @@ public class KDTokenController {
* @return java.lang.String
* @Author weiloong_zhang
*/
public String getKDAppTokenTest() {
log.info("开始获取金蝶的AppToken");
//开始封装
//接口地址
String appTokenUrl = ERPURLConstant.ERP_URL + "/ierp/api/getAppToken.do";
//请求参数
LinkedHashMap appTokenParams = new LinkedHashMap<>();
appTokenParams.put("appId", "erpapi");
appTokenParams.put("appSecret", "ZHYkdERPapi@2025");
appTokenParams.put("tenantid", "zyierp");
appTokenParams.put("accountId", ERPURLConstant.ACCOUNT_ID);
//开始发起请求
String appTokenRes = "";
try {
appTokenRes = restTemplate.postForObject(appTokenUrl, appTokenParams, String.class);
} catch (RestClientException e) {
e.printStackTrace();
}
//转换为JSONObject
JSONObject appTokenJSON = JSONObject.parseObject(appTokenRes);
if (!"success".equals(appTokenJSON.getString("state")) || appTokenJSON.getJSONObject("data") == null) {
log.error("获取金蝶的AppToken失败,{}", appTokenRes);
return "";
}
//获取apptoken成功
String appToken = appTokenJSON.getJSONObject("data").getString("app_token");
log.info("获取金蝶的AppToken成功,{}", appToken);
return appToken;
}
// public String getKDAppTokenTest() {
// log.info("开始获取金蝶的AppToken");
//
// //开始封装
// //接口地址
// String appTokenUrl = ERPURLConstant.ERP_URL + "/ierp/api/getAppToken.do";
// //请求参数
// LinkedHashMap appTokenParams = new LinkedHashMap<>();
// appTokenParams.put("appId", "erpapi");
// appTokenParams.put("appSecret", "ZHYkdERPapi@2025");
// appTokenParams.put("tenantid", "zyierp");
// appTokenParams.put("accountId", ERPURLConstant.ACCOUNT_ID);
//
// //开始发起请求
// String appTokenRes = "";
//
// try {
// appTokenRes = restTemplate.postForObject(appTokenUrl, appTokenParams, String.class);
// } catch (RestClientException e) {
// e.printStackTrace();
// }
//
// //转换为JSONObject
// JSONObject appTokenJSON = JSONObject.parseObject(appTokenRes);
//
// if (!"success".equals(appTokenJSON.getString("state")) || appTokenJSON.getJSONObject("data") == null) {
// log.error("获取金蝶的AppToken失败,{}", appTokenRes);
// return "";
// }
//
// //获取apptoken成功
// String appToken = appTokenJSON.getJSONObject("data").getString("app_token");
//
// log.info("获取金蝶的AppToken成功,{}", appToken);
//
// return appToken;
// }
/**
* 金蝶a测试access_token获取
@ -189,55 +189,55 @@ public class KDTokenController {
* @return java.lang.String
* @Author weiloong_zhang
*/
public String getKDAccessTokenTest() {
log.info("开始获取金蝶accessToken");
//用来接收token的字符串
String accessToken = "";
//判断咖啡因中是否存在accessToken
if (CaffeineCacheUtil.get("kd_access_token_test") != null && !"".equals(CaffeineCacheUtil.get("kd_access_token_test"))) {
log.info("获取到缓存中的accessToken,{}", accessToken);
accessToken = CaffeineCacheUtil.get("kd_access_token_test").toString();
return accessToken;
}
//不存在，将执行获取accessToken的逻辑
//开始封装参数
//URL
String accessTokenUrl = ERPURLConstant.ERP_URL + "/ierp/api/login.do";
//请求参数
LinkedHashMap accessTokenParams = new LinkedHashMap<>();
accessTokenParams.put("user", "18660772123");
accessTokenParams.put("usertype", "Mobile");
accessTokenParams.put("apptoken", getKDAppTokenTest());
accessTokenParams.put("tenantid", "zyierp");
accessTokenParams.put("accountId", ERPURLConstant.ACCOUNT_ID);
accessTokenParams.put("language", "zh_CN");
//开始向金蝶发起请求
String accessTokenRes = "";
try {
accessTokenRes = restTemplate.postForObject(accessTokenUrl, accessTokenParams, String.class);
} catch (RestClientException e) {
e.printStackTrace();
}
JSONObject accessTokenJSON = JSONObject.parseObject(accessTokenRes);
if (!"success".equals(accessTokenJSON.getString("state")) || accessTokenJSON.getJSONObject("data") == null) {
log.error("获取金蝶的accessToken失败,{}", accessTokenRes);
return "";
}
log.info("获取金蝶的accessToken成功,{}", accessTokenJSON.getJSONObject("data").getString("access_token"));
accessToken = accessTokenJSON.getJSONObject("data").getString("access_token");
//存放到咖啡因之中
CaffeineCacheUtil.put("kd_access_token_test", accessToken);
return accessToken;
}
// public String getKDAccessTokenTest() {
// log.info("开始获取金蝶accessToken");
//
// //用来接收token的字符串
// String accessToken = "";
//
// //判断咖啡因中是否存在accessToken
// if (CaffeineCacheUtil.get("kd_access_token_test") != null && !"".equals(CaffeineCacheUtil.get("kd_access_token_test"))) {
// log.info("获取到缓存中的accessToken,{}", accessToken);
// accessToken = CaffeineCacheUtil.get("kd_access_token_test").toString();
// return accessToken;
// }
//
// //不存在，将执行获取accessToken的逻辑
// //开始封装参数
// //URL
// String accessTokenUrl = ERPURLConstant.ERP_URL + "/ierp/api/login.do";
//
// //请求参数
// LinkedHashMap accessTokenParams = new LinkedHashMap<>();
// accessTokenParams.put("user", "18660772123");
// accessTokenParams.put("usertype", "Mobile");
// accessTokenParams.put("apptoken", getKDAppTokenTest());
// accessTokenParams.put("tenantid", "zyierp");
// accessTokenParams.put("accountId", ERPURLConstant.ACCOUNT_ID);
// accessTokenParams.put("language", "zh_CN");
//
// //开始向金蝶发起请求
// String accessTokenRes = "";
//
// try {
// accessTokenRes = restTemplate.postForObject(accessTokenUrl, accessTokenParams, String.class);
// } catch (RestClientException e) {
// e.printStackTrace();
// }
//
// JSONObject accessTokenJSON = JSONObject.parseObject(accessTokenRes);
//
// if (!"success".equals(accessTokenJSON.getString("state")) || accessTokenJSON.getJSONObject("data") == null) {
// log.error("获取金蝶的accessToken失败,{}", accessTokenRes);
// return "";
// }
//
// log.info("获取金蝶的accessToken成功,{}", accessTokenJSON.getJSONObject("data").getString("access_token"));
// accessToken = accessTokenJSON.getJSONObject("data").getString("access_token");
//
// //存放到咖啡因之中
// CaffeineCacheUtil.put("kd_access_token_test", accessToken);
//
// return accessToken;
// }
}

2
src/main/java/com/management/controller/VendorController.java
View File

@ -146,7 +146,7 @@ public class VendorController {
vendorReq.put("data", Arrays.asList(vendorMap));
//开始获取token
String accessToken = new KDTokenController().getKDAccessToken();
String accessToken = new KDTokenController().getKDAccessTokenTest();
if (accessToken == null || accessToken.equals("")) {
log.info("金蝶token为空或不存在");

8
src/main/java/com/management/controller/XSHTController.java
View File

@ -402,12 +402,12 @@ public class XSHTController {
//contractDetailMap.put("material_number", contractDetailData.getString("product_id__r"));//物料编号
contractDetailMap.put("material_number", "80800001");//物料编号
contractDetailMap.put("specification", contractDetailData.getString("specification__c") != null ? contractDetailData.getString("specification__c") : "");//规格
contractDetailMap.put("baseunit", contractDetailData.getString("unit__c__r") != null ? contractDetailData.getString("unit__c__r") : "");//单位
//contractDetailMap.put("baseunit", contractDetailData.getString("unit__c__r") != null ? contractDetailData.getString("unit__c__r") : "");//单位
//contractDetailMap.put("baseunit", "TEST0001");//todo 单位
contractDetailMap.put("unit_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码
//contractDetailMap.put("unit_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码
contractDetailMap.put("unit1_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码
contractDetailMap.put("f9w5_unit1_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码
contractDetailMap.put("baseqty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量
//contractDetailMap.put("f9w5_unit1_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码
//contractDetailMap.put("baseqty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量
contractDetailMap.put("qty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量
contractDetailMap.put("priceandtax", contractDetailData.getBigDecimal("sales_price") != null ? contractDetailData.getBigDecimal("sales_price") : 0);//含税单价
//contractDetailMap.put("taxrateid_number", contractDetailData.getBigDecimal("tax_rate__c") != null ? contractDetailData.getBigDecimal("tax_rate__c") : 0);//税率