From 182dd03086a2dbff1058b92bcf9864398bef2ae8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 05 二月 2024 21:40:57 +0800
Subject: [PATCH] 地图保存解析设备id错误
---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/plant/PlantService.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/plant/PlantService.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/plant/PlantService.java
index 2480006..6259868 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/plant/PlantService.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/plant/PlantService.java
@@ -40,15 +40,12 @@
Plant p = new Plant();
p.setName(plantDTO.getName());
p.setGridSetting(plantDTO.getGridSetting());
-
plantMapper.insert(p);
-
Long plantId = p.getId();
- List<Integer> machineIds = this.parseMachineIdInGrid(plantDTO.getGridSetting());
-
- for(Integer mid:machineIds ) {
+ List<Long> machineIds = this.parseMachineIdInGrid(plantDTO.getGridSetting());
+ for(Long mid:machineIds ) {
Machine m = machineMapper.selectById(mid);
if(m != null) {
m.setPlantId(plantId);
@@ -58,8 +55,13 @@
}
- public List<Integer> parseMachineIdInGrid(String gridSetting){
- List<Integer> macineIds = new ArrayList<>();
+ /**
+ * 瑙ｆ瀽鍑哄湴鍥句腑鍖呮嫭鐨勮澶噄d
+ * @param gridSetting
+ * @return
+ */
+ public List<Long> parseMachineIdInGrid(String gridSetting){
+ List<Long> macineIds = new ArrayList<>();
try {
JSONArray arr1 = JSONArray.parseArray(gridSetting);
@@ -70,7 +72,7 @@
for(int j=0;j<arr2.size();j++) {
node = arr2.getJSONObject(j);
if(node.containsKey("id")) {
- macineIds.add(node.getInteger("id"));
+ macineIds.add(node.getLong("id"));
}
}
}
@@ -93,8 +95,8 @@
String oriGridSetting = p.getGridSetting();
//娓呯┖鍘熸湁鐨刴achine鐨刾lantId
- List<Integer> oriMachineIds = this.parseMachineIdInGrid(oriGridSetting);
- for(Integer mid:oriMachineIds ) {
+ List<Long> oriMachineIds = this.parseMachineIdInGrid(oriGridSetting);
+ for(Long mid:oriMachineIds ) {
Machine m = machineMapper.selectById(mid);
if(m != null) {
m.setPlantId(null);
@@ -103,10 +105,10 @@
}
//鏂伴厤缃殑鏈哄簥锛屾洿鏂皃lantId
- List<Integer> machineIds = this.parseMachineIdInGrid(plantDTO.getGridSetting());
+ List<Long> machineIds = this.parseMachineIdInGrid(plantDTO.getGridSetting());
Long plantId = plantDTO.getId();
- for(Integer mid:machineIds ) {
+ for(Long mid : machineIds) {
Machine m = machineMapper.selectById(mid);
if(m != null) {
m.setPlantId(plantId);
--
Gitblit v1.9.3