Browse Source

天气接口

523096025 1 year ago
parent
commit
7fc1fc101a

+ 5 - 1
huimv-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.admin.config;
 
 import org.springframework.context.annotation.Bean;
@@ -5,12 +6,14 @@ 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
@@ -25,3 +28,4 @@ public class InterceptorConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/huatongApi/receive/feed");
     }
 }
+*/

+ 5 - 2
huimv-admin/src/main/java/com/huimv/admin/config/JWTInterceptor.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.admin.config;
 
 import com.alibaba.fastjson.JSONObject;
@@ -13,13 +14,15 @@ 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 {
 
 
@@ -79,4 +82,4 @@ public class JWTInterceptor implements HandlerInterceptor {
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
 
     }
-}
+}*/

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

@@ -53,7 +53,7 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-
+        System.out.println(farmId);
 
         QueryWrapper<ProdStock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);

+ 22 - 13
huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -21,6 +21,7 @@ import org.springframework.http.*;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDate;
@@ -39,6 +40,7 @@ public class ShenChanTimer {
 
     @Scheduled(cron = "0 0 */4 * * ? ")
 //    @Scheduled(cron = "0 * * * * ?")
+    @GetMapping("/test")
     private void getShenChan() throws Exception {
         Integer farmId = 21;
         String time = LocalDate.now().toString();
@@ -98,23 +100,30 @@ public class ShenChanTimer {
                 }
 
             }
-        }
-        for (List stock : stockData) {
-            if ("正康".equals(stock.get(0))){
+
+            if ("东阳".equals(stock.get(0))){
                 if (ObjectUtil.isNotEmpty(prodStock)){
-                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+//                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+                    prodStock.setZzcl(5433);
+//                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+                    prodStock.setByzcl(6760);
+//                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+                    prodStock.setYfzcl(4361);
+//                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                    prodStock.setZcl(16554);
                     prodStock.setCreatTime(new Date());
                     prodStock.setFarmId(24);
                     prodStockService.updateById(prodStock);
                 }else {
                     prodStock = new ProdStock();
-                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                    //                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+                    prodStock.setZzcl(5433);
+//                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+                    prodStock.setByzcl(6760);
+//                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+                    prodStock.setYfzcl(4361);
+//                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                    prodStock.setZcl(16554);
                     prodStock.setMzcl(100);
                     prodStock.setGzcl(200);
                     prodStock.setBrzcl(452);
@@ -127,11 +136,11 @@ public class ShenChanTimer {
                     prodStock.setFarmId(24);
                     prodStockService.save(prodStock);
                 }
-
             }
         }
+
         for (List stock : stockData) {
-            if ("正康".equals(stock.get(0))){
+            if ("浦江".equals(stock.get(0))){
                 if (ObjectUtil.isNotEmpty(prodStock)){
                     prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
                     prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));

+ 2 - 2
huimv-admin/src/main/resources/application-prod.yml

@@ -47,5 +47,5 @@ spring:
 
 mybatis-plus:
   configuration:
-    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

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

@@ -27,7 +27,7 @@ FROM `prod_stock` t
 JOIN (
   SELECT DATE_FORMAT(creat_time, '%Y-%m') AS `month`, MAX(id) AS max_id
   FROM `prod_stock`
-  GROUP BY DATE_FORMAT(creat_time, '%Y-%m')
+  GROUP BY DATE_FORMAT(creat_time, '%Y-%m') ,farm_id
 ) m ON DATE_FORMAT(t.creat_time, '%Y-%m') = m.month AND t.id = m.max_id
     ${ew.customSqlSegment}
 </select>