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 42b171db..97653c9a 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 @@ -110,13 +110,4 @@ public interface IComparisonDao extends IBaseDao { * **/ List queryComparisonBymdmIdFileds(ComparisonEntity comparison); - /** - * - * @content 根据数据来源内类型是插件的应用类型做分组 - * @Param - * @Return - * @Author hecan - * @Date 2024/6/4 17:41 - * **/ - List queryModuleSource(); } 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 4c8a0298..d50098cb 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,10 +81,4 @@ public class ComparisonDaoImpl extends MybatisGenericDao queryModuleSource() { - List list =(List) super.selectList(getSqlIdPrifx() + "queryModuleSource",""); - return list; - } } 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 a47e7a3f..6a97f2b4 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 @@ -32,7 +32,7 @@ public class ComparisonEntity extends BaseEntity { private String rulePrefix;//规则前缀 CK-yyyyMMdd-0001中的CK private String ruleMiddle;//规则中间 CK-yyyyMMdd-0001中的yyyyMMdd - private String ruleSuffix;//规则后缀 CK-yyyyMMdd-0001中的0001 + private int ruleSuffix;//规则后缀 CK-yyyyMMdd-0001中的0001 private String mId;//mdm_module的id private String dbId;//mdm_module_db的id @@ -100,11 +100,11 @@ public class ComparisonEntity extends BaseEntity { this.ruleMiddle = ruleMiddle; } - public String getRuleSuffix() { + public int getRuleSuffix() { return ruleSuffix; } - public void setRuleSuffix(String ruleSuffix) { + public void setRuleSuffix(int ruleSuffix) { this.ruleSuffix = ruleSuffix; } 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 906661bd..d24c345d 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 @@ -35,7 +35,7 @@ left join mdm_module_db moddb on m.id=moddb.mdm_id left join mdm_module_db_fileds filed on filed.mdm_id=m.id and filed.db_id=moddb.id - where m.mdm_code= #{mdmCode} + where m.mdm_code= #{mdmCode} and (moddb.db_type='1' or moddb.db_type='2') @@ -61,7 +61,7 @@ update_type as updateType,show_type as showType, query_type as queryType, list_type as listType, view_type as viewType,mdm_id as mId,db_id as dbId from mdm_module_db_fileds - where mdm_id= #{mId} and sts='Y' + where db_id= #{dbId} and sts='Y' @@ -74,21 +74,14 @@ - - - - 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 931ed6e6..76ba706d 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 @@ -6,16 +6,21 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.github.pagehelper.PageInfo; import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; +import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; +import com.hzya.frame.mdm.service.impl.MdmServiceCache; +import com.hzya.frame.sysnew.comparison.controlsLog.dao.impl.ControlsLogDaoImpl; import com.hzya.frame.sysnew.comparison.dao.IComparisonDao; import com.hzya.frame.sysnew.comparison.dao.IComparisonDetailsDao; import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; import com.hzya.frame.sysnew.comparison.service.IComparisonService; -import com.hzya.frame.sysnew.generalData.dao.IGeneralDataDao; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; +import org.apache.ivy.Main; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import sun.java2d.pipe.AAShapePipe; @@ -30,6 +35,12 @@ public class ComparisonServiceImpl extends BaseService @Autowired private IComparisonDetailsDao comparisonDetailsDao; + @Autowired + private ControlsLogDaoImpl controlsLogDaoimpl; + + @Autowired + private MdmServiceCache mdmServiceCache; + @Autowired public void setGeneralDataDao(IComparisonDao dao) { this.comparisonDao = dao; @@ -53,7 +64,8 @@ public class ComparisonServiceImpl extends BaseService //根据主数据编码查询表名称，字段名称等信息 10001 //comparisonEntities = comparisonDao.queryComparison(comparisonEntity); - comparisonEntities=getComparisonEntity(comparisonEntity); + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("查询失败"); @@ -95,6 +107,9 @@ public class ComparisonServiceImpl extends BaseService if (!checkStr(jsonObject.getString("mdmCode"))) { return BaseResult.getFailureMessageEntity("主数据编码为空"); } + if (!checkStr(jsonObject.getString("optionName"))) { + return BaseResult.getFailureMessageEntity("操作人为空"); + } /*if (!checkStr(jsonObject.getString("rulePrefix"))) { return BaseResult.getFailureMessageEntity("规则为空"); }*/ @@ -105,7 +120,8 @@ public class ComparisonServiceImpl extends BaseService //根据主数据编码查询表名称，字段名称等信息 10001 // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); - comparisonEntities=getComparisonEntity(comparisonEntity); + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("保存失败"); @@ -119,20 +135,27 @@ public class ComparisonServiceImpl extends BaseService if (comparisonEntities != null && comparisonEntities.size() > 0) { map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); - String uuid = UUIDUtils.getUUID(); - map.put("id", uuid); + String uuid=null; + if(jsonObjectMain.getString("id")==null){ + uuid = UUIDUtils.getUUID(); + map.put("id", uuid); + }else{ + uuid = jsonObjectMain.getString("id"); + map.put("id", jsonObjectMain.getString("id")); + } map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("org_id", "0"); map.put("create_time", new Date()); map.put("modify_time", new Date()); map.put("sts", "Y"); + map.put("data_status","Y");//新增状态 map.put("add_status","0");//新增状态 map.put("update_status","1");//修改状态 map.put("delete_status","1");//删除状态 + ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); //查询单据规则 try { - ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule); String documentRule =comparisonEntityRule.getDocumentRule();; //"KH-2024-05-30-1"; logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}",documentRule); @@ -143,7 +166,8 @@ public class ComparisonServiceImpl extends BaseService String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-")); String ruleMiddle = getRuleDate(ruleDate); //获取规则后缀 - String ruleSuffix= documentRule.substring(documentRule.lastIndexOf("-")+1); + String ruleSuffixLength= documentRule.substring(documentRule.lastIndexOf("-")+1); + int ruleSuffix = ruleSuffixLength.length(); //生成单据规则 comparisonEntity.setRulePrefix(rulePrefix); comparisonEntity.setRuleMiddle(ruleMiddle); @@ -168,7 +192,8 @@ public class ComparisonServiceImpl extends BaseService ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntity); //保存子表数据 if (mapDetails != null && mapDetails.size() > 0) { - mapDetails.put("id", UUIDUtils.getUUID()); + String uuidDetail = UUIDUtils.getUUID(); + mapDetails.put("id", uuidDetail); mapDetails.put("formmain_id", uuid); mapDetails.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); mapDetails.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); @@ -176,11 +201,17 @@ public class ComparisonServiceImpl extends BaseService mapDetails.put("create_time", new Date()); mapDetails.put("modify_time", new Date()); mapDetails.put("sts", "Y"); + mapDetails.put("data_status","Y");//新增状态 comparisonDetailsEntity.setMapDetails(mapDetails); ComparisonDetailsEntity comparisonDetailsEntityOne = comparisonDetailsDao.saveComparisonDetails(comparisonDetailsEntity); - comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); + //comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); + map.put("details",mapDetails); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); } - return BaseResult.getSuccessMessageEntity("保存成功", comparisonEntityOne); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + return BaseResult.getSuccessMessageEntity("保存成功", map); } catch (Exception e) { logger.info("保存通用数据时候错误:{}", e.getMessage()); return BaseResult.getFailureMessageEntity("保存失败"); @@ -200,6 +231,9 @@ public class ComparisonServiceImpl extends BaseService if (!checkStr(jsonObject.getString("mdmCode"))) { return BaseResult.getFailureMessageEntity("主数据编码为空"); } + if (!checkStr(jsonObject.getString("optionName"))) { + return BaseResult.getFailureMessageEntity("操作人为空"); + } ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); JSONObject jsonObjectMain=jsonObject.getJSONObject("main");//获取主表数据 @@ -212,7 +246,8 @@ public class ComparisonServiceImpl extends BaseService try { // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); - comparisonEntities=getComparisonEntity(comparisonEntity); + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("更新失败"); @@ -221,7 +256,7 @@ public class ComparisonServiceImpl extends BaseService Map mapDetails=new HashMap<>();//将子表数据存到map中 if(comparisonEntities !=null && comparisonEntities.size()>0) { map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); - mapDetails=spliceDetailMap(comparisonEntities,map,comparisonDetailsEntity,jsonArray); + mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("org_id", "0"); @@ -256,7 +291,11 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); comparisonDetailsEntity.setMapDetails(mapDetails); comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); } + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); return BaseResult.getSuccessMessageEntity("更新成功", integer); }else{ return BaseResult.getFailureMessageEntity("更新失败"); @@ -290,7 +329,8 @@ public class ComparisonServiceImpl extends BaseService try { // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); - comparisonEntities=getComparisonEntity(comparisonEntity); + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("删除失败"); @@ -321,7 +361,9 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); + controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); } + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); return BaseResult.getSuccessMessageEntity("删除成功",integer); }else{ return BaseResult.getFailureMessageEntity("删除失败","请查看id是否在表中存在"); @@ -390,6 +432,92 @@ public class ComparisonServiceImpl extends BaseService return mapDetails; } + //根据主数据编码获取主表和明细表表名称，表字段信息 + public List getComparisonEntityCache(ComparisonEntity comparison,String type){ + List comparisonEntities = new ArrayList<>(); + //根据主数据编号获取模板主表 + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(Long.valueOf(comparison.getMdmCode())); + //根据模板主表id获取模版表数据 + if(mdmModuleEntity!=null){ + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbEntities)){ + for (MdmModuleDbEntity moduleDbEntity : mdmModuleDbEntities) { + switch (type){ + case "main": + //获取主表和明细表的字段信息 + if(moduleDbEntity.getDbType().equals("1") || moduleDbEntity.getDbType().equals("2")){ + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity=new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbFiledsEntities)){ + for (MdmModuleDbFiledsEntity moduleDbFiledsEntity : mdmModuleDbFiledsEntities) { + if (moduleDbFiledsEntity.getDbId().equals(moduleDbEntity.getId())) { + ComparisonEntity comparisonEntityFile = new ComparisonEntity(); + comparisonEntityFile.setChName(moduleDbFiledsEntity.getChName()); + comparisonEntityFile.setEnName(moduleDbFiledsEntity.getEnName()); + comparisonEntityFile.setFiledType(moduleDbFiledsEntity.getFiledType()); + comparisonEntityFile.setAddType(moduleDbFiledsEntity.getAddType()); + comparisonEntityFile.setUpdateType(moduleDbFiledsEntity.getUpdateType()); + comparisonEntityFile.setShowType(moduleDbFiledsEntity.getShowType()); + comparisonEntityFile.setQueryType(moduleDbFiledsEntity.getQueryType()); + comparisonEntityFile.setListType(moduleDbFiledsEntity.getListType()); + comparisonEntityFile.setViewType(moduleDbFiledsEntity.getViewType()); + comparisonEntityFile.setDbName(moduleDbEntity.getDbName()); + comparisonEntityFile.setDbType(moduleDbEntity.getDbType()); + comparisonEntityFile.setDbId(moduleDbEntity.getId()); + comparisonEntityFile.setmId(mdmModuleEntity.getId()); + comparisonEntityFile.setMdmName(mdmModuleEntity.getMdmName()); + comparisonEntityFile.setMdmCode(String.valueOf(mdmModuleEntity.getMdmCode())); + comparisonEntities.add(comparisonEntityFile); + } + } + } + } + break; + case "option": + //获取主表和明细表的字段信息 + if(moduleDbEntity.getDbType().equals("3")){ + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity=new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setDbId(moduleDbEntity.getId()); + List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbFiledsEntities)){ + for (MdmModuleDbFiledsEntity moduleDbFiledsEntity : mdmModuleDbFiledsEntities) { + if (moduleDbFiledsEntity.getDbId().equals(moduleDbEntity.getId())) { + ComparisonEntity comparisonEntityFile = new ComparisonEntity(); + comparisonEntityFile.setChName(moduleDbFiledsEntity.getChName()); + comparisonEntityFile.setEnName(moduleDbFiledsEntity.getEnName()); + comparisonEntityFile.setFiledType(moduleDbFiledsEntity.getFiledType()); + comparisonEntityFile.setAddType(moduleDbFiledsEntity.getAddType()); + comparisonEntityFile.setUpdateType(moduleDbFiledsEntity.getUpdateType()); + comparisonEntityFile.setShowType(moduleDbFiledsEntity.getShowType()); + comparisonEntityFile.setQueryType(moduleDbFiledsEntity.getQueryType()); + comparisonEntityFile.setListType(moduleDbFiledsEntity.getListType()); + comparisonEntityFile.setViewType(moduleDbFiledsEntity.getViewType()); + comparisonEntityFile.setDbName(moduleDbEntity.getDbName()); + comparisonEntityFile.setDbType(moduleDbEntity.getDbType()); + comparisonEntityFile.setDbId(moduleDbEntity.getId()); + comparisonEntityFile.setmId(mdmModuleEntity.getId()); + comparisonEntityFile.setMdmName(mdmModuleEntity.getMdmName()); + comparisonEntityFile.setMdmCode(String.valueOf(mdmModuleEntity.getMdmCode())); + comparisonEntities.add(comparisonEntityFile); + } + } + } + } + break; + default: + break; + } + + } + } + return comparisonEntities; + } + return null; + } + //根据主数据编码获取数据，表名称，字段名称等 public List getComparisonEntity(ComparisonEntity comparisonEntity) { List comparisonEntities = new ArrayList<>(); @@ -398,7 +526,38 @@ public class ComparisonServiceImpl extends BaseService if (comparisonEntityModule != null) { //根据mdm_module得id查询mdm_module_db得数据 List comparisonEntitiesModuleDb = comparisonDao.queryComparisonBymdmId(comparisonEntityModule); - //根据mdm_module得id查询mdm_module_db_fileds得数据 + 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) { @@ -422,22 +581,10 @@ public class ComparisonServiceImpl extends BaseService comparisonEntities.add(comparisonEntityFile); } } - } + }*/ return comparisonEntities; } return null; } - //查询数据来源 根据数据来源内类型是插件的应用类型做分组 - public List getComparisonEntityFiles(){ - List comparisonEntities = comparisonDao.queryModuleSource(); - if(CollectionUtils.isNotEmpty(comparisonEntities)){ - for (ComparisonEntity comparisonEntity : comparisonEntities) { - //根据来源类型获取档案数据 比如U8C - - } - } - return null; - } - }