生物防控人员2

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

@@ -1,28 +1,28 @@
-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/*","/huatongApi/env-nh3-n/send")
-                .excludePathPatterns("/huatongApi/receive/feed","/huatongApi/energy-data/getData"
-                        ,"/huatongApi/energy-data/getData2" ,"/huatongApi/energy-data/getData3","/huatongApi/energy-data/getData4");
-    }
-}
+//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/*","/huatongApi/env-nh3-n/send")
+//                .excludePathPatterns("/huatongApi/receive/feed","/huatongApi/energy-data/getData"
+//                        ,"/huatongApi/energy-data/getData2" ,"/huatongApi/energy-data/getData3","/huatongApi/energy-data/getData4");
+//    }
+//}

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

@@ -1,82 +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>
- *wo
- * @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>
+// *wo
+// * @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/entity/ProdMonthOutPig.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -36,6 +37,7 @@ public class ProdMonthOutPig implements Serializable {
     /**
      * 月
      */
+    @JsonFormat(pattern = "yyyy-MM" ,timezone = "GMT+8")
     private Date dateTime;
 
     /**

huimv-admin/src/main/java/com/huimv/admin/mapper/ProdStockMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface ProdStockMapper extends BaseMapper<ProdStock> {
     List<ProdStock> listDay(@Param(Constants.WRAPPER) QueryWrapper<ProdStock> queryWrapper);
 
-    Integer sumInPig(@Param("farmId") Integer farmId, @Param("beginDate") String beginDate);
+    Integer sumInPig(@Param(Constants.WRAPPER) QueryWrapper<ProdStock> queryWrapper);
 
-    Integer sumOutPig(@Param("farmId") Integer farmId, @Param("beginDate") String beginDate,@Param("endDate") String endDate);
+    Integer sumOutPig(@Param(Constants.WRAPPER) QueryWrapper<ProdStock> queryWrapper);
 }

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

@@ -216,8 +216,8 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         }
         DateTime dateTime = DateUtil.offsetDay(new Date(), -8);
 
-        List<ProdStock> prodStocks = prodStockMapper.selectList(new QueryWrapper<ProdStock>().eq("farm_id", farmId).eq("display_type", displayType).ge("creat_time", dateTime).orderByDesc("creat_time"));
-        ProdStock prodStock = prodStocks.get(0);
+        List<ProdStock> prodStocks = prodStockMapper.selectList(new QueryWrapper<ProdStock>().eq("farm_id", farmId).eq("display_type", displayType).ge("creat_time", dateTime));
+        ProdStock prodStock = prodStocks.get(prodStocks.size()-1);
         Map endMap = new HashMap();
         endMap.put("CLBD",prodStocks);
         endMap.put("MCCL",prodStock);
@@ -252,12 +252,14 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
 
     @Override
     public Integer sumInPig(Integer farmId, DateTime beginOfMonth) {
-        return  prodStockMapper.sumInPig(farmId,beginOfMonth.toString().substring(0,10));
+
+        return  prodStockMapper.sumInPig(new QueryWrapper<ProdStock>().eq("farm_id",farmId).eq("display_type",0).ge("creat_time",beginOfMonth));
     }
 
     @Override
     public Integer sumOutPig(Integer farmId, DateTime beginOfMonth,DateTime endTime) {
-        return  prodStockMapper.sumOutPig(farmId,beginOfMonth.toString().substring(0,10),endTime.toString().substring(0,10));
+//        return  prodStockMapper.sumOutPig(farmId,beginOfMonth.toString().substring(0,10),endTime.toString().substring(0,10));
+        return  prodStockMapper.sumOutPig(new QueryWrapper<ProdStock>().eq("farm_id",farmId).eq("display_type",0).between("creat_time",beginOfMonth,endTime));
     }
 
     @Override

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

@@ -32,6 +32,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @EnableScheduling
+//@RestController
+//@RequestMapping("/test")
 public class ShenChanTimer {
 
     //生产数据
@@ -62,8 +64,8 @@ public class ShenChanTimer {
         String data =   getList(stockLoginDto.getToken(),stockLoginDto.getApp_secret());
         ProdStockDto prodStockDto = JSONUtil.toBean(data, ProdStockDto.class);
         List<List<Object>> stockData = prodStockDto.getData();
-//        DateTime beginOfYear = DateUtil.beginOfYear(DateUtil.offsetMonth(new Date(), -10));
-//        System.out.println(beginOfYear);
+        DateTime beginOfYear = DateUtil.beginOfYear(DateUtil.offsetMonth(new Date(), -10));
+        System.out.println(beginOfYear);
 //        for (int i = 0; i < 390; i++) {
 //            DateTime dateTime = DateUtil.offsetDay(beginOfYear, i);
 //            System.out.println("dateTime--"+dateTime);

huimv-admin/src/main/resources/com/huimv/admin/mapper/ProdStockMapper.xml

@@ -32,9 +32,9 @@
     </select>
         <select id="sumInPig" resultType="java.lang.Integer">
 
-           SELECT  IFNULL(SUM(in_pig) ,0)FROM `prod_stock` WHERE farm_id = ${farmId} AND creat_time &gt;=  ${beginDate} AND display_type =0
+           SELECT  IFNULL(SUM(in_pig) ,0)FROM `prod_stock` ${ew.customSqlSegment}
         </select>
     <select id="sumOutPig" resultType="java.lang.Integer">
-           SELECT IFNULL(SUM(out_pig),0) FROM `prod_stock` WHERE farm_id = ${farmId} AND creat_time BETWEEN   ${beginDate} AND  ${endDate} AND display_type =0
+           SELECT IFNULL(SUM(out_pig),0) FROM `prod_stock`${ew.customSqlSegment}
     </select>
 </mapper>