优化代码，移除冗余，修复bug

zhangc

2025-01-14 9c7b28c7b7cfc1c5f411d72e401a947eaba6b06b

 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;
@@ -87,7 +86,10 @@
        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() + "]号AGV小车报警了\n");
@@ -95,19 +97,21 @@
                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 +121,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"));
                }