定时器修改

huimv-env-admin/src/main/java/com/huimv/env/admin/config/ApiPrefixAutoConfiguration.java

@@ -1,16 +1,16 @@
-package com.huimv.env.admin.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
-
-    @Override
-    public void configurePathMatch(PathMatchConfigurer configurer) {
-        configurer.addPathPrefix("/smarteleApi",  c -> c.isAnnotationPresent(RestController.class));
-    }
-
-}
+//package com.huimv.env.admin.config;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//@Configuration
+//public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
+//
+//    @Override
+//    public void configurePathMatch(PathMatchConfigurer configurer) {
+//        configurer.addPathPrefix("/smarteleApi",  c -> c.isAnnotationPresent(RestController.class));
+//    }
+//
+//}

huimv-env-admin/src/main/java/com/huimv/env/admin/config/InterceptorConfig.java

@@ -1,26 +1,26 @@
-package com.huimv.env.admin.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @Description: 注册验证tocken的拦截器
- * @Author
- * @Date 2021/4/19 20:41
- * @Version V1.0
- */
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
-    @Bean
-    public JWTInterceptor jwtInterceptor(){
-        return new JWTInterceptor();
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/smarteleApi/admin/my/*");
-    }
-}
+//package com.huimv.env.admin.config;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+///**
+// * @Description: 注册验证tocken的拦截器
+// * @Author
+// * @Date 2021/4/19 20:41
+// * @Version V1.0
+// */
+//@Configuration
+//public class InterceptorConfig implements WebMvcConfigurer {
+//    @Bean
+//    public JWTInterceptor jwtInterceptor(){
+//        return new JWTInterceptor();
+//    }
+//
+//    @Override
+//    public void addInterceptors(InterceptorRegistry registry) {
+//        registry.addInterceptor(jwtInterceptor()).
+//                excludePathPatterns("/smarteleApi/admin/my/*");
+//    }
+//}

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/TerminalPort.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fhs.core.trans.anno.Trans;
@@ -95,7 +96,7 @@ public class TerminalPort implements TransPojo {
 
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     @TableField("status")
     private Integer status;

huimv-env-admin/src/main/java/com/huimv/env/admin/timer/DeviceTimer.java

@@ -39,22 +39,42 @@ public class DeviceTimer {
     @Scheduled(cron = "0 0 0/1 * * ? ")
     private void action() {
         Date date = new Date(System.currentTimeMillis() - 1000 * 60 * 60); // 1小时前
+
+        List<TerminalPort> terminalPortss = portMapper.selectList(null);
+        for (TerminalPort terminal : terminalPortss) {
+            if (null == terminal.getUpdateTime() || date.after(terminal.getUpdateTime())) {
+                terminal.setStatus(0);
+            } else {
+                terminal.setStatus(1);
+            }
+            portMapper.updateById(terminal);
+        }
+        List<Terminal> terminals = terminalMapper.selectList(null);
+        for (Terminal terminal : terminals) {
+            terminal.setStatus(0);
+            terminalMapper.updateById(terminal);
+        }
+        List<Gateway> geteways = gatewayMapper.selectList(null);
+        for (Gateway gateway : geteways) {
+            gateway.setStatus(0);
+            gatewayMapper.updateById(gateway);
+        }
+
         List<HeartDto> heartDtos = heartInfoMapper.listHeart();
         for (HeartDto heartDto : heartDtos) {
-
             if (date.after(heartDto.getCreateTime())) {
                 //说明一个小时内都没有心跳
                 QueryWrapper<Terminal> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("device_code", heartDto.getTerminalCode());
                 Terminal terminal = terminalMapper.selectOne(queryWrapper);
                 if (ObjectUtil.isNotEmpty(terminal)) {
-                    terminal.setStatus(1);
+                    terminal.setStatus(0);
                     terminalMapper.updateById(terminal);
                     QueryWrapper<TerminalPort> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.eq("terminal_id", terminal.getId());
                     List<TerminalPort> terminalPorts = portMapper.selectList(queryWrapper1);
                     for (TerminalPort terminalPort : terminalPorts) {
-                        terminalPort.setStatus(1);
+                        terminalPort.setStatus(0);
                         portMapper.updateById(terminalPort);
                     }
                 }
@@ -63,15 +83,15 @@ public class DeviceTimer {
                 queryWrapper.eq("device_code", heartDto.getTerminalCode());
                 Terminal terminal = terminalMapper.selectOne(queryWrapper);
                 if (ObjectUtil.isNotEmpty(terminal)) {
-                    terminal.setStatus(0);
+                    terminal.setStatus(1);
                     terminalMapper.updateById(terminal);
-                    QueryWrapper<TerminalPort> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.eq("terminal_id", terminal.getId());
-                    List<TerminalPort> terminalPorts = portMapper.selectList(queryWrapper1);
-                    for (TerminalPort terminalPort : terminalPorts) {
-                        terminalPort.setStatus(0);
-                        portMapper.updateById(terminalPort);
-                    }
+//                    QueryWrapper<TerminalPort> queryWrapper1 = new QueryWrapper<>();
+//                    queryWrapper1.eq("terminal_id", terminal.getId());
+//                    List<TerminalPort> terminalPorts = portMapper.selectList(queryWrapper1);
+//                    for (TerminalPort terminalPort : terminalPorts) {
+//                        terminalPort.setStatus(1);
+//                        portMapper.updateById(terminalPort);
+//                    }
                 }
             }
         }
@@ -83,7 +103,7 @@ public class DeviceTimer {
                 queryWrapper.eq("device_code", heartDto.getTerminalCode());
                 Gateway terminal = gatewayMapper.selectOne(queryWrapper);
                 if (ObjectUtil.isNotEmpty(terminal)) {
-                    terminal.setStatus(1);
+                    terminal.setStatus(0);
                     gatewayMapper.updateById(terminal);
                 }
             } else {
@@ -91,7 +111,7 @@ public class DeviceTimer {
                 queryWrapper.eq("device_code", heartDto.getTerminalCode());
                 Gateway terminal = gatewayMapper.selectOne(queryWrapper);
                 if (ObjectUtil.isNotEmpty(terminal)) {
-                    terminal.setStatus(0);
+                    terminal.setStatus(1);
                     gatewayMapper.updateById(terminal);
                 }
             }