From 1603610d28288e6bf8915f75e73a4a995a452d91 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Wed, 26 Jun 2024 10:15:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildpackage/src/main/resources/application.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml index 1f564c28..df96d990 100644 --- a/buildpackage/src/main/resources/application.yml +++ b/buildpackage/src/main/resources/application.yml @@ -122,3 +122,17 @@ jeecg : minio_name: ?? minio_pass: ?? bucketName: ?? +cbs8: + appId: + appSecret: + url: + # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 + ya_private_key: + # 这个私钥到时候上传到cbs，和下面到是同一对 + #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 + ya_public_key: + cbs_public_key: + #电子回单下载临时存放位置 + elec_path: +OA: + data_source_code: \ No newline at end of file From 8239fca7b54f76de847bea129722c0979a7a9049 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Wed, 26 Jun 2024 10:16:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildpackage/src/main/resources/application.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml index df96d990..1f564c28 100644 --- a/buildpackage/src/main/resources/application.yml +++ b/buildpackage/src/main/resources/application.yml @@ -122,17 +122,3 @@ jeecg : minio_name: ?? minio_pass: ?? bucketName: ?? -cbs8: - appId: - appSecret: - url: - # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 - ya_private_key: - # 这个私钥到时候上传到cbs，和下面到是同一对 - #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 - ya_public_key: - cbs_public_key: - #电子回单下载临时存放位置 - elec_path: -OA: - data_source_code: \ No newline at end of file From 1645913af7188c17243df57973806f714586df66 Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Wed, 26 Jun 2024 10:16:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0tlo=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 44 ++++++++++++++----- pom.xml | 5 +++ 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/buildpackage/src/main/resources/logback-spring.xml b/buildpackage/src/main/resources/logback-spring.xml index 780f5c31..fed8a49d 100644 --- a/buildpackage/src/main/resources/logback-spring.xml +++ b/buildpackage/src/main/resources/logback-spring.xml @@ -14,8 +14,7 @@ - + @@ -24,7 +23,14 @@ - + + + + + + + + ${CONSOLE_LOG_PATTERN} ${encodings} @@ -52,8 +58,12 @@ - - %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n @@ -77,8 +87,12 @@ ACCEPT DENY - - %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n @@ -102,8 +116,12 @@ ACCEPT DENY - - %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n @@ -125,8 +143,12 @@ - - %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n diff --git a/pom.xml b/pom.xml index 3f21aeaa..427bbb8b 100644 --- a/pom.xml +++ b/pom.xml @@ -369,6 +369,11 @@ flyway-mysql 8.5.13 + + com.yomahub + tlog-all + 1.5.2 + From 55695a0257c615eb6ab16ebed1a3dfdae1a65c93 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 26 Jun 2024 10:41:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=96=B0=E5=A2=9E=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controlsLog/dao/IControlsLogDao.java | 4 +- .../dao/impl/ControlsLogDaoImpl.java | 4 +- .../controlsLog/entity/ControlsLogEntity.java | 19 +++ .../controlsLog/entity/ControlsLogEntity.xml | 18 +- .../sysnew/comparison/dao/IComparisonDao.java | 10 ++ .../dao/impl/ComparisonDaoImpl.java | 7 + .../entity/ComparisonDetailsEntity.java | 18 ++ .../comparison/entity/ComparisonEntity.java | 27 +++ .../comparison/entity/ComparisonEntity.xml | 13 ++ .../service/impl/ComparisonServiceImpl.java | 161 ++++++++---------- 10 files changed, 188 insertions(+), 93 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/IControlsLogDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/IControlsLogDao.java index 1ef9f35c..873bcc62 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/IControlsLogDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/IControlsLogDao.java @@ -9,12 +9,12 @@ public interface IControlsLogDao extends IBaseDao { /** * * @content 操作日志保存 - * @Param formmainId:主表id,sourceName：来源名称，code：来源编码,sourceData:源数据,optionType:操作类型,optionName:操作人,dbName:数据库名称 + * @Param formmainId:主表id,sourceName：来源名称，code：来源编码,sourceData:源数据,optionType:操作类型,optionName:操作人,dbName:数据库名称,dataType:类型：1成功，2失败 * @Return * @Author hecan * @Date 2024/6/5 15:29 * **/ @DS("master") - ControlsLogEntity saveControlsLog(String formmainId,String sourceName,String code,String sourceData,String optionType,String optionName,String dbName); + ControlsLogEntity saveControlsLog(String formmainId,String sourceName,String code,String sourceData,String optionType,String optionName,String dbName,String dataType); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/impl/ControlsLogDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/impl/ControlsLogDaoImpl.java index 7db1b35b..034ca37e 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/impl/ControlsLogDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/impl/ControlsLogDaoImpl.java @@ -12,8 +12,7 @@ public class ControlsLogDaoImpl extends MybatisGenericDao - + - + - + + + @@ -31,6 +33,8 @@ and source_data = #{sourceData} and option_type = #{optionType} and option_name = #{optionName} + and data_type = #{dataType} + and remark = #{remark} and sorts = #{sorts} and create_user_id = #{create_user_id} and create_time = #{create_time} @@ -56,6 +60,8 @@ source_data , option_type , option_name , + data_type, + remark, sorts , create_user_id , modify_user_id , @@ -74,6 +80,8 @@ #{sourceData} , #{optionType} , #{optionName} , + #{dataType}, + #{remark}, #{sorts} , (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${dbName} a WHERE a.sts = 'Y' ), #{create_user_id} , @@ -99,6 +107,8 @@ source_data = #{sourceData}, option_type = #{optionType}, option_name = #{optionName}, + data_type = #{dataType}, + remark = #{remark}, sorts = #{sorts}, create_user_id = #{create_user_id}, create_time = #{create_time}, @@ -125,6 +135,8 @@ source_data = #{sourceData}, option_type = #{optionType}, option_name = #{optionName}, + data_type = #{dataType}, + remark = #{remark}, and sorts = #{sorts} and sts = #{sts} and company_id = #{companyId} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java index 97653c9a..c9f165f3 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java @@ -109,5 +109,15 @@ public interface IComparisonDao extends IBaseDao { * @Date 2024/6/4 11:45 * **/ List queryComparisonBymdmIdFileds(ComparisonEntity comparison); + + /** + * + * @content 根据mdm_id查询mdm_module_db_fileds_rule中的字段是否是必填项 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/25 15:09 + * **/ + List queryComparisonBymdmIdDbIdFiledId(ComparisonEntity comparison); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java index d50098cb..8cb609f5 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java @@ -81,4 +81,11 @@ public class ComparisonDaoImpl extends MybatisGenericDao queryComparisonBymdmIdDbIdFiledId(ComparisonEntity comparison) { + List list =(List) super.selectList(getSqlIdPrifx() + "queryComparisonBymdmIdDbIdFiledId", comparison); + return list; + } + } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java index 112c0d4a..82838e9d 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java @@ -32,6 +32,24 @@ public class ComparisonDetailsEntity extends BaseEntity { private String formmainId;//上级id private String dataId;//第三方主键id + private String ruleCode;//规则编码required 判断字段是否是必填 + private String ruleValue;//规则值 true/false 判断字段是否是必填 + + public String getRuleCode() { + return ruleCode; + } + + public void setRuleCode(String ruleCode) { + this.ruleCode = ruleCode; + } + + public String getRuleValue() { + return ruleValue; + } + + public void setRuleValue(String ruleValue) { + this.ruleValue = ruleValue; + } public String getDataId() { return dataId; diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java index 1cb1b3db..6226ae09 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java @@ -45,6 +45,33 @@ public class ComparisonEntity extends BaseEntity { private String viewType;//显示类型：显示 private String dataId;//第三方主键id + private String ruleCode;//规则编码required 判断字段是否是必填 + private String ruleValue;//规则值 true/false 判断字段是否是必填 + private String filedId;//mdm_module_db_fileds_rule的id + + public String getFiledId() { + return filedId; + } + + public void setFiledId(String filedId) { + this.filedId = filedId; + } + + public String getRuleCode() { + return ruleCode; + } + + public void setRuleCode(String ruleCode) { + this.ruleCode = ruleCode; + } + + public String getRuleValue() { + return ruleValue; + } + + public void setRuleValue(String ruleValue) { + this.ruleValue = ruleValue; + } public String getDataId() { return dataId; diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml index 341e28cd..cb3981a5 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml @@ -82,6 +82,19 @@ from ${dbName} where document_rule like concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','%'); + + + insert into ${dbName} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java index 251be257..2f45873e 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java @@ -20,6 +20,7 @@ import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; import com.hzya.frame.sysnew.comparison.service.IComparisonService; import com.hzya.frame.uuid.UUIDLong; import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseEntity; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; @@ -140,6 +141,7 @@ public class ComparisonServiceImpl extends BaseService ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); List comparisonEntities=new ArrayList<>(); + String uuid= String.valueOf(UUIDLong.longUUID()); try { //根据主数据编码查询表名称，字段名称等信息 10001 // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); @@ -153,7 +155,9 @@ public class ComparisonServiceImpl extends BaseService JSONObject jsonObjectMain=new JSONObject(); JSONArray jsonArray=new JSONArray(); List arrayList=new ArrayList<>(); - //根据dbtype和dbname分组，拿到表名称和表类型 + + String tableName=null; + //根据dbtype和dbname分组，拿到表名称和表类型 Map>> collect = comparisonEntities.stream().collect(Collectors.groupingBy(ComparisonEntity::getDbName, Collectors.groupingBy(ComparisonEntity::getDbType))); List> keyPairs = collect.entrySet().stream() .flatMap(e1 -> e1.getValue().keySet().stream() @@ -164,9 +168,12 @@ public class ComparisonServiceImpl extends BaseService //如果是1，就是主表，根据查询出来得主表是否是传输传递得主表 if(keyPair.getValue().equals("1")){ String main = jsonObject.getString(keyPair.getKey()); + tableName=keyPair.getKey(); if(main!=null){ jsonObjectMain = JSONObject.parseObject(main); if(!checkStr(jsonObjectMain.getString("data_id"))){ + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","2"); return BaseResult.getFailureMessageEntity("新增时候主表data_id不能为空"); } } @@ -179,6 +186,8 @@ public class ComparisonServiceImpl extends BaseService JSONObject jsonObjectDetails = jsonArray.getJSONObject(i); jsonObjectDetails.put("table_name", keyPair.getKey()); if(!checkStr(jsonObjectDetails.getString("data_id"))){ + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","2"); return BaseResult.getFailureMessageEntity("新增时候明细data_id不能为空"); } } @@ -191,7 +200,20 @@ public class ComparisonServiceImpl extends BaseService List>> mapDetails = new ArrayList<>();//将子表数据存到map中 if (comparisonEntities != null && comparisonEntities.size() > 0) { map = spliceMainMap(comparisonEntities, jsonObjectMain, map, comparisonEntity, comparisonDetailsEntity); - String uuid= String.valueOf(UUIDLong.longUUID()); + + //判断输入的主表字段是否是必填项 + for (ComparisonEntity entity : comparisonEntities) { + //如果必填字段不为空 + if(entity.getRuleValue()!=null && entity.getDbType().equals("1")){ + //如果值为空，说明没有传这个字段或者这个字段的值为空 + if(jsonObjectMain.getString(entity.getEnName()) ==null || jsonObjectMain.getString(entity.getEnName()).equals("")){ + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","2"); + return BaseResult.getFailureMessageEntity(entity.getDbName()+"表的"+entity.getEnName()+"字段不能为空"); + } + } + } + map.put("id", uuid); map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); @@ -230,16 +252,40 @@ public class ComparisonServiceImpl extends BaseService comparisonEntityRule.setMap(map); } catch (Exception e) { logger.info("保存通用数据时候生成单据规则错误:{}", e.getMessage()); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","2"); return BaseResult.getFailureMessageEntity("保存失败"); } } } catch (Exception e) { logger.info("通用数据保存接口中查询单据规则错误:{}", e.getMessage()); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","2"); return BaseResult.getFailureMessageEntity("保存失败"); } try { List list = new ArrayList<>(); JSONObject jsonObjectList = new JSONObject(); + + //判断明细表字段是否是必填项 + if (arrayList != null && arrayList.size() > 0) { + for (JSONArray jsonArrayDetails : arrayList) { + for (Object object : jsonArrayDetails) { + JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object); + for (ComparisonEntity entity : comparisonEntities) { + if(entity.getRuleValue()!=null && entity.getDbType().equals("2")){ + //如果值为空，说明没有传这个字段或者这个字段的值为空 + if(jsonObjectDetails.getString(entity.getEnName())==null || jsonObjectDetails.getString(entity.getEnName()).equals("")){ + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","2"); + return BaseResult.getFailureMessageEntity(entity.getDbName()+"表的"+entity.getEnName()+"字段不能为空"); + } + } + } + } + } + } + //保存主表数据 ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntityRule); jsonObjectList.put(comparisonEntityOne.getDbName(),map); @@ -274,10 +320,12 @@ public class ComparisonServiceImpl extends BaseService } list.add(jsonObjectList); //保存操作日志 - controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntityRule.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","1"); return BaseResult.getSuccessMessageEntity("保存成功", list); } catch (Exception e) { logger.info("保存通用数据时候错误:{}", e.getMessage()); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","2"); return BaseResult.getFailureMessageEntity("保存失败"); } } @@ -360,26 +408,16 @@ public class ComparisonServiceImpl extends BaseService return BaseResult.getFailureMessageEntity("根据data_id查询id数据为空，请检查data_id"); } String id = String.valueOf(comparisonEntitiePages.get(0).get("id")); - - map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("org_id", "0"); map.put("modify_time", new Date()); map.put("sts", "Y"); map.put("data_status","F");//数据状态 map.put("update_status","0");//修改状态 + map.remove("id"); comparisonEntity.setMap(map); comparisonEntity.setId(id); - /*//生成单据规则 - comparisonEntity.setRulePrefix(jsonObject.getString("rulePrefix")); - try { - ComparisonEntity comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); - map.put("document_rule",comparisonEntityRule.getDocumentRule());//单据规则 - map.put("document_rule_num",comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 - }catch (Exception e){ - logger.info("更新通用数据时候生成单据规则错误:{}",e.getMessage()); - return BaseResult.getFailureMessageEntity("更新失败",e.getMessage()); - }*/ try { List jsonObjects=new ArrayList<>(); JSONObject jsonObjectList=new JSONObject(); @@ -398,14 +436,13 @@ public class ComparisonServiceImpl extends BaseService stringObjectMap.put("modify_time", new Date()); stringObjectMap.put("sts", "Y"); stringObjectMap.put("data_status","F");//数据状态 + stringObjectMap.remove("id"); comparisonDetailsEntity.setDataId(String.valueOf(stringObjectMap.get("data_id"))); comparisonDetailsEntity.setFormmainId(id); comparisonDetailsEntity.setMapDetails(stringObjectMap); comparisonDetailsEntity.setDbName(String.valueOf(stringObjectMap.get("table_name"))); stringObjectMap.remove("table_name"); comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); - //保存操作日志 - // controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); } } jsonObjectList.put(comparisonDetailsEntity.getDbName(),mapDetails); @@ -414,13 +451,15 @@ public class ComparisonServiceImpl extends BaseService } jsonObjects.add(jsonObjectList); //保存操作日志 - controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","1"); return BaseResult.getSuccessMessageEntity("更新成功", jsonObjects); }else{ return BaseResult.getFailureMessageEntity("更新失败"); } } catch (Exception e) { logger.info("更新通用数据时候错误:{}", e.getMessage()); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","2"); return BaseResult.getFailureMessageEntity("更新失败"); } } @@ -501,6 +540,7 @@ public class ComparisonServiceImpl extends BaseService } String id = String.valueOf(comparisonEntitiePages.get(0).get("id")); + map.remove("id"); comparisonEntity.setId(id); comparisonEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); comparisonEntity.setMap(map); @@ -513,13 +553,14 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); // controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); } - controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","1"); return BaseResult.getSuccessMessageEntity("删除成功",integer); }else{ return BaseResult.getFailureMessageEntity("删除失败","请查看data_id是否在表中存在"); } }catch (Exception e){ logger.info("删除通用数据数据错误:{}",e.getMessage()); + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","2"); return BaseResult.getFailureMessageEntity("删除失败"); } } @@ -610,6 +651,12 @@ public class ComparisonServiceImpl extends BaseService MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(Long.valueOf(comparison.getMdmCode())); //根据模板主表id获取模版表数据 if(mdmModuleEntity!=null){ + //根据mdm_id查询mdm_module_db_fileds_rule中的必填项字段 + ComparisonEntity comparisonEntity=new ComparisonEntity(); + comparisonEntity.setmId(mdmModuleEntity.getId()); + List comparisonEntitiesFieldRule = comparisonDao.queryComparisonBymdmIdDbIdFiledId(comparisonEntity); + + //根据mdm_id查询mdm_module_db的信息 MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); @@ -641,6 +688,15 @@ public class ComparisonServiceImpl extends BaseService comparisonEntityFile.setmId(mdmModuleEntity.getId()); comparisonEntityFile.setMdmName(mdmModuleEntity.getMdmName()); comparisonEntityFile.setMdmCode(String.valueOf(mdmModuleEntity.getMdmCode())); + if(CollectionUtils.isNotEmpty(comparisonEntitiesFieldRule)){ + for (ComparisonEntity entity : comparisonEntitiesFieldRule) { + if(entity.getEnName().equals(moduleDbFiledsEntity.getEnName()) && entity.getDbType().equals(moduleDbEntity.getDbType())){ + //设置rule_code和rule_value，用于判断字段是否是必填项 + comparisonEntityFile.setRuleCode(entity.getRuleCode()); + comparisonEntityFile.setRuleValue(entity.getRuleValue()); + } + } + } comparisonEntities.add(comparisonEntityFile); } } @@ -688,73 +744,6 @@ public class ComparisonServiceImpl extends BaseService return null; } - //根据主数据编码获取数据，表名称，字段名称等 - public List getComparisonEntity(ComparisonEntity comparisonEntity) { - List comparisonEntities = new ArrayList<>(); - //根据主数据编码查询mdm_module数据 - ComparisonEntity comparisonEntityModule = comparisonDao.queryComparisonBymdmCode(comparisonEntity); - if (comparisonEntityModule != null) { - //根据mdm_module得id查询mdm_module_db得数据 - List comparisonEntitiesModuleDb = comparisonDao.queryComparisonBymdmId(comparisonEntityModule); - if(CollectionUtils.isNotEmpty(comparisonEntitiesModuleDb)) { - for (ComparisonEntity comparison : comparisonEntitiesModuleDb) { - //查询出主表和明细表信息 - if(comparison.getDbType().equals("1")||comparison.getDbType().equals("2")) { - //根据mdm_module_db的id查询对应表的字段 - List comparisonEntitiesFiles = comparisonDao.queryComparisonBymdmIdFileds(comparison); - if (CollectionUtils.isNotEmpty(comparisonEntitiesFiles)) { - for (ComparisonEntity comparisonEntitiesFile : comparisonEntitiesFiles) { - ComparisonEntity comparisonEntityFile = new ComparisonEntity(); - comparisonEntityFile.setChName(comparisonEntitiesFile.getChName()); - comparisonEntityFile.setEnName(comparisonEntitiesFile.getEnName()); - comparisonEntityFile.setFiledType(comparisonEntitiesFile.getFiledType()); - comparisonEntityFile.setAddType(comparisonEntitiesFile.getAddType()); - comparisonEntityFile.setUpdateType(comparisonEntitiesFile.getUpdateType()); - comparisonEntityFile.setShowType(comparisonEntitiesFile.getShowType()); - comparisonEntityFile.setQueryType(comparisonEntitiesFile.getQueryType()); - comparisonEntityFile.setListType(comparisonEntitiesFile.getListType()); - comparisonEntityFile.setViewType(comparisonEntitiesFile.getViewType()); - comparisonEntityFile.setDbName(comparison.getDbName()); - comparisonEntityFile.setDbType(comparison.getDbType()); - comparisonEntityFile.setDbId(comparison.getDbId()); - comparisonEntityFile.setmId(comparisonEntitiesFile.getmId()); - comparisonEntityFile.setMdmName(comparisonEntityModule.getMdmName()); - comparisonEntityFile.setMdmCode(comparisonEntityModule.getMdmCode()); - comparisonEntities.add(comparisonEntityFile); - } - } - } - } - } - /* //根据mdm_module得id查询mdm_module_db_fileds得数据 - List comparisonEntitiesFiles = comparisonDao.queryComparisonBymdmIdFileds(comparisonEntityModule); - for (ComparisonEntity comparison : comparisonEntitiesModuleDb) { - for (ComparisonEntity comparisonEntitiesFile : comparisonEntitiesFiles) { - if(comparison.getDbId().equals(comparisonEntitiesFile.getDbId())){ - ComparisonEntity comparisonEntityFile=new ComparisonEntity(); - comparisonEntityFile.setChName(comparisonEntitiesFile.getChName()); - comparisonEntityFile.setEnName(comparisonEntitiesFile.getEnName()); - comparisonEntityFile.setFiledType(comparisonEntitiesFile.getFiledType()); - comparisonEntityFile.setAddType(comparisonEntitiesFile.getAddType()); - comparisonEntityFile.setUpdateType(comparisonEntitiesFile.getUpdateType()); - comparisonEntityFile.setShowType(comparisonEntitiesFile.getShowType()); - comparisonEntityFile.setQueryType(comparisonEntitiesFile.getQueryType()); - comparisonEntityFile.setListType(comparisonEntitiesFile.getListType()); - comparisonEntityFile.setViewType(comparisonEntitiesFile.getViewType()); - comparisonEntityFile.setDbName(comparison.getDbName()); - comparisonEntityFile.setDbType(comparison.getDbType()); - comparisonEntityFile.setDbId(comparison.getDbId()); - comparisonEntityFile.setmId(comparisonEntitiesFile.getmId()); - comparisonEntityFile.setMdmName(comparisonEntityModule.getMdmName()); - comparisonEntityFile.setMdmCode(comparisonEntityModule.getMdmCode()); - comparisonEntities.add(comparisonEntityFile); - } - } - }*/ - return comparisonEntities; - } - return null; - } } From 5e3f82f111d285c6dd89c3abeb6acfda2c0a7501 Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Wed, 26 Jun 2024 13:49:28 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0tlo=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 427bbb8b..afe24610 100644 --- a/pom.xml +++ b/pom.xml @@ -371,9 +371,10 @@ com.yomahub - tlog-all + tlog-all-spring-boot-starter 1.5.2 +