From 241ab413828a3627a123ae001fc05f5c35031861 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期六, 24 一月 2026 14:34:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 204 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 190 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 83f5d5c..30569f8 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,13 +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.BasStation;
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.*;
@@ -16,7 +28,6 @@
import javax.servlet.http.HttpServletRequest;
import java.util.*;
-import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -26,11 +37,15 @@
private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
@Autowired
- private com.zy.asrs.service.TvDeviceService tvDeviceService;
+ private TvDeviceService tvDeviceService;
@Autowired
- private com.zy.asrs.service.BasStationTvService basStationTvService;
+ private BasStationTvService basStationTvService;
@Autowired
- private com.zy.asrs.service.BasStationService basStationService;
+ private StationUtils stationUtils;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private AnnouncementService announcementService;
@Value("${app.version:1.0.0}")
private String appVersion;
@@ -53,14 +68,12 @@
@GetMapping("/getLedInfos")
public R getLedInfos(HttpServletRequest request) {
String remoteAddr = request.getRemoteAddr();
- // 1. 鏍规嵁IP鏌ヨ鐢佃鏈�
TvDevice tvDevice = tvDeviceService.selectOne(
new EntityWrapper<TvDevice>().eq("ip", remoteAddr));
if (tvDevice == null) {
return R.error("鏈壘鍒癐P瀵瑰簲鐨勭數瑙嗘満璁惧: " + remoteAddr);
}
- // 2. 鏌ヨ缁戝畾鐨勭珯鍙癐D
List<BasStationTv> relations = basStationTvService
.selectList(new EntityWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
if (relations == null || relations.isEmpty()) {
@@ -69,14 +82,136 @@
return r;
}
- // 3. 鑾峰彇绔欏彴璇︽儏
- List<Integer> stationIds = relations.stream().map(BasStationTv::getStationId)
- .collect(Collectors.toList());
- List<BasStation> stations = basStationService.selectBatchIds(stationIds);
- R r = R.ok();
- r.put("data", stations);
- return r;
+ 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());
+
+ if (wcsStationDto == null) {
+ continue;
+ }
+
+ if (wcsStationDto.getLoading() != 1) {
+ continue;
+ }
+
+ String errorMsg = "";
+ if (!Cools.isEmpty(wcsStationDto.getErrorMsg())) {
+ errorMsg += wcsStationDto.getErrorMsg();
+ }
+
+ 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());
+ tvDataDto.setTaskNo(wcsStationDto.getTaskNo());
+ tvDataDto.setBarcode(wcsStationDto.getBarcode());
+ tvDataDto.setErrorMsg(errorMsg);
+ tvDataDto.setIoType(wcsStationDto.getIoType());
+ tvDataDto.setWrkDetls(wcsStationDto.getWrkDetls());
+
+ if (Cools.isEmpty(errorMsg)) {
+ tvDataDto.setErrorCode(0);
+ }else {
+ tvDataDto.setErrorCode(1);
+ }
+
+ list.add(tvDataDto);
+ }
+
+ return R.ok().add(list);
+ }
+
+ @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));
}
/**
@@ -98,4 +233,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