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

Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 

 Conflicts:
	buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
This commit is contained in:
lvleigang 2024-06-21 17:02:07 +08:00
parent 14d1532be3 53000de5ae
commit e694304837
5 changed files with 92 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
String distributeId = jsonObject.getString("distributeId");//发送表id String distributeId = jsonObject.getString("distributeId");//发送表id
String type = jsonObject.getString("type");//发送类型，1、新增2、修改3、删除 String type = jsonObject.getString("type");//发送类型，1、新增2、修改3、删除
if(mdmCode == null || documentRule == null || distributeId == null || type == null if(mdmCode == null || documentRule == null || distributeId == null || type == null
|| "".equals(mdmCode) || "".equals(documentRule) || "".equals(distributeId) || "".equals(type)){ || "".equals(mdmCode) || "".equals(documentRule) || "".equals(distributeId) || "".equals(type)){
taskDetailEntity.setResult("系统保存参数错误"); taskDetailEntity.setResult("系统保存参数错误");
taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity);
return BaseResult.getFailureMessageEntity("系统保存参数错误"); return BaseResult.getFailureMessageEntity("系统保存参数错误");
@ -186,7 +186,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity() ; MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity() ;
mdmModuleDistributeDetailEntity.setDistributeId(distributeId); mdmModuleDistributeDetailEntity.setDistributeId(distributeId);
mdmModuleDistributeDetailEntity.setSts("Y"); mdmModuleDistributeDetailEntity.setSts("Y");
List<MdmModuleDistributeDetailEntity> mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity); List<MdmModuleDistributeDetailEntity> mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity);
// 启用停用 0、停用 // 启用停用 0、停用
//if("1".equals(mdmModuleDistributeEntity.getEnabledType())){ //if("1".equals(mdmModuleDistributeEntity.getEnabledType())){
@ -276,13 +276,13 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){ if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) { for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){ if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){
if(object.getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){ if(object.getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
Map<String,Object> mapDetail = new HashMap<>(); Map<String,Object> mapDetail = new HashMap<>();
mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue()); mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue());
mapDetail.put("id",object.getString(mdmModuleDbFiledsEntities.get(i2).getEnName())); mapDetail.put("id",object.getString(mdmModuleDbFiledsEntities.get(i2).getEnName()));
JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail); JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail);
object.put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail); object.put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail);
} }
} }
} }
} }
@ -308,13 +308,11 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){ if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){
for (int i3 = 0; i3 < detail.size(); i3++) { for (int i3 = 0; i3 < detail.size(); i3++) {
if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){ if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
Map<String,Object> mapDetail = new HashMap<>(); Map<String,Object> mapDetail = new HashMap<>();
mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue()); mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue());
mapDetail.put("id",detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName())); mapDetail.put("id",detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()));
JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail); JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail);
detail.get(i3).put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail); detail.get(i3).put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail);
}
} }
} }
@ -424,9 +422,9 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
queryMdmModuleDistributeEntity.setEnabledType("1"); queryMdmModuleDistributeEntity.setEnabledType("1");
queryMdmModuleDistributeEntity.setEnabledState("1"); queryMdmModuleDistributeEntity.setEnabledState("1");
List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(queryMdmModuleDistributeEntity); List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(queryMdmModuleDistributeEntity);
if(mdmModuleDistributeEntities == null || mdmModuleDistributeEntities.size() == 0){ if(mdmModuleDistributeEntities == null || mdmModuleDistributeEntities.size() == 0){
continue; continue;
} }
//查询主数据db //查询主数据db
MdmModuleDbEntity queryMdmModuleDbEntity = new MdmModuleDbEntity(); MdmModuleDbEntity queryMdmModuleDbEntity = new MdmModuleDbEntity();
queryMdmModuleDbEntity.setMdmId(mdmModuleEntities.get(i).getId()); queryMdmModuleDbEntity.setMdmId(mdmModuleEntities.get(i).getId());
@ -461,7 +459,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
logger.info("执行成功"); logger.info("执行成功");
return BaseResult.getSuccessMessageEntity("执行成功"); return BaseResult.getSuccessMessageEntity("执行成功");
} catch (Exception e) { } catch (Exception e) {
logger.error("执行失败{}",e.getMessage()); logger.error("执行失败{}",e.getMessage());
} }
return BaseResult.getSuccessMessageEntity("执行成功"); return BaseResult.getSuccessMessageEntity("执行成功");
} }
@ -1028,13 +1026,11 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){ if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){
for (int i3 = 0; i3 < detail.size(); i3++) { for (int i3 = 0; i3 < detail.size(); i3++) {
if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){ if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
Map<String,Object> mapDetail = new HashMap<>(); Map<String,Object> mapDetail = new HashMap<>();
mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue()); mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue());
mapDetail.put("id",detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName())); mapDetail.put("id",detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()));
JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail); JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail);
detail.get(i3).put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail); detail.get(i3).put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail);
}
} }
} }
} }
@ -1074,7 +1070,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
} }
StringBuilder body = new StringBuilder(); StringBuilder body = new StringBuilder();
boolean flag = true; boolean flag = true;
try { try {
if (bodys != null && !"".equals(bodys)) { if (bodys != null && !"".equals(bodys)) {
ByteArrayEntity entity = new ByteArrayEntity(bodys.getBytes("UTF-8")); ByteArrayEntity entity = new ByteArrayEntity(bodys.getBytes("UTF-8"));
entity.setContentType("application/json"); entity.setContentType("application/json");

14
service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
View File

@ -2585,13 +2585,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId()); mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
List<MdmModuleDbFiledsEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); List<MdmModuleDbFiledsEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
List<MdmModuleDbFiledsEntity> list = new ArrayList<>(); List<MdmModuleDbFiledsEntity> list = new ArrayList<>();
if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){ if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
for (int i = 0; i < mdmModuleDbEntities.size(); i++) { for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
if(entity.getDbId().equals(mdmModuleDbEntities.get(i).getDbId()) && "1".equals(mdmModuleDbEntities.get(i).getViewType())){ if(entity.getDbId().equals(mdmModuleDbEntities.get(i).getDbId()) && "1".equals(mdmModuleDbEntities.get(i).getViewType())){
list.add(mdmModuleDbEntities.get(i)); list.add(mdmModuleDbEntities.get(i));
} }
} }
} }
return BaseResult.getSuccessMessageEntity("查询数据成功", list); return BaseResult.getSuccessMessageEntity("查询数据成功", list);
} }

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

@ -1772,7 +1772,7 @@ public class MdmServiceImpl implements IMdmService {
groovyStr.put("jsonStr", groovy); groovyStr.put("jsonStr", groovy);
try { try {
Object str = groovyIntegrationService.groovyScriptExecution(groovyStr); Object str = groovyIntegrationService.groovyScriptExecution(groovyStr);
JSONObject jsonResultEntity = JSONObject.parseObject(str.toString()); JSONObject jsonResultEntity = JSONObject.parseObject(str.toString());
header = (Map<String, String>) jsonResultEntity.get("header"); header = (Map<String, String>) jsonResultEntity.get("header");
querys = jsonResultEntity.getString("querys"); querys = jsonResultEntity.getString("querys");
bodys = jsonResultEntity.getString("bodys"); bodys = jsonResultEntity.getString("bodys");
@ -1901,14 +1901,14 @@ public class MdmServiceImpl implements IMdmService {
} }
} else { } else {
//不是认证类型直接取值 //不是认证类型直接取值
if (querys.getString(SysEnum.EXAMPLE.getValue()) != null && !"".equals(querys.getString(SysEnum.EXAMPLE.getValue()))) {//入参没有值用实例值，如果没有不添加 if (querys.getString(SysEnum.EXAMPLE.getValue()) != null && !"".equals(querys.getString(SysEnum.EXAMPLE.getValue()))) {//入参没有值用实例值，如果没有不添加
if(map.get(querys.getString(SysEnum.PARAMETERNAME.getValue())) == null){ if(map.get(querys.getString(SysEnum.PARAMETERNAME.getValue())) == null){
map.put(querys.getString(SysEnum.PARAMETERNAME.getValue()), querys.getString(SysEnum.EXAMPLE.getValue())); map.put(querys.getString(SysEnum.PARAMETERNAME.getValue()), querys.getString(SysEnum.EXAMPLE.getValue()));
} }
} else {//没有值直接拼接 } else {//没有值直接拼接
if(map.get(querys.getString(SysEnum.PARAMETERNAME.getValue())) == null){ if(map.get(querys.getString(SysEnum.PARAMETERNAME.getValue())) == null){
map.put(querys.getString(SysEnum.PARAMETERNAME.getValue()), ""); map.put(querys.getString(SysEnum.PARAMETERNAME.getValue()), "");
} }
} }
} }
} }

112
service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
View File

@ -20,63 +20,63 @@ import com.hzya.frame.web.entity.BaseEntity;
*/ */
public class SysApplicationApiEntity extends BaseEntity { public class SysApplicationApiEntity extends BaseEntity {
/** 接口编码 */ /** 接口编码 */
private Long apiCode; private Long apiCode;
/** Api接口地址(固定系统内部外放接口地址) */ /** Api接口地址(固定系统内部外放接口地址) */
private String apiPath; private String apiPath;
/** 1启用2停用 */ /** 1启用2停用 */
private String apiStatus; private String apiStatus;
/** api应用 */ /** api应用 */
private String appId; private String appId;
/** api应用名称 */ /** api应用名称 */
private String appName; private String appName;
/** api应用地址 **/ /** api应用地址 **/
private String appUrl; private String appUrl;
/** 目录 */ /** 目录 */
private String catalogueId; private String catalogueId;
/** 目录名称 */ /** 目录名称 */
private String catalogueName; private String catalogueName;
/** api名称 */ /** api名称 */
private String apiName; private String apiName;
/** api描述 */ /** api描述 */
private String apiRemark; private String apiRemark;
/** 是否需要登录 1、是 2、否 */ /** 是否需要登录 1、是 2、否 */
private String needLogin; private String needLogin;
/** 认证接口 */ /** 认证接口 */
private String authenticationPort; private String authenticationPort;
/** 传参方式 1、query 2、data */ /** 传参方式 1、query 2、data */
private String parameterPassingMode; private String parameterPassingMode;
/** 目标地址 */ /** 目标地址 */
private String destinationAddress; private String destinationAddress;
/** 请求编码 1、UTF-8 */ /** 请求编码 1、UTF-8 */
private String requestCoding; private String requestCoding;
/** 请求方法 1、POST 2、GET */ /** 请求方法 1、POST 2、GET */
private String requestMethod; private String requestMethod;
/** 超时时间 6000 ms */ /** 超时时间 6000 ms */
private String timeoutPeriod; private String timeoutPeriod;
/** 限流 6000 ms */ /** 限流 6000 ms */
private String currentLimiting; private String currentLimiting;
/** Header入参 JSON */ /** Header入参 JSON */
private String headerIn; private String headerIn;
/** Query入参 JSON */ /** Query入参 JSON */
private String queryIn; private String queryIn;
/** Body 入参类型 1、Application/json */ /** Body 入参类型 1、Application/json */
private String bodyInType; private String bodyInType;
/** Body 入参 JSON */ /** Body 入参 JSON */
private String bodyIn; private String bodyIn;
/** Body 出参 JSON */ /** Body 出参 JSON */
private String bodyOut; private String bodyOut;
/** bean名称 */ /** bean名称 */
private String beanName; private String beanName;
/** 方法名称 */ /** 方法名称 */
private String funName; private String funName;
/** 是否扩展api 1、启用 2、停用*/ /** 是否扩展api 1、启用 2、停用*/
private String extensionApi; private String extensionApi;
/** 返回成功字段 */ /** 返回成功字段 */
private String returnSuccessField; private String returnSuccessField;
/** 返回成功值*/ /** 返回成功值*/
private String returnSuccessValue; private String returnSuccessValue;
/** 返回描述字段*/ /** 返回描述字段*/
private String returnMsg; private String returnMsg;

18
service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
View File

@ -2052,11 +2052,11 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
* @Date 11:36 上午 2023/10/20 * @Date 11:36 上午 2023/10/20
**/ **/
private SysMessageManageLogEntity saveLog(SysApplicationEntity sendApp, SysApplicationEntity receiveApp, SysApplicationApiEntity receiveApi, private SysMessageManageLogEntity saveLog(SysApplicationEntity sendApp, SysApplicationEntity receiveApp, SysApplicationApiEntity receiveApi,
String oldbodys,String bodys, String oldbodys,String bodys,
Map<String, String> oldheaderMap,Map<String, String> headerMap, Map<String, String> oldheaderMap,Map<String, String> headerMap,
Map<String, String> headers, Map<String, String> headers,
String oldquerys, String querys, String oldquerys, String querys,
String body, boolean flag,String msg) { String body, boolean flag,String msg) {
SysMessageManageLogEntity sysMessageManageLogEntity = new SysMessageManageLogEntity(); SysMessageManageLogEntity sysMessageManageLogEntity = new SysMessageManageLogEntity();
//messageManageId 消息主表主键 //messageManageId 消息主表主键
//theme 消息主题 //theme 消息主题
@ -2379,10 +2379,10 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
mdmModuleDistributeEntity.setAddScript(entity.getId()); mdmModuleDistributeEntity.setAddScript(entity.getId());
mdmModuleDistributeEntity.setUpdateScript(entity.getId()); mdmModuleDistributeEntity.setUpdateScript(entity.getId());
mdmModuleDistributeEntity.setDeleteScript(entity.getId()); mdmModuleDistributeEntity.setDeleteScript(entity.getId());
Integer a = mdmModuleDistributeDao.queryCountUse(mdmModuleDistributeEntity); Integer a = mdmModuleDistributeDao.queryCountUse(mdmModuleDistributeEntity);
if(a > 0){ if(a > 0){
return BaseResult.getFailureMessageEntity("脚本已经被使用，请先取消关联"); return BaseResult.getFailureMessageEntity("脚本已经被使用，请先取消关联");
} }
entity.setUpdate(); entity.setUpdate();
sysApplicationScriptDao.logicRemoveMultiCondition(entity); sysApplicationScriptDao.logicRemoveMultiCondition(entity);
return BaseResult.getSuccessMessageEntity("删除脚本成功"); return BaseResult.getSuccessMessageEntity("删除脚本成功");