From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/timer/LedWebsocket.java | 72 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/timer/LedWebsocket.java b/src/main/java/com/zy/asrs/timer/LedWebsocket.java
index 3cdd235..3e2209f 100644
--- a/src/main/java/com/zy/asrs/timer/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/timer/LedWebsocket.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
-
import com.zy.asrs.entity.AxisBean;
import com.zy.asrs.entity.LocChartPie;
import com.zy.asrs.entity.LocDetl;
@@ -13,10 +12,8 @@
import com.zy.asrs.service.LocDetlService;
import com.zy.common.config.WebSocketServer;
import com.zy.common.service.CommonService;
-
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
@@ -26,7 +23,7 @@
@Slf4j
public class LedWebsocket {
- private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
+ private static final String[] WEEK = {"鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�"};
@Autowired
private ReportQueryMapper reportQueryMapper;
@@ -35,13 +32,13 @@
@Autowired
private LocDetlService locDetlService;
- @Scheduled(cron = "0/2 * * * * ? ")
+ // @Scheduled(cron = "0/2 * * * * ? ")
private void send() {
//楗煎浘
List<Map<String, Object>> pie = new ArrayList<>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
+ if (locUseRate != null) {
Map<String, Object> map = new HashMap<>();
map.put("name", "鍦ㄥ簱");
map.put("value", locUseRate.getFqty());
@@ -71,30 +68,30 @@
double usedPr = Arith.multiplys(1, usedDivides, 100);
//鎶樼嚎鍥�
- Map<String,Object> map=new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<String, Object>();
List<AxisBean> list = new ArrayList<AxisBean>();
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
- if(listChart!=null) {
+ if (listChart != null) {
ArrayList<Integer> data1 = new ArrayList<Integer>();
ArrayList<Integer> data2 = new ArrayList<Integer>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
+ for (int i = 0; i < 12; i++) {
boolean flag = true;
calendar.add(Calendar.DATE, 1);
String str = sf.format(calendar.getTime());
- for(WorkChartAxis workChart : listChart) {
- if(str.equals(workChart.getYmd())) {
+ for (WorkChartAxis workChart : listChart) {
+ if (str.equals(workChart.getYmd())) {
data1.add(workChart.getInqty());
data2.add(workChart.getOutqty());
flag = false;
break;
}
}
- if(flag) {
+ if (flag) {
data1.add(0);
data2.add(0);
}
@@ -113,35 +110,36 @@
//浠撳簱鏁版嵁
EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
locDetlEntityWrapper.setSqlSelect("matnr,COUNT(*) as matnrCount").groupBy("matnr");
- List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
+ List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
Date now = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(now);
// Map<String, Object> map = new HashMap<>();
- map.put("to","all");
- map.put("message", Cools.add("type", "default").add("pie", pie)
- .add("stockCunt", locUseRate.getFqty())
- .add("emptyCount", locUseRate.getOqty())
- .add("noneCount", locUseRate.getXqty())
- .add("total", total)
- .add("used", used)
- .add("usedPr", usedPr)
- .add("rows",list)
- .add("year", calendar.get(Calendar.YEAR))
- .add("month", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MONTH)+1), 2))
- .add("day", CommonService.zerofill(String.valueOf(calendar.get(Calendar.DATE)), 2))
- .add("hour", CommonService.zerofill(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)), 2))
- .add("minute", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MINUTE)), 2))
- .add("second", CommonService.zerofill(String.valueOf(calendar.get(Calendar.SECOND)) , 2))
- .add("week", WEEK[calendar.get(Calendar.DAY_OF_WEEK)-1])
- .add("inventoryData",selectMap));
- webSocketServer.onMessage(JSONObject.toJSONString(map),null,"all");
+ map.put("to", "all");
+ map.put("message", Cools.add("type", "default").add("pie", pie)
+ .add("stockCunt", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("noneCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
+ .add("rows", list)
+ .add("year", calendar.get(Calendar.YEAR))
+ .add("month", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MONTH) + 1), 2))
+ .add("day", CommonService.zerofill(String.valueOf(calendar.get(Calendar.DATE)), 2))
+ .add("hour", CommonService.zerofill(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)), 2))
+ .add("minute", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MINUTE)), 2))
+ .add("second", CommonService.zerofill(String.valueOf(calendar.get(Calendar.SECOND)), 2))
+ .add("week", WEEK[calendar.get(Calendar.DAY_OF_WEEK) - 1])
+ .add("inventoryData", selectMap));
+ webSocketServer.onMessage(JSONObject.toJSONString(map), null, "all");
}
- @Scheduled(cron = "0/2 * * * * ? ")
- private void errorSend(){
- Map<String,Object> map=new HashMap<String, Object>();
+
+ // @Scheduled(cron = "0/2 * * * * ? ")
+ private void errorSend() {
+ Map<String, Object> map = new HashMap<String, Object>();
// for (LedSlave slave : slaveProperties.getLed()) {
// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
// if (null != ledThread) {
@@ -153,9 +151,9 @@
// }
}
- @Scheduled(cron = "0/2 * * * * ? ")
- private void TaskSend(){
- Map<String,Object> map=new HashMap<String, Object>();
+ // @Scheduled(cron = "0/2 * * * * ? ")
+ private void TaskSend() {
+ Map<String, Object> map = new HashMap<String, Object>();
// List<LedCommand> commandList = null;
// for (LedSlave slave : slaveProperties.getLed()) {
// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
--
Gitblit v1.9.1