From 6867f6de91378cc8e9e1fe291131d7db0d2993a0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 17 十月 2025 23:23:29 +0800
Subject: [PATCH] 对接

---
 src/main/java/com/zy/asrs/task/AgvWarnScheduler.java |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
index 5a653bc..ba3471c 100644
--- a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
@@ -1,6 +1,5 @@
 package com.zy.asrs.task;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -51,11 +50,12 @@
     private AgvBasMapper agvBasMapper;
 
 
+
     /**
      *  鍒犻櫎鍛婅鏃ュ織
      */
     @Scheduled(cron = "0 0 1 * * ? ")
-    private void delWarnLog() {
+    public void delWarnLog() {
         String format = DateUtil.format(DateUtil.offsetMonth(new Date(), -1), "yyyy-MM-dd HH:mm:ss");
         List<AgvWarnLog> agvWarnList = agvWarnLogService.selectList(new EntityWrapper<AgvWarnLog>().le("modi_time", format));
         for (AgvWarnLog agvWarn : agvWarnList) {
@@ -67,7 +67,7 @@
      * 瓒呰繃涓�鍒嗛挓娌℃洿鏂扮殑锛屽垹闄�
      */
     @Scheduled(fixedDelay = 10000)
-    private void del() {
+    public void del() {
         String format = DateUtil.format(DateUtil.offsetMinute(new Date(), -1), "yyyy-MM-dd HH:mm:ss");
         List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().le("modi_time", format));
         for (AgvWarn agvWarn : agvWarnList) {
@@ -76,7 +76,7 @@
     }
 
     @Scheduled(fixedDelay = 20000)
-    private void report() {
+    public void report() {
         List<Agv> agvs = agvBasMapper.selectList(new EntityWrapper<Agv>());
         Config first = configService.selectOne(new EntityWrapper<Config>().eq("code", "AGV_WARN_RATE1"));
         Config second = configService.selectOne(new EntityWrapper<Config>().eq("code", "AGV_WARN_RATE2"));
@@ -87,27 +87,35 @@
         HashMap<String, Object> sendData = new HashMap<>();
         for (AgvWarn agvWarn : agvWarnList) {
             Integer warnTime = getWarnTime(agvWarn.getTimes(), first.getValue(), second.getValue(), third.getValue());
-            DateTime begin = DateUtil.parse(agvWarn.getBeginTime(), "yyyy-MM-dd HH:mm:ss");
+            Date begin = DateUtil.parse(agvWarn.getBeginTime(), "yyyy-MM-dd HH:mm:ss");
+            if (DateUtil.offsetMinute(agvWarn.getAppeTime(), -3).after(begin)) {
+                begin = agvWarn.getAppeTime();
+            }
             if (DateUtil.offsetMinute(new Date(), -warnTime).after(begin)) {
                 buffer = new StringBuffer();
-                buffer.append(processRegion(agvs, agvWarn.getRobotCode()) + "[" + agvWarn.getRobotCode() + "]鍙稟GV灏忚溅鎶ヨ浜哱n");
+                String s = processRegion(agvs, agvWarn.getRobotCode());
+                if (s == null) {
+                    continue;
+                }
+                buffer.append(s + "[" + agvWarn.getRobotCode() + "]鍙稟GV灏忚溅鎶ヨ浜哱n");
                 buffer.append("鎶ヨ绫诲瀷锛�" + agvWarn.getWarnContent() + "\n");
                 if (!Cools.isEmpty(agvWarn.getSourceLocNo())) {
                     buffer.append("浠�:[" + agvWarn.getSourceLocNo() + "]鍒癧" + agvWarn.getLocNo() + "]\n");
                 }
-                buffer.append("鎶ヨ寮�濮嬫椂闂�:" + agvWarn.getBeginTime() + "\n");
-                buffer.append("褰撳墠鏃堕棿:" + DateUtil.formatDateTime(new Date()) + "\n");
-                int i = agvWarn.getTimes() + 1;
+                //buffer.append("鎶ヨ寮�濮嬫椂闂�:" + agvWarn.getBeginTime() + "\n");
+                buffer.append("鎶ヨ寮�濮嬫椂闂�:" + DateUtil.formatDateTime(begin) + "\n");
+                buffer.append("褰撳墠鏃堕棿:" + DateUtil.formatDateTime(new Date()));
+                //int i = agvWarn.getTimes() + 1;
                 //buffer.append("绗琜" + i + "]娆℃姤璀�");
                 HashMap<String, Object> param = new HashMap<>();
                 HashMap<String, Object> data = new HashMap<>();
                 data.put("content", buffer.toString());
                 param.put("msgtype", "text");
                 param.put("text", data);
-                //log.info("鍙戦�佹姤璀︿俊鎭細{}", JSON.toJSONString(param));
                 sendData.put(agvWarn.getRobotCode() + agvWarn.getWarnContent(), param);
             }
             for (HashMap.Entry<String, Object> entry : sendData.entrySet()) {
+                log.info("鍙戦�佹姤璀︿俊鎭細{}", JSON.toJSONString(entry.getValue()));
                 String response = null;
                 try {
                     response = new HttpHandler.Builder().setUri(url.getValue()).setJson(JSON.toJSONString(entry.getValue())).setHttps(true).build().doPost();
@@ -117,9 +125,8 @@
                 JSONObject jsonObject = JSON.parseObject(response);
                 if (jsonObject.get("errmsg").equals("ok")) {
                     agvWarn.setTimes(agvWarn.getTimes() + 1);
+                    agvWarn.setModiTime(new Date());
                     agvWarnService.updateById(agvWarn);
-                    //鍙戦�佹垚鍔�
-                    return;
                 } else {
                     log.error("鍙戦�佸け璐ワ紝閿欒淇℃伅锛歿}", jsonObject.get("errmsg"));
                 }
@@ -152,6 +159,9 @@
         }
         for (Agv agv : agvs) {
             if (agv.getAgvNo() != null && agv.getAgvNo().equals(agvNo)) {
+                if (!Cools.isEmpty(agv.getFlag()) && agv.getFlag() == 1) {
+                    return null;
+                }
                 return agv.getRegion();
             }
         }

--
Gitblit v1.9.1