From 572466e8ebaa67f1809a97ecf912d30e8802fd98 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 28 四月 2025 14:18:39 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/webservice/impl/EquipmentWebServiceImpl.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/webservice/impl/EquipmentWebServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/webservice/impl/EquipmentWebServiceImpl.java
index 21e1507..70d9563 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/webservice/impl/EquipmentWebServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/webservice/impl/EquipmentWebServiceImpl.java
@@ -15,6 +15,8 @@
import javax.annotation.Resource;
import javax.jws.WebService;
+import java.util.ArrayList;
+import java.util.List;
/**
@@ -38,10 +40,18 @@
@Override
public String equipmentDaySchedule(String msg) {
log.info("MES涓婃姤鏃ヨ鍒掑師濮嬫暟鎹� === {}", msg);
- EquipmentDaySchedule equipmentDaySchedule = JSONObject.parseObject(msg, EquipmentDaySchedule.class);
- MdcEquipmentDaySchedule mdcEquipmentDaySchedule = new MdcEquipmentDaySchedule();
- BeanUtils.copyProperties(equipmentDaySchedule, mdcEquipmentDaySchedule);
- mdcEquipmentDayScheduleService.save(mdcEquipmentDaySchedule);
+ List<EquipmentDaySchedule> equipmentDayScheduleList = JSONObject.parseArray(msg, EquipmentDaySchedule.class);
+ if (equipmentDayScheduleList == null || equipmentDayScheduleList.isEmpty()) {
+ WsResult wsResult = new WsResult("0", "json瑙ｆ瀽澶辫触");
+ return JSONObject.toJSONString(wsResult);
+ }
+ List<MdcEquipmentDaySchedule> mdcEquipmentDayScheduleList = new ArrayList<>();
+ for (EquipmentDaySchedule equipmentDaySchedule : equipmentDayScheduleList) {
+ MdcEquipmentDaySchedule mdcEquipmentDaySchedule = new MdcEquipmentDaySchedule();
+ BeanUtils.copyProperties(equipmentDaySchedule, mdcEquipmentDaySchedule);
+ mdcEquipmentDayScheduleList.add(mdcEquipmentDaySchedule);
+ }
+ mdcEquipmentDayScheduleService.saveBatch(mdcEquipmentDayScheduleList);
log.info("MES涓婃姤鏃ヨ鍒掓暟鎹垚鍔燂紒");
WsResult wsResult = new WsResult("1", "鎴愬姛");
@@ -51,11 +61,18 @@
@Override
public String equipmentDaySummary(String msg) {
log.info("MES涓婃姤鏃ユ眹鎬诲師濮嬫暟鎹� === {}", msg);
- EquipmentDaySummary equipmentDaySummary = JSONObject.parseObject(msg, EquipmentDaySummary.class);
- MdcEquipmentDaySummary mdcEquipmentDaySummary = new MdcEquipmentDaySummary();
- BeanUtils.copyProperties(equipmentDaySummary, mdcEquipmentDaySummary);
- mdcEquipmentDaySummaryService.save(mdcEquipmentDaySummary);
-
+ List<EquipmentDaySummary> equipmentDaySummaryList = JSONObject.parseArray(msg, EquipmentDaySummary.class);
+ if (equipmentDaySummaryList == null || equipmentDaySummaryList.isEmpty()) {
+ WsResult wsResult = new WsResult("0", "json瑙ｆ瀽澶辫触");
+ return JSONObject.toJSONString(wsResult);
+ }
+ List<MdcEquipmentDaySummary> mdcEquipmentDaySummaryList = new ArrayList<>();
+ for (EquipmentDaySummary equipmentDaySummary : equipmentDaySummaryList) {
+ MdcEquipmentDaySummary mdcEquipmentDaySummary = new MdcEquipmentDaySummary();
+ BeanUtils.copyProperties(equipmentDaySummary, mdcEquipmentDaySummary);
+ mdcEquipmentDaySummaryList.add(mdcEquipmentDaySummary);
+ }
+ mdcEquipmentDaySummaryService.saveBatch(mdcEquipmentDaySummaryList);
log.info("MES涓婃姤鏃ユ眹鎬绘暟鎹垚鍔燂紒");
WsResult wsResult = new WsResult("1", "鎴愬姛");
return JSONObject.toJSONString(wsResult);
--
Gitblit v1.9.3