生物防控人员2

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

@@ -82,17 +82,9 @@ public class LoginController {
 
         String accountName = map.get("accountName");
         String password = map.get("password");
-//        String code = map.get("code");
 
         String remoteHost = req.getRemoteHost();
 
-//        String redisCode = redisTemplate.opsForValue().get(remoteHost);
-//        if (redisCode == null) {
-//            return  new Result(10005,"验证码过期,点击刷新",false);
-//        }
-//        if (!redisCode.equals(code.toUpperCase())) {
-//            return  new Result(10006,"验证码错误,登录失败",false);
-//        }
         // 未对密码加密
         Result result = iLoginService.loginMultilevel(accountName, password);
         if (result.getCode() == 10000) {
@@ -162,7 +154,6 @@ public class LoginController {
     public Result logoutOne(HttpServletRequest req, @RequestBody Map<String, String> map) {
         String accountName = map.get("accountName");
         String password = map.get("password");
-        String remoteHost = req.getRemoteHost();
         Result result = iLoginService.loginMultilevel(accountName, password);
         if (result.getCode() == 10000) {
             SysAccountMultilevel data = (SysAccountMultilevel) result.getData();

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

@@ -56,8 +56,8 @@ public class ShenChanTimer {
 
 //有个问题 正康的视频咋也看不了
 
-//     @Scheduled(cron = "0 * * * * ? ")
-    @Scheduled(cron = "1 0 * * * ?")
+     @Scheduled(cron = "0 * * * * ? ")
+//    @Scheduled(cron = "1 0 * * * ?")
 //    @GetMapping("/test")
     @Transactional
     public void getShenChan() throws Exception {
@@ -68,13 +68,20 @@ public class ShenChanTimer {
 //        System.out.println(prodStockDto.getData());
         List<List<Object>> stockData = prodStockDto.getData();
         System.out.println("--》"+prodStockDto);
-
-        for (List stock : stockData) {
-//            System.out.println("stock -->"+stock);
-            switch (stock.get(0).toString()) {
+//         DateTime beginOfYear = DateUtil.offsetDay(new Date(), -100);
+//        System.out.println(beginOfYear);
+//        for (int i = 0; i < 100; i++) {
+//            DateTime dateTime = DateUtil.offsetDay(beginOfYear, i);
+//            System.out.println("dateTime--"+dateTime);
+            for (List stock : stockData) {
+                System.out.println("stock -->" + stock);
+                switch (stock.get(0).toString()) {
                 case "正康":
                     saveProdStrok(stockLoginDto,21,stock,dateTime);
                     break;
+                    case "下水碓":
+                        saveProdStrok(stockLoginDto, 22, stock, dateTime);
+                        break;
                 case "东阳":
                     saveProdStrok(stockLoginDto,24,stock,dateTime);
                     break;
@@ -112,8 +119,9 @@ public class ShenChanTimer {
                     break;
                 default:
                     break;
+                }
             }
-        }
+//        }
 //        }
     }
 

huimv-receive/src/main/resources/com/huimv/receive/mapper/BaseProcessMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
     <select id="pageByLocationId" resultType="com.huimv.receive.entity.vo.BaseProcessByLocationVo">
 
-   select *from (
+   SELECT *FROM (
      SELECT   NULL AS qualified_date,NULL AS pass_user_name,NULL AS pcr_type,process_id ,id,farm_id ,admission_user_id ,test_location,check_date,test_location_id
       ,bill_status  ,NULL AS isolate_end_date ,1 AS `type`   , NULL AS isolate_day_num   ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date ,img_url,img_status,clean_time ,NULL AS dry_time,NULL AS dry_tem  FROM `bill_clean`
 
@@ -37,7 +37,18 @@
    bill_status,
       isolate_end_date ,   4 AS `type` ,isolate_day_num  ,isolate_real_day_num, isolate_real_end_date , NULL AS img_url, NULL AS  img_status ,NULL AS clean_time ,NULL AS dry_time,NULL AS dry_tem
 
-    FROM  `bill_isolate`) a  where  a.process_id  = #{processId} and test_location_id  = #{locationId} order by a.check_date desc
+    FROM  `bill_isolate`
+
+      UNION
+   SELECT NULL AS qualified_date,NULL AS pass_user_name, NULL AS pcr_type, process_id ,id,farm_id,admission_user_id ,test_location,check_date,test_location_id
+    ,bill_status  ,NULL AS isolate_end_date ,
+    5  AS `type` ,NULL AS isolate_day_num ,NULL AS isolate_real_day_num,  NULL AS  isolate_real_end_date, img_url, img_status ,NULL AS clean_time  , NULL AS dry_time, NULL AS dry_tem FROM  `bill_sampling`
+
+       UNION
+   SELECT   NULL AS qualified_date,NULL AS pass_user_name,NULL AS pcr_type,process_id ,id,farm_id ,admission_user_id ,test_location,check_date,test_location_id
+      ,bill_status  ,NULL AS isolate_end_date ,6 AS `type`   , NULL AS isolate_day_num   ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date ,img_url,img_status,clean_time ,NULL AS dry_time,NULL AS dry_tem  FROM `bill_clean`
+    ) a  WHERE  a.process_id  = #{processId} and test_location_id  = #{locationId} order by a.check_date desc
+
 
     </select>