From 38ecb3eb89d582ea73a6ead1bb81439390068ba2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 01 四月 2025 11:17:50 +0800
Subject: [PATCH] 删除多余数字
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index afbca94..78ec958 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -78,7 +79,7 @@
EdgGlassTaskInfoService edgGlassTaskInfoService;
@Override
- public List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell) {
+ public JSONObject queryCurrentCutDrawing(int deviceId, int stationCell) {
// 鑾峰彇鏈潯绾垮綋鍓嶆鍦ㄦ墽琛岀殑宸ョ▼
Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getState, 1).eq(Engineering::getStationCell, stationCell));
@@ -106,7 +107,12 @@
patternSequence = lastGlass.getPatternSequence();
}
}
- return baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
+ JSONObject jsonObject = new JSONObject();
+ List<CutDrawingVO> currentCutDrawings = baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
+ jsonObject.append("currentCutTerritory", currentCutDrawings);
+ jsonObject.append("engineer", engineering.getEngineerId());
+ jsonObject.append("sequence", patternSequence);
+ return jsonObject;
}
@Override
--
Gitblit v1.8.0