制造数据修改

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,82 @@
-//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/service/impl/EnvDeviceServiceImpl.java

@@ -289,7 +289,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         JSONArray jsonArray = new JSONArray();
         for (int i = 0; i < basePigpens.size(); i++) {
             QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.like("other2", basePigpens.get(i).getId());
+            queryWrapper1.like("other2", basePigpens.get(i).getId()).eq("f_type",2);
             List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的楼层
             for (int j = 0; j < basePigpens1.size(); j++) {
                 QueryWrapper<EnvDevice> deviceQueryWrapper = new QueryWrapper<>();

huimv-admin/src/main/java/com/huimv/admin/timer/EnergyTimer.java

@@ -41,10 +41,10 @@ public class EnergyTimer {
             basePigpenQueryWrapper.eq("id", energyEnvDevice.getUnitId()).eq("farm_id", energyEnvDevice.getFarmId());
             BasePigpen basePigpen = basePigpenMapper.selectOne(basePigpenQueryWrapper);
 
-            String feed = NumberUtils.getNum(83, 85, 1);
-            String water = NumberUtils.getNum(250, 270, 1);
-            String gas = NumberUtils.getNum(250, 270, 1);
-            String electricity = NumberUtils.getNum(83, 85, 1);
+            String feed = NumberUtils.getNum(70, 90, 1);
+            String water = NumberUtils.getNum(200, 280, 1);
+            String gas = NumberUtils.getNum(200, 280, 1);
+            String electricity = NumberUtils.getNum(70, 90, 1);
 
             EnergyData energyData = new EnergyData();
             energyData.setCreateDate(new Date());

huimv-admin/src/main/java/com/huimv/admin/timer/GasTimer.java

@@ -33,15 +33,15 @@ public class  GasTimer {
         String type = NumberUtils.getNum(1, 5, 0);//loc_type
         for (int i = 1; i < 5; i++) {
 
-            String nh3n = NumberUtils.getNumFloat(0.04, 0.0501);//NH3N
-            String jlm = NumberUtils.getNumFloat(0.05, 0.0701);//jlm
-            String elht = NumberUtils.getNumFloat(2.00, 2.5001);//elht
-            String ejel = NumberUtils.getNumFloat(0.04, 0.0501);//ejel
-            String h2s = NumberUtils.getNumFloat(0.04, 0.0501);//h2s
-            String byx = NumberUtils.getNumFloat(4.0, 4.5001);//byx
-            String ch3 = NumberUtils.getNumFloat(0.005, 0.0062);//ch3
-            String sja = NumberUtils.getNumFloat(0.05, 0.0701);//sja
-            String cq = NumberUtils.getNumFloat(15.0, 18.001);//cq
+            String nh3n = NumberUtils.getNumFloat(0.01, 0.0501);//NH3N
+            String jlm = NumberUtils.getNumFloat(0.01, 0.0701);//jlm
+            String elht = NumberUtils.getNumFloat(1.00, 2.5001);//elht
+            String ejel = NumberUtils.getNumFloat(0.01, 0.0501);//ejel
+            String h2s = NumberUtils.getNumFloat(0.01, 0.0501);//h2s
+            String byx = NumberUtils.getNumFloat(1.0, 4.5001);//byx
+            String ch3 = NumberUtils.getNumFloat(0.001, 0.0062);//ch3
+            String sja = NumberUtils.getNumFloat(0.01, 0.0701);//sja
+            String cq = NumberUtils.getNumFloat(10.0, 18.001);//cq
 
             GasData gasData = new GasData();
             gasData.setLoctionType(i);

huimv-admin/src/main/java/com/huimv/admin/timer/ProtTimer.java

@@ -39,12 +39,12 @@ public class ProtTimer {
         for (int i = 1; i < 4; i++) {
 
             //假设已经拿到了数据
-            String num = NumberUtils.getNumFloat(5.0,6.0002);//ph
-            String num1 = NumberUtils.getNum(350, 361, 1);//cod
-            String num2 = NumberUtils.getNum(55, 61,1);//nh3n
-            String num3 = NumberUtils.getNumFloat(5.0, 6.5002);//tp
-            String num4 = NumberUtils.getNum(7800, 8001,0);//tn
-            String num5 = NumberUtils.getNum(290, 301,0);//flow
+            String num = NumberUtils.getNumFloat(4.0,6.0002);//ph
+            String num1 = NumberUtils.getNum(300, 361, 1);//cod
+            String num2 = NumberUtils.getNum(40, 61,1);//nh3n
+            String num3 = NumberUtils.getNumFloat(4.0, 6.5002);//tp
+            String num4 = NumberUtils.getNum(7000, 8001,0);//tn
+            String num5 = NumberUtils.getNum(220, 301,0);//flow
 
             //排污口专用数据
             String ph = NumberUtils.getNumFloat(5.0,5.9);//ph