主数据通用保存接口处理树形结构数据

2024年9月4日11:03:18

service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml

@@ -346,6 +346,7 @@ where id = #{id}
                 `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
                 `company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
                 `data_id` varchar(100) DEFAULT NULL COMMENT 'data_id',
+                `mdm_up_id` varchar(100) DEFAULT NULL COMMENT 'mdm_up_id',
             </when>
             <when test="tableType  == '2'.toString()">
                 `id` varchar(50) NOT NULL COMMENT '唯一标识码',

service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java

@@ -52,6 +52,27 @@ public class ComparisonEntity extends BaseEntity {
     private List<String> fields;
     private List<String> returnField;
 
+    /**  显示类型 1、树2、列表*/
+    private String viewName;
+    //下级结构树
+    private List<ComparisonEntity> comparisonEntities;
+
+    public List<ComparisonEntity> getComparisonEntities() {
+        return comparisonEntities;
+    }
+
+    public void setComparisonEntities(List<ComparisonEntity> comparisonEntities) {
+        this.comparisonEntities = comparisonEntities;
+    }
+
+    public String getViewName() {
+        return viewName;
+    }
+
+    public void setViewName(String viewName) {
+        this.viewName = viewName;
+    }
+
     public List<String> getReturnField() {
         return returnField;
     }

service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml

@@ -35,7 +35,7 @@
        from ${dbName} a
         <trim prefix="where" prefixOverrides="and">
             <foreach collection="map.entrySet()" item="value" index="key">
-                and ${key}  like concat('%',#{value},'%')
+                and ${key}  = #{value}
             </foreach>
            and sts='Y' and (data_status='Y' or data_status='F')
         </trim>

service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java

@@ -1,15 +1,17 @@
 package com.hzya.frame.sysnew.comparison.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 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.dao.IMdmModuleDao;
 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.mdmModuleView.dao.IMdmModuleViewDao;
+import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity;
 import com.hzya.frame.mdm.service.impl.MdmServiceCache;
 import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
 import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
@@ -20,15 +22,10 @@ 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.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;
-import org.apache.ivy.Main;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.java2d.pipe.AAShapePipe;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -49,6 +46,9 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
     @Autowired
     private MdmServiceCache mdmServiceCache;
 
+    @Autowired
+    private IMdmModuleViewDao mdmModuleViewDao;
+
     @Autowired
     public void setGeneralDataDao(IComparisonDao dao) {
         this.comparisonDao = dao;
@@ -105,6 +105,12 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                 comparisonEntity.setFields(fields);
                 //查询主表数据
                 List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity);
+
+                //递归查询组织树
+                if(map.get("viewName").equals("1")){
+                    return  recursiveQueryComparison(comparisonEntitiePages,comparisonEntity);
+                }
+
                 if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){
                     for (Map<String, Object> comparisonEntitiePage : comparisonEntitiePages) {
                         JSONObject jsonObjects=new JSONObject();
@@ -224,6 +230,27 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                     //return BaseResult.getFailureMessageEntity(comparisonEntity.getDbName()+"表中已经存在data_id为:"+jsonObjectMain.getString("data_id")+"的数据");
                     return updateEntity(json);
                 } else {
+
+                    //如果是树形结构，查询不存在，新增时候需要得到parent_id,根据parent_id查询data_id是否有，之后将查询得父id设置到mdm_up_id中
+                    if(comparisonEntities.get(0).getViewName().equals("1")){
+                        List<String> fieldParent = getFields(comparisonEntity);
+                        Map<String, Object> mapParentId = new HashMap<>();
+                        mapDataId.put("data_id", jsonObjectMain.getString("parent_id"));
+                        ComparisonEntity comparisonParentId = new ComparisonEntity();
+                        comparisonParentId.setMap(mapParentId);
+                        comparisonParentId.setDbName(comparisonEntity.getDbName());
+                        comparisonParentId.setFields(fieldParent);
+                        List<Map<String, Object>> listParentId = comparisonDao.queryComparisonPage(comparisonDataId);
+                        //如果根据parentid查询数据不为空，将dataid为parenti得id值设置到mdm_up_id中
+                        if(CollectionUtils.isNotEmpty(listParentId)){
+                            if(null != listParentId.get(0).get("mdm_up_id")){
+                                map.put("mdm_up_id",listParentId.get(0).get("mdm_up_id")+","+listParentId.get(0).get("id"));
+                            }else{
+                                map.put("mdm_up_id",listParentId.get(0).get("id"));
+                            }
+                        }
+                    }
+
                     //判断输入的主表字段是否是必填项
                     for (ComparisonEntity entity : comparisonEntities) {
                         //如果必填字段不为空
@@ -361,7 +388,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                 }
             }
         }
-        return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数");
+        return BaseResult.getFailureMessageEntity("保存失败","请检查传递参数");
     }
 
     //更新通用数据数据
@@ -440,6 +467,26 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             if(CollectionUtils.isEmpty(comparisonEntitiePages)){
                 return BaseResult.getFailureMessageEntity("根据data_id查询id数据为空，请检查data_id");
             }
+
+            //判断是否是树形结构
+            if(comparisonEntities.get(0).getViewName().equals("1")){
+                //根据data_id查询出parent_id，再根据parent_id得值查询data_id字段中为这个得值,如果有，将data_id为parent_id得id值保存到mdm_up_id中
+                Map<String,Object> mapParent=new HashMap<>();
+                mapParent.put("data_id",comparisonEntitiePages.get(0).get("parent_id"));
+                ComparisonEntity comparisonParent=new ComparisonEntity();
+                comparisonParent.setDbName(comparisonEntity.getDbName());
+                comparisonParent.setMap(mapParent);
+                comparisonParent.setFields(fields);
+                List<Map<String,Object>> comparisonEntitieParent = comparisonDao.queryComparisonPage(comparisonParent);
+                if(!CollectionUtils.isEmpty(comparisonEntitieParent)){
+                    if(null != comparisonEntitieParent.get(0).get("mdm_up_id")){
+                        map.put("mdm_up_id",comparisonEntitieParent.get(0).get("mdm_up_id")+","+comparisonEntitieParent.get(0).get("id"));
+                    }else{
+                        map.put("mdm_up_id",comparisonEntitieParent.get(0).get("id"));
+                    }
+                }
+            }
+
             String id = String.valueOf(comparisonEntitiePages.get(0).get("id"));
             map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443");
             map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443");
@@ -500,7 +547,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                 return BaseResult.getFailureMessageEntity("更新失败");
             }
         }
-        return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数");
+        return BaseResult.getFailureMessageEntity("更新失败","请检查传递参数");
     }
 
     private List<String> getFields(ComparisonEntity comparisonEntity) {
@@ -583,6 +630,12 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             if(CollectionUtils.isEmpty(comparisonEntitiePages)){
                 return BaseResult.getFailureMessageEntity("根据data_id查询id数据为空，请检查data_id");
             }
+
+            //递归删除树结构  1.树  2.列表
+            if(map.get("viewName").equals("1")){
+                return recursiveDeleteComparison(comparisonEntitiePages,comparisonEntity);
+            }
+
             String id = String.valueOf(comparisonEntitiePages.get(0).get("id"));
 
             map.remove("id");
@@ -612,7 +665,59 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                 return BaseResult.getFailureMessageEntity("删除失败");
             }
         }
-        return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数");
+        return BaseResult.getFailureMessageEntity("删除失败","请检查传递参数");
+    }
+
+    //递归删除组织树
+    private Object recursiveDeleteComparison(List<Map<String,Object>> list,ComparisonEntity comparisonEntity){
+        for(int i=0;i<list.size();i++){
+            List<String> fields = getFields(comparisonEntity);
+            Map<String,Object> mapId=new HashMap<>();
+            mapId.put("mdm_up_id",list.get(0).get("id"));
+            ComparisonEntity comparison=new ComparisonEntity();
+            comparison.setDbName(comparisonEntity.getDbName());
+            comparison.setMap(mapId);
+            comparison.setFields(fields);
+            List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparison);
+            if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){
+                recursiveDeleteComparison(comparisonEntitiePages,comparisonEntity);
+            }
+            comparisonEntity.setId(String.valueOf(list.get(0).get("id")));
+            Integer integer = comparisonDao.deleteComparison(comparisonEntity);
+            JSONObject json1 = new JSONObject();
+            json1.put("status","200");
+            json1.put("integer",integer);
+            return json1;
+        }
+        return null;
+    }
+
+    //递归查询组织树
+    private Object recursiveQueryComparison(List<Map<String,Object>> list,ComparisonEntity comparisonEntity){
+        if(CollectionUtils.isNotEmpty(list)) {
+            for (int i = 0; i < list.size(); i++) {
+                List<String> fields = getFields(comparisonEntity);
+                Map<String,Object> mapId=new HashMap<>();
+                mapId.put("mdm_up_id",list.get(0).get("id"));
+                ComparisonEntity comparison=new ComparisonEntity();
+                comparison.setDbName(comparisonEntity.getDbName());
+                comparison.setMap(mapId);
+                comparison.setFields(fields);
+                List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparison);
+                if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){
+                    recursiveQueryComparison(comparisonEntitiePages,comparisonEntity);
+                    for (Map<String, Object> map : list) {
+                        map.put("comparisonEntities",comparisonEntitiePages);
+                    }
+                }
+                PageInfo pageInfo = new PageInfo(list);
+                JSONObject json1=new JSONObject();
+                json1.put("status","200");
+                json1.put("pageInfo",pageInfo);
+                return json1;
+            }
+        }
+        return null;
     }
 
     //根据应用key和应用密钥获取应用编码和应用名称
@@ -704,6 +809,11 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             comparisonEntity.setmId(mdmModuleEntity.getId());
             List<ComparisonEntity> comparisonEntitiesFieldRule = comparisonDao.queryComparisonBymdmIdDbIdFiledId(comparisonEntity);
 
+            //根据mdm_module得id判断是树结构还是列表结构
+            MdmModuleViewEntity mdmModuleViewEntity=new MdmModuleViewEntity();
+            mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
+            List<MdmModuleViewEntity> mdmModuleViewEntities = mdmModuleViewDao.query(mdmModuleViewEntity);
+
             //根据mdm_id查询mdm_module_db的信息
             MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
             mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
@@ -736,6 +846,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                                             comparisonEntityFile.setmId(mdmModuleEntity.getId());
                                             comparisonEntityFile.setMdmName(mdmModuleEntity.getMdmName());
                                             comparisonEntityFile.setMdmCode(String.valueOf(mdmModuleEntity.getMdmCode()));
+                                            comparisonEntityFile.setViewName(CollectionUtils.isNotEmpty(mdmModuleViewEntities)?mdmModuleViewEntities.get(0).getViewName():null);
                                             if(CollectionUtils.isNotEmpty(comparisonEntitiesFieldRule)){
                                                 for (ComparisonEntity entity : comparisonEntitiesFieldRule) {
                                                     if(entity.getEnName().equals(moduleDbFiledsEntity.getEnName()) && entity.getDbType().equals(moduleDbEntity.getDbType())){

service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hzya.frame.sysnew.grovy.service.impl;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
 import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService;
@@ -34,7 +35,7 @@ public class GroovyIntegrationServiceImpl implements IGroovyIntegrationService {
     }
 
     public static void main(String[] args) {
-        java.lang.String str = "{\"data\":{\"document_rule\":\"DDUSER-2024-08-29-00001\",\"create_user_id\":\"c796fd9ba4c9f5ff3cc2fa41a040e443\",\"unionid\":\"coYVgzQqG4CQiia82l3iSsGQiEiE\",\"create_time\":1724917764000,\"modify_time\":1725003633000,\"mobile\":\"13934391285\",\"title\":\"\",\"userid\":\"255217304629918083\",\"document_rule_num\":1,\"add_status\":\"0\",\"update_status\":\"0\",\"event_type\":\"user_modify_org\",\"sts\":\"Y\",\"data_id\":\"255217304629918083\",\"delete_status\":\"1\",\"org_id\":\"0\",\"name\":\"相二林\",\"dept_id_list\":\"[1,921358750]\",\"id\":\"8979640169757689261\",\"job_number\":\"xel123\",\"data_status\":\"F\",\"modify_user_id\":\"c796fd9ba4c9f5ff3cc2fa41a040e443\",\"sorts\":1,\"email\":\"251481237@qq.com\"},\"query\":\"[]\",\"header\":\"[]\",\"body\":\"[{\\\"id\\\":\\\"e5faa5a5-8de4-45d4-bfa9-de80497cb222\\\",\\\"parameterName\\\":\\\"body\\\",\\\"first\\\":true}]\"}";
+        java.lang.String str = "{\"data\":{\"document_rule\":\"DDUSER-2024-09-04-00007\",\"create_user_id\":\"c796fd9ba4c9f5ff3cc2fa41a040e443\",\"unionid\":\"2fkFIWM9iSJAcLxiimUZdUWwiEiE\",\"create_time\":1725413884000,\"modify_time\":1725413884000,\"title\":\"高级软件工程师\",\"hired_date\":1677600000000,\"userid\":\"023822475524346736\",\"document_rule_num\":7,\"add_status\":\"0\",\"update_status\":\"1\",\"event_type\":\"user_modify_org\",\"sts\":\"Y\",\"data_id\":\"023822475524346736\",\"delete_status\":\"1\",\"org_id\":\"0\",\"mdm_dd_user_position\":[{\"create_user_id\":\"c796fd9ba4c9f5ff3cc2fa41a040e443\",\"formmain_id\":\"8740260843790486508\",\"create_time\":1725413884000,\"modify_time\":1725413884000,\"title\":\"高级软件工程师\",\"sts\":\"Y\",\"data_id\":\"5a79ab0bd206414aab97087915e6488a\",\"org_id\":\"0\",\"id\":\"-5911347781273497855\",\"data_status\":\"Y\",\"modify_user_id\":\"c796fd9ba4c9f5ff3cc2fa41a040e443\",\"dept_id\":\"66631023\",\"sorts\":7}],\"name\":\"徐新璐\",\"dept_id_list\":\"[66631023]\",\"id\":\"8740260843790486508\",\"job_number\":\"2176\",\"data_status\":\"Y\",\"modify_user_id\":\"c796fd9ba4c9f5ff3cc2fa41a040e443\",\"sorts\":446},\"query\":\"[]\",\"header\":\"[]\",\"body\":\"[{\\\"id\\\":\\\"e5faa5a5-8de4-45d4-bfa9-de80497cb222\\\",\\\"parameterName\\\":\\\"body\\\",\\\"first\\\":true}]\"}";
         A88772 s = new A88772();
         System.out.println(s.execute(str));
     }
@@ -53,6 +54,18 @@ public class GroovyIntegrationServiceImpl implements IGroovyIntegrationService {
             mdmUser.put("title",data.getString("title"));
             mdmUser.put("dept_id_list",data.getString("dept_id_list"));
             mdmUser.put("dataStatus",data.getString("event_type"));
+            com.alibaba.fastjson.JSONArray array = data.getJSONArray("mdm_dd_user_position");
+            com.alibaba.fastjson.JSONArray postArray = new com.alibaba.fastjson.JSONArray();
+            if (null != array && array.size() > 0){
+                for (int i=0; i<array.size();i++) {
+                    com.alibaba.fastjson.JSONObject jsonObject = array.getJSONObject(i);
+                    com.alibaba.fastjson.JSONObject post = new com.alibaba.fastjson.JSONObject();
+                    post.put("dept_id",jsonObject.getString("dept_id"));
+                    post.put("title",jsonObject.getString("title"));
+                    postArray.add(post);
+                }
+            }
+            mdmUser.put("items",postArray);
             bodys.put("mdm_dd_user",mdmUser);
             returnObject.put("bodys",bodys.toJSONString());
             return returnObject.toJSONString();