添加设备在线率统计

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

@@ -1,26 +1,26 @@
-package com.huimv.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("/huatongApi/admin/my/*");
-    }
-}
+//package com.huimv.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("/huatongApi/admin/my/*");
+//    }
+//}

huimv-admin/src/main/java/com/huimv/admin/config/JWTInterceptor.java

@@ -1,81 +1,81 @@
-package com.huimv.admin.config;
-
-import com.alibaba.fastjson.JSONObject;
-import com.huimv.admin.common.token.TokenConstant;
-import com.huimv.admin.common.token.TokenSign;
-import io.jsonwebtoken.Claims;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
- *  jwt拦截器
- * </p>
- * @since 2021/4/19
- */
-public class JWTInterceptor implements HandlerInterceptor {
-
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        // 如果不是映射到方法，则直接通过
-        if (!(handler instanceof HandlerMethod)) {
-            return true;
-        }
-
-        response.setContentType("application/json;charset=utf-8");
-        // 获取token
-        String token=request.getHeader("accessToken");
-
-
-        if (null==token){
-            Map<String,Object> map=new HashMap<>();
-            map.put("data","token is null");
-            map.put("code","401");
-            response.setStatus(401);
-            response.getWriter().write(JSONObject.toJSONString(map));
-            return false;
-        }else {
-            Claims claims = TokenSign.getClaims(token);
-            if (claims == null){
-                Map<String,Object> map=new HashMap<>();
-                map.put("data","token is overdue");
-                map.put("code","403");
-                response.setStatus(403);
-                response.getWriter().write(JSONObject.toJSONString(map));
-                return false;
-            }
-
-            boolean result= TokenSign.verify(token);
-            if (result){
-                //更新存储的token信息
-                TokenConstant.updateTokenMap(token);
-                return true;
-            }
-            Map<String,Object> map=new HashMap<>();
-            map.put("data","token is null");
-            map.put("code","401");
-            response.setStatus(401);
-            response.getWriter().write(JSONObject.toJSONString(map));
-            return false;
-
-        }
-    }
-
-
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-
-    }
-}
+//package com.huimv.admin.config;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.huimv.admin.common.token.TokenConstant;
+//import com.huimv.admin.common.token.TokenSign;
+//import io.jsonwebtoken.Claims;
+//import org.springframework.web.method.HandlerMethod;
+//import org.springframework.web.servlet.HandlerInterceptor;
+//import org.springframework.web.servlet.ModelAndView;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * <p>
+// *  jwt拦截器
+// * </p>
+// * @since 2021/4/19
+// */
+//public class JWTInterceptor implements HandlerInterceptor {
+//
+//
+//    @Override
+//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+//        // 如果不是映射到方法，则直接通过
+//        if (!(handler instanceof HandlerMethod)) {
+//            return true;
+//        }
+//
+//        response.setContentType("application/json;charset=utf-8");
+//        // 获取token
+//        String token=request.getHeader("accessToken");
+//
+//
+//        if (null==token){
+//            Map<String,Object> map=new HashMap<>();
+//            map.put("data","token is null");
+//            map.put("code","401");
+//            response.setStatus(401);
+//            response.getWriter().write(JSONObject.toJSONString(map));
+//            return false;
+//        }else {
+//            Claims claims = TokenSign.getClaims(token);
+//            if (claims == null){
+//                Map<String,Object> map=new HashMap<>();
+//                map.put("data","token is overdue");
+//                map.put("code","403");
+//                response.setStatus(403);
+//                response.getWriter().write(JSONObject.toJSONString(map));
+//                return false;
+//            }
+//
+//            boolean result= TokenSign.verify(token);
+//            if (result){
+//                //更新存储的token信息
+//                TokenConstant.updateTokenMap(token);
+//                return true;
+//            }
+//            Map<String,Object> map=new HashMap<>();
+//            map.put("data","token is null");
+//            map.put("code","401");
+//            response.setStatus(401);
+//            response.getWriter().write(JSONObject.toJSONString(map));
+//            return false;
+//
+//        }
+//    }
+//
+//
+//    @Override
+//    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+//
+//    }
+//
+//    @Override
+//    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+//
+//    }
+//}

huimv-admin/src/main/java/com/huimv/admin/controller/EnvDeviceOnlineController.java

@@ -34,7 +34,7 @@ public class EnvDeviceOnlineController {
     @RequestMapping("/list")
     public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        List<EnvDeviceOnline> list = envDeviceOnlineService.list(new QueryWrapper<EnvDeviceOnline>().eq("farm_id", farmId).orderByDesc("creat_time"));
+        List<EnvDeviceOnline> list = envDeviceOnlineService.list(new QueryWrapper<EnvDeviceOnline>().eq("farm_id", farmId).orderByAsc("creat_time"));
         return  new Result(ResultCode.SUCCESS,list);
     }
 

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtDataServiceImpl.java

@@ -779,6 +779,7 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
         jsonObject.put("WarningCount", count1);
         jsonObject.put("day", day);
         jsonObject.put("flowCount", protData.getFlow());
+        jsonObject.put("online", protData.getFlow());
         return new Result(ResultCode.SUCCESS,jsonObject);
     }