From d4be7bbd5d1889d434c5d45d94fb625b3b120242 Mon Sep 17 00:00:00 2001 From: lld <15027638633@163.com> Date: Sat, 31 Jan 2026 20:18:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A7=E5=88=B6=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E6=97=A5=E5=BF=97,=E4=BB=A5=E5=8F=8A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/tool/TestController.java | 17 +++++++++++++++++ agri-admin/src/main/resources/application.yml | 2 +- .../agri/framework/config/SecurityConfig.java | 2 +- .../interceptor/DeviceStatusHandler.java | 4 ++-- .../interceptor/FrontendControlHandler.java | 1 - .../com/agri/system/domain/SysDevOperLog.java | 12 ++++++++++++ .../mapper/system/SysAgriLimitMapper.xml | 2 ++ .../mapper/system/SysDevOperLogMapper.xml | 6 +++++- 8 files changed, 40 insertions(+), 6 deletions(-) diff --git a/agri-admin/src/main/java/com/agri/web/controller/tool/TestController.java b/agri-admin/src/main/java/com/agri/web/controller/tool/TestController.java index b2b6d96..a6cde8c 100644 --- a/agri-admin/src/main/java/com/agri/web/controller/tool/TestController.java +++ b/agri-admin/src/main/java/com/agri/web/controller/tool/TestController.java @@ -1,8 +1,10 @@ package com.agri.web.controller.tool; import com.agri.common.core.controller.BaseController; +import com.agri.common.core.domain.AjaxResult; import com.agri.common.core.domain.R; import com.agri.common.utils.StringUtils; +import com.agri.framework.config.MqttConfig; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.swagger.annotations.Api; @@ -11,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; +import org.eclipse.paho.client.mqttv3.MqttException; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -37,6 +41,9 @@ import java.util.Map; @RequestMapping("/test/user") public class TestController extends BaseController { + @Resource + private MqttConfig.MqttMessageSender mqttMessageSender; + private final static Map users = new LinkedHashMap(); { users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); @@ -118,6 +125,16 @@ public class TestController extends BaseController return R.fail("用户不存在"); } } + + + @RequestMapping("getStatus") + public void getStatus() throws MqttException { + + + mqttMessageSender.publish("dtu/864865085008135/down", "{\"jbk\":0,\"read\":true}"); + logger.info("{\"jbk\":0,\"read\":true}"); + + } } @ApiModel(value = "UserEntity", description = "用户实体") diff --git a/agri-admin/src/main/resources/application.yml b/agri-admin/src/main/resources/application.yml index 3c696e3..dc7946e 100644 --- a/agri-admin/src/main/resources/application.yml +++ b/agri-admin/src/main/resources/application.yml @@ -43,7 +43,7 @@ server: # 日志配置 logging: level: - com.agri: info + com.agri: debug org.springframework: warn # 用户配置 diff --git a/agri-framework/src/main/java/com/agri/framework/config/SecurityConfig.java b/agri-framework/src/main/java/com/agri/framework/config/SecurityConfig.java index 6d9cacf..e93c26e 100644 --- a/agri-framework/src/main/java/com/agri/framework/config/SecurityConfig.java +++ b/agri-framework/src/main/java/com/agri/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage","/api/mqtt/status").permitAll() + requests.antMatchers("/login", "/register", "/captchaImage","/api/mqtt/status","/test/user/getStatus").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/agri-framework/src/main/java/com/agri/framework/interceptor/DeviceStatusHandler.java b/agri-framework/src/main/java/com/agri/framework/interceptor/DeviceStatusHandler.java index 37bd235..9c0d79b 100644 --- a/agri-framework/src/main/java/com/agri/framework/interceptor/DeviceStatusHandler.java +++ b/agri-framework/src/main/java/com/agri/framework/interceptor/DeviceStatusHandler.java @@ -190,9 +190,9 @@ public class DeviceStatusHandler { .set(SysDevOperLog::getAckReceived,1) .set(SysDevOperLog::getIsLockSuc,1) .set(SysDevOperLog::getAckSuc, 1) - .set(SysDevOperLog::getUpdateBy,"自动关") + .set(SysDevOperLog::getUpdateBy,"设备回执") .set(SysDevOperLog::getIsTask,autoOffSeconds > 0?1:0) - .set(ObjectUtils.isEmpty(autoOffSeconds), SysDevOperLog::getNoTaskReason,"当前运行时间：【"+autoOffSeconds+"】") + .set(SysDevOperLog::getNoTaskReason,autoOffSeconds > 0?null:"【自动关任务】标记不符合执行运行时间未配置，当前运行时间：【"+autoOffSeconds+"】") .set(SysDevOperLog::getAck, payload) .set(SysDevOperLog::getExecResult, 1) .update(); diff --git a/agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java b/agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java index 75a3fd6..8a80a26 100644 --- a/agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java +++ b/agri-framework/src/main/java/com/agri/framework/interceptor/FrontendControlHandler.java @@ -219,7 +219,6 @@ public class FrontendControlHandler { .set(SysDevOperLog::getIsLockSuc,1) .set(SysDevOperLog::getAckSuc, 1) .set(SysDevOperLog::getIsTask, 1) - .set(SysDevOperLog::getUpdateBy,"自动关") .set(autoOffSeconds <= 0, SysDevOperLog::getNoTaskReason,"当前运行时间：【"+autoOffSeconds+"】") .set(SysDevOperLog::getUpdateBy, "测试") .set(SysDevOperLog::getExecResult, 1) diff --git a/agri-system/src/main/java/com/agri/system/domain/SysDevOperLog.java b/agri-system/src/main/java/com/agri/system/domain/SysDevOperLog.java index 56d3170..2beea05 100644 --- a/agri-system/src/main/java/com/agri/system/domain/SysDevOperLog.java +++ b/agri-system/src/main/java/com/agri/system/domain/SysDevOperLog.java @@ -79,6 +79,9 @@ public class SysDevOperLog extends BaseEntity @Excel(name = "是否触发定时任务") private int isTask; + @Excel(name = "大棚运行时间限位") + private int runTime; + /** 未触发原因 */ @Excel(name = "未触发原因") private String noTaskReason; @@ -264,6 +267,14 @@ public class SysDevOperLog extends BaseEntity this.version = version; } + public int getRunTime() { + return runTime; + } + + public void setRunTime(int runTime) { + this.runTime = runTime; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -281,6 +292,7 @@ public class SysDevOperLog extends BaseEntity .append("ackSuc", getAckSuc()) .append("isLockSuc", getIsLockSuc()) .append("isTask", getIsTask()) + .append("runTime", getRunTime()) .append("noTaskReason", getNoTaskReason()) .append("ack", getAck()) .append("execResult", getExecResult()) diff --git a/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml b/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml index 4d741fe..2a6e645 100644 --- a/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml +++ b/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml @@ -138,4 +138,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file diff --git a/agri-system/src/main/resources/mapper/system/SysDevOperLogMapper.xml b/agri-system/src/main/resources/mapper/system/SysDevOperLogMapper.xml index 8ea617a..fa9d6b9 100644 --- a/agri-system/src/main/resources/mapper/system/SysDevOperLogMapper.xml +++ b/agri-system/src/main/resources/mapper/system/SysDevOperLogMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, agri_name, imei, func_code, op_type, op_source, payload, lock_acquired, lock_holder, task_status, ack_received, ack_suc, is_lock_suc, is_task, no_task_reason, ack, exec_result, skip_reason, latest_state, remark, version, create_by, create_time, update_by, update_time from sys_dev_oper_log + select id, agri_name, imei, func_code, op_type, op_source, payload, lock_acquired, lock_holder, task_status, ack_received, ack_suc, is_lock_suc, is_task, run_time, no_task_reason, ack, exec_result, skip_reason, latest_state, remark, version, create_by, create_time, update_by, update_time from sys_dev_oper_log