From 0cbb588628da7bcdca146420a672916a76df2e0c Mon Sep 17 00:00:00 2001
From: niying <132>
Date: 星期一, 29 一月 2024 11:53:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java b/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java
index cec9ff3..25ea4b3 100644
--- a/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java
+++ b/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java
@@ -29,7 +29,7 @@
@Override
@Transactional
- public JSONArray saveMdmData(JSONArray recordArray) {
+ public JSONArray saveMdmData(JSONArray recordArray,String name) {
JSONArray newJsonArray = new JSONArray();
int size = recordArray.size();
Object[] params = new Object[]{};
@@ -43,7 +43,7 @@
String updatedat = jsonObj.getString("updatedat");
String updatetime = jsonObj.getString("updatetime");
mdmData = new MdmData();
- mdmData.setType("灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�");
+ mdmData.setType(name);
mdmData.setId(id);
mdmData.setTgcoriginalCode(tgcoriginalcode);
mdmData.setUpdatedat(updatedat);
@@ -76,6 +76,54 @@
}
@Override
+ @Transactional
+ public JSONArray saveMdmUnitData(JSONArray recordArray, String name) {
+ JSONArray newJsonArray = new JSONArray();
+ int size = recordArray.size();
+ Object[] params = new Object[]{};
+ MdmData mdmData = null;
+ if(size != 0){
+ for (int i = 0; i < size; i++) {
+ String json = recordArray.get(i).toString();
+ JSONObject jsonObj = JSON.parseObject(json);
+ String id = jsonObj.getString("code");
+ String tgcoriginalcode = jsonObj.getString("originalcode");
+ //String updatedat = jsonObj.getString("updatedat");
+ String updatetime = jsonObj.getString("updatetime");
+ mdmData = new MdmData();
+ mdmData.setType(name);
+ mdmData.setId(id);
+ mdmData.setTgcoriginalCode(tgcoriginalcode);
+ mdmData.setUpdatedat("");
+ mdmData.setUpdatetime(updatetime);
+ String countSql = "SELECT mdm.uuid,mdm.id,mdm.tgcoriginalCode,mdm.updatedat,mdm.updatetime FROM mdm_data AS mdm where mdm.tgcoriginalCode='"+tgcoriginalcode+"' ";
+ List<MdmData> list = dynamicQuery.nativeQueryList(MdmData.class,countSql,params);
+ if(list.size()>0){
+ //璇存槑瀛樺湪鏁版嵁
+ for (MdmData mdm : list) {
+ String updatetime1 = mdm.getUpdatetime();
+ if(updatetime1.equals(updatetime)){
+ //鏁版嵁鏃犲彉鍖�
+ continue;
+ }
+ jsonObj.put("renewstatus","update");
+ newJsonArray.add(jsonObj);
+ //鏁版嵁瀛樺湪鍙樺寲
+ dynamicQuery.update(mdm);//鏇存柊鏁版嵁
+ }
+ }else {
+ jsonObj.put("renewstatus","new");
+ newJsonArray.add(jsonObj);
+ //璇存槑璇ユ暟鎹负鏂版暟鎹�
+ mdmData.setUuid(UUID.randomUUID().toString());
+ dynamicQuery.save(mdmData);
+ }
+ }
+ }
+ return newJsonArray;
+ }
+
+ @Override
public List<SysConfigEntity> querySysConfigs(String interfaceName) {
Object[] params = new Object[]{interfaceName};
String countSql = "select id,ADDRESS as address,DESCRIPTION as description,cronExpression,isEnable,sysName,association from sys_config where isEnable='鍚敤' and association=?";
--
Gitblit v1.8.0