生物安全修改

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/config/ApiError.java

@@ -0,0 +1,20 @@
+package com.huimv.secure.config;
+
+import com.huimv.secure.common.utils.ResultCode;
+import lombok.Data;
+
+
+@Data
+public class ApiError {
+    private Integer code;
+
+    private String message;
+
+    private String exmessage;
+
+    public ApiError(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/config/GlobalExceptionHandler.java

@@ -0,0 +1,44 @@
+package com.huimv.secure.config;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+import javax.servlet.http.HttpServletRequest;
+
+@ControllerAdvice
+public class GlobalExceptionHandler {
+    
+    /**
+     * 处理 HTTP 404 错误
+     */
+    @ExceptionHandler(NoHandlerFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ResponseBody
+    public ApiError handleNotFound(HttpServletRequest req, Exception ex) {
+        return new ApiError(HttpStatus.NOT_FOUND.value(), "无该资源: " + req.getRequestURI());
+    }
+ 
+    /**
+     * 处理 HTTP 500 错误
+     */
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ResponseBody
+    public ApiError handleInternalServerError(HttpServletRequest req, Exception ex) {
+        return new ApiError(HttpStatus.INTERNAL_SERVER_ERROR.value(), "抱歉，系统遇到了问题，请稍后再试或联系技术支持: ");
+    }
+
+    /**
+     * 处理其他所有未处理的异常
+     */
+    @ExceptionHandler(Throwable.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ResponseBody
+    public ApiError handleOtherExceptions(HttpServletRequest req, Throwable ex) {
+        return new ApiError(HttpStatus.INTERNAL_SERVER_ERROR.value(), "系统内部错误: " + ex.getMessage());
+    }
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/config/InterceptorConfig.java

@@ -75,6 +75,10 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/sys-user/*"
                         ,"/sys-account-multilevel/*"
                         ,"/base-farm/getFarm"
+                        ,"/bill-personnel-admission/screenCount"
+                        ,"/bill-personnel-admission/screenWarning"
+                        ,"/base-location/listAll"
+                        ,"/bill-pcr/listConfiguration"
                         );
     }
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/BaseLocationController.java

@@ -41,31 +41,56 @@ public class BaseLocationController {
         QueryWrapper<Exist> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
         Exist one = existService.getOne(queryWrapper);
-        if (one.getExist() == 1 && vistitType.equals("0")) {
-            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("vistit_type", vistitType)
-                    .ne("location_type", 0)));
-        }
-        if (one.getExist() == 1 && vistitType.equals("3")) {
-            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("vistit_type", vistitType)
-                    .ne("location_type", 0).ne("id", 7)));
-        }
-        if (one.getExist() == 1 && vistitType.equals("5")) {
-            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("vistit_type", vistitType)
-                    .eq("id", 9)));
-        }
+//        if (/*one.getExist() == 1 && */vistitType.equals("0")) {
+//            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+//                    .eq("vistit_type", vistitType)
+//                    .ne("location_type", 0)));
+//        }
+//        if (/*one.getExist() == 1 &&*/ vistitType.equals("3")) {
+//            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+//                    .eq("vistit_type", vistitType)
+//                    .ne("location_type", 0).ne("id", 7)));
+//        }
+//        if (/*one.getExist() == 1 &&*/ vistitType.equals("5")) {
+//            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+//                    .eq("vistit_type", vistitType)
+//                    .eq("id", 9)));
+//        }
+        return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+                .eq("vistit_type", vistitType)
+                .ne("location_type", 0)));
+    }
+    @PostMapping("/listAll1")
+    public Result listAll1(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String vistitType = paramsMap.get("vistitType");
+        QueryWrapper<Exist> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Exist one = existService.getOne(queryWrapper);
+//        if (/*one.getExist() == 1 && */vistitType.equals("0")) {
+//            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+//                    .eq("vistit_type", vistitType)
+//                    .ne("location_type", 0)));
+//        }
+//        if (/*one.getExist() == 1 &&*/ vistitType.equals("3")) {
+//            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+//                    .eq("vistit_type", vistitType)
+//                    .ne("location_type", 0).ne("id", 7)));
+//        }
+//        if (/*one.getExist() == 1 &&*/ vistitType.equals("5")) {
+//            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+//                    .eq("vistit_type", vistitType)
+//                    .eq("id", 9)));
+//        }
         return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
                 .eq("vistit_type", vistitType)
                 .ne("location_type", 0)));
     }
-
     @PostMapping("/listLuggageLocation")
     public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                .eq("vistit_type", 0).eq("parent_id", 0)));
+                .eq("vistit_type", 0).eq("location_type", 1)));
     }
 
 
@@ -77,4 +102,5 @@ public class BaseLocationController {
         List<BaseLocation> baseLocations = locationService.list(queryWrapper);
         return new Result(ResultCode.SUCCESS,baseLocations);
     }
+
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/BillCleanController.java

@@ -189,4 +189,9 @@ public class BillCleanController {
         }
         return new Result(10000, "删除成功！", true);
     }
+
+    @RequestMapping("/listScreen")
+    public Result listScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return cleanService.listScreen(httpServletRequest, paramsMap);
+    }
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/BillPcrController.java

@@ -119,4 +119,9 @@ public class BillPcrController {
         configurationService.updateById(configuration);
         return new Result(10000,"保存成功！",true);
     }
+    @PostMapping("/listConfiguration")
+    public Result listConfiguration(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        return new Result(ResultCode.SUCCESS,configurationService.getOne(new QueryWrapper<Configuration>().eq("farm_id", farmId)));
+    }
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/BillPersonnelAdmissionController.java

@@ -187,6 +187,14 @@ public class BillPersonnelAdmissionController {
     public Result selectList( @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.selectList( paramsMap);
     }
+    @RequestMapping("/screenCount")
+    public Result screenCount( @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.screenCount( paramsMap);
+    }
+    @RequestMapping("/screenWarning")
+    public Result screenWarning( @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.screenWarning( paramsMap);
+    }
     @RequestMapping("/delete")
     public Result delete( @RequestBody Map<String, String> paramsMap) throws ParseException {
         String ids = paramsMap.get("ids");

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/LoginController.java

@@ -177,7 +177,7 @@ public class LoginController {
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountName);
             accessToken.setFarmId(accountEntity.getFarmId());
-            String token = TokenSign.sign(accountName, id, accountEntity.getFarmId(), null, null);
+            String token = TokenSign.sign(accountEntity.getUserName(), id, accountEntity.getFarmId(), null, null);
             accessToken.setToken(token);
 
             accessToken.setId(id);
@@ -273,7 +273,7 @@ public class LoginController {
     public Result logWeChatGetPhone(HttpServletRequest req, @RequestParam String jsCode) {
         String access_token ="";
         if ( !redisTemplate.hasKey("weChatGetPhone") || redisTemplate.getExpire("weChatGetPhone") ==null || redisTemplate.getExpire("weChatGetPhone") <=0){
-            String result = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/token?appid=wxa28e45fe5cb10ff1&secret=c16e584ec6e69fd35edd98ec21ec5e94&grant_type=client_credential");
+            String result = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/token?appid=wxb68dc341b4212c77&secret=ced18a31c7f2250cba4673733029f70a&grant_type=client_credential");
             System.out.println(result);
             JSONObject jsonObject = JSON.parseObject(result);
             access_token =  (String) jsonObject.get("access_token");
@@ -295,7 +295,7 @@ public class LoginController {
     @PostMapping("/register")
     public Result addAdmission(HttpServletRequest req, @RequestParam("userName") String userName,
                                @RequestParam("phone") String phone,
-//                               @RequestParam("workName") String workName,
+                               @RequestParam("workName") String workName,
                                @RequestParam("papersType") String papersType,
                                @RequestParam("papersCode") String papersCode,
                                @RequestParam(value = "imgUrl", required = false) MultipartFile imgUrl,
@@ -316,12 +316,19 @@ public class LoginController {
         }
         SysAccountMultilevel sysAccountMultilevel = new SysAccountMultilevel();
         sysAccountMultilevel.setUserName(userName);
+        sysAccountMultilevel.setPapersCode(papersCode);
+        sysAccountMultilevel.setPid(0);
+        sysAccountMultilevel.setPids("0");
         sysAccountMultilevel.setPhone(phone);
         sysAccountMultilevel.setAccount(phone);
         sysAccountMultilevel.setPassword("123456");
+        sysAccountMultilevel.setWorkName(workName);
         sysAccountMultilevel.setAccountStatus(1);
+        sysAccountMultilevel.setFarmIds("25");
+        sysAccountMultilevel.setLastFarmId("25");
         sysAccountMultilevel.setFarmId("25");
         sysAccountMultilevel.setWechatId(openId);
+        sysAccountMultilevel.setPapersType(papersType);
         sysAccountMultilevel.setType(7);
         String imageCom = uploadImage.getImageCom(imgUrl);
         if (imageCom.equals("上传失败")) {

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/SysAccountMultilevelController.java

@@ -85,4 +85,18 @@ public class SysAccountMultilevelController {
         accountMultilevelService.updateById(sysAccountMultilevel);
         return Result.SUCCESS();
     }
+
+    @PostMapping("/updateUser")
+    public Result updateUser(HttpServletRequest httpServletRequest,
+                             @RequestParam(value = "img", required = false) MultipartFile img,
+                             @RequestParam(value = "userName", required = false) String userName,
+                             @RequestParam(value = "phone", required = false) String phone,
+                             @RequestParam(value = "workPost", required = false) Integer workPost,
+                             @RequestParam(value = "workLocation", required = false) String workLocation,
+                             @RequestParam(value = "workLocationId", required = false) String workLocationId,
+                             @RequestParam(value = "workName", required = false) String workName,
+                             @RequestParam(value = "papersType", required = false) String papersType,
+                             @RequestParam(value = "papersCode", required = false) String papersCode) throws IOException {
+        return accountMultilevelService.updateUser(httpServletRequest,img,userName,phone,workPost,workLocation,workLocationId,workName,papersType,papersCode);
+    }
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/BaseProcess.java

@@ -75,7 +75,7 @@ public class BaseProcess implements Serializable {
      */
     private String currentLocationId;
 
-    private Integer farmId;
+    private String farmId;
 
     /**
      * 0 进行中，1已完成，2拒绝（提前结束）

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/BillAccessDoor.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,6 +39,7 @@ public class BillAccessDoor implements Serializable {
     /**
      * 检测时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date checkDate;
 
     /**

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/BillClean.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -58,6 +59,7 @@ public class BillClean implements Serializable {
     /**
      * 来访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date vistitDate;
 
     /**
@@ -75,6 +77,7 @@ public class BillClean implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date passDate;
 
     /**
@@ -95,6 +98,7 @@ public class BillClean implements Serializable {
     /**
      * 检测时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date checkDate;
 
     /**

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/BillDry.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -58,6 +59,7 @@ public class BillDry implements Serializable {
     /**
      * 来访时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date vistitDate;
 
     /**
@@ -75,6 +77,7 @@ public class BillDry implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date passDate;
 
     /**
@@ -95,6 +98,7 @@ public class BillDry implements Serializable {
     /**
      * 检测时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date checkDate;
 
     /**

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/BillGate.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,6 +39,7 @@ public class BillGate implements Serializable {
     /**
      * 检测时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date checkDate;
 
     /**

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/BillGoodsInventory.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -70,6 +71,7 @@ public class BillGoodsInventory implements Serializable {
      */
     private String goodsUnit;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
 
     private String farmId;

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/BillPcr.java

@@ -87,6 +87,7 @@ public class BillPcr implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date passDate;
 
     /**

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/vo/CleanAndDryVo2.java

@@ -47,7 +47,7 @@ public class CleanAndDryVo2 {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
-    private Integer farmId;
+    private String farmId;
 
     /**
      * 当前状态 0待审批 1合格  2异常

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/vo/ListAdmissionVo2.java

@@ -0,0 +1,15 @@
+package com.huimv.secure.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ListAdmissionVo2 {
+    private Integer personCount;
+    private Integer carCount;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date subDate;
+
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/vo/UserJob.java

@@ -8,4 +8,5 @@ public class UserJob {
     private Integer  pcr;
     private Integer  safe;
     private Integer  factory;
+    private Integer jjadmin;
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/mapper/BillDryMapper.java

@@ -1,7 +1,14 @@
 package com.huimv.secure.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.secure.entity.BillClean;
 import com.huimv.secure.entity.BillDry;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.vo.CleanVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2024-01-04
  */
 public interface BillDryMapper extends BaseMapper<BillDry> {
-
+    List<CleanVo> listAll(@Param(Constants.WRAPPER) QueryWrapper<BillDry> queryWrapper);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/mapper/BillGoodsInventoryMapper.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.secure.entity.BillGoodsInventory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.BillLuggage;
 import com.huimv.secure.entity.vo.BillGoodsInventoryVo;
+import com.huimv.secure.entity.vo.LuggageVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,4 +21,6 @@ import java.util.List;
  */
 public interface BillGoodsInventoryMapper extends BaseMapper<BillGoodsInventory> {
     List<BillGoodsInventoryVo> listAll(@Param(Constants.WRAPPER) QueryWrapper<BillGoodsInventory> queryWrapper);
+
+    List<LuggageVo> list(@Param(Constants.WRAPPER) QueryWrapper<BillGoodsInventory> queryWrapper);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/mapper/BillPersonnelAdmissionMapper.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.secure.entity.vo.BillAdmissionVo;
 import com.huimv.secure.entity.vo.FactoryDirectorVo;
 import com.huimv.secure.entity.vo.ListAdmissionVo;
+import com.huimv.secure.entity.vo.ListAdmissionVo2;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -32,4 +33,6 @@ public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAd
     List<ListAdmissionVo> countAdmission(@Param(Constants.WRAPPER) QueryWrapper<BillPersonnelAdmission> queryWrapper);
 
     List<BillAdmissionVo> admissionTail(@Param(Constants.WRAPPER) QueryWrapper<BillPersonnelAdmission> queryWrapper);
+
+    List<ListAdmissionVo2> screenCount(@Param(Constants.WRAPPER) QueryWrapper<BillPersonnelAdmission> queryWrapper);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/IBillCleanService.java

@@ -48,4 +48,7 @@ public interface IBillCleanService extends IService<BillClean> {
     Result AllClean(Map<String, String> paramsMap);
 
     Result CleanSelect( Map<String, String> paramsMap);
+
+    //大屏
+    Result listScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/IBillPersonnelAdmissionService.java

@@ -71,4 +71,10 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
 
     //详细数据查询
     Result selectList( Map<String, String> paramsMap);
+
+    //大屏的通行统计
+    Result screenCount( Map<String, String> paramsMap);
+
+    //大屏的环境预警
+    Result screenWarning( Map<String, String> paramsMap);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/ISysAccountMultilevelService.java

@@ -3,7 +3,10 @@ package com.huimv.secure.service;
 import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.entity.SysAccountMultilevel;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -31,4 +34,7 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
     Result getLastFarmId(Integer userId);
 
     Result listSubordinateByFarm(String farmId, Integer userId);
+
+    Result updateUser(HttpServletRequest httpServletRequest, MultipartFile img, String userName, String phone, Integer workPost, String workLocation, String workLocationId, String workName, String papersType, String papersCode) throws IOException;
+
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/impl/BillCleanServiceImpl.java

@@ -64,6 +64,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     private BillIsolateMapper isolateMapper;
     @Autowired
     private BillPersonnelAdmissionMapper admissionMapper;
+    @Autowired
+    private BillGoodsInventoryMapper goodsInventoryMapper;
 
 
     @Override
@@ -88,7 +90,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         if (type.equals("0")) {
 
             QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+            queryWrapper1.eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
             List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
             List<Integer> ids = new ArrayList<>();
             for (BaseLocation baseLocation : baseLocations) {
@@ -706,6 +708,36 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 cleanMapper.updateById(billClean);
             }
 
+            if (billClean.getVistitType() == 5 || billClean.getDestId() == 13) {
+                if ("1".equals(result)) {
+                    billClean.setBillStatus(1);
+                    baseProcess.setProcessType(1);
+                    baseProcess.setAllLocationStatus("2,2");
+                } else {
+                    baseProcess.setAllLocationStatus("2,3");
+                    billClean.setBillStatus(2);
+                    baseProcess.setProcessType(2);
+                }
+                billClean.setImgStatus(1);
+                billClean.setImgUrl(s);
+                billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                billClean.setTestLocation(baseLocation.getLocationName());
+                billClean.setTestLocationId(baseLocation.getId());
+                billClean.setCheckDate(sdf.parse(date));
+                billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                billClean.setCleanTime("10");
+
+                baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+                String status = baseProcess.getCurrentStatus();
+                String substring = status.substring(0, status.length() - 1);
+                baseProcess.setCurrentStatus(substring + "1");
+                processMapper.updateById(baseProcess);
+                cleanMapper.updateById(billClean);
+            }
+
             //饲料车
             if (billClean.getDestId() == 8) {
                 if (billClean.getTestLocationId() == 7) {
@@ -833,6 +865,35 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     }
                 }
             }
+            if (billClean.getDestId() == 7) {
+                if ("1".equals(result)) {
+                    billClean.setBillStatus(1);
+                    baseProcess.setProcessType(1);
+                    baseProcess.setAllLocationStatus("2,2");
+                } else {
+                    baseProcess.setAllLocationStatus("2,3");
+                    billClean.setBillStatus(2);
+                    baseProcess.setProcessType(2);
+                }
+                billClean.setImgStatus(1);
+                billClean.setImgUrl(s);
+                billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                billClean.setTestLocation(baseLocation.getLocationName());
+                billClean.setTestLocationId(baseLocation.getId());
+                billClean.setCheckDate(sdf.parse(date));
+                billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                billClean.setCleanTime("10");
+
+                baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+                String status = baseProcess.getCurrentStatus();
+                String substring = status.substring(0, status.length() - 1);
+                baseProcess.setCurrentStatus(substring + "1");
+                processMapper.updateById(baseProcess);
+                cleanMapper.updateById(billClean);
+            }
 
             return new Result(10000, "修改成功！", true);
 
@@ -899,7 +960,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
 //                    baseProcess.setAllLocationStatus("2,2,2,3");
 
                     if (billClean.getTestLocationId() == 8) {
-                        baseProcess.setAllLocationStatus("2,2,2,2,3");
+                        baseProcess.setAllLocationStatus("2,2,3");
                     }
 
                     processMapper.updateById(baseProcess);
@@ -916,26 +977,54 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     @Override
     public Result listCount(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String dataType = paramsMap.get("dataType");
+        if ("".equals(dataType) || null == dataType) {
+            dataType = "1";
+        }
         Date timesmorning = DataUill.getTimesmorning();
-        QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).ge("sub_date", timesmorning);
-        queryWrapper.eq("bill_status", 1);
-        Integer count = billCleanMapper.selectCount(queryWrapper);//合格
-        QueryWrapper<BillClean> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).ge("sub_date", timesmorning);
-        queryWrapper1.eq("bill_status", 2);
-        Integer count1 = billCleanMapper.selectCount(queryWrapper1);//异常
-        Integer allCount = count + count1;
-        DecimalFormat def = new DecimalFormat("0.00");
+        JSONObject jsonObject = new JSONObject();
+        Integer allCount;
+        Integer count;
+        Integer count1;
         String rank;
-        if (allCount == 0 || allCount == null) {
-            Double ranks = Double.valueOf("0.00");
-            rank = ranks.toString();
+        if ("1".equals(dataType)) {
+            QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).ge("sub_date", timesmorning);
+            queryWrapper.eq("bill_status", 1);
+            count = billCleanMapper.selectCount(queryWrapper);//合格
+            QueryWrapper<BillClean> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).ge("sub_date", timesmorning);
+            queryWrapper1.eq("bill_status", 2);
+            count1 = billCleanMapper.selectCount(queryWrapper1);//异常
+            allCount = count + count1;
+            DecimalFormat def = new DecimalFormat("0.00");
+            if (allCount == 0 || allCount == null) {
+                Double ranks = Double.valueOf("0.00");
+                rank = ranks.toString();
+            } else {
+                Double ranks = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+                rank = def.format(ranks);
+            }
         } else {
-            Double ranks = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
-            rank = def.format(ranks);
+            QueryWrapper<BillDry> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).ge("sub_date", timesmorning);
+            queryWrapper.eq("bill_status", 1);
+            count = dryMapper.selectCount(queryWrapper);//合格
+            QueryWrapper<BillDry> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).ge("sub_date", timesmorning);
+            queryWrapper1.eq("bill_status", 2);
+            count1 = dryMapper.selectCount(queryWrapper1);//异常
+            allCount = count + count1;
+            DecimalFormat def = new DecimalFormat("0.00");
+
+            if (allCount == 0 || allCount == null) {
+                Double ranks = Double.valueOf("0.00");
+                rank = ranks.toString();
+            } else {
+                Double ranks = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+                rank = def.format(ranks);
+            }
         }
-        JSONObject jsonObject = new JSONObject();
         jsonObject.put("count", allCount);
         jsonObject.put("count1", count);
         jsonObject.put("count2", count1);
@@ -946,64 +1035,156 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     @Override
     public Result AllClean(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String dataType = paramsMap.get("dataType");
+        if ("".equals(dataType) || null == dataType) {
+            dataType = "1";
+        }
         String personType = paramsMap.get("personType");
         String type = paramsMap.get("type");
         if ("".equals(type) || null == type) {
             type = "1";
         }
         List<CleanVo> pcrVos = null;
-        QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).in("bill_status", 1, 2);
-        if ("".equals(personType) || null == personType) {
+        if ("1".equals(dataType)) {
+            QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).in("bill_status", 1, 2);
+            if ("".equals(personType) || null == personType) {
 
+            } else {
+                queryWrapper.eq("vistit_type", personType);
+            }
+            if ("1".equals(type)) {
+                Date timesmorning = DataUill.getTimesmorning();
+                queryWrapper.ge("sub_date", timesmorning);
+            } else if ("2".equals(type)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                queryWrapper.ge("sub_date", calendar.getTime());
+            } else if ("3".equals(type)) {
+                Date monthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("sub_date", monthmorning);
+            }
+            pcrVos = billCleanMapper.listAll(queryWrapper);
+            for (CleanVo pcrVo : pcrVos) {
+                pcrVo.setAllCount(pcrVo.getPassCount() + pcrVo.getRefuseCount());
+            }
         } else {
-            queryWrapper.eq("vistit_type", personType);
-        }
-        if ("1".equals(type)) {
-            Date timesmorning = DataUill.getTimesmorning();
-            queryWrapper.ge("sub_date", timesmorning);
-        } else if ("2".equals(type)) {
-            Calendar calendar = Calendar.getInstance();
-            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-            queryWrapper.ge("sub_date", calendar.getTime());
-        } else if ("3".equals(type)) {
-            Date monthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("sub_date", monthmorning);
-        }
-        pcrVos = billCleanMapper.listAll(queryWrapper);
-        for (CleanVo pcrVo : pcrVos) {
-            pcrVo.setAllCount(pcrVo.getPassCount() + pcrVo.getRefuseCount());
+            QueryWrapper<BillDry> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).in("bill_status", 1, 2);
+            if ("".equals(personType) || null == personType) {
+
+            } else {
+                queryWrapper.eq("vistit_type", personType);
+            }
+            if ("1".equals(type)) {
+                Date timesmorning = DataUill.getTimesmorning();
+                queryWrapper.ge("sub_date", timesmorning);
+            } else if ("2".equals(type)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                queryWrapper.ge("sub_date", calendar.getTime());
+            } else if ("3".equals(type)) {
+                Date monthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("sub_date", monthmorning);
+            }
+            pcrVos = dryMapper.listAll(queryWrapper);
+            for (CleanVo pcrVo : pcrVos) {
+                pcrVo.setAllCount(pcrVo.getPassCount() + pcrVo.getRefuseCount());
+            }
         }
         return new Result(ResultCode.SUCCESS, pcrVos);
     }
 
     @Override
     public Result CleanSelect(Map<String, String> paramsMap) {
+        String dataType = paramsMap.get("dataType");
+        if ("".equals(dataType) || null == dataType) {
+            dataType = "1";
+        }
+        String destId = paramsMap.get("destId");
         String farmId = paramsMap.get("farmId");
         String type = paramsMap.get("type");//来访类型
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
         String pageNum = paramsMap.get("current");
         String pageSize = paramsMap.get("size");
+
         if ("".equals(pageNum) || null == pageNum) {
             pageNum = "1";
         }
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
-        QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-        if (ObjectUtil.isNotEmpty(startTime)) {
-            startTime = startTime + " 00:00:00";
-            endTime = endTime + " 23:59:59";
-            queryWrapper.between("check_date", startTime, endTime);
+
+        //洗澡
+        if ("1".equals(dataType)) {
+            QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+            if (ObjectUtil.isNotEmpty(startTime)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("check_date", startTime, endTime);
+            }
+            queryWrapper.lambda().orderByDesc(BillClean::getId);
+            queryWrapper.eq("farm_id", farmId);
+            if ("".equals(type) || null == type) {
+            } else {
+                queryWrapper.eq("vistit_type", type).eq(StringUtils.isNotBlank(destId), "dest_id", destId);
+            }
+            Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            return new Result(ResultCode.SUCCESS, billCleanMapper.selectPage(page, queryWrapper));
+        }
+        //烘干
+        if ("2".equals(dataType)) {
+            QueryWrapper<BillDry> queryWrapper = new QueryWrapper<>();
+            if (ObjectUtil.isNotEmpty(startTime)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("check_date", startTime, endTime);
+            }
+            queryWrapper.lambda().orderByDesc(BillDry::getId);
+            queryWrapper.eq("farm_id", farmId);
+            if ("".equals(type) || null == type) {
+            } else {
+                queryWrapper.eq("vistit_type", type).eq(StringUtils.isNotBlank(destId), "dest_id", destId);
+            }
+            Page<BillDry> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            return new Result(ResultCode.SUCCESS, dryMapper.selectPage(page, queryWrapper));
         }
-        queryWrapper.lambda().orderByDesc(BillClean::getId);
-        queryWrapper.eq("farm_id", farmId);
+        //物资分类
+        if ("3".equals(dataType)) {
+            QueryWrapper<BillGoodsInventory> queryWrapper = new QueryWrapper<>();
+            if (ObjectUtil.isNotEmpty(startTime)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("check_date", startTime, endTime);
+            }
+            queryWrapper.lambda().orderByDesc(BillGoodsInventory::getId);
+            queryWrapper.eq("farm_id", farmId);
+            if ("".equals(type) || null == type) {
+            } else {
+                queryWrapper.eq("goods_type", type);
+            }
+            Page<BillGoodsInventory> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            return new Result(ResultCode.SUCCESS, goodsInventoryMapper.selectPage(page, queryWrapper));
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result listScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
         if ("".equals(type) || null == type) {
+            type = "1";
+        }
+        QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("pass_date");
+        if (type.equals("1")) {
+            queryWrapper.eq("farm_id", farmId).eq("vistit_type", 0).ne("bill_status", 0);
         } else {
-            queryWrapper.eq("vistit_type", type);
+            queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0).ne("bill_status", 0);
         }
-        Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS, billCleanMapper.selectPage(page, queryWrapper));
+
+        return new Result(ResultCode.SUCCESS, billCleanMapper.selectList(queryWrapper));
     }
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/impl/BillLuggageServiceImpl.java

@@ -9,8 +9,10 @@ import com.huimv.secure.common.utils.DataUill;
 import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.common.utils.UploadImage;
+import com.huimv.secure.entity.BillGoodsInventory;
 import com.huimv.secure.entity.BillLuggage;
 import com.huimv.secure.entity.vo.LuggageVo;
+import com.huimv.secure.mapper.BillGoodsInventoryMapper;
 import com.huimv.secure.mapper.BillLuggageMapper;
 import com.huimv.secure.service.IBillLuggageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -44,6 +46,8 @@ public class BillLuggageServiceImpl extends ServiceImpl<BillLuggageMapper, BillL
     private UploadImage uploadImage;
     @Resource
     private BillLuggageMapper billLuggageMapper;
+    @Autowired
+    private BillGoodsInventoryMapper goodsInventoryMapper;
 
 
     @Override
@@ -86,21 +90,44 @@ public class BillLuggageServiceImpl extends ServiceImpl<BillLuggageMapper, BillL
         if ("".equals(type) || null == type) {
             type = "3";
         }
+        String dataType = paramsMap.get("dataType");// 1为行李寄存 2为物资分类
+        if ("".equals(dataType) || null == dataType) {
+            dataType = "1";
+        }
         List<LuggageVo> luggageVos = null;
-        QueryWrapper<BillLuggage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
-        if ("3".equals(type)) {
-            Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("luggage_date", timesMonthmorning);
-        } else if ("2".equals(type)) {
-            Calendar calendar = Calendar.getInstance();
-            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-            queryWrapper.ge("luggage_date", calendar.getTime());
-        } else if ("1".equals(type)) {
-            Date timesmorning = DataUill.getTimesmorning();
-            queryWrapper.ge("luggage_date", timesmorning);
+        if ("1".equals(dataType)) {
+            QueryWrapper<BillLuggage> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId);
+            if ("3".equals(type)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("luggage_date", timesMonthmorning);
+            } else if ("2".equals(type)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                queryWrapper.ge("luggage_date", calendar.getTime());
+            } else if ("1".equals(type)) {
+                Date timesmorning = DataUill.getTimesmorning();
+                queryWrapper.ge("luggage_date", timesmorning);
+            }
+            luggageVos = billLuggageMapper.list(queryWrapper);
+        } else {
+            QueryWrapper<BillGoodsInventory> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId);
+            if ("3".equals(type)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("create_date", timesMonthmorning);
+            } else if ("2".equals(type)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                queryWrapper.ge("create_date", calendar.getTime());
+            } else if ("1".equals(type)) {
+                Date timesmorning = DataUill.getTimesmorning();
+                queryWrapper.ge("create_date", timesmorning);
+            }
+            luggageVos = goodsInventoryMapper.list(queryWrapper);
         }
-        luggageVos = billLuggageMapper.list(queryWrapper);
+
+
         return new Result(ResultCode.SUCCESS, luggageVos);
     }
 

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/impl/BillPcrServiceImpl.java

@@ -96,7 +96,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         }
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+        queryWrapper1.eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
         List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
         List<Integer> ids = new ArrayList<>();
         for (BaseLocation baseLocation : baseLocations) {
@@ -242,7 +242,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                 baseProcess.setCurrentStatus(substring + "2," + 0);
                 if (baseLocation.getId() == 2) {
                     //第一次检测不合格
-                    billPcr.setPcrType(0);
+                    billPcr.setPcrType(1);
                     baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",一级洗消站");
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
                 }
@@ -251,26 +251,32 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     baseProcess.setProcessType(2);
                     baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
-                    String status1 = baseProcess.getAllLocationStatus();
-                    String[] split = status1.split(",");
-                    split[0] = "2";
-                    split[2] = "2";
-                    split[3] = "3";
-                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3]);
+//                    String status1 = baseProcess.getAllLocationStatus();
+//                    String[] split = status1.split(",");
+//                    split[0] = "2";
+//                    split[1] = "2";
+//                    split[2] = "3";
+                    baseProcess.setAllLocationStatus("2,2,3");
                 }
                 if (baseLocation.getId() == 5) {
-                    String status1 = baseProcess.getAllLocationStatus();
-                    String[] split = status1.split(",");
-                    split[0] = "2";
-                    split[1] = "3";
-                    baseProcess.setAllLocationStatus(split[0] + "," + split[1]);
+                    billPcr.setPcrType(1);
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",污道二级洗消站");
+                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
+//                    String status1 = baseProcess.getAllLocationStatus();
+//                    String[] split = status1.split(",");
+//                    split[0] = "2";
+//                    split[1] = "3";
+//                    baseProcess.setAllLocationStatus(split[0] + "," + split[1]);
                 }
                 if (baseLocation.getId() == 7) {
-                    String status1 = baseProcess.getAllLocationStatus();
-                    String[] split = status1.split(",");
-                    split[0] = "2";
-                    split[1] = "3";
-                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                    billPcr.setPcrType(1);
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",一级洗消站");
+                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
+//                    String status1 = baseProcess.getAllLocationStatus();
+//                    String[] split = status1.split(",");
+//                    split[0] = "2";
+//                    split[1] = "3";
+//                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
                 }
                 if (baseLocation.getId() == 10) {
                     String status1 = baseProcess.getAllLocationStatus();

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -153,25 +153,31 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         QueryWrapper<Exist> existQueryWrapper = new QueryWrapper<>();
         existQueryWrapper.eq("farm_id", farmId);
         Exist exist = existMapper.selectOne(existQueryWrapper);
-        if (vistitType.equals("5")) {
-            baseProcess.setAllLocationStatus("1,0");
-            baseProcess.setAllLocation("场外,一级洗消站");
-            baseProcess.setAllLocationId("11,12");
-        } else {
+        if (admissionType.equals("0")) {
             queryWrapper.eq("vistit_type", vistitType).orderByAsc("location_type");
             List<BaseLocation> baseLocations = baseLocationMapper.selectList(queryWrapper);
-            if (admissionType.equals("1")) {
-                baseProcess.setAllLocation("场外," + destName);
-                QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("vistit_type", vistitType).eq("location_type", 0);
-                baseProcess.setAllLocationId(baseLocationMapper.selectOne(queryWrapper1).getId() + "," + destId);
+            if (vistitType.equals("5") && Integer.parseInt(destId) < 13) {
+                baseProcess.setAllLocationStatus("1,0");
+                baseProcess.setAllLocation("场外,一级洗消站");
+                baseProcess.setAllLocationId("11,12");
+            } else if (vistitType.equals("5") && Integer.parseInt(destId) == 13) {
+                baseProcess.setAllLocationStatus("1,0");
+                baseProcess.setAllLocation("一级洗消站,净道二级洗消站");
+                baseProcess.setAllLocationId("12,13");
+            } else if (vistitType.equals("4")) {
                 baseProcess.setAllLocationStatus("1,0");
+                baseProcess.setAllLocation("场外,污道二级洗消站");
+                baseProcess.setAllLocationId("9,10");
+            } else if (vistitType.equals("1")) {
+                baseProcess.setAllLocationStatus("1,0");
+                baseProcess.setAllLocation("场外,污道二级洗消站");
+                baseProcess.setAllLocationId("4,5");
             } else {
-                if ("0".equals(vistitType) && exist.getExist() == 1 && Integer.parseInt(destId) > 2) {
+                if ("0".equals(vistitType) && Integer.parseInt(destId) > 2) {
                     baseProcess.setAllLocation("场外,一级洗消站,净道二级洗消站");
                     baseProcess.setAllLocationId("1,2,3");
                     baseProcess.setAllLocationStatus("1,0,0");
-                } else if ("3".equals(vistitType) && exist.getExist() == 1 && Integer.parseInt(destId) > 7) {
+                } else if ("3".equals(vistitType) && Integer.parseInt(destId) > 7) {
                     baseProcess.setAllLocation("场外,一级洗消站,净道二级洗消站");
                     baseProcess.setAllLocationId("6,7,8");
                     baseProcess.setAllLocationStatus("1,0,0");
@@ -199,8 +205,15 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 }
 
             }
-        }
 
+        } else {
+            baseProcess.setAllLocation("场外," + destName);
+            QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("vistit_type", vistitType).eq("location_type", 0);
+            baseProcess.setAllLocationId(baseLocationMapper.selectOne(queryWrapper1).getId() + "," + destId);
+            baseProcess.setAllLocationStatus("1,0");
+
+        }
 
         //获取位置
         BaseLocation baseLocation;
@@ -209,13 +222,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         } else {
             baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("vistit_type", vistitType).eq("parent_id", 0));
         }
+
         if (ObjectUtil.isEmpty(baseLocation)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return new Result(10001, "该来访类型位置不存在", false);
         }
         baseProcess.setCurrentLocation(baseLocation.getLocationName());
         baseProcess.setCurrentLocationId(baseLocation.getId().toString());
-        baseProcess.setFarmId(Integer.parseInt(farmId));
+        baseProcess.setFarmId(farmId);
         baseProcessMapper.insert(baseProcess);
         billPersonnelAdmission.setProcessId(baseProcess.getId());
         billPersonnelAdmissionMapper.insert(billPersonnelAdmission);
@@ -392,8 +406,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())) {
                     billPcr.setCarNum(billPersonnelAdmission.getCarNum());
                 }
-                billPcr.setTestLocation(baseLocation.getNextLocation());
-                billPcr.setTestLocationId(baseLocation.getNextId());
+                if (baseLocation.getId() == 12 || baseLocation.getId() == 13) {
+                    billPcr.setTestLocation(baseLocation.getLocationName());
+                    billPcr.setTestLocationId(baseLocation.getId());
+                } else {
+                    billPcr.setTestLocation(baseLocation.getNextLocation());
+                    billPcr.setTestLocationId(baseLocation.getNextId());
+                }
                 billPcrMapper.insert(billPcr);
 //                SendSMS.sendSMS(phoneList,"通过入场申请测试");
             } else {
@@ -477,8 +496,25 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             } else if ("2".equals(status)) {
                 queryWrapper.eq("bill_status", 0);
             }
+
+            QueryWrapper<BillAccessDoor> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId);
+            List<BillAccessDoor> doors = doorMapper.selectList(queryWrapper1);
+            Integer passCount = 0;
+            Integer resultCount = 0;
+            for (BillAccessDoor door : doors) {
+                if (door.getBillStatus() == 0) {
+                    resultCount = resultCount + 1;
+                }
+                if (door.getBillStatus() == 1) {
+                    passCount = passCount + 1;
+                }
+            }
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("passCount", passCount);
+            jsonObject.put("resultCount", resultCount);
             Page<BillAccessDoor> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            return new Result(ResultCode.SUCCESS, doorMapper.selectPage(page, queryWrapper));
+            return new Result(ResultCode.SUCCESS, doorMapper.selectPage(page, queryWrapper),jsonObject);
         } else {
             QueryWrapper<BillGate> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
@@ -487,8 +523,25 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             } else if ("2".equals(status)) {
                 queryWrapper.eq("bill_status", 0);
             }
+
+            QueryWrapper<BillGate> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId);
+            List<BillGate> doors = gateMapper.selectList(queryWrapper1);
+            Integer passCount = 0;
+            Integer resultCount = 0;
+            for (BillGate door : doors) {
+                if (door.getBillStatus() == 0) {
+                    resultCount = resultCount + 1;
+                }
+                if (door.getBillStatus() == 1) {
+                    passCount = passCount + 1;
+                }
+            }
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("passCount", passCount);
+            jsonObject.put("resultCount", resultCount);
             Page<BillGate> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            return new Result(ResultCode.SUCCESS, gateMapper.selectPage(page, queryWrapper));
+            return new Result(ResultCode.SUCCESS, gateMapper.selectPage(page, queryWrapper),jsonObject);
         }
     }
 
@@ -1338,6 +1391,45 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     }
 
     @Override
+    public Result screenCount(Map<String, String> paramsMap) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", paramsMap.get("farmId")).ge("pass_date", calendar.getTime());
+        List<ListAdmissionVo2> admissionVo2s = billPersonnelAdmissionMapper.screenCount(queryWrapper);
+        return new Result(ResultCode.SUCCESS, admissionVo2s);
+    }
+
+    @Override
+    public Result screenWarning(Map<String, String> paramsMap) {
+
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<BillAccessDoor> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
+        List<BillAccessDoor> doors = doorMapper.selectList(queryWrapper);
+        List<String> list = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (BillAccessDoor door : doors) {
+            String s = "";
+            if (door.getBillStatus() == 0) {
+                s = sdf.format(door.getCheckDate()) + " 陌生人进入" + door.getCheckLocation();
+            }
+            list.add(s);
+        }
+        QueryWrapper<BillGate> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).orderByDesc("check_date");
+        List<BillGate> gates = gateMapper.selectList(queryWrapper1);
+        for (BillGate door : gates) {
+            String s = "";
+            if (door.getBillStatus() == 0) {
+                s = sdf.format(door.getCheckDate()) + " 陌生车辆" + door.getCarNum()+"进入"+door.getCheckLocation();
+            }
+            list.add(s);
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
     public Result uploadImgAndAdmissin(MultipartFile imgUrl, Integer id) throws IOException {
         BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionMapper.selectById(id);
         String imageCom = "";

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/impl/SysAccountMultilevelServiceImpl.java

@@ -3,9 +3,8 @@ package com.huimv.secure.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huimv.secure.common.utils.Result;
-import com.huimv.secure.common.utils.ResultCode;
-import com.huimv.secure.common.utils.UploadImage;
+import com.huimv.secure.common.token.TokenSign;
+import com.huimv.secure.common.utils.*;
 import com.huimv.secure.entity.SysAccountMultilevel;
 import com.huimv.secure.entity.SysUser;
 import com.huimv.secure.mapper.SysAccountMultilevelMapper;
@@ -15,7 +14,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -67,7 +71,7 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         sysAccountMultilevel.setPid(0);
         sysAccountMultilevel.setPids("");
         sysAccountMultilevel.setImgUrl(sysUser.getImgUrl());
-//        sysAccountMultilevel.setPapersType(sysUser.getCardType());
+        sysAccountMultilevel.setPapersType("0");
         sysAccountMultilevel.setUserId(sysAccountMultilevel1.getUserId());
         accountMultilevelMapper.insert(sysAccountMultilevel);
         return new Result(10000,"添加成功",true);
@@ -97,17 +101,20 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
     public Result listAccount(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String userName = paramsMap.get("userName");//员工工号或姓名
-        String workType = paramsMap.get("workType");//工作岗位
-        String workLocation = paramsMap.get("workLocation");//工作地点
+        String workType = paramsMap.get("job");//工作岗位
+        String workLocation = paramsMap.get("workLocationType");//工作地点
         String pageNum = paramsMap.get("current");
         String pageSize = paramsMap.get("size");
         Page<SysAccountMultilevel> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<SysAccountMultilevel> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
-        queryWrapper.like(StringUtils.isNotBlank(userName), "account", userName).or()
-                .like(StringUtils.isNotBlank(userName), "user_id", userName)
-                .eq(StringUtils.isNotBlank(workType),"type", workType)
-                .eq(StringUtils.isNotBlank(workLocation),"work_location_type", workLocation);
+        queryWrapper.like(StringUtils.isNotBlank(workType),"jobs", workType);
+        queryWrapper.eq(StringUtils.isNotBlank(workLocation),"work_location_type", workLocation);
+
+        if (StringUtils.isNotBlank(userName)) {
+            queryWrapper.and(i -> i.like("account",userName).or().like("user_id",userName));
+        }
+
         return new Result(ResultCode.SUCCESS, accountMultilevelMapper.selectPage(page, queryWrapper));
     }
 
@@ -147,5 +154,50 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         List<SysAccountMultilevel> page = this.list(wrapper);
         return new Result(ResultCode.SUCCESS, page);
     }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result updateUser(HttpServletRequest httpServletRequest, MultipartFile img, String userName, String phone, Integer workPost, String workLocation, String workLocationId, String workName, String papersType, String papersCode) throws IOException {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        if (ObjectUtil.isNotEmpty(img)) {
+            if (uploadImage.getImageCom(img).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片上传失败", false);
+            }
+            sysAccountMultilevel.setImgUrl(uploadImage.getImageCom(img));
+        }
+        if (ObjectUtil.isNotEmpty(userName)) {
+            sysAccountMultilevel.setUserName(userName);
+        }
+        if (ObjectUtil.isNotEmpty(phone)) {
+            if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "手机号格式错误！", false);
+            }
+            sysAccountMultilevel.setPhone(phone);
+        }
+        if (ObjectUtil.isNotEmpty(workPost)) {
+            sysAccountMultilevel.setWorkPost(workPost.toString());
+        }
+        if (ObjectUtil.isNotEmpty(workLocation)) {
+            sysAccountMultilevel.setWorkLocation(workLocation);
+        }
+        if (ObjectUtil.isNotEmpty(workLocationId)) {
+            sysAccountMultilevel.setWorkLocationType(Integer.parseInt(workLocationId));
+        }
+        if (ObjectUtil.isNotEmpty(workName)) {
+            sysAccountMultilevel.setWorkName(workName);
+        }
+
+
+        if (!IDCardValidator.isValidIDCard(papersCode)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new Result(10001, "身份证号格式错误!", false);
+        }
+
+        sysAccountMultilevel.setPapersCode(papersCode);
+
+        accountMultilevelMapper.updateById(sysAccountMultilevel);
+        return new Result(ResultCode.SUCCESS, sysAccountMultilevel);
+    }
 
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/impl/SysUserServiceImpl.java

@@ -72,9 +72,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             pageSize = 10;
         }
         wrapper.eq("farm_id",farmId);
-        wrapper.eq(ObjectUtil.isNotEmpty(job),"job",job);
-        wrapper.eq(ObjectUtil.isNotEmpty(workLocation),"work_location",workLocation);
-        wrapper.eq(ObjectUtil.isNotEmpty(workLocationType),"work_location_type",workLocationType);
+        wrapper.like(ObjectUtil.isNotEmpty(job),"job",job);
+        wrapper.eq(ObjectUtil.isNotEmpty(workLocation),"work_location_type",workLocation);
+//        wrapper.eq(ObjectUtil.isNotEmpty(workLocationType),"work_location_type",workLocationType);
         wrapper.eq(ObjectUtil.isNotEmpty(gender),"gender",gender);
         if (StringUtils.isNotBlank(searchStr)) {
             wrapper.and(i -> i.like("user_name",searchStr).or().like("user_phone",searchStr));
@@ -108,9 +108,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         Exist exist = existMapper.selectOne(new QueryWrapper<Exist>().eq("farm_id", farmId));
         if (exist.getExist() == 0){
-            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().groupBy("location_type").orderByAsc("location_type")));
+            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().groupBy("location_type").ne("location_type",0).orderByAsc("location_type")));
         }else {
-            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().groupBy("location_type").orderByAsc("location_type")));
+            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().groupBy("location_type").ne("location_type",0).orderByAsc("location_type")));
         }
     }
 

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/timer/SafeTimer.java

@@ -0,0 +1,114 @@
+package com.huimv.secure.timer;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.secure.entity.*;
+import com.huimv.secure.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 java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+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;
+
+
+    @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());
+                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());
+
+                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));
+
+                baseProcess.setProcessType(1);
+                baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + now);
+                String status = baseProcess.getCurrentStatus();
+                String substring = status.substring(0, status.length() - 1);
+                baseProcess.setCurrentStatus(substring + "1");
+
+                baseProcess.setAllLocationStatus("2,2,2");
+                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() + Integer.valueOf(pcr.getQualifiedDate()) * 60 * 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);
+            }
+        }
+    }
+
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/resources/com/huimv/secure/mapper/BillGoodsInventoryMapper.xml

@@ -14,4 +14,11 @@ FROM
 GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
 ORDER BY DATE_FORMAT(create_date,"%Y-%m-%d") asc
     </select>
+
+    <select id="list" resultType="com.huimv.secure.entity.vo.LuggageVo">
+        select sum(goods_nums) count,create_date dateTime from bill_goods_inventory
+        ${ew.customSqlSegment}
+        group by DATE_FORMAT(create_date,"%y-%m-%d")
+        order by create_date asc
+    </select>
 </mapper>

huimv.nongke.secure/huimv.nongke.secure/src/main/resources/com/huimv/secure/mapper/BillPersonnelAdmissionMapper.xml

@@ -74,4 +74,15 @@ GROUP BY
 ORDER BY
     DATE(sub_date)
     </select>
+
+    <select id="screenCount" resultType="com.huimv.secure.entity.vo.ListAdmissionVo2">
+        select
+        pass_date as subDate,
+        SUM(CASE WHEN vistit_type = 0 THEN 1 ELSE 0 END) AS personCount,
+        SUM(CASE WHEN bill_status != 0 THEN 1 ELSE 0 END) AS carCount
+        from bill_personnel_admission
+        ${ew.customSqlSegment}
+        group by DATE_FORMAT(pass_date,"%y-%m-%d")
+        order by pass_date asc
+    </select>
 </mapper>

huimv.nongke.secure/huimv.nongke.secure/src/main/resources/com/huimv/secure/mapper/SysUserMapper.xml

@@ -32,7 +32,8 @@ GROUP BY age_range
         IFNULL (SUM(CASE WHEN job LIKE "%5%"  THEN 1 ELSE 0 END) ,0)AS clean,
         IFNULL (SUM(CASE WHEN job LIKE "%4%"  THEN 1 ELSE 0 END) ,0) AS pcr,
         IFNULL (SUM(CASE WHEN job LIKE "%3%"  THEN 1 ELSE 0 END)  ,0)AS safe,
-       IFNULL ( SUM(CASE WHEN job LIKE "%1%"  THEN 1 ELSE 0 END)  ,0)AS factory
+       IFNULL ( SUM(CASE WHEN job LIKE "%1%"  THEN 1 ELSE 0 END)  ,0)AS factory,
+       IFNULL ( SUM(CASE WHEN job LIKE "%2%"  THEN 1 ELSE 0 END)  ,0)AS jjadmin
     FROM
        `sys_user`
        WHERE farm_id = #{farmId}

huimv.nongke.secure/huimv.nongke.secure/src/main/resources/mapper/BillDryMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.secure.mapper.BillDryMapper">
 
+    <select id="listAll" resultType="com.huimv.secure.entity.vo.CleanVo">
+        SELECT
+    DATE(sub_date) as dateTime,
+    SUM(CASE WHEN bill_status = 1 THEN 1 ELSE 0 END) AS passCount,
+    SUM(CASE WHEN bill_status = 2 THEN 1 ELSE 0 END) AS refuseCount
+FROM
+    `bill_dry`
+
+    ${ew.customSqlSegment}
+GROUP BY
+    DATE(sub_date)
+ORDER BY
+    DATE(sub_date)
+    </select>
 </mapper>

huimv.nongke.secure/huimv.nongke.secure/target/classes/application-prod.yml

@@ -13,7 +13,7 @@ spring:
 
   datasource:
     druid:
-      url: jdbc:mysql://192.168.1.7:3306/huimv-nongke-secure?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://115.238.57.190:3306/huimv-nongke-secure?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
       username: root
       password: hm123456
       driver-class-name: com.mysql.cj.jdbc.Driver

huimv.nongke.secure/huimv.nongke.secure/target/classes/com/huimv/secure/mapper/BaseProcessMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.secure.mapper.BaseProcessMapper">
 
+    <select id="pageByLocationId" resultType="com.huimv.secure.entity.vo.BaseProcessByLocationVo">
+
+   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`
+
+   UNION
+   SELECT qualified_date,pass_user_name,pcr_type, process_id ,id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status
+   ,NULL AS isolate_end_date ,2 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_pcr`
+
+   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 ,3  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  ,dry_time,dry_tem FROM  `bill_dry`
+    UNION
+
+   SELECT  NULL AS qualified_date,pass_user_name,  NULL AS pcr_type, process_id ,id,farm_id,admission_user_id , isolate_location AS test_location,
+   isolate_start_date AS check_date ,
+   isolate_location_id AS test_location_id  ,
+   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
+
+    </select>
+
 </mapper>

huimv.nongke.secure/huimv.nongke.secure/target/classes/com/huimv/secure/mapper/BillCleanMapper.xml

@@ -2,6 +2,76 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.secure.mapper.BillCleanMapper">
 
+
+
+    <select id="listPersonalCleanAndDry" resultType="com.huimv.secure.entity.vo.CleanAndDryVo">
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,pass_date,1 AS 'type'
+        FROM `bill_clean` WHERE admission_user_id = #{userId} AND vistit_type = #{vistitType}
+
+        UNION ALL
+
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,pass_date,2 AS 'type'
+        FROM `bill_dry` WHERE admission_user_id = #{userId} AND vistit_type = #{vistitType}
+        ORDER BY sub_date DESC
+    </select>
+    <select id="listCleanAndDry" resultType="com.huimv.secure.entity.vo.CleanAndDryVo">
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,pass_date,sub_date,1 AS 'type'
+        FROM `bill_clean` WHERE farm_id = #{farmId} AND vistit_type != 0 AND img_status = 1
+        <if test="status != null">
+            AND bill_status = #{status}
+        </if>
+
+        UNION ALL
+
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,pass_date,sub_date,2 AS 'type'
+        FROM `bill_dry` WHERE farm_id = #{farmId} AND vistit_type != 0 AND img_status = 1
+        <if test="status != null">
+            AND bill_status = #{status}
+        </if>
+        ORDER BY sub_date DESC
+    </select>
+
+    <select id="CleanAndDry" resultType="com.huimv.secure.entity.vo.CleanAndDryVo2">
+        select *,null,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
+        and test_location_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
+        and img_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        union all
+        select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
+        and test_location_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
+        and img_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        ORDER BY sub_date DESC
+    </select>
+
+
+    <select id="CleanAndDry2" resultType="com.huimv.secure.entity.vo.CleanAndDryVo2">
+        select id,vistit_type,dest_name,dest_id,admission_user_name,admission_user_id,vistit_date,sub_date,farm_id,bill_status,pass_date,pass_user_name,pass_user_id,process_id,check_date,test_location,test_location_id,phone,car_num,img_url,img_status,clean_time,null,1 AS 'type' from bill_clean where farm_id=#{farmId} and
+        vistit_type in (1,2,3,4,5,6) and img_status=1
+        and bill_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        union all
+        select id,vistit_type,dest_name,dest_id,admission_user_name,admission_user_id,vistit_date,sub_date,farm_id,bill_status,pass_date,pass_user_name,pass_user_id,process_id,check_date,test_location,test_location_id,phone,car_num,img_url,img_status,dry_time,dry_tem,2 AS 'type' from bill_dry where farm_id=#{farmId} and
+        vistit_type in (1,2,3,4,5,6) and img_status=1
+        and bill_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        ORDER BY sub_date DESC
+    </select>
+
     <select id="listAll" resultType="com.huimv.secure.entity.vo.CleanVo">
         SELECT
     DATE(sub_date) as dateTime,

huimv.nongke.secure/huimv.nongke.secure/target/classes/com/huimv/secure/mapper/BillGoodsInventoryMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.secure.mapper.BillGoodsInventoryMapper">
 
+
+    <select id="listAll" resultType="com.huimv.secure.entity.vo.BillGoodsInventoryVo">
+        SELECT
+    DATE(create_date) as dateTime,
+    sum(goods_nums) count
+FROM
+    `bill_goods_inventory`
+
+    ${ew.customSqlSegment}
+GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+ORDER BY DATE_FORMAT(create_date,"%Y-%m-%d") asc
+    </select>
+
+    <select id="list" resultType="com.huimv.secure.entity.vo.LuggageVo">
+        select sum(goods_nums) count,create_date dateTime from bill_goods_inventory
+        ${ew.customSqlSegment}
+        group by DATE_FORMAT(create_date,"%y-%m-%d")
+        order by create_date asc
+    </select>
 </mapper>

huimv.nongke.secure/huimv.nongke.secure/target/classes/com/huimv/secure/mapper/BillPersonnelAdmissionMapper.xml

@@ -2,6 +2,57 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.secure.mapper.BillPersonnelAdmissionMapper">
 
+
+
+    <select id="listAll" resultType="com.huimv.secure.entity.vo.FactoryDirectorVo">
+        SELECT id,admission_user_name AS 'userName',process_id processId, bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
+FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = '7'
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName',process_id processId, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type',sub_date
+FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = '7'
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName',process_id processId, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,1 AS 'type',sub_date
+FROM bill_pcr WHERE farm_id = #{farmId} AND vistit_type = '7'
+
+UNION ALL
+
+SELECT  id,admission_user_name AS 'userName',process_id processId, bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
+FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type}
+ORDER BY sub_date DESC
+    </select>
+
+
+    <select id="listCarAll" resultType="com.huimv.secure.entity.vo.FactoryDirectorVo">
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
+FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = '7'
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,4 AS 'type',sub_date
+FROM bill_dry WHERE farm_id = #{farmId} AND vistit_type = '7' AND img_status = 1
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type',sub_date
+FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = '7' AND img_status = 1
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,1 AS 'type',sub_date
+FROM bill_pcr WHERE farm_id = #{farmId} AND vistit_type = '7'
+
+UNION ALL
+
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
+FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type}
+ORDER BY sub_date DESC
+    </select>
+
+
     <select id="countAdmission" resultType="com.huimv.secure.entity.vo.ListAdmissionVo">
         select count(*) count, vistit_type type from bill_personnel_admission
         ${ew.customSqlSegment}
@@ -23,4 +74,15 @@ GROUP BY
 ORDER BY
     DATE(sub_date)
     </select>
+
+    <select id="screenCount" resultType="com.huimv.secure.entity.vo.ListAdmissionVo2">
+        select
+        pass_date as subDate,
+        SUM(CASE WHEN vistit_type = 0 THEN 1 ELSE 0 END) AS personCount,
+        SUM(CASE WHEN bill_status != 0 THEN 1 ELSE 0 END) AS carCount
+        from bill_personnel_admission
+        ${ew.customSqlSegment}
+        group by DATE_FORMAT(pass_date,"%y-%m-%d")
+        order by pass_date asc
+    </select>
 </mapper>

huimv.nongke.secure/huimv.nongke.secure/target/classes/com/huimv/secure/mapper/SysUserMapper.xml

@@ -32,7 +32,8 @@ GROUP BY age_range
         IFNULL (SUM(CASE WHEN job LIKE "%5%"  THEN 1 ELSE 0 END) ,0)AS clean,
         IFNULL (SUM(CASE WHEN job LIKE "%4%"  THEN 1 ELSE 0 END) ,0) AS pcr,
         IFNULL (SUM(CASE WHEN job LIKE "%3%"  THEN 1 ELSE 0 END)  ,0)AS safe,
-       IFNULL ( SUM(CASE WHEN job LIKE "%1%"  THEN 1 ELSE 0 END)  ,0)AS factory
+       IFNULL ( SUM(CASE WHEN job LIKE "%1%"  THEN 1 ELSE 0 END)  ,0)AS factory,
+       IFNULL ( SUM(CASE WHEN job LIKE "%2%"  THEN 1 ELSE 0 END)  ,0)AS jjadmin
     FROM
        `sys_user`
        WHERE farm_id = #{farmId}

huimv.nongke.secure/huimv.nongke.secure/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,187 +0,0 @@
-com\huimv\secure\controller\BillGoodsInventoryController.class
-com\huimv\secure\entity\vo\AccountVo.class
-com\huimv\secure\service\IBaseDeviceService.class
-com\huimv\secure\mapper\BillDryMapper.class
-com\huimv\secure\entity\vo\DoorVo.class
-com\huimv\secure\controller\BillPersonnelAdmissionController.class
-com\huimv\secure\entity\BillAccessDoor.class
-com\huimv\secure\common\utils\UploadImage.class
-com\huimv\secure\entity\dto\WeCahtVo.class
-com\huimv\secure\entity\Exist.class
-com\huimv\secure\service\impl\SysGroupMenuServiceImpl.class
-com\huimv\secure\controller\BillCleanController.class
-com\huimv\secure\entity\dto\PrintLuggageDto.class
-com\huimv\secure\service\IBillGateService.class
-com\huimv\secure\service\ISysGroupService.class
-com\huimv\secure\service\impl\BillPersonnelAdmissionServiceImpl$1.class
-com\huimv\secure\controller\BaseFarmController.class
-com\huimv\secure\common\utils\SnowflakeSequence.class
-com\huimv\secure\service\IConfigurationService.class
-com\huimv\secure\common\utils\Result.class
-com\huimv\secure\service\ISysGroupMenuService.class
-com\huimv\secure\entity\vo\FactoryDirectorVo.class
-com\huimv\secure\controller\BillLuggageController.class
-com\huimv\secure\mapper\AgeRangesMapper.class
-com\huimv\secure\entity\dto\PcrDto.class
-com\huimv\secure\entity\BillGate.class
-com\huimv\secure\service\ISysAccountGroupService.class
-com\huimv\secure\service\IBaseFarmService.class
-com\huimv\secure\service\IExistService.class
-com\huimv\secure\service\impl\BillPersonnelAdmissionServiceImpl.class
-com\huimv\secure\common\utils\PdfUtil.class
-com\huimv\secure\mapper\BillGoodsInventoryMapper.class
-com\huimv\secure\mapper\BaseProcessMapper.class
-com\huimv\secure\service\IBaseLocationService.class
-com\huimv\secure\mapper\BillPersonnelAdmissionMapper.class
-com\huimv\secure\entity\BillPcr.class
-com\huimv\secure\service\impl\DeviceListServiceImpl.class
-com\huimv\secure\service\impl\BaseFarmServiceImpl.class
-com\huimv\secure\controller\SysGroupController.class
-com\huimv\secure\mapper\ConfigurationMapper.class
-com\huimv\secure\entity\vo\UserVo.class
-com\huimv\secure\controller\BillIsolateController.class
-com\huimv\secure\mapper\DeviceListMapper.class
-com\huimv\secure\service\impl\PeopleListServiceImpl.class
-com\huimv\secure\common\utils\PageResult.class
-com\huimv\secure\entity\BillLuggage.class
-com\huimv\secure\controller\BillGateController.class
-com\huimv\secure\entity\BillGoodsInventory.class
-com\huimv\secure\controller\ConfigurationController.class
-com\huimv\secure\mapper\SysMenuMapper.class
-com\huimv\secure\entity\vo\BillAdmissionAndGoods.class
-com\huimv\secure\service\impl\BillDryServiceImpl.class
-com\huimv\secure\entity\AgeRanges.class
-com\huimv\secure\config\MybatisPlusConfig.class
-com\huimv\secure\common\utils\ChineseCharToEnUtil.class
-com\huimv\secure\entity\vo\LuggageVo.class
-com\huimv\secure\service\impl\BillIsolateServiceImpl.class
-com\huimv\secure\entity\SysMenu.class
-com\huimv\secure\entity\vo\BillAdmissionVo.class
-com\huimv\secure\mapper\BaseDeviceMapper.class
-com\huimv\secure\service\impl\BillLuggageServiceImpl.class
-com\huimv\secure\service\impl\BaseProcessServiceImpl.class
-com\huimv\secure\common\exception\MExceptionEnum.class
-com\huimv\secure\entity\vo\CleanVo.class
-com\huimv\secure\controller\PeopleListController.class
-com\huimv\secure\service\impl\BillPcrServiceImpl.class
-com\huimv\secure\controller\BillDryController.class
-com\huimv\secure\mapper\BillGateMapper.class
-com\huimv\secure\common\utils\StringUtilsWork.class
-com\huimv\secure\controller\BillPcrController.class
-com\huimv\secure\service\IBaseWorkTypeService.class
-com\huimv\secure\service\IBaseProcessService.class
-com\huimv\secure\service\IPeopleListService.class
-com\huimv\secure\controller\DeviceListController.class
-com\huimv\secure\service\impl\BillGateServiceImpl.class
-com\huimv\secure\service\IBillDryService.class
-com\huimv\secure\mapper\ExistMapper.class
-com\huimv\secure\mapper\PeopleListMapper.class
-com\huimv\secure\common\utils\AirQualityIndexUtil.class
-com\huimv\secure\entity\vo\CleanAndDryVo2.class
-com\huimv\secure\entity\SysUser.class
-com\huimv\secure\controller\AgeRangesController.class
-com\huimv\secure\common\exception\MiException.class
-com\huimv\secure\service\impl\BaseDeviceServiceImpl.class
-com\huimv\secure\entity\dto\UserAccountDto.class
-com\huimv\secure\mapper\BillCleanMapper.class
-com\huimv\secure\common\token\TokenConstant.class
-com\huimv\secure\service\IBillPersonnelAdmissionService.class
-com\huimv\secure\controller\BaseLocationController.class
-com\huimv\secure\mapper\BaseLocationMapper.class
-com\huimv\secure\entity\BillPersonnelAdmission.class
-com\huimv\secure\common\utils\PageFactory.class
-com\huimv\secure\mapper\SysGroupMenuMapper.class
-com\huimv\secure\mapper\SysAccountMultilevelMapper.class
-com\huimv\secure\service\IBillAccessDoorService.class
-com\huimv\secure\entity\vo\IsolateVo.class
-com\huimv\secure\entity\BaseProcess.class
-com\huimv\secure\controller\SysUserController.class
-com\huimv\secure\entity\BillDry.class
-com\huimv\secure\service\IBillLuggageService.class
-com\huimv\secure\service\impl\BillAccessDoorServiceImpl.class
-com\huimv\secure\service\ISysMenuService.class
-com\huimv\secure\entity\vo\BillGoodsInventoryVo.class
-com\huimv\secure\service\impl\SysAccountGroupServiceImpl.class
-com\huimv\secure\entity\vo\UserJob.class
-com\huimv\secure\service\impl\SysUserServiceImpl.class
-com\huimv\secure\service\IBillCleanService.class
-com\huimv\secure\service\IBillIsolateService.class
-com\huimv\secure\entity\vo\DeviceVo.class
-com\huimv\secure\service\ISysUserService.class
-com\huimv\secure\session\AccessToken.class
-com\huimv\secure\entity\SysGroupMenu.class
-com\huimv\secure\service\impl\ExistServiceImpl.class
-com\huimv\secure\service\impl\BaseLocationServiceImpl.class
-com\huimv\secure\config\SwaggerConfig.class
-com\huimv\secure\mapper\BillIsolateMapper.class
-com\huimv\secure\common\token\TokenSign.class
-com\huimv\secure\entity\BaseLocation.class
-com\huimv\secure\service\IDeviceListService.class
-com\huimv\secure\entity\pojo\UserPagePojo.class
-com\huimv\secure\controller\BaseDeviceController.class
-com\huimv\secure\mapper\BaseFarmMapper.class
-com\huimv\secure\entity\BillIsolate.class
-com\huimv\secure\entity\vo\BaseProcessByLocationVo.class
-com\huimv\secure\service\impl\BillCleanServiceImpl.class
-com\huimv\secure\common\utils\PlatformException.class
-com\huimv\secure\entity\dto\UserAndAccountGroup.class
-com\huimv\secure\service\impl\SysGroupServiceImpl.class
-com\huimv\secure\entity\Configuration.class
-com\huimv\secure\entity\vo\CleanAndDryVo.class
-com\huimv\secure\entity\dto\PrintAdmissionDto.class
-com\huimv\secure\SecureAppllication.class
-com\huimv\secure\entity\SysAccountGroup.class
-com\huimv\secure\controller\SysAccountGroupController.class
-com\huimv\secure\mapper\BillPcrMapper.class
-com\huimv\secure\service\impl\SysAccountMultilevelServiceImpl.class
-com\huimv\secure\entity\BaseFarm.class
-com\huimv\secure\entity\vo\UserAgeAndGender.class
-com\huimv\secure\common\utils\DataUill.class
-com\huimv\secure\common\utils\IpTools.class
-com\huimv\secure\entity\SysAccountMultilevel.class
-com\huimv\secure\service\IBillGoodsInventoryService.class
-com\huimv\secure\service\impl\ConfigurationServiceImpl.class
-com\huimv\secure\entity\vo\PcrVo1.class
-com\huimv\secure\service\IBillPcrService.class
-com\huimv\secure\entity\SysGroup.class
-com\huimv\secure\mapper\BillLuggageMapper.class
-com\huimv\secure\common\utils\GeneratorCodeConfig.class
-com\huimv\secure\common\utils\OpenapiUtil.class
-com\huimv\secure\controller\ExistController.class
-com\huimv\secure\entity\PeopleList.class
-com\huimv\secure\entity\vo\UserAccountVo.class
-com\huimv\secure\mapper\SysGroupMapper.class
-com\huimv\secure\controller\SysGroupMenuController.class
-com\huimv\secure\common\utils\ResultUtil.class
-com\huimv\secure\entity\dto\PrintIsolateDto.class
-com\huimv\secure\common\utils\ResultCode.class
-com\huimv\secure\mapper\SysAccountGroupMapper.class
-com\huimv\secure\entity\vo\BaseProcessVo.class
-com\huimv\secure\entity\BaseDevice.class
-com\huimv\secure\service\impl\BaseWorkTypeServiceImpl.class
-com\huimv\secure\mapper\BaseWorkTypeMapper.class
-com\huimv\secure\entity\DeviceList.class
-com\huimv\secure\service\impl\BillGoodsInventoryServiceImpl.class
-com\huimv\secure\service\impl\SysMenuServiceImpl.class
-com\huimv\secure\common\utils\PercentUtil.class
-com\huimv\secure\controller\BaseProcessController.class
-com\huimv\secure\common\utils\VerifyUtil.class
-com\huimv\secure\entity\vo\ListAdmissionVo.class
-com\huimv\secure\entity\BaseWorkType.class
-com\huimv\secure\common\utils\ConstUtil.class
-com\huimv\secure\entity\vo\SysUserVo.class
-com\huimv\secure\controller\SysMenuController.class
-com\huimv\secure\common\utils\NumberUtils.class
-com\huimv\secure\mapper\BillAccessDoorMapper.class
-com\huimv\secure\entity\vo\PcrVo.class
-com\huimv\secure\common\utils\IDCardValidator.class
-com\huimv\secure\common\utils\GetMD5Str.class
-com\huimv\secure\controller\SysAccountMultilevelController.class
-com\huimv\secure\common\utils\PhoneNumberValidator.class
-com\huimv\secure\controller\BillAccessDoorController.class
-com\huimv\secure\service\ISysAccountMultilevelService.class
-com\huimv\secure\mapper\SysUserMapper.class
-com\huimv\secure\entity\BillClean.class
-com\huimv\secure\common\utils\SendSMS.class
-com\huimv\secure\common\exception\ExceptionEnum.class
-com\huimv\secure\controller\BaseWorkTypeController.class

huimv.nongke.secure/huimv.nongke.secure/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,106 +1,156 @@
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\IsolateVo.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillCleanController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillAccessDoorController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\DistributedLockManager.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillIsolateService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\SendSMS.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillGoodsInventoryController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysAccountMultilevel.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillIsolateController.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\DeviceList.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\token\TokenConstant.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BaseProcess.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\LuggageVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BaseWorkTypeController.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\token\TokenSign.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysMenu.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\DeviceListMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillLuggage.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\CleanVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\FactoryDirectorVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BaseLocationController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BaseLocation.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\ApiError.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\MybatisPlusConfig.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillGateServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\Result.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillIsolateServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\NumberUtils.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\OpenapiUtil.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\AgeRanges.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillGate.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BaseDeviceMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\ExistController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\FarmController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillGateMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\PdfUtil.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillCleanMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysGroupService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\SecureAppllication.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillAccessDoorService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\Print.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\CleanAndDryVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\SysGroupMenuServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysAccountGroup.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\BillGoodsInventoryVo.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillPersonnelAdmissionServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\SysGroupController.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BaseFarmMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\SysUserServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\PhoneNumberValidator.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillPersonnelAdmission.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysAccountMultilevelMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\exception\MExceptionEnum.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\Configuration.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\BillAdmissionVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\AirQualityIndexUtil.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillDryController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\Exist.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillAccessDoorMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BaseLocationMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BaseProcessController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\PrintIsolateDto.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\SysAccountMultilevelController.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillDryService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BaseFarmServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysGroup.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillLuggageService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysUser.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillGoodsInventoryMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\UploadImage.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\GetFarmIdVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillDryMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\SysAccountGroupServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\FarmServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\ConfigurationServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\PcrVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\PeopleList.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\GetFarmVo2.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\UserVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysGroupMenuMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\exception\MiException.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillGoodsInventoryServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysAccountMultilevelService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\PlatformException.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\PcrVo1.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\SysGroupServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBaseLocationService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillGateController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillPcr.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysGroupMenu.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\PcrDto.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysMenuService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BaseProcessServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BaseFarmController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillAccessDoorServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\SnowflakeSequence.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\PeopleListController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IFarmService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\UserAndAccountGroup.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillIsolateMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\ResultCode.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\PeopleListMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BaseWorkTypeMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillGoodsInventoryService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillGoodsInventory.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\SysUserVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysAccountGroupMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysMenuMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\StringUtilsWork.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\PrintLuggageDto.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillDry.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillPersonnelAdmissionMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\PrintAdmissionDto.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\InterceptorConfig.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\ConfigurationMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BaseWorkType.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\DeviceVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BaseDeviceController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BaseWorkTypeServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IExistService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\IDCardValidator.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillPersonnelAdmissionController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillClean.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\UserAccountVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BaseProcessMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IPeopleListService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillCleanController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\SendSMS.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillIsolateController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\DeviceList.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\token\TokenConstant.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\LuggageVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\token\TokenSign.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysMenu.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\DeviceListMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\CleanVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\GlobalExceptionHandler.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\Result.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillIsolateServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\NumberUtils.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\OpenapiUtil.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillGate.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillCleanMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysGroupService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysAccountGroup.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\BillGoodsInventoryVo.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillPersonnelAdmissionServiceImpl.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\SysGroupController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BaseFarmMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\PhoneNumberValidator.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillPersonnelAdmission.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysAccountMultilevelMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\LoginController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillAccessDoorMapper.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BaseProcessController.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillDryService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysUser.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\exception\ExceptionEnum.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\BillAdmissionAndGoods.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillPcrService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\DoorVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\UserJob.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\GeneratorCodeConfig.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillDryMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\SysAccountGroupServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysAccountGroupService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\ResultUtil.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBaseFarmService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\ConfigurationController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillCleanServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\ConfigurationServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\PcrVo.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\PeopleList.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\SwaggerConfig.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BaseDevice.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\PageFactory.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\FarmMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillPcrServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysUserService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\UserVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysUserMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillDryServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillPcrMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysGroupMenuMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\exception\MiException.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ILoginService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillLuggageController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\ConstUtil.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BaseFarm.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillGoodsInventoryServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysAccountMultilevelService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\PlatformException.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillGateService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\PcrVo1.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\ApiPrefixAutoConfiguration.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\BaseProcessVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\IpTools.java
@@ -109,83 +159,46 @@ D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBaseProcessService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\AgeRangesController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\WeCahtVo.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\SysGroupServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBaseLocationService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IConfigurationService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillGateController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IDeviceListService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BaseLocationServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillPcr.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\SysGroupMenu.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\PcrDto.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\session\AccessToken.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysMenuService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BaseProcessServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\ChineseCharToEnUtil.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillPcrController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\UserAgeAndGender.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BaseFarmController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\AgeRangesMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillAccessDoorServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\SnowflakeSequence.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\PeopleListController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\SysAccountGroupController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\ExistServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\ISysGroupMenuService.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillPersonnelAdmissionService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\UserAndAccountGroup.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\LoginServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\DeviceListController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\SysMenuController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\UserAccountDto.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\BaseProcessByLocationVo.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillIsolateMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysGroupMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\VerifyUtil.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\ResultCode.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\ExistMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\PeopleListMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillCleanService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BaseWorkTypeMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBillGoodsInventoryService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\Farm.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\SysMenuServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillGoodsInventory.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\SysUserVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IBaseDeviceService.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysAccountGroupMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\SysMenuMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\StringUtilsWork.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\PrintLuggageDto.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\JWTInterceptor.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillDry.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\AccountVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BillLuggageServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BillPersonnelAdmissionMapper.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\dto\PrintAdmissionDto.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\ListAdmissionVo.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\config\InterceptorConfig.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\ConfigurationMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\PeopleListServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\pojo\UserPagePojo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\PageResult.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\SysUserController.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\SysGroupMenuController.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BaseWorkType.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\DeviceVo.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillIsolate.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\GetMD5Str.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BaseDeviceController.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BaseWorkTypeServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillAccessDoor.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\PercentUtil.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\DeviceListServiceImpl.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\CleanAndDryVo2.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\BaseDeviceServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IExistService.java
+D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\timer\SafeTimer.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\DataUill.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\common\utils\IDCardValidator.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\controller\BillPersonnelAdmissionController.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\BillClean.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\entity\vo\UserAccountVo.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\mapper\BaseProcessMapper.java
 D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\impl\SysAccountMultilevelServiceImpl.java
-D:\huimv.nongke.secure\huimv.nongke.secure\src\main\java\com\huimv\secure\service\IPeopleListService.java