From 507d193d16bc32a7cacfd2bf2c19e1db24390414 Mon Sep 17 00:00:00 2001
From: 倪影Alone <8315454+ni-ying-alone@user.noreply.gitee.com>
Date: 星期二, 03 九月 2024 18:13:12 +0800
Subject: [PATCH] 物料业务数据分发功能实现
---
src/main/resources/application.properties | 8 ++++----
src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java | 3 ++-
src/main/java/com/itstyle/mdm/utils/MdmUtils.java | 15 ++++++++++-----
src/main/resources/templates/sysConfig/distribute.html | 1 +
src/main/java/com/itstyle/mdm/entity/MdmData.java | 12 ++++++++++++
src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java | 10 ++++++++++
src/main/resources/templates/log/listlog.html | 4 ++--
7 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/itstyle/mdm/entity/MdmData.java b/src/main/java/com/itstyle/mdm/entity/MdmData.java
index 58381ed..348e81a 100644
--- a/src/main/java/com/itstyle/mdm/entity/MdmData.java
+++ b/src/main/java/com/itstyle/mdm/entity/MdmData.java
@@ -28,4 +28,16 @@
public String getId() {
return id;
}
+
+ @Override
+ public String toString() {
+ return "MdmData{" +
+ "uuid='" + uuid + '\'' +
+ ", id='" + id + '\'' +
+ ", tgcoriginalCode='" + tgcoriginalCode + '\'' +
+ ", updatedat='" + updatedat + '\'' +
+ ", updatetime='" + updatetime + '\'' +
+ ", type='" + type + '\'' +
+ '}';
+ }
}
diff --git a/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java b/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
index 8de44ba..0ea7e0c 100644
--- a/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
+++ b/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
@@ -12,6 +12,16 @@
*/
MDM_LADGPS_MATERIAL_NAME("灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�","/api/V1/zone/getWLCodes"),
+ /**
+ * 灞�鍩熺墿鏂欒瘝鍏哥紪鐮�
+ */
+ MDM_LADGPS_MATERIAL_DICTIONARY("灞�鍩熺墿鏂欒瘝鍏哥紪鐮佹暟鎹幏鍙�","/api/V1/ztwo/getWLCDCodes"),
+
+ /**
+ * 灞�鍩熺墿鏂欒瘝鍏哥紪鐮�
+ */
+ MDM_MATERIAL_DICTIONARY("鐗╂枡涓氬姟缂栫爜鏁版嵁鑾峰彇","/api/V1/zbusiness/getWLYWCodes"),
+
/**
* 涓氬姟鍩虹鏁版嵁缂栫爜鑾峰彇(璁￠噺鍗曚綅)
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 25ea4b3..f84d827 100644
--- a/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java
+++ b/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java
@@ -38,7 +38,7 @@
for (int i = 0; i < size; i++) {
String json = recordArray.get(i).toString();
JSONObject jsonObj = JSON.parseObject(json);
- String id = jsonObj.getString("id");
+ String id = jsonObj.getString("tgctwoclasscode");
String tgcoriginalcode = jsonObj.getString("tgcoriginalcode");
String updatedat = jsonObj.getString("updatedat");
String updatetime = jsonObj.getString("updatetime");
@@ -68,6 +68,7 @@
newJsonArray.add(jsonObj);
//璇存槑璇ユ暟鎹负鏂版暟鎹�
mdmData.setUuid(UUID.randomUUID().toString());
+ System.out.println(mdmData.toString());
dynamicQuery.save(mdmData);
}
}
diff --git a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
index 6330f79..e63158f 100644
--- a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
+++ b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
@@ -51,21 +51,26 @@
records = records.replaceAll("\\p{Z}", "");
JSONObject jsonObj = JSON.parseObject(records);
records = jsonObj.getString("records");
+ records = records.replaceAll("unit","unitName");
+ records = records.replaceAll("jzgg","specification");
+ records = records.replaceAll("model","specificationDisplayName");
+ records = records.replaceAll("namecn","code");
+ records = records.replaceAll("hyflmc","typeCode");
JSONArray recordArray = JSON.parseArray(records);//鐗╂枡鏁版嵁淇℃伅
//灏嗘暟鎹繚瀛樿嚦鏁版嵁搴�
JSONArray newJson = mdmService.saveMdmData(recordArray,name);
if(newJson.size()!=0){
//瀹氫箟杩斿洖json鏍煎紡
- returnJson.append("{\n" +
+ /*returnJson.append("{\n" +
" \"current\": 1,\n" +
" \"orders\": [],\n" +
- " \"pages\": 303,");
- returnJson.append("\"records\": "+newJson.toJSONString());
- returnJson.append(",\n" +
+ " \"pages\": 303,");*/
+ returnJson.append("{\"records\": "+newJson.toJSONString()+"}");
+ /*returnJson.append(",\n" +
" \"searchCount\": true,\n" +
" \"size\": 1,\n" +
" \"total\": 303\n" +
- "}");
+ "}");*/
//杩斿洖json鏍煎紡鍙傛暟
String toString = returnJson.toString();
System.out.println(toString);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 75f57ff..129dea5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -28,10 +28,10 @@
#娉ㄦ剰涓枃涔辩爜
-spring.datasource.url=jdbc:mysql://localhost:3306/quartz?characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
-spring.datasource.username=root
-spring.datasource.password=123456
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://10.240.10.41:3306/quartz?characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
+spring.datasource.username=quartz
+spring.datasource.password=tianheng.mysql
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
# Specify the DBMS
spring.jpa.database = MYSQL
# Show or not log for each sql query
diff --git a/src/main/resources/templates/log/listlog.html b/src/main/resources/templates/log/listlog.html
index dcee87c..5a3d760 100644
--- a/src/main/resources/templates/log/listlog.html
+++ b/src/main/resources/templates/log/listlog.html
@@ -54,10 +54,10 @@
}, {
key : "createTime",
title : "鍙戦�佹椂闂�"
- }, {
+ }/*, {
key : "prams",
title : "璇锋眰鍙傛暟"
- }, {
+ }*/, {
key : "result",
title : "鍝嶅簲缁撴灉"
},{
diff --git a/src/main/resources/templates/sysConfig/distribute.html b/src/main/resources/templates/sysConfig/distribute.html
index 556a190..47d19aa 100644
--- a/src/main/resources/templates/sysConfig/distribute.html
+++ b/src/main/resources/templates/sysConfig/distribute.html
@@ -198,6 +198,7 @@
top.frames[iframeId].vm.formQuartz.address = address;
top.frames[iframeId].vm.formQuartz.description = description;
top.frames[iframeId].vm.formQuartz.association = association;
+ console.log(top.frames[iframeId].vm.formQuartz.association);
top.frames[iframeId].vm.formQuartz.isEnable = isEnable;
top.frames[iframeId].vm.formQuartz.cronExpression = cronExpression;
},
--
Gitblit v1.8.0