生物防控人员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;
+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 {
+
 //
-//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 {
-//
-//    }
-//}
+    @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/ProdStockController.java

@@ -60,6 +60,10 @@ public class ProdStockController {
     public Result listStockScreenHenglu(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return prodStockService.listStockScreenHenglu(httpServletRequest,paramsMap);
     }
+    @RequestMapping("/listStockScreenHengluSale")
+    public Result listStockScreenHengluSale(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return prodStockService.listStockScreenHengluSale(httpServletRequest,paramsMap);
+    }
     @RequestMapping("/listStockScreenHengluDay")
     public Result listStockScreenHengluDay(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return prodStockService.listStockScreenHengluDay(httpServletRequest,paramsMap);

huimv-admin/src/main/java/com/huimv/admin/service/IProdStockService.java

@@ -41,4 +41,6 @@ public interface IProdStockService extends IService<ProdStock> {
     Result listWarning(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listStockScreenHengluMonth(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listStockScreenHengluSale(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -227,8 +227,10 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         sjtjMap.put("YFCH",100);
         sjtjMap.put("MRWLL",1.50);
         sjtjMap.put("RZZ",731);
+        sjtjMap.put("SWPIG",0);
         if (ObjectUtil.isNotEmpty(farm_id)){
             sjtjMap.put("CLCH",prodStock.getCheng());
+            sjtjMap.put("SWPIG",prodStock.getSiPig());
             sjtjMap.put("YFCH",farm_id.getYfchl());
             sjtjMap.put("MRWLL",farm_id.getMrwll());
             sjtjMap.put("RZZ",farm_id.getRzz());
@@ -327,5 +329,32 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
 
     }
 
+    @Override
+    public Result listStockScreenHengluSale(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        String displayType = paramsMap.get("displayType");
+        if (StringUtils.isBlank(displayType)){
+            displayType = "0";
+        }
+        QueryWrapper<ProdSale> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("display_type",Integer.parseInt(displayType));
+        queryWrapper.eq("farm_id", farmId);
+        if (StringUtils.isBlank(type)) {
+            type = "1";
+        }
+       // 1 月
+        if ("1".equals(type)) {
+            queryWrapper.ge("creat_time", DateUtil.offsetMonth(DateUtil.beginOfMonth(new Date()),-6));
+            List<ProdSale> prodSales = saleMapper.listMonth(queryWrapper);
+            return new Result(ResultCode.SUCCESS,prodSales);
+        } else {
+            queryWrapper.ge("creat_time", DateUtil.offsetDay(DateUtil.beginOfDay(new Date()),-7)).orderByAsc("creat_time");
+
+            return new Result(ResultCode.SUCCESS, saleMapper.selectList(queryWrapper));
+        }
+
+    }
+
 
 }

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

@@ -11,6 +11,7 @@ import com.huimv.admin.entity.*;
 import com.huimv.admin.entity.zengxindto.*;
 import com.huimv.admin.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,9 +32,10 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
-@EnableScheduling
 //@RestController
 //@RequestMapping("/test")
+@Configuration
+@EnableScheduling
 public class ShenChanTimer {
 
     //生产数据
@@ -55,17 +57,18 @@ public class ShenChanTimer {
 
 
     //    @Scheduled(cron = "0 * * * * ? ")
-    @Scheduled(cron = "1 0 * * * ?")
-//    @GetMapping("/test")
+//    @Scheduled(cron = "1 0 * * * ?")
+    @GetMapping("/test")
     @Transactional
     public void getShenChan() throws Exception {
         StockLoginDto stockLoginDto = login();
         DateTime dateTime = DateUtil.beginOfDay(new Date());
         String data =   getList(stockLoginDto.getToken(),stockLoginDto.getApp_secret());
         ProdStockDto prodStockDto = JSONUtil.toBean(data, ProdStockDto.class);
+//        System.out.println(prodStockDto.getData());
         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);
@@ -398,6 +401,7 @@ public class ShenChanTimer {
         tokenMap.put("sign",sign);
         String url1 = url + "?token=" + token + "&sign_method=md5" + "&timestamp=" + formattedDateTime + "&version=2.0" + "&sign=" + sign + "&data={data}" ;
         String forObject = restTemplate.getForObject(url1 , String.class,params);
+        System.out.println(proc_name +"------>"+ forObject);
         return forObject;
 
     }