生物安全二轮二次修改

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

@@ -59,7 +59,7 @@ public class BillPersonnelAdmissionController {
                                @RequestParam(value = "imgUrl",required = false) MultipartFile imgUrl,
                                @RequestParam(value = "img",required = false) String img,
                                @RequestParam("vistitDate") String vistitDate,
-                               @RequestParam("vistitReson") Integer vistitReson,
+                               @RequestParam("vistitReson") String vistitReson,
                                @RequestParam("destId") String destId,
                                @RequestParam("destName") String destName,
                                @RequestParam(value = "carNum",required = false) String carNum,

huimv-admin/src/main/java/com/huimv/admin/entity/BillIsolate.java

@@ -127,7 +127,7 @@ public class BillIsolate implements Serializable {
     /**
      * 真实隔离天数
      */
-    private Integer isolateRealDayNum;
+    private String isolateRealDayNum;
 
     /**
      * 真实隔离结束时间

huimv-admin/src/main/java/com/huimv/admin/entity/BillPcr.java

@@ -120,5 +120,5 @@ public class BillPcr implements Serializable {
 
     private String carNum;
 
-    private Date qualifiedDate;
+    private String qualifiedDate;
 }

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

@@ -46,7 +46,7 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     Result listByIdClean(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
     Result editClean(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
     Result editDry(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
-    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, Integer vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException;
+    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -260,6 +260,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         isolate.setSubDate(billClean.getSubDate());
                         isolate.setFarmId(billClean.getFarmId());
                         isolate.setBillStatus(0);
+                        isolate.setIsolateDayNum("");
                         isolate.setProcessId(billClean.getProcessId());
                         isolate.setIsolateLocation(baseLocation.getLocationName());
                         isolate.setIsolateLocationId(baseLocation.getId());
@@ -300,6 +301,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             isolate.setSubDate(LocalDateTime.now());
                             isolate.setFarmId(billClean.getFarmId());
                             isolate.setBillStatus(0);
+                            isolate.setIsolateDayNum("");
                             isolate.setProcessId(billClean.getProcessId());
                             isolate.setIsolateLocation(baseLocation.getLocationName());
                             isolate.setIsolateLocationId(baseLocation.getId());

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

@@ -149,6 +149,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billPcr.setTestLocationId(baseLocation.getId());
                     billPcr.setCheckDate(sdf.parse(date));
                     billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billPcr.setQualifiedDate("2小时");
 
 
                     //通过生成洗消记录
@@ -261,6 +262,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
                     billPcr.setTestLocationId(baseLocation.getId());
+                    billPcr.setQualifiedDate("2小时");
                     billPcr.setCheckDate(sdf.parse(date));
                     billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
 

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

@@ -88,7 +88,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, Integer vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException {
+    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum, String source, String goods) throws IOException {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
             return new Result(10001, "手机号格式错误！", false);
@@ -128,7 +128,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if (ObjectUtil.isNotEmpty(source)) {
             billPersonnelAdmission.setSource(source);
         }
-        billPersonnelAdmission.setVistitReson(vistitReson.toString());
+        billPersonnelAdmission.setVistitReson(vistitReson);
         billPersonnelAdmission.setFarmId(Integer.parseInt(farmId));
         BaseProcess baseProcess = new BaseProcess();
         baseProcess.setDestName(destName);
@@ -658,7 +658,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         isolate.setIsolateDayNum(dayNum);
         isolate.setBillStatus(1);
         isolateMapper.updateById(isolate);
-        ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10);
+ /*       ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10);
         Runnable task = new Runnable() {
             @Override
             public void run() {
@@ -728,7 +728,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         // 设定延迟时间（两小时后执行，单位为秒）
         long delay = (endDate.getTime() - startDate.getTime()) / 1000;
         // 执行定时任务
-        scheduler.schedule(task, delay, TimeUnit.SECONDS);
+        scheduler.schedule(task, delay, TimeUnit.SECONDS);*/
         return new Result(10000, "提交成功！", true);
     }
 
@@ -789,7 +789,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             cal1.setTime(startDate);
             cal2.setTime(endDate);
             long days = (cal2.getTimeInMillis() - cal1.getTimeInMillis()) / (1000 * 3600 * 24);
-            billIsolate.setIsolateRealDayNum((int) days);
+            billIsolate.setIsolateRealDayNum(Long.toString(days) );
             billIsolate.setBillStatus(2);
             billIsolate.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
             billIsolate.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
@@ -845,7 +845,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             cal1.setTime(startDate);
             cal2.setTime(endDate);
             long days = (cal2.getTimeInMillis() - cal1.getTimeInMillis()) / (1000 * 3600 * 24);
-            billIsolate.setIsolateRealDayNum((int) days);
+            billIsolate.setIsolateRealDayNum(Long.toString(days));
             billIsolate.setBillStatus(3);
             billIsolate.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
             billIsolate.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));

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

@@ -0,0 +1,54 @@
+package com.huimv.admin.timer;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.common.utils.NumberUtils;
+import com.huimv.admin.entity.BillIsolate;
+import com.huimv.admin.entity.GasData;
+import com.huimv.admin.entity.GasThreshold;
+import com.huimv.admin.entity.GasWarningInfo;
+import com.huimv.admin.mapper.GasDataMapper;
+import com.huimv.admin.mapper.GasThresholdMapper;
+import com.huimv.admin.mapper.GasWarningInfoMapper;
+import com.huimv.admin.service.IBillIsolateService;
+import com.huimv.admin.service.IBillPcrService;
+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 java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Configuration
+@EnableScheduling
+public class SafeTimer {
+
+
+    @Autowired
+    private IBillPcrService pcrService;
+    @Autowired
+    private IBillIsolateService isolateService;
+
+
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    private void getShenChan() throws Exception {
+        QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("bill_status", 1);
+        List<BillIsolate> isolates = isolateService.list(queryWrapper);
+        Date date = new Date();
+        for (BillIsolate isolate : isolates) {
+            if (isolate.getIsolateEndDate().getTime() <= date.getTime()) {
+                isolate.setIsolateRealEndDate(date);
+                isolate.setIsolateRealDayNum(isolate.getIsolateDayNum());
+                isolate.setBillStatus(2);
+                isolate.setPassUserName("自然解除隔离");
+                isolate.setPassDate(date);
+                isolateService.updateById(isolate);
+            }
+        }
+    }
+
+}