From 08e0a5609942a787f2eb7305d35a62e73734f95f Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Mon, 24 Jun 2024 17:48:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysApplicationServiceImpl.java | 27 ++++++++++++++++--- .../frame/web/quartz/QuartzJobFactory.java | 16 +++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) 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 fe49d95d..d6f85b69 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 @@ -225,8 +225,8 @@ public class SysApplicationServiceImpl extends BaseService sysApplicationDatabaseEntities = sysApplicationDatabaseDao.queryBase(checkData); + if(detailEntity.getId() != null && !"".equals(detailEntity.getId())){ + if(sysApplicationDatabaseEntities != null && sysApplicationDatabaseEntities.size() > 0){ + for (int i = 0; i < sysApplicationDatabaseEntities.size(); i++) { + if(!detailEntity.getId().equals(sysApplicationDatabaseEntities.get(i).getId())){ + return BaseResult.getFailureMessageEntity("数据源编码已经存在，请修改"); + } + } + } + }else { + if(sysApplicationDatabaseEntities != null && sysApplicationDatabaseEntities.size() > 0){ + return BaseResult.getFailureMessageEntity("数据源编码已经存在，请修改"); + } + } + } //修改应用基本信息 SysApplicationEntity sysApplicationEntity = doUpdateApp(entity); if ("2".equals(entity.getUpdateType())) {//开发管理界面，需要保存 接口参数，和数据源 @@ -1691,7 +1712,7 @@ public class SysApplicationServiceImpl extends BaseService sysApplicationDatabaseEntities = sysApplicationDatabaseDao.queryBase(sysApplicationDatabaseEntity); + if(sysApplicationDatabaseEntities != null && sysApplicationDatabaseEntities.size() == 1){ + sourceCode = sysApplicationDatabaseEntities.get(0).getSourceCode(); + } + //查找插件 PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(sysApplicationPluginEntity.getPluginCode()); if(pluginBaseEntity == null ){ @@ -114,6 +129,7 @@ public class QuartzJobFactory implements Job { JSONObject req = new JSONObject(); req.put("startTime",oldStartTime); req.put("endTime",startTime); + req.put("sourceCode",sourceCode); try { JsonResultEntity jsonResultEntity = pluginBaseEntity.executeBusiness(req); if(jsonResultEntity.isFlag()){ From aea0ee873b9320e5a66ecd35c63ac60187f8fd76 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 25 Jun 2024 08:59:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdm/service/impl/MdmServiceImpl.java | 87 ++++++++++++++----- 1 file changed, 67 insertions(+), 20 deletions(-) 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 45d2599a..3c1aef25 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 @@ -2511,35 +2511,84 @@ public class MdmServiceImpl implements IMdmService { mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); List mdmDataFiledDtos = new ArrayList<>(); for (int i1 = 0; i1 < fileds.size(); i1++) { - MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); - mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName()); - mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName())); - mdmDataFiledDtos.add(mdmDataFiledDto); + if("id".equals(fileds.get(i1).getEnName())){ + if (jsonObject.getString("id") != null) { + MdmDataFiledDto ids = new MdmDataFiledDto(); + ids.setFiledsName("id"); + ids.setFiledsValue(jsonObject.getString("id")); + mdmDataFiledDtos.add(ids); + } else { + MdmDataFiledDto ids = new MdmDataFiledDto(); + ids.setFiledsName("id"); + ids.setFiledsValue(UUIDUtils.getUUID()); + mdmDataFiledDtos.add(ids); + } + }else if("formmain_id".equals(fileds.get(i1).getEnName())){ + MdmDataFiledDto formain_id = new MdmDataFiledDto(); + formain_id.setFiledsName("formmain_id"); + formain_id.setFiledsValue(id); + mdmDataFiledDtos.add(formain_id); + }else if("data_status".equals(fileds.get(i1).getEnName())){ + if (jsonObject.getString("id") != null) { + MdmDataFiledDto ids = new MdmDataFiledDto(); + ids.setFiledsName("data_status"); + ids.setFiledsValue("F"); + mdmDataFiledDtos.add(ids); + } else { + MdmDataFiledDto ids = new MdmDataFiledDto(); + ids.setFiledsName("data_status"); + ids.setFiledsValue("Y"); + mdmDataFiledDtos.add(ids); + } + }else if("sorts".equals(fileds.get(i1).getEnName())){ + + }else if("create_user_id".equals(fileds.get(i1).getEnName())){ + //if (jsonObject.getString("id") != null) { + // + //} else { + // MdmDataFiledDto ids = new MdmDataFiledDto(); + // ids.setFiledsName("create_user_id"); + // ids.setFiledsValue(UUIDUtils.getUUID()); + // mdmDataFiledDtos.add(ids); + //} + }else if("create_time".equals(fileds.get(i1).getEnName())){ + + }else if("modify_user_id".equals(fileds.get(i1).getEnName())){ + //MdmDataFiledDto ids = new MdmDataFiledDto(); + //ids.setFiledsName("modify_user_id"); + //ids.setFiledsValue(UUIDUtils.getUUID()); + //mdmDataFiledDtos.add(ids); + }else if("company_id".equals(fileds.get(i1).getEnName())){ + MdmDataFiledDto ids = new MdmDataFiledDto(); + ids.setFiledsName("company_id"); + ids.setFiledsValue("0"); + mdmDataFiledDtos.add(ids); + }else if("org_id".equals(fileds.get(i1).getEnName())){ + MdmDataFiledDto ids = new MdmDataFiledDto(); + ids.setFiledsName("org_id"); + ids.setFiledsValue("0"); + mdmDataFiledDtos.add(ids); + }else if("modify_time".equals(fileds.get(i1).getEnName())){ + + }else if("sts".equals(fileds.get(i1).getEnName())){ + + }else { + MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); + mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName()); + mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName())); + mdmDataFiledDtos.add(mdmDataFiledDto); + } } MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); mdmDataFiledDto.setFiledsName("logid"); mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString()); mdmDataFiledDtos.add(mdmDataFiledDto); - MdmDataFiledDto formain_id = new MdmDataFiledDto(); - formain_id.setFiledsName("formmain_id"); - formain_id.setFiledsValue(id); - mdmDataFiledDtos.add(formain_id); - mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); if (jsonObject.getString("id") != null) { - MdmDataFiledDto sts = new MdmDataFiledDto(); - sts.setFiledsName("sts"); - sts.setFiledsValue("Y"); - mdmDataFiledDtos.add(sts); mdmDataDto.setId(jsonObject.getString("id")); int a = mdmModuleDao.updateForm(mdmDataDto); } else { - MdmDataFiledDto ids = new MdmDataFiledDto(); - ids.setFiledsName("id"); - ids.setFiledsValue(UUIDUtils.getUUID()); - mdmDataFiledDtos.add(ids); - mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType()); int a = mdmModuleDao.saveForm(mdmDataDto); } @@ -2547,9 +2596,7 @@ public class MdmServiceImpl implements IMdmService { } } } - saveOption(dbname,mdmCode,saveData,id,msg); - } return str.toString(); } From 0e7b05e788d6960783e0304eecefde849a93f00b Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 25 Jun 2024 09:22:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E4=B8=BB=E9=94=AEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MdmModuleServiceImpl.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java index 8a9c3ac6..6ffdef17 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java @@ -582,6 +582,24 @@ public class MdmModuleServiceImpl extends BaseService i document_rule_num.setCreate(); document_rule_num.setDataType("1"); mdmModuleDbFiledsEntities.add(document_rule_num); + + MdmModuleDbFiledsEntity data_id = new MdmModuleDbFiledsEntity(); + data_id.setMdmId(entity.getMdmId()); + data_id.setDbId(entity.getId()); + data_id.setEnName("data_id"); + data_id.setChName("第三方主键ID"); + data_id.setFiledType("1"); + data_id.setAddType("2"); + data_id.setUpdateType("2"); + data_id.setShowType("2"); + data_id.setQueryType("2"); + data_id.setListType("2"); + data_id.setViewType("2"); + data_id.setFiledLength("255"); + data_id.setCreate(); + data_id.setDataType("1"); + mdmModuleDbFiledsEntities.add(data_id); + } if ("2".equals(entity.getDbType()) || "3".equals(entity.getDbType()) || "4".equals(entity.getDbType())) { MdmModuleDbFiledsEntity formmain_id = new MdmModuleDbFiledsEntity(); @@ -600,6 +618,24 @@ public class MdmModuleServiceImpl extends BaseService i formmain_id.setCreate(); formmain_id.setDataType("1"); mdmModuleDbFiledsEntities.add(formmain_id); + + MdmModuleDbFiledsEntity data_id = new MdmModuleDbFiledsEntity(); + data_id.setMdmId(entity.getMdmId()); + data_id.setDbId(entity.getId()); + data_id.setEnName("data_id"); + data_id.setChName("第三方主键ID"); + data_id.setFiledType("1"); + data_id.setAddType("2"); + data_id.setUpdateType("2"); + data_id.setShowType("2"); + data_id.setQueryType("2"); + data_id.setListType("2"); + data_id.setViewType("2"); + data_id.setFiledLength("255"); + data_id.setCreate(); + data_id.setDataType("1"); + mdmModuleDbFiledsEntities.add(data_id); + } //写入日志字段：操作人 if ("3".equals(entity.getDbType())) {