From 2f9849905dbb8d65faa28628a40084708a0386ef Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 25 十二月 2025 10:58:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasMapController.java | 159 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 145 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 2c91165..fbfd4db 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -2,19 +2,28 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasMap;
+import com.zy.asrs.entity.BasStation;
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasMapService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.service.BasStationService;
+import com.zy.asrs.service.DeviceConfigService;
import com.zy.asrs.utils.MapExcelUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.common.web.BaseController;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.StationObjModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -29,7 +38,15 @@
@Autowired
private BasMapService basMapService;
@Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private DeviceConfigService deviceConfigService;
+ @Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private MapExcelUtils mapExcelUtils;
+ @Autowired
+ private BasStationService basStationService;
@RequestMapping(value = "/basMap/{id}/auth")
@ManagerAuth
@@ -140,20 +157,29 @@
return R.ok().add(basMap.getData());
}
- @Autowired
- private MapExcelUtils mapExcelUtils;
+ @GetMapping("/basMap/getLevList")
+ @ManagerAuth
+ public R getLevList() {
+ List<Integer> levList = basMapService.getLevList();
+ return R.ok().add(levList);
+ }
@PostMapping("/basMap/crn/upload")
- public R uploadExcel2(@RequestParam("file") MultipartFile file) throws IOException {
+ public R uploadExcel(@RequestParam("file") MultipartFile file) throws IOException {
// 淇濆瓨涓婁紶鐨勬枃浠跺埌涓存椂浣嶇疆
String filePath = System.getProperty("java.io.tmpdir") + file.getOriginalFilename();
file.transferTo(new File(filePath));
HashMap<Integer, List<List<HashMap<String, Object>>>> dataMap = mapExcelUtils.readExcel(filePath);
+ HashMap<Integer, List<StationObjModel>> deviceStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> barcodeStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> inStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> outStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> runBlockReassignStationMap = new HashMap<>();
- List<List<HashMap<String, Object>>> dataList = new ArrayList<>();
for (Map.Entry<Integer, List<List<HashMap<String, Object>>>> entry : dataMap.entrySet()) {
- Integer key = entry.getKey();
+ Integer lev = entry.getKey();
+ List<List<HashMap<String, Object>>> dataList = new ArrayList<>();
List<List<HashMap<String, Object>>> list = entry.getValue();
for (int i = 0; i < list.size(); i++) {
@@ -172,9 +198,60 @@
}else if (nodeType.equals("RGB(255,192,0)")) {
//鍫嗗灈鏈�
nodeData.put("type", "crn");
+ }else if (nodeType.equals("RGB(255,255,0)")) {
+ //鍙屽伐浣嶅爢鍨涙満
+ nodeData.put("type", "dualCrn");
}else if (nodeType.equals("RGB(0,112,192)")) {
//杈撻�佺嚎
nodeData.put("type", "devp");
+
+ JSONObject value = JSON.parseObject(String.valueOf(map.get("value")));
+ Integer deviceNo = value.getInteger("deviceNo");
+ StationObjModel stationObjModel = new StationObjModel();
+ stationObjModel.setDeviceNo(deviceNo);
+ stationObjModel.setStationId(value.getInteger("stationId"));
+ stationObjModel.setStationLev(lev);
+
+ List<StationObjModel> stationList = deviceStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ stationList.add(stationObjModel);
+ deviceStationMap.put(deviceNo, stationList);
+
+ Integer isBarcodeStation = value.getInteger("isBarcodeStation");
+ if (isBarcodeStation != null && isBarcodeStation == 1) {
+ List<StationObjModel> barcodeStationList = barcodeStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ barcodeStationList.add(stationObjModel);
+ barcodeStationMap.put(deviceNo, barcodeStationList);
+ }
+
+ Integer isInStation = value.getInteger("isInStation");
+ if (isInStation != null && isInStation == 1) {
+ StationObjModel inStationModel = new StationObjModel();
+ StationObjModel barcodeStation = new StationObjModel();
+ inStationModel.setDeviceNo(deviceNo);
+ inStationModel.setStationId(value.getInteger("stationId"));
+ inStationModel.setBarcodeStation(barcodeStation);
+
+ barcodeStation.setDeviceNo(value.getInteger("barcodeStationDeviceNo"));
+ barcodeStation.setStationId(value.getInteger("barcodeStation"));
+
+ List<StationObjModel> inStationList = inStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ inStationList.add(inStationModel);
+ inStationMap.put(deviceNo, inStationList);
+ }
+
+ Integer isOutStation = value.getInteger("isOutStation");
+ if (isOutStation != null && isOutStation == 1) {
+ List<StationObjModel> outStationList = outStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ outStationList.add(stationObjModel);
+ outStationMap.put(deviceNo, outStationList);
+ }
+
+ Integer runBlockReassign = value.getInteger("runBlockReassign");
+ if (runBlockReassign != null && runBlockReassign == 1) {
+ List<StationObjModel> runBlockReassignStationList = runBlockReassignStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ runBlockReassignStationList.add(stationObjModel);
+ runBlockReassignStationMap.put(deviceNo, runBlockReassignStationList);
+ }
}else if (nodeType.equals("RGB(0,176,240)")) {
//RGV
nodeData.put("type", "rgv");
@@ -195,17 +272,71 @@
}
dataList.add(arrayList);
}
+
+ BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", lev));
+ if (basMap == null){
+ basMap = new BasMap();
+ }
+ basMap.setData(JSON.toJSONString(dataList));
+ basMap.setOriginData(JSON.toJSONString(dataList));
+ basMap.setCreateTime(new Date());
+ basMap.setUpdateTime(new Date());
+ basMap.setLev(lev);
+ basMapService.insertOrUpdate(basMap);
}
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
- if (basMap == null){
- basMap = new BasMap();
- }
- basMap.setData(JSON.toJSONString(dataList));
- basMap.setOriginData(JSON.toJSONString(dataList));
- basMap.setCreateTime(new Date());
- basMap.setUpdateTime(new Date());
- basMapService.insertOrUpdate(basMap);
+ basStationService.delete(new EntityWrapper<>());
+
+ deviceStationMap.forEach((deviceNo, stationList) -> {
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceNo));
+ if (basDevp == null){
+ basDevp = new BasDevp();
+ basDevp.setDevpNo(deviceNo);
+ basDevp.setCreateTime(new Date());
+ basDevp.setStatus(1);
+ }
+
+ List<StationObjModel> barcodeStationList = barcodeStationMap.get(deviceNo);
+ List<StationObjModel> inStationList = inStationMap.get(deviceNo);
+ List<StationObjModel> outStationList = outStationMap.get(deviceNo);
+ List<StationObjModel> runBlockReassignStationList = runBlockReassignStationMap.get(deviceNo);
+
+ if (barcodeStationList != null) {
+ basDevp.setBarcodeStationList(JSON.toJSONString(barcodeStationList, SerializerFeature.DisableCircularReferenceDetect));
+ }
+
+ if (inStationList != null) {
+ basDevp.setInStationList(JSON.toJSONString(inStationList, SerializerFeature.DisableCircularReferenceDetect));
+ }
+
+ if (outStationList != null) {
+ basDevp.setOutStationList(JSON.toJSONString(outStationList, SerializerFeature.DisableCircularReferenceDetect));
+ }
+
+ if (runBlockReassignStationList != null) {
+ basDevp.setRunBlockReassignLocStationList(JSON.toJSONString(runBlockReassignStationList, SerializerFeature.DisableCircularReferenceDetect));
+ }
+
+ basDevp.setStationList(JSON.toJSONString(stationList, SerializerFeature.DisableCircularReferenceDetect));
+ basDevp.setUpdateTime(new Date());
+ basDevpService.insertOrUpdate(basDevp);
+
+ DeviceConfig deviceConfig = deviceConfigService.selectOne(new EntityWrapper<DeviceConfig>().eq("device_no", deviceNo).eq("device_type", String.valueOf(SlaveType.Devp)));
+ if (deviceConfig != null){
+ deviceConfig.setFakeInitStatus(JSON.toJSONString(stationList));
+ deviceConfigService.updateById(deviceConfig);
+ }
+
+ for (StationObjModel stationObjModel : stationList) {
+ BasStation basStation = new BasStation();
+ basStation.setStationId(stationObjModel.getStationId());
+ basStation.setDeviceNo(stationObjModel.getDeviceNo());
+ basStation.setStationLev(stationObjModel.getStationLev());
+ basStation.setCreateTime(new Date());
+ basStation.setStatus(1);
+ basStationService.insert(basStation);
+ }
+ });
return R.ok();
}
--
Gitblit v1.9.1