hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project

This commit is contained in:
yuqh 2024-06-21 09:31:37 +08:00
parent 06cb8e5a4d 299ba86d60
commit 0223fd56e5
10 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
View File

@ -81,7 +81,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
@Resource @Resource
private IMdmModuleSendLogDao mdmModuleSendLogDao; private IMdmModuleSendLogDao mdmModuleSendLogDao;
@Value("${ax.url}") @Value("${zt.url}")
private String url ; private String url ;
//多线程请求加锁 HttpRequest 构造方法是静态的 //多线程请求加锁 HttpRequest 构造方法是静态的

2
buildpackage/src/main/resources/application-ax.yml
View File

@ -19,5 +19,5 @@ spring:
savefile: savefile:
# 文件保存路径 # 文件保存路径
path: E:\yongansystem\file path: E:\yongansystem\file
ax: zt:
url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface

2
buildpackage/src/main/resources/application-hclocal.yml
View File

@ -23,5 +23,5 @@ spring:
savefile: savefile:
# 文件保存路径 # 文件保存路径
path: D:\yongansystem\kangarooDataCenter\v3\logs path: D:\yongansystem\kangarooDataCenter\v3\logs
ax: zt:
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

2
buildpackage/src/main/resources/application-llg.yml
View File

@ -31,5 +31,5 @@ spring:
savefile: savefile:
# 文件保存路径 # 文件保存路径
path: /Users/apple/Desktop/log/local path: /Users/apple/Desktop/log/local
ax: zt:
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

2
buildpackage/src/main/resources/application-local.yml
View File

@ -19,5 +19,5 @@ spring:
savefile: savefile:
# 文件保存路径 # 文件保存路径
path: /Users/apple/Desktop/log/local path: /Users/apple/Desktop/log/local
ax: zt:
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

2
buildpackage/src/main/resources/application-yuqh.yml
View File

@ -19,5 +19,5 @@ spring:
savefile: savefile:
# 文件保存路径 # 文件保存路径
path: E:\yongansystem\log path: E:\yongansystem\log
ax: zt:
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

2
buildpackage/src/main/resources/application.yml
View File

@ -90,7 +90,7 @@ mybatis-plus:
global-config: global-config:
db-config: db-config:
id-type: auto # 主键策略 id-type: auto # 主键策略
ax: zt:
url: url:
# 积木报表工具 # 积木报表工具
#JimuReport[minidao配置] #JimuReport[minidao配置]

2
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
View File

@ -150,7 +150,7 @@ public class MdmServiceImpl implements IMdmService {
private IMdmModuleViewDetailDao mdmModuleViewDetailDao; private IMdmModuleViewDetailDao mdmModuleViewDetailDao;
//多线程请求加锁 HttpRequest 构造方法是静态的 //多线程请求加锁 HttpRequest 构造方法是静态的
private final Object lock = new Object(); private final Object lock = new Object();
@Value("${ax.url}") @Value("${zt.url}")
private String url; private String url;
/** /**

57
service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
View File

@ -137,13 +137,13 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
Map<String, Object> map = new HashMap<>();//将主表数据存到map中 Map<String, Object> map = new HashMap<>();//将主表数据存到map中
Map<String, Object> mapDetails = new HashMap<>();//将子表数据存到map中 Map<String, Object> mapDetails = new HashMap<>();//将子表数据存到map中
if (comparisonEntities != null && comparisonEntities.size() > 0) { if (comparisonEntities != null && comparisonEntities.size() > 0) {
map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); map = spliceMainMap(comparisonEntities, jsonObjectMain, map, comparisonEntity);
mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); mapDetails = spliceDetailMap(comparisonEntities, mapDetails, comparisonDetailsEntity, jsonArray);
String uuid=null; String uuid = null;
if(jsonObjectMain.getString("id")==null){ if (jsonObjectMain.getString("id") == null) {
uuid = UUIDUtils.getUUID(); uuid = UUIDUtils.getUUID();
map.put("id", uuid); map.put("id", uuid);
}else{ } else {
uuid = jsonObjectMain.getString("id"); uuid = jsonObjectMain.getString("id");
map.put("id", jsonObjectMain.getString("id")); map.put("id", jsonObjectMain.getString("id"));
} }
@ -153,47 +153,48 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
map.put("create_time", new Date()); map.put("create_time", new Date());
map.put("modify_time", new Date()); map.put("modify_time", new Date());
map.put("sts", "Y"); map.put("sts", "Y");
map.put("data_status","Y");//新增状态 map.put("data_status", "Y");//新增状态
map.put("add_status","0");//新增状态 map.put("add_status", "0");//新增状态
map.put("update_status","1");//修改状态 map.put("update_status", "1");//修改状态
map.put("delete_status","1");//删除状态 map.put("delete_status", "1");//删除状态
ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); ComparisonEntity comparisonEntityRule = comparisonEntities.get(0);
//查询单据规则 //查询单据规则 只查询主表得，明细表不用
try { try {
comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule); ComparisonEntity comparisonEntityRules = comparisonDao.queryComparisonById(comparisonEntityRule);
String documentRule =comparisonEntityRule.getDocumentRule();; //"KH-2024-05-30-1"; String documentRule = comparisonEntityRules.getDocumentRule();
logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}",documentRule); ; //"KH-2024-05-30-1";
if(documentRule !=null){ logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}", documentRule);
if (documentRule != null) {
//获取规则前缀 CK //获取规则前缀 CK
String rulePrefix=documentRule.substring(0,documentRule.indexOf("-")); String rulePrefix = documentRule.substring(0, documentRule.indexOf("-"));
//获取规则中间日期 yyyy-MM-dd //获取规则中间日期 yyyy-MM-dd
String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-")); String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-"));
String ruleMiddle = getRuleDate(ruleDate); String ruleMiddle = getRuleDate(ruleDate);
//获取规则后缀 //获取规则后缀
String ruleSuffixLength= documentRule.substring(documentRule.lastIndexOf("-")+1); String ruleSuffixLength = documentRule.substring(documentRule.lastIndexOf("-") + 1);
int ruleSuffix = ruleSuffixLength.length(); int ruleSuffix = ruleSuffixLength.length();
//生成单据规则 //生成单据规则
comparisonEntity.setRulePrefix(rulePrefix); comparisonEntityRule.setRulePrefix(rulePrefix);
comparisonEntity.setRuleMiddle(ruleMiddle); comparisonEntityRule.setRuleMiddle(ruleMiddle);
comparisonEntity.setRuleSuffix(ruleSuffix); comparisonEntityRule.setRuleSuffix(ruleSuffix);
try { try {
//新生成单据规则保存到数据库 //新生成单据规则保存到数据库
comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); ComparisonEntity comparisonEntityRuleGz = comparisonDao.queryComparisonRule(comparisonEntityRule);
map.put("document_rule", comparisonEntityRule.getDocumentRule());//单据规则 map.put("document_rule", comparisonEntityRuleGz.getDocumentRule());//单据规则
map.put("document_rule_num", comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 map.put("document_rule_num", comparisonEntityRuleGz.getDocumentRuleNum());//单据规则流水号
comparisonEntity.setMap(map); comparisonEntityRule.setMap(map);
} catch (Exception e) { } catch (Exception e) {
logger.info("保存通用数据时候生成单据规则错误:{}", e.getMessage()); logger.info("保存通用数据时候生成单据规则错误:{}", e.getMessage());
return BaseResult.getFailureMessageEntity("保存失败"); return BaseResult.getFailureMessageEntity("保存失败");
} }
} }
}catch (Exception e){ } catch (Exception e) {
logger.info("通用数据保存接口中查询单据规则错误:{}",e.getMessage()); logger.info("通用数据保存接口中查询单据规则错误:{}", e.getMessage());
return BaseResult.getFailureMessageEntity("保存失败"); return BaseResult.getFailureMessageEntity("保存失败");
} }
try { try {
//保存主表数据 //保存主表数据
ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntity); ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntityRule);
//保存子表数据 //保存子表数据
if (mapDetails != null && mapDetails.size() > 0) { if (mapDetails != null && mapDetails.size() > 0) {
String uuidDetail = UUIDUtils.getUUID(); String uuidDetail = UUIDUtils.getUUID();
@ -211,10 +212,10 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
//comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); //comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne);
map.put("details",mapDetails); map.put("details",mapDetails);
//保存操作日志 //保存操作日志
controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); //controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log");
} }
//保存操作日志 //保存操作日志
controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntityRule.getDbName()+"_option_log");
return BaseResult.getSuccessMessageEntity("保存成功", map); return BaseResult.getSuccessMessageEntity("保存成功", map);
} catch (Exception e) { } catch (Exception e) {
logger.info("保存通用数据时候错误:{}", e.getMessage()); logger.info("保存通用数据时候错误:{}", e.getMessage());

2
service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java
View File

@ -38,7 +38,7 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
this.axDao = dao; this.axDao = dao;
this.dao = dao; this.dao = dao;
} }
@Value("${ax.url}") @Value("${zt.url}")
private String voucherUrl; private String voucherUrl;
private final String publicKey = "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj"; private final String publicKey = "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj";
private final String secretKey = "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="; private final String secretKey = "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=";