From 5a0dbf5c84f677c9f20252ccc63221dc7ba68d6c Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 15 五月 2025 08:48:07 +0800 Subject: [PATCH] 修改项 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/webservice/impl/EquipmentWebServiceImpl.java | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 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..26d8c68 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; /** @@ -37,26 +39,41 @@ @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); + log.info("鎺ユ敹MES涓婃姤鏃ヨ鍒掑師濮嬫暟鎹� === {}", msg); + List<EquipmentDaySchedule> equipmentDayScheduleList = JSONObject.parseArray(msg, EquipmentDaySchedule.class); + if (equipmentDayScheduleList == null || equipmentDayScheduleList.isEmpty()) { + WsResult wsResult = new WsResult("0", "json瑙f瀽澶辫触"); + 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涓婃姤鏃ヨ鍒掓暟鎹垚鍔燂紒"); + log.info("鎺ユ敹MES涓婃姤鏃ヨ鍒掓暟鎹垚鍔燂紒"); WsResult wsResult = new WsResult("1", "鎴愬姛"); return JSONObject.toJSONString(wsResult); } @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); - - log.info("MES涓婃姤鏃ユ眹鎬绘暟鎹垚鍔燂紒"); + log.info("鎺ユ敹MES涓婃姤鏃ユ眹鎬诲師濮嬫暟鎹� === {}", msg); + List<EquipmentDaySummary> equipmentDaySummaryList = JSONObject.parseArray(msg, EquipmentDaySummary.class); + if (equipmentDaySummaryList == null || equipmentDaySummaryList.isEmpty()) { + WsResult wsResult = new WsResult("0", "json瑙f瀽澶辫触"); + 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