wwh 1 rok pred
rodič
commit
d26a612ba5
46 zmenil súbory, kde vykonal 51 pridanie a 469 odobranie
  1. 1 3
      huimv-receive/src/main/java/com/huimv/receive/service/IBaseDeviceService.java
  2. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBaseFarmService.java
  3. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBaseFlowService.java
  4. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBaseJobService.java
  5. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBaseProcessService.java
  6. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBaseVisitingService.java
  7. 3 5
      huimv-receive/src/main/java/com/huimv/receive/service/IBaseWashoutPointService.java
  8. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBillAccessDoorService.java
  9. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBillCleanBeforeService.java
  10. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBillGateService.java
  11. 3 5
      huimv-receive/src/main/java/com/huimv/receive/service/IBillGoodsInventoryService.java
  12. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBillLuggageService.java
  13. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBillPcrService.java
  14. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBillPersonnelAdmissionService.java
  15. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IBillSamplingService.java
  16. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IConfigurationService.java
  17. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IDeviceListService.java
  18. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IExistService.java
  19. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/IPeopleListService.java
  20. 0 1
      huimv-receive/src/main/java/com/huimv/receive/service/ISysAccountMultilevelService.java
  21. 1 2
      huimv-receive/src/main/java/com/huimv/receive/service/ISysUserService.java
  22. 2 11
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseDeviceServiceImpl.java
  23. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseFarmServiceImpl.java
  24. 1 3
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseFlowServiceImpl.java
  25. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseJobServiceImpl.java
  26. 0 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseLocationServiceImpl.java
  27. 0 3
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseProcessServiceImpl.java
  28. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseVisitingServiceImpl.java
  29. 1 4
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseWashoutPointServiceImpl.java
  30. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillAccessDoorServiceImpl.java
  31. 1 4
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanBeforeServiceImpl.java
  32. 4 2
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java
  33. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillGateServiceImpl.java
  34. 0 2
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillGoodsInventoryServiceImpl.java
  35. 0 3
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillIsolateServiceImpl.java
  36. 0 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillLuggageServiceImpl.java
  37. 0 7
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java
  38. 0 2
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java
  39. 1 6
      huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java
  40. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/ConfigurationServiceImpl.java
  41. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/DeviceListServiceImpl.java
  42. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/ExistServiceImpl.java
  43. 1 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/PeopleListServiceImpl.java
  44. 0 1
      huimv-receive/src/main/java/com/huimv/receive/service/impl/SysAccountMultilevelServiceImpl.java
  45. 8 8
      huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java
  46. 0 370
      huimv-receive/src/main/java/com/huimv/receive/timer/SafeTimer.java

+ 1 - 3
huimv-receive/src/main/java/com/huimv/receive/service/IBaseDeviceService.java

@@ -1,15 +1,13 @@
 package com.huimv.receive.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
-import java.util.Map;
-
 /**
  * <p>
  *  服务类

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBaseFarmService.java

@@ -1,7 +1,7 @@
 package com.huimv.receive.service;
 
-import com.huimv.receive.entity.BaseFarm;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.BaseFarm;
 
 /**
  * <p>

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBaseFlowService.java

@@ -1,8 +1,8 @@
 package com.huimv.receive.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseFlow;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
 

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBaseJobService.java

@@ -1,7 +1,7 @@
 package com.huimv.receive.service;
 
-import com.huimv.receive.entity.BaseJob;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.BaseJob;
 
 /**
  * <p>

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBaseProcessService.java

@@ -27,5 +27,5 @@ public interface IBaseProcessService extends IService<BaseProcess> {
     Result listAll(Map<String, String> map);
 
     //进程终止
-    Result edit(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
+    Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBaseVisitingService.java

@@ -1,8 +1,8 @@
 package com.huimv.receive.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseVisiting;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
 

+ 3 - 5
huimv-receive/src/main/java/com/huimv/receive/service/IBaseWashoutPointService.java

@@ -1,13 +1,11 @@
 package com.huimv.receive.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseWashoutPoint;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.receive.entity.dto.GetWashoutPointDto;
 import com.huimv.receive.entity.vo.WashOutVo;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,11 +17,11 @@ import java.util.Map;
  * @since 2024-03-06
  */
 public interface IBaseWashoutPointService extends IService<BaseWashoutPoint> {
-    Result list(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+    Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result add(HttpServletRequest httpServletRequest, WashOutVo washOutVo);
 
-    Result delete(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+    Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listDest(Map<String, String> paramsMap);
 

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBillAccessDoorService.java

@@ -1,7 +1,7 @@
 package com.huimv.receive.service;
 
-import com.huimv.receive.entity.BillAccessDoor;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.BillAccessDoor;
 
 /**
  * <p>

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBillCleanBeforeService.java

@@ -1,8 +1,8 @@
 package com.huimv.receive.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillCleanBefore;
-import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBillGateService.java

@@ -1,7 +1,7 @@
 package com.huimv.receive.service;
 
-import com.huimv.receive.entity.BillGate;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.BillGate;
 
 /**
  * <p>

+ 3 - 5
huimv-receive/src/main/java/com/huimv/receive/service/IBillGoodsInventoryService.java

@@ -3,12 +3,10 @@ package com.huimv.receive.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillGoodsInventory;
-import com.huimv.receive.entity.vo.GoodsVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,9 +18,9 @@ import java.util.Map;
  * @since 2023-08-22
  */
 public interface IBillGoodsInventoryService extends IService<BillGoodsInventory> {
-    Result listAll(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+    Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result edit(HttpServletRequest httpServletRequest,String id, String goods, MultipartFile imgUrl) throws IOException;
+    Result edit(HttpServletRequest httpServletRequest, String id, String goods, MultipartFile imgUrl) throws IOException;
 
-    Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+    Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBillLuggageService.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface IBillLuggageService extends IService<BillLuggage> {
 
-    Result addLuggage(HttpServletRequest httpServletRequest,String farmId, String userName, String phone, String luggageDate, String luggageLocation, String luggageLocationId, Integer luggageNum, MultipartFile img, MultipartFile img2, MultipartFile img3, MultipartFile img4, MultipartFile img5) throws IOException;
+    Result addLuggage(HttpServletRequest httpServletRequest, String farmId, String userName, String phone, String luggageDate, String luggageLocation, String luggageLocationId, Integer luggageNum, MultipartFile img, MultipartFile img2, MultipartFile img3, MultipartFile img4, MultipartFile img5) throws IOException;
 
     Result listPersonalLuggage(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBillPcrService.java

@@ -43,5 +43,5 @@ public interface IBillPcrService extends IService<BillPcr> {
     void printPcr(HttpServletResponse httpServletRequest, Map<String, String> paramsMap) throws Exception;
 
     //大屏
-    Result PcrList(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+    Result PcrList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBillPersonnelAdmissionService.java

@@ -43,7 +43,7 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     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, String departureId, String departureName) throws IOException;
     Result addAdmissionFeed(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, String departureId, String departureName,
-                            String resource, MultipartFile feedImgUrl,Integer cleanId,String cleanName,String remark) throws IOException;
+                            String resource, MultipartFile feedImgUrl, Integer cleanId, String cleanName, String remark) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IBillSamplingService.java

@@ -1,8 +1,8 @@
 package com.huimv.receive.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillSampling;
-import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IConfigurationService.java

@@ -1,7 +1,7 @@
 package com.huimv.receive.service;
 
-import com.huimv.receive.entity.Configuration;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.Configuration;
 
 /**
  * <p>

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IDeviceListService.java

@@ -1,7 +1,7 @@
 package com.huimv.receive.service;
 
-import com.huimv.receive.entity.DeviceList;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.DeviceList;
 
 /**
  * <p>

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IExistService.java

@@ -1,7 +1,7 @@
 package com.huimv.receive.service;
 
-import com.huimv.receive.entity.Exist;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.Exist;
 
 /**
  * <p>

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/IPeopleListService.java

@@ -1,7 +1,7 @@
 package com.huimv.receive.service;
 
-import com.huimv.receive.entity.PeopleList;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.PeopleList;
 
 /**
  * <p>

+ 0 - 1
huimv-receive/src/main/java/com/huimv/receive/service/ISysAccountMultilevelService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.entity.SysUser;
-import com.huimv.receive.entity.vo.UserVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;

+ 1 - 2
huimv-receive/src/main/java/com/huimv/receive/service/ISysUserService.java

@@ -1,9 +1,8 @@
 package com.huimv.receive.service;
 
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.SysUser;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.entity.pojo.UserPagePojo;
 import org.springframework.web.multipart.MultipartFile;
 

+ 2 - 11
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseDeviceServiceImpl.java

@@ -4,29 +4,20 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huimv.receive.common.utils.DataUill;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.utils.Print;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseDevice;
-import com.huimv.receive.entity.BillClean;
-import com.huimv.receive.entity.SysUser;
 import com.huimv.receive.mapper.BaseDeviceMapper;
 import com.huimv.receive.service.IBaseDeviceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.DecimalFormat;
-import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDateTime;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseFarmServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.entity.BaseFarm;
 import com.huimv.receive.mapper.BaseFarmMapper;
 import com.huimv.receive.service.IBaseFarmService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 3
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseFlowServiceImpl.java

@@ -1,15 +1,13 @@
 package com.huimv.receive.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultUtil;
 import com.huimv.receive.entity.BaseFlow;
-import com.huimv.receive.entity.BaseVisiting;
 import com.huimv.receive.mapper.BaseFlowMapper;
 import com.huimv.receive.service.IBaseFlowService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseJobServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.entity.BaseJob;
 import com.huimv.receive.mapper.BaseJobMapper;
 import com.huimv.receive.service.IBaseJobService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 0 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseLocationServiceImpl.java

@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.soap.Addressing;
 import java.util.Map;
 
 /**

+ 0 - 3
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseProcessServiceImpl.java

@@ -2,7 +2,6 @@ package com.huimv.receive.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,9 +12,7 @@ import com.huimv.receive.entity.*;
 import com.huimv.receive.entity.vo.BaseProcessByLocationVo;
 import com.huimv.receive.entity.vo.BaseProcessVo;
 import com.huimv.receive.entity.vo.ProcessVo;
-import com.huimv.receive.entity.vo.UserAccountVo;
 import com.huimv.receive.mapper.*;
-import com.huimv.receive.service.IBaseLocationService;
 import com.huimv.receive.service.IBaseProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseVisitingServiceImpl.java

@@ -1,13 +1,13 @@
 package com.huimv.receive.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultUtil;
 import com.huimv.receive.entity.BaseVisiting;
 import com.huimv.receive.mapper.BaseVisitingMapper;
 import com.huimv.receive.service.IBaseVisitingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 4
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseWashoutPointServiceImpl.java

@@ -1,16 +1,14 @@
 package com.huimv.receive.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BaseProcess;
 import com.huimv.receive.entity.BaseVisiting;
 import com.huimv.receive.entity.BaseWashoutPoint;
-import com.huimv.receive.entity.SysAccountMultilevel;
-import com.huimv.receive.entity.dto.GetFlowListDto;
 import com.huimv.receive.entity.dto.GetWashoutPointDto;
 import com.huimv.receive.entity.dto.WashListDto;
 import com.huimv.receive.entity.vo.DestVo;
@@ -20,7 +18,6 @@ import com.huimv.receive.mapper.BaseVisitingMapper;
 import com.huimv.receive.mapper.BaseWashoutPointMapper;
 import com.huimv.receive.mapper.SysAccountMultilevelMapper;
 import com.huimv.receive.service.IBaseWashoutPointService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillAccessDoorServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.entity.BillAccessDoor;
 import com.huimv.receive.mapper.BillAccessDoorMapper;
 import com.huimv.receive.service.IBillAccessDoorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 4
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanBeforeServiceImpl.java

@@ -3,8 +3,8 @@ package com.huimv.receive.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
 import com.huimv.receive.common.utils.FlowUtil;
 import com.huimv.receive.common.utils.Result;
@@ -13,7 +13,6 @@ import com.huimv.receive.common.utils.UploadImage;
 import com.huimv.receive.entity.*;
 import com.huimv.receive.mapper.*;
 import com.huimv.receive.service.IBillCleanBeforeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -22,10 +21,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.Map;
 
 /**

+ 4 - 2
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -9,10 +9,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
 import com.huimv.receive.common.utils.*;
 import com.huimv.receive.entity.*;
-import com.huimv.receive.entity.vo.*;
+import com.huimv.receive.entity.vo.CleanAndDryVo;
+import com.huimv.receive.entity.vo.CleanAndDryVo2;
+import com.huimv.receive.entity.vo.CleanDryGoodsVo;
+import com.huimv.receive.entity.vo.CleanVo;
 import com.huimv.receive.mapper.*;
 import com.huimv.receive.service.IBillCleanService;
-import com.huimv.receive.service.IBillPcrService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillGateServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.entity.BillGate;
 import com.huimv.receive.mapper.BillGateMapper;
 import com.huimv.receive.service.IBillGateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 0 - 2
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillGoodsInventoryServiceImpl.java

@@ -2,7 +2,6 @@ package com.huimv.receive.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
@@ -12,7 +11,6 @@ import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.common.utils.UploadImage;
 import com.huimv.receive.entity.*;
 import com.huimv.receive.entity.vo.BillGoodsInventoryVo;
-import com.huimv.receive.entity.vo.GoodsVo;
 import com.huimv.receive.mapper.*;
 import com.huimv.receive.service.IBillGoodsInventoryService;
 import org.springframework.beans.factory.annotation.Autowired;

+ 0 - 3
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillIsolateServiceImpl.java

@@ -11,7 +11,6 @@ import com.huimv.receive.common.utils.Print;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BillIsolate;
-import com.huimv.receive.entity.BillPersonnelAdmission;
 import com.huimv.receive.entity.vo.IsolateVo;
 import com.huimv.receive.mapper.BillIsolateMapper;
 import com.huimv.receive.service.IBillIsolateService;
@@ -20,8 +19,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.*;
 
 /**

+ 0 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillLuggageServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
 import com.huimv.receive.common.utils.*;
-import com.huimv.receive.entity.BillClean;
 import com.huimv.receive.entity.BillLuggage;
 import com.huimv.receive.entity.vo.LuggageVo;
 import com.huimv.receive.mapper.BillLuggageMapper;

+ 0 - 7
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java

@@ -1,9 +1,6 @@
 package com.huimv.receive.service.impl;
 
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.Header;
-import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -26,11 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

+ 0 - 2
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -36,8 +36,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
 import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

+ 1 - 6
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -3,8 +3,8 @@ package com.huimv.receive.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
 import com.huimv.receive.common.utils.FlowUtil;
 import com.huimv.receive.common.utils.Result;
@@ -13,7 +13,6 @@ import com.huimv.receive.common.utils.UploadImage;
 import com.huimv.receive.entity.*;
 import com.huimv.receive.mapper.*;
 import com.huimv.receive.service.IBillSamplingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -22,12 +21,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/ConfigurationServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.entity.Configuration;
 import com.huimv.receive.mapper.ConfigurationMapper;
 import com.huimv.receive.service.IConfigurationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/DeviceListServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.entity.DeviceList;
 import com.huimv.receive.mapper.DeviceListMapper;
 import com.huimv.receive.service.IDeviceListService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/ExistServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.entity.Exist;
 import com.huimv.receive.mapper.ExistMapper;
 import com.huimv.receive.service.IExistService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/PeopleListServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.entity.PeopleList;
 import com.huimv.receive.mapper.PeopleListMapper;
 import com.huimv.receive.service.IPeopleListService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 0 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/SysAccountMultilevelServiceImpl.java

@@ -11,7 +11,6 @@ import com.huimv.receive.common.utils.*;
 import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.entity.SysUser;
 import com.huimv.receive.entity.vo.AccountVo;
-import com.huimv.receive.entity.vo.UserVo;
 import com.huimv.receive.mapper.SysAccountMultilevelMapper;
 import com.huimv.receive.mapper.SysUserMapper;
 import com.huimv.receive.service.ISysAccountMultilevelService;

+ 8 - 8
huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -1,28 +1,26 @@
 package com.huimv.receive.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.utils.Print;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.common.utils.UploadImage;
-import com.huimv.receive.entity.*;
+import com.huimv.receive.entity.BaseLocation;
+import com.huimv.receive.entity.Farm;
+import com.huimv.receive.entity.SysAccountMultilevel;
+import com.huimv.receive.entity.SysUser;
 import com.huimv.receive.entity.pojo.UserPagePojo;
 import com.huimv.receive.entity.vo.UserAccountVo;
 import com.huimv.receive.entity.vo.UserAgeAndGender;
 import com.huimv.receive.entity.vo.UserJob;
 import com.huimv.receive.mapper.*;
-import com.huimv.receive.service.IBaseLocationService;
-import com.huimv.receive.service.IFarmService;
 import com.huimv.receive.service.ISysUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -30,8 +28,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

+ 0 - 370
huimv-receive/src/main/java/com/huimv/receive/timer/SafeTimer.java

@@ -1,370 +0,0 @@
-package com.huimv.receive.timer;
-
-
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.huimv.receive.common.token.TokenSign;
-import com.huimv.receive.common.utils.FlowUtil;
-import com.huimv.receive.entity.*;
-import com.huimv.receive.service.*;
-import com.huimv.receive.service.impl.BillPcrServiceImpl;
-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.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-@Configuration
-@EnableScheduling
-public class SafeTimer {
-
-
-    @Autowired
-    private IBillPcrService pcrService;
-    @Autowired
-    private IBillIsolateService isolateService;
-    @Autowired
-    private IConfigurationService configurationService;
-
-    @Autowired
-    private ISysUserService sysUserService;
-    @Autowired
-    private IBaseProcessService processService;
-    @Autowired
-    private IBaseLocationService locationService;
-    @Autowired
-    private IBillCleanService cleanService;
-    @Autowired
-    private IBillDryService dryService;
-    @Autowired
-    private IBillCleanBeforeService beforeService;
-    @Autowired
-    private IBillSamplingService samplingService;
-    @Autowired
-    private IBillGoodsInventoryService inventoryService;
-
-
-    @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 billIsolate : isolates) {
-            if (billIsolate.getIsolateEndDate().getTime() <= date.getTime()) {
-                billIsolate.setIsolateRealEndDate(date);
-                billIsolate.setIsolateRealDayNum(billIsolate.getIsolateDayNum());
-                billIsolate.setBillStatus(2);
-                billIsolate.setPassUserName("自然解除隔离");
-                billIsolate.setPassDate(date);
-                BaseProcess baseProcess = processService.getById(billIsolate.getProcessId());
-                QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-                locationQueryWrapper.eq("id", billIsolate.getIsolateLocationId());
-                BaseLocation baseLocation = locationService.getOne(locationQueryWrapper);//当前隔离所在的位置
-
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                String end = sdf.format(billIsolate.getIsolateEndDate());
-                String start = sdf.format(billIsolate.getIsolateStartDate());
-                String now = sdf.format(new Date());
-
-                String allLocationId = baseProcess.getAllLocationId();//所有的位置id
-                String allFlowId = baseProcess.getAllFlowId();//所有的流程id
-                String currentFlowId = baseProcess.getCurrentFlowId();//当前已经完成的流程id
-                String substring1 = allFlowId.substring(currentFlowId.length() + 1, allFlowId.length());
-                String[] splits = substring1.split(",");
-                Integer nextId = Integer.parseInt(splits[0]);
-                Object newObject = BillPcrServiceImpl.getNewObject(nextId, billIsolate.getDestName(), billIsolate.getDestId(), billIsolate.getAdmissionUserName(),
-                        billIsolate.getAdmissionUserId(), billIsolate.getVistitDate(), billIsolate.getSubDate(),
-                        billIsolate.getProcessId(), billIsolate.getFarmId(), billIsolate.getIsolateLocation(), billIsolate.getIsolateLocationId(),
-                        billIsolate.getVistitType(),billIsolate.getPhone(),billIsolate.getDepartureName(),billIsolate.getDepartureId());
-                if (nextId == 0) {
-                    if (StringUtils.isBlank(splits[1])) {
-                        baseProcess.setProcessType(1);
-                        String[] strings = allLocationId.split(",");
-                        String ss2 = "";
-                        for (int i = 0; i < strings.length; i++) {
-                            strings[i].replaceAll(strings[i], "2");
-                            if (i == strings.length - 1) {
-                                ss2 = ss2 + strings[i].replaceAll(strings[i], "2");
-                            } else {
-                                ss2 = strings[i].replaceAll(strings[i], "2") + "," + ss2;
-                            }
-                        }
-                        baseProcess.setAllLocationStatus(ss2);
-                    } else {
-                        String[] strings = allLocationId.split(",");
-                        Integer index = 0;
-                        for (int i = 0; i < strings.length; i++) {
-                            if ((baseLocation.getId().toString()).equals(strings[i])) {
-                                index = i;
-                            }
-                        }
-                        QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper();
-                        queryWrapper1.eq("id", strings[index + 2]);
-                        BaseLocation location = locationService.getOne(queryWrapper1);
-                        FlowUtil flowUtil = new FlowUtil();
-                        Object entity = flowUtil.getEntity(Integer.parseInt(splits[1]), billIsolate.getVistitType(), billIsolate.getDestName()
-                                , billIsolate.getDestId(), billIsolate.getAdmissionUserId(), billIsolate.getAdmissionUserName(), billIsolate.getPhone(),
-                                billIsolate.getVistitDate(), location.getId(), location.getLocationName(), billIsolate.getFarmId()
-                                , baseProcess.getId(), billIsolate.getDepartureName(), billIsolate.getDepartureId());
-                        if (Integer.parseInt(splits[1]) == 1) {
-                            //新增采样
-                            BillSampling billSampling = (BillSampling) entity;
-                            if (billIsolate.getVistitType() != 0) {
-                                billSampling.setCarNum(billIsolate.getCarNum());
-                            }
-                            if (billIsolate.getVistitType() == 5) {
-                                billSampling.setResource(billIsolate.getResource());
-                                billSampling.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                                billSampling.setRemark(billIsolate.getRemark());
-                            }
-                            samplingService.save(billSampling);
-                        } else if (Integer.parseInt(splits[1]) == 2) {
-                            //新增pcr
-                            BillPcr billClean = (BillPcr) entity;
-                            if (billIsolate.getVistitType() != 0) {
-                                billClean.setCarNum(billIsolate.getCarNum());
-                            }
-                            if (billIsolate.getVistitType() == 5) {
-                                billClean.setResource(billIsolate.getResource());
-                                billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                                billClean.setRemark(billIsolate.getRemark());
-                            }
-                            pcrService.save(billClean);
-                        } else if (Integer.parseInt(splits[1]) == 3) {
-                            //新增洗澡
-                            BillClean billClean = (BillClean) entity;
-                            if (billIsolate.getVistitType() != 0) {
-                                billClean.setCarNum(billIsolate.getCarNum());
-                            }
-                            if (billIsolate.getVistitType() == 5) {
-                                billClean.setResource(billIsolate.getResource());
-                                billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                                billClean.setRemark(billIsolate.getRemark());
-                            }
-                            cleanService.save(billClean);
-                        } else if (Integer.parseInt(splits[1]) == 4) {
-                            //新增隔离
-                            BillIsolate pcr = (BillIsolate) entity;
-                            if (billIsolate.getVistitType() != 0) {
-                                pcr.setCarNum(billIsolate.getCarNum());
-                            }
-                            if (billIsolate.getVistitType() == 5) {
-                                pcr.setResource(billIsolate.getResource());
-                                pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                                pcr.setRemark(billIsolate.getRemark());
-                            }
-                            isolateService.save(pcr);
-                        } else if (Integer.parseInt(splits[1]) == 5) {
-                            BillDry billClean = (BillDry) entity;
-                            if (billIsolate.getVistitType() != 0) {
-                                billClean.setCarNum(billIsolate.getCarNum());
-                            }
-                            if (billIsolate.getVistitType() == 5) {
-                                billClean.setResource(billIsolate.getResource());
-                                billClean.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                                billClean.setRemark(billIsolate.getRemark());
-                            }
-                            dryService.save(billClean);
-                            //新增烘干
-                        } else if (Integer.parseInt(splits[1]) == 6) {
-                            //新增洗澡前拍照
-                            BillCleanBefore before = (BillCleanBefore) entity;
-                            if (billIsolate.getVistitType() != 0) {
-                                before.setCarNum(billIsolate.getCarNum());
-                            }
-                            if (billIsolate.getVistitType() == 5) {
-                                before.setResource(billIsolate.getResource());
-                                before.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                                before.setRemark(billIsolate.getRemark());
-                            }
-                            beforeService.save(before);
-                        } else if (Integer.parseInt(splits[1]) == 7) {
-                            //新增洗澡前拍照
-                            BillGoodsInventory before = (BillGoodsInventory) entity;
-                            if (billIsolate.getVistitType() != 0) {
-                                before.setCarNum(billIsolate.getCarNum());
-                            }
-                            if (billIsolate.getVistitType() == 5) {
-                                before.setResource(billIsolate.getResource());
-                                before.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                                before.setRemark(billIsolate.getRemark());
-                            }
-                            inventoryService.save(before);
-                        }
-                        baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
-                        Integer locationId = billIsolate.getIsolateLocationId();
-                        int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
-                        String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
-                        String[] split1 = substring.split(",");
-                        String sb2 = "";
-                        for (int i = 0; i < split1.length; i++) {
-                            if (i == split1.length - 1) {
-                                sb2 = sb2 + split1[i].replaceAll(split1[i], "2");
-                            } else {
-                                sb2 = split1[i].replaceAll(split1[i], "2") + "," + sb2;
-                            }
-                        }
-                        sb2 = sb2 + baseProcess.getAllLocationStatus().substring(indexOf + 3);
-                        baseProcess.setAllLocationStatus(sb2);
-                    }
-                } else if (nextId == 1) {
-                    //新增采样
-                    BillSampling billSampling = (BillSampling) newObject;
-                    if (billIsolate.getVistitType() != 0) {
-                        billSampling.setCarNum(billIsolate.getCarNum());
-                    }
-                    if (billIsolate.getVistitType() == 5) {
-                        billSampling.setResource(billIsolate.getResource());
-                        billSampling.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                        billSampling.setRemark(billIsolate.getRemark());
-                    }
-
-                    samplingService.save(billSampling);
-                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-                }else if (nextId == 2) {
-                    //新增pcr
-                    BillPcr pcr = (BillPcr) newObject;
-                    if (billIsolate.getVistitType() != 0) {
-                        pcr.setCarNum(billIsolate.getCarNum());
-                    }
-                    if (billIsolate.getVistitType() == 5) {
-                        pcr.setResource(billIsolate.getResource());
-                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                        pcr.setRemark(billIsolate.getRemark());
-                    }
-                    pcrService.save(pcr);
-                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-                }else if (nextId == 3) {
-                    //新增洗澡
-                    BillClean pcr = (BillClean) newObject;
-                    if (billIsolate.getVistitType() != 0) {
-                        pcr.setCarNum(billIsolate.getCarNum());
-                    }
-                    if (billIsolate.getVistitType() == 5) {
-                        pcr.setResource(billIsolate.getResource());
-                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                        pcr.setRemark(billIsolate.getRemark());
-                    }
-                    cleanService.save(pcr);
-                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-                }else if (nextId == 4) {
-                    //新增隔离
-                    BillIsolate pcr = (BillIsolate) newObject;
-                    if (billIsolate.getVistitType() != 0) {
-                        pcr.setCarNum(billIsolate.getCarNum());
-                    }  if (billIsolate.getVistitType() == 5) {
-                        pcr.setResource(billIsolate.getResource());
-                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                        pcr.setRemark(billIsolate.getRemark());
-                    }
-
-                    isolateService.save(pcr);
-                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-                }else if (nextId == 5) {
-                    BillDry pcr = (BillDry) newObject;
-                    if (billIsolate.getVistitType() != 0) {
-                        pcr.setCarNum(billIsolate.getCarNum());
-                    }
-                    if (billIsolate.getVistitType() == 5) {
-                        pcr.setResource(billIsolate.getResource());
-                        pcr.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                        pcr.setRemark(billIsolate.getRemark());
-                    }
-                    dryService.save(pcr);
-                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-                    //新增烘干
-                }else if (nextId == 6) {
-                    //新增洗澡前拍照
-                    BillCleanBefore before = (BillCleanBefore) newObject;
-                    if (billIsolate.getVistitType() != 0) {
-                        before.setCarNum(billIsolate.getCarNum());
-                    }
-                    if (billIsolate.getVistitType() == 5) {
-                        before.setResource(billIsolate.getResource());
-                        before.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                        before.setRemark(billIsolate.getRemark());
-                    }
-                    beforeService.save(before);
-                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-                }else if (nextId == 7) {
-                    //新增洗澡前拍照
-                    BillGoodsInventory before = (BillGoodsInventory) newObject;
-                    if (billIsolate.getVistitType() != 0) {
-                        before.setCarNum(billIsolate.getCarNum());
-                    }
-                    if (billIsolate.getVistitType() == 5) {
-                        before.setResource(billIsolate.getResource());
-                        before.setFeedImgUrl(billIsolate.getFeedImgUrl());
-                        before.setRemark(billIsolate.getRemark());
-                    }
-                    inventoryService.save(before);
-                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
-                }
-
-
-                billIsolate.setIsolateRealEndDate(new Date());
-                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
-                Calendar cal1 = Calendar.getInstance();
-                Calendar cal2 = Calendar.getInstance();
-                Date startDate = sdf1.parse(start);
-                Date endDate = sdf1.parse(now);
-                cal1.setTime(startDate);
-                cal2.setTime(endDate);
-                long days = (cal2.getTimeInMillis() - cal1.getTimeInMillis()) / (1000 * 3600 * 24);
-                billIsolate.setIsolateRealDayNum(Long.toString(days));
-                billIsolate.setBillStatus(2);
-
-                baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + now);
-
-                String status = baseProcess.getCurrentStatus();
-                String substring = status.substring(0, status.length() - 1);
-                baseProcess.setCurrentStatus(substring + "1," + 0);
-
-
-                isolateService.updateById(billIsolate);
-                processService.updateById(baseProcess);
-            }
-        }
-    }
-
-    @Scheduled(cron = "0 0/1 * * * ? ")
-    private void pcr() throws Exception {
-        QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("bill_status", 1);
-        List<BillPcr> pcrs = pcrService.list(queryWrapper);
-        Date date = new Date();
-        for (BillPcr pcr : pcrs) {
-            Date subDate = pcr.getCheckDate();
-            // 将LocalDateTime转换为Date
-
-            if ((subDate.getTime() + pcr.getQualifiedDate()  * 60 * 1000) <= date.getTime()) {
-                pcr.setBillStatus(3);
-                pcrService.updateById(pcr);
-            }
-        }
-    }
-
-    //计算年龄
-    @Scheduled(cron = "0 0 0 * * ? ")
-    private void getAge()   {
-        System.out.println("开始");
-        List<SysUser> sysUsers = sysUserService.list();
-        for (SysUser sysUser : sysUsers) {
-            int i = DateUtil.ageOfNow(sysUser.getBirthday());
-            if (i !=sysUser.getAge() ){
-                sysUser.setAge(i);
-                sysUserService.updateById(sysUser);
-            }
-        }
-    }
-
-}