From 62a399b547c3bd8c7081f7470ce66a6e17cf6d6f Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 29 一月 2026 16:33:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 147 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 98b40ca..c887cb7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,17 +1,25 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.BasStationTv;
import com.zy.asrs.entity.TvDevice;
import com.zy.asrs.entity.dto.TvDataDto;
+import com.zy.asrs.entity.dto.TvLocDataDto;
import com.zy.asrs.entity.dto.WcsStationDto;
+import com.zy.asrs.enums.RedisKeyType;
import com.zy.asrs.service.BasStationTvService;
import com.zy.asrs.service.TvDeviceService;
import com.zy.asrs.utils.StationUtils;
import com.zy.asrs.utils.Utils;
+import com.zy.common.utils.RedisUtil;
+import com.zy.system.entity.Announcement;
+import com.zy.system.service.AnnouncementService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +42,10 @@
private BasStationTvService basStationTvService;
@Autowired
private StationUtils stationUtils;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private AnnouncementService announcementService;
@Value("${app.version:1.0.0}")
private String appVersion;
@@ -71,6 +83,12 @@
}
+ String manualError = "";
+ Object manualErrorObj = redisUtil.get(RedisKeyType.TV_MANUAL_ERROR_MSG.key);
+ if (manualErrorObj != null) {
+ manualError = String.valueOf(manualErrorObj);
+ }
+
List<TvDataDto> list = new ArrayList<>();
for (BasStationTv relation : relations) {
WcsStationDto wcsStationDto = stationUtils.stationMap.get(relation.getStationId());
@@ -91,6 +109,12 @@
if (!Cools.isEmpty(wcsStationDto.getSystemWarning())) {
errorMsg += wcsStationDto.getSystemWarning();
}
+ if (!Cools.isEmpty(manualError)) {
+ if (!Cools.isEmpty(errorMsg)) {
+ errorMsg += "锛�";
+ }
+ errorMsg += manualError;
+ }
TvDataDto tvDataDto = new TvDataDto();
tvDataDto.setStationId(wcsStationDto.getStationId());
@@ -109,7 +133,88 @@
list.add(tvDataDto);
}
- return R.ok().add(list);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("data", list);
+ map.put("deviceName", tvDevice.getName());
+ return R.ok().add(map);
+ }
+
+ @GetMapping("/getError")
+ public R getError(HttpServletRequest request) {
+ Set<String> errors = new LinkedHashSet<>();
+ Object manualErrorObj = redisUtil.get(RedisKeyType.TV_MANUAL_ERROR_MSG.key);
+ String manualError = manualErrorObj == null ? "" : String.valueOf(manualErrorObj);
+ if (!Cools.isEmpty(manualError)) {
+ errors.add(manualError);
+ }
+
+ String remoteAddr = request.getRemoteAddr();
+ TvDevice tvDevice = tvDeviceService.selectOne(
+ new EntityWrapper<TvDevice>().eq("ip", remoteAddr));
+ if (tvDevice != null) {
+ List<BasStationTv> relations = basStationTvService
+ .selectList(new EntityWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
+ if (relations != null && !relations.isEmpty()) {
+ for (BasStationTv relation : relations) {
+ WcsStationDto wcsStationDto = stationUtils.stationMap.get(relation.getStationId());
+ if (wcsStationDto == null) {
+ continue;
+ }
+ if (wcsStationDto.getLoading() != 1) {
+ continue;
+ }
+ String deviceError = "";
+ if (!Cools.isEmpty(wcsStationDto.getErrorMsg())) {
+ deviceError += wcsStationDto.getErrorMsg();
+ }
+ if (!Cools.isEmpty(wcsStationDto.getSystemWarning())) {
+ if (!Cools.isEmpty(deviceError)) {
+ deviceError += "锛�";
+ }
+ deviceError += wcsStationDto.getSystemWarning();
+ }
+ if (!Cools.isEmpty(deviceError)) {
+ errors.add(deviceError);
+ }
+ }
+ }
+ }
+
+ String errorMsg = String.join("锛�", errors);
+ Map<String, Object> result = new HashMap<>();
+ result.put("errorMsg", errorMsg);
+ return R.ok(result);
+ }
+
+ @GetMapping("/manualError/auth")
+ @ManagerAuth
+ public R getManualErrorAuth() {
+ Object manualErrorObj = redisUtil.get(RedisKeyType.TV_MANUAL_ERROR_MSG.key);
+ String manualError = manualErrorObj == null ? "" : String.valueOf(manualErrorObj);
+ Map<String, Object> result = new HashMap<>();
+ result.put("manualError", manualError);
+ return R.ok(result);
+ }
+
+ @PostMapping("/manualError/auth")
+ @ManagerAuth
+ public R setManualError(@RequestBody JSONObject param) {
+ String manualError = param.getString("manualError");
+ if (Cools.isEmpty(manualError)) {
+ redisUtil.del(RedisKeyType.TV_MANUAL_ERROR_MSG.key);
+ return R.ok();
+ }
+ redisUtil.set(RedisKeyType.TV_MANUAL_ERROR_MSG.key, manualError);
+ return R.ok();
+ }
+
+ @GetMapping("/announcement")
+ public R top5(){
+ EntityWrapper<Announcement> wrapper = new EntityWrapper<>();
+ wrapper.eq("status", 1);
+ wrapper.orderBy("create_time", false);
+ wrapper.last("limit 5");
+ return R.ok(announcementService.selectList(wrapper));
}
/**
@@ -131,4 +236,45 @@
);
}
+ /**
+ * 鑾峰彇搴撲綅鏁版嵁
+ */
+ @GetMapping("/queryLoc")
+ public R queryLoc() {
+ TvLocDataDto tvLocDataDto = new TvLocDataDto();
+ Object o = redisUtil.get(RedisKeyType.TV_LOC_DATA_DTO.key);
+ if(o == null){
+ return R.ok().add(tvLocDataDto);
+ }
+
+ tvLocDataDto = JSON.parseObject(o.toString(), TvLocDataDto.class);
+ return R.ok().add(tvLocDataDto);
+ }
+
+ /**
+ * WMS鍏ュ嚭搴撴姌绾垮浘
+ */
+ @GetMapping("/inOutLineCharts")
+ public R inOutLineCharts() {
+ Object o = redisUtil.get(RedisKeyType.TV_LINE_CHARTS.key);
+ if(o == null){
+ return R.error();
+ }
+
+ return R.ok().add(JSON.parseObject(o.toString()));
+ }
+
+ /**
+ * WMS搴撳瓨鏁版嵁缁熻
+ */
+ @GetMapping("/locDetlStatistics")
+ public R locDetlStatistics() {
+ Object o = redisUtil.get(RedisKeyType.TV_LOC_DETL_STATISTICS.key);
+ if(o == null){
+ return R.error();
+ }
+
+ return R.ok().add(JSON.parseArray(o.toString()));
+ }
+
}
--
Gitblit v1.9.1