From 3dd4c5adaf15c19d7e9171bab7910fc202081f67 Mon Sep 17 00:00:00 2001
From: yuqh <123456>
Date: Fri, 23 Aug 2024 15:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EU8=E4=B8=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8A=BD=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdm/mdmModule/entity/MdmModuleEntity.xml  |   2 +
 .../sys/viewFiled/entity/ViewFiledMapper.xml  |   2 +-
 .../service/impl/MasterDataServiceImpl.java   | 128 +++++++++++++++++-
 3 files changed, 127 insertions(+), 5 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
index 4c3d4b73..325ec5df 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@@ -926,6 +926,7 @@ where id = #{id}
             USER_TAB_COLUMNS
         WHERE
           TABLE_NAME =  #{tableName}
+        and table_schema = 'businesscenter'
 
     </select>
 
@@ -934,6 +935,7 @@ where id = #{id}
         SELECT LOWER(COLUMN_NAME)
         FROM information_schema.columns
         WHERE table_name = #{tableName}
+            and table_schema = 'businesscenter'
     </select>
     <!-- 分页查询列表 采用like格式 -->
     <select id="queryMdmST" resultType="com.alibaba.fastjson.JSONObject"  parameterType="java.util.HashMap">
diff --git a/service/src/main/java/com/hzya/frame/sys/viewFiled/entity/ViewFiledMapper.xml b/service/src/main/java/com/hzya/frame/sys/viewFiled/entity/ViewFiledMapper.xml
index 6bf6dd04..f1c16322 100644
--- a/service/src/main/java/com/hzya/frame/sys/viewFiled/entity/ViewFiledMapper.xml
+++ b/service/src/main/java/com/hzya/frame/sys/viewFiled/entity/ViewFiledMapper.xml
@@ -415,7 +415,7 @@ FROM
     INFORMATION_SCHEMA.COLUMNS
 WHERE
      TABLE_NAME = #{tableName}
-		and TABLE_SCHEMA = 'businesscenter'
+    table_schema = 'businesscenter'
 
 
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java
index 60b0b85d..fffa210f 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataServiceImpl.java
@@ -100,14 +100,26 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
                     case "5":
                         //通过主数据编码判断，不同的接口走不通的查询逻辑
                         switch (mdmCode){
-                            case "10003"://致远用户信息
-                                tableName = "mdm_user";
-                                listAll = bindingUser(jsonObject, mdmModuleSourceEntity, dbCode,startTime,endTime);
+                            case "10011"://U8物料信息
+                                tableName = "mdm_materiel";
+                                listAll = bindingU8Materiel(jsonObject, mdmModuleSourceEntity, dbCode,startTime,endTime);
+                                break;
+                            case "10013"://U8仓库信息
+                                tableName = "mdm_warehouse";
+                                listAll = bindingU8Warehouse(jsonObject, mdmModuleSourceEntity, dbCode,startTime,endTime);
+                                break;
+                            case "10004"://U8客户信息
+                                tableName = "mdm_customer";
+                                listAll = bindingU8Customer(jsonObject, mdmModuleSourceEntity, dbCode,startTime,endTime);
                                 break;
                             default:
                                 logger.info("未匹配到主数据的编码，请检查");
                                 break;
                         }
+                        break;
+                    default:
+                        logger.info("未知系统，请检查");
+                        break;
                 }
                 //调用主数据接口进行数据推送或更新
                 if (null != listAll && listAll.size() > 0) {
@@ -122,6 +134,114 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
         }
         return BaseResult.getSuccessMessageEntity("主数据同步成功");
     }
+
+    private List<JSONObject> bindingU8Customer(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode, String startTime, String endTime) {
+        List<JSONObject> list = new ArrayList<>();
+        StringBuffer sb = new StringBuffer();
+        if(null != jsonObject && StrUtil.isNotEmpty(jsonObject.getString("code"))){
+            String code = jsonObject.getString("code");
+            sb.append(" and a.ccuscode = '"+code+"'");
+        }else{
+//            ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
+            sb.append(" and a.dModifyDate >= '"+startTime+"'");
+            sb.append(" and a.dModifyDate <> '"+endTime+"'");
+        }
+        StringBuffer stringBuffer = new StringBuffer();
+        stringBuffer.append("select * from v_hzya_Customer a WHERE 1=1 " +sb.toString());
+        mdmModuleSourceEntity.setDataSourceCode(dbCode);
+        List<HashMap<String, Object>> hashMaps = masterDataDaoImpl.queryArchivesByDataSource(stringBuffer.toString(),mdmModuleSourceEntity);
+        if(CollectionUtils.isNotEmpty(hashMaps)){
+            for (HashMap<String, Object> hashMap : hashMaps) {
+                JSONObject main = new JSONObject();
+                JSONObject mdm_cust = new JSONObject();
+                for(String key:hashMap.keySet()) {
+                    mdm_cust.put(key, hashMap.get(key));
+                }
+                //获取明细信息
+                String ccuscode = (String) hashMap.get("ccuscode");
+                StringBuffer stringBufferDetails = new StringBuffer();
+                stringBufferDetails.append("select * from v_hzya_CustomerBank WHERE cCusCode = '"+ccuscode+"' " );
+                List<HashMap<String, Object>> hashMapsDetails = masterDataDaoImpl.queryArchivesByDataSource(stringBufferDetails.toString(),mdmModuleSourceEntity);
+                JSONArray mdm_customer_bank = new JSONArray();
+                if(CollectionUtils.isNotEmpty(hashMapsDetails)){
+                    for (HashMap<String, Object> detailsMap : hashMapsDetails) {
+                        JSONObject details = new JSONObject();
+                        for (String key : detailsMap.keySet()) {
+                            details.put(key, detailsMap.get(key));
+                        }
+                        mdm_customer_bank.add(details);
+                    }
+                }
+                main.put("mdm_customer_bank",mdm_customer_bank);
+                main.put("mdm_customer",mdm_cust);
+                list.add(main);
+            }
+        }
+        return list;
+    }
+
+    private List<JSONObject> bindingU8Warehouse(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode, String startTime, String endTime) {
+        List<JSONObject> list = new ArrayList<>();
+        StringBuffer sb = new StringBuffer();
+        if(null != jsonObject && StrUtil.isNotEmpty(jsonObject.getString("code"))){
+            String code = jsonObject.getString("code");
+            sb.append(" and a.cwhcode = '"+code+"'");
+        }else{
+//            ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
+            sb.append(" and a.dModifyDate >= '"+startTime+"'");
+            sb.append(" and a.dModifyDate <> '"+endTime+"'");
+        }
+        StringBuffer stringBuffer = new StringBuffer();
+        stringBuffer.append("select * from v_hzya_Warehouse a where 1=1 " + sb.toString());
+//                " WHERE 1=1 and a.id = '-2698997042624247722'");
+        mdmModuleSourceEntity.setDataSourceCode(dbCode);
+        List<HashMap<String, Object>> hashMaps = masterDataDaoImpl.queryArchivesByDataSource(stringBuffer.toString(),mdmModuleSourceEntity);
+        int i = 0;
+        if(CollectionUtils.isNotEmpty(hashMaps)){
+            for (HashMap<String, Object> hashMap : hashMaps) {
+                JSONObject main = new JSONObject();
+                JSONObject mdm_warehouse = new JSONObject();
+                for(String key:hashMap.keySet()) {
+                    mdm_warehouse.put(key, hashMap.get(key));
+                }
+                main.put("mdm_warehouse",mdm_warehouse);
+                list.add(main);
+            }
+        }
+        return list;
+    }
+
+    private List<JSONObject> bindingU8Materiel(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode, String startTime, String endTime) {
+        List<JSONObject> list = new ArrayList<>();
+        StringBuffer sb = new StringBuffer();
+        if(null != jsonObject && StrUtil.isNotEmpty(jsonObject.getString("code"))){
+            String code = jsonObject.getString("code");
+            sb.append(" and a.cinvccode = '"+code+"'");
+        }else{
+//            ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
+            sb.append(" and a.dModifyDate >= '"+startTime+"'");
+            sb.append(" and a.dModifyDate <> '"+endTime+"'");
+        }
+        StringBuffer stringBuffer = new StringBuffer();
+        stringBuffer.append("select * from v_hzya_Inventory a where 1=1 " + sb.toString());
+//                " WHERE 1=1 and a.id = '-2698997042624247722'");
+        mdmModuleSourceEntity.setDataSourceCode(dbCode);
+        List<HashMap<String, Object>> hashMaps = masterDataDaoImpl.queryArchivesByDataSource(stringBuffer.toString(),mdmModuleSourceEntity);
+        int i = 0;
+        if(CollectionUtils.isNotEmpty(hashMaps)){
+            for (HashMap<String, Object> hashMap : hashMaps) {
+                JSONObject main = new JSONObject();
+                JSONObject mdm_materiel = new JSONObject();
+                for(String key:hashMap.keySet()) {
+                    mdm_materiel.put(key, hashMap.get(key));
+                }
+                main.put("mdm_materiel",mdm_materiel);
+                list.add(main);
+            }
+        }
+        return list;
+    }
+
     //绑定银行
     private List<JSONObject> binDingBank(JSONObject jsonObject, MdmModuleSourceEntity mdmModuleSourceEntity, String dbCode)throws Exception {
         List<JSONObject> list = new ArrayList<>();
@@ -247,7 +367,7 @@ public class MasterDataServiceImpl extends BaseService<ComparisonEntity, String>
                 Object attribute = comparisonServiceimpl.queryEntityPage(jsonStr);
                 logger.info("得到的attribute值为：{}", JSON.toJSONString(attribute));
                 JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute);
-                JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list");
+                JSONArray jsonArrayList = jsonObjectAttribute.getJSONObject("pageInfo").getJSONArray("list");
                 //如果jsonArrayList为null，说明没有值，在表中不存在
                 if (jsonArrayList == null || jsonArrayList.size() == 0) {
 //                    //将查询出来得数据调用通用接口新增，保存到表中