diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index 30920aef..dde0b50d 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -57,6 +57,8 @@ import com.hzya.frame.sys.roleModule.dao.IRoleModuleMapper;
import com.hzya.frame.sys.roleModule.entity.RoleModule;
import com.hzya.frame.sys.userRole.dao.IUserRoleMapper;
import com.hzya.frame.sys.userRole.entity.UserRole;
+import com.hzya.frame.sysnew.buttonConfig.dao.ISysButtonConfigDao;
+import com.hzya.frame.sysnew.buttonConfig.entity.SysButtonConfigEntity;
import com.hzya.frame.sysnew.menuConfig.dao.ISysMenuConfigDao;
import com.hzya.frame.sysnew.menuConfig.entity.SysMenuConfigEntity;
import com.hzya.frame.uuid.UUIDUtils;
@@ -113,6 +115,8 @@ public class MdmServiceImpl implements IMdmService {
protected IUserRoleMapper userRoleMapper;
@Resource
private ISysMenuConfigDao sysMenuConfigDao;
+ @Resource
+ private ISysButtonConfigDao sysButtonConfigDao;
/**
* @param object
* @return com.hzya.frame.web.entity.JsonResultEntity
@@ -987,6 +991,83 @@ public class MdmServiceImpl implements IMdmService {
module.setOptions(object1.toString());//菜单mate参数
sysMenuConfigDao.save(module);
//todo 新增按钮
+ SysButtonConfigEntity xz = new SysButtonConfigEntity();
+ xz.setCode("new");
+ xz.setNameCh("新建");
+ xz.setNameEn("new");
+ xz.setMenuId(module.getId());
+ xz.setIconName("");
+ xz.setStyles("");
+ xz.setBtnFunction("new");
+ xz.setRemark("主数据新建按钮");
+ xz.setCreate();
+ sysButtonConfigDao.save(xz);
+ SysButtonConfigEntity cz = new SysButtonConfigEntity();
+ cz.setCode("resize");
+ cz.setNameCh("重置");
+ cz.setNameEn("resize");
+ cz.setMenuId(module.getId());
+ cz.setIconName("");
+ cz.setStyles("");
+ cz.setBtnFunction("resize");
+ cz.setRemark("主数据重置按钮");
+ cz.setCreate();
+ sysButtonConfigDao.save(cz);
+ SysButtonConfigEntity cx = new SysButtonConfigEntity();
+ cx.setCode("search");
+ cx.setNameCh("查询");
+ cx.setNameEn("search");
+ cx.setMenuId(module.getId());
+ cx.setIconName("");
+ cx.setStyles("");
+ cx.setBtnFunction("search");
+ cx.setRemark("主数据查询按钮");
+ cx.setCreate();
+ sysButtonConfigDao.save(cx);
+ SysButtonConfigEntity xg = new SysButtonConfigEntity();
+ xg.setCode("edit");
+ xg.setNameCh("修改");
+ xg.setNameEn("edit");
+ xg.setMenuId(module.getId());
+ xg.setIconName("");
+ xg.setStyles("");
+ xg.setBtnFunction("edit");
+ xg.setRemark("主数据修改按钮");
+ xg.setCreate();
+ sysButtonConfigDao.save(xg);
+ SysButtonConfigEntity sc = new SysButtonConfigEntity();
+ sc.setCode("dele");
+ sc.setNameCh("删除");
+ sc.setNameEn("dele");
+ sc.setMenuId(module.getId());
+ sc.setIconName("");
+ sc.setStyles("");
+ sc.setBtnFunction("dele");
+ sc.setRemark("主数据删除按钮");
+ sc.setCreate();
+ sysButtonConfigDao.save(sc);
+ SysButtonConfigEntity ck = new SysButtonConfigEntity();
+ ck.setCode("dele");
+ ck.setNameCh("查看");
+ ck.setNameEn("dele");
+ ck.setMenuId(module.getId());
+ ck.setIconName("");
+ ck.setStyles("");
+ ck.setBtnFunction("dele");
+ ck.setRemark("主数据查看按钮");
+ ck.setCreate();
+ sysButtonConfigDao.save(ck);
+ SysButtonConfigEntity xf = new SysButtonConfigEntity();
+ xf.setCode("send");
+ xf.setNameCh("下发");
+ xf.setNameEn("send");
+ xf.setMenuId(module.getId());
+ xf.setIconName("");
+ xf.setStyles("");
+ xf.setBtnFunction("send");
+ xf.setRemark("主数据下发按钮");
+ xf.setCreate();
+ sysButtonConfigDao.save(xf);
//module.setServiceName("mdmService");//Spring bean名称
//module.setLvl("2");//等级
//module.setName("integrationOptionAdmin"+moduleEntity.getMdmCode());//名称
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
index 39480627..0dbde1b7 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
@@ -1691,6 +1691,8 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
sysExtensionApiEntity.setHeaders(oldheaderMap);
sysExtensionApiEntity.setQuerys(oldquerys);
sysExtensionApiEntity.setBodys(oldbodys);
+ Method[] methods = null;
+ Object object = null;
// 判断是否有内部api 是否扩展api 1、启用 2、停用
if (receiveApi.getExtensionApi() != null && "1".equals(receiveApi.getExtensionApi())
@@ -1698,14 +1700,13 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
&& receiveApi.getFunName() != null && !"".equals(receiveApi.getFunName())
) {
//获取类
- Object object = null;
try {
object = ApplicationContextUtil.getBeanByName(receiveApi.getBeanName());
} catch (SecurityException e) {
}
//获取类下面的方法
- Method[] methods = object.getClass().getMethods();
+ methods = object.getClass().getMethods();
if (methods == null || methods.length == 0) {
return BaseResult.getFailureMessageEntity("未找到内部方法，请联系管理员");
}
@@ -1751,8 +1752,8 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
JSONArray jsonArray = JSONArray.parseArray(receiveApi.getHeaderIn());
if (jsonArray != null && jsonArray.size() > 0) {
for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject object = jsonArray.getJSONObject(i);
- headers.put(object.getString("parameterName"), object.getString("example"));
+ JSONObject object1 = jsonArray.getJSONObject(i);
+ headers.put(object1.getString("parameterName"), object1.getString("example"));
}
}
}
@@ -1816,14 +1817,37 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
}
logger.info("保存日志开始");
- saveLog(sendApp, receiveApp, receiveApi, oldbodys, bodys, oldheaderMap, headerMap, headers, oldquerys, querys, body.toString(), true);
+ SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(),true);
+ if (methods != null && methods.length > 0) {
+ for (Method m : methods) {
+ if (null != m) {
+ if (m.getName().equals(receiveApi.getFunName().trim()+"CallBack")) {
+ try {
+ logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+ m.invoke(object, sysMessageManageLogEntity);
+ logger.info("invoke结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+ } catch (Exception e) {
+ logger.error("invokeException{}", e.getMessage());
+ }
+ }
+ }
+ }
+ }
logger.info("保存日志结束");
if (flag) {
if (JSONUtil.isTypeJSON(body.toString())) {
JSONObject jsonObject = JSONObject.parseObject(body.toString());
- return BaseResult.getSuccessMessageEntity("转发成功", jsonObject);
+ if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){
+ return BaseResult.getSuccessMessageEntity("转发成功", jsonObject);
+ }else {
+ return BaseResult.getFailureMessageEntity("转发失败", jsonObject);
+ }
} else {
- return BaseResult.getSuccessMessageEntity("转发成功", body);
+ if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){
+ return BaseResult.getSuccessMessageEntity("转发成功", body);
+ }else {
+ return BaseResult.getFailureMessageEntity("转发失败", body);
+ }
}
} else {
return BaseResult.getFailureMessageEntity("转发失败", body);
@@ -1874,10 +1898,38 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
}
}
logger.info("保存日志开始");
- saveLog(sendApp, receiveApp, receiveApi, oldbodys, bodys, oldheaderMap, headerMap, headers, oldquerys, querys, body.toString(), true);
+ SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(), true);
+ if (methods != null && methods.length > 0) {
+ for (Method m : methods) {
+ if (null != m) {
+ if (m.getName().equals(receiveApi.getFunName().trim()+"CallBack")) {
+ try {
+ logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+ m.invoke(object, sysMessageManageLogEntity);
+ logger.info("invoke结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+ } catch (Exception e) {
+ logger.error("invokeException{}", e.getMessage());
+ }
+ }
+ }
+ }
+ }
logger.info("保存日志结束");
if (flag) {
- return BaseResult.getSuccessMessageEntity("转发成功", body);
+ if (JSONUtil.isTypeJSON(body.toString())) {
+ JSONObject jsonObject = JSONObject.parseObject(body.toString());
+ if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){
+ return BaseResult.getSuccessMessageEntity("转发成功", jsonObject);
+ }else {
+ return BaseResult.getFailureMessageEntity("转发失败", jsonObject);
+ }
+ } else {
+ if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){
+ return BaseResult.getSuccessMessageEntity("转发成功", body);
+ }else {
+ return BaseResult.getFailureMessageEntity("转发失败", body);
+ }
+ }
} else {
return BaseResult.getFailureMessageEntity("转发失败", body);
}
@@ -1943,9 +1995,9 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
* @Description 保存日志
* @Date 11:36 上午 2023/10/20
**/
- private void saveLog(SysApplicationEntity sendApp, SysApplicationEntity receiveApp, SysApplicationApiEntity receiveApi,
- String oldbodys, String bodys,
- Map<String, String> oldheaderMap, Map<String, String> headerMap,
+ private SysMessageManageLogEntity saveLog(SysApplicationEntity sendApp, SysApplicationEntity receiveApp, SysApplicationApiEntity receiveApi,
+ String oldbodys,String bodys,
+ Map<String, String> oldheaderMap,Map<String, String> headerMap,
Map<String, String> headers,
String oldquerys, String querys,
String body, boolean flag) {
@@ -2027,6 +2079,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
sysMessageManageLogEntity.setModify_time(new Date());
sysMessageManageLogEntity.setSts("Y");
taskExecutor.execute(() -> doEsbTask(sysMessageManageLogEntity));
+ return sysMessageManageLogEntity;
}
/**