后台接口

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

@@ -1,9 +1,14 @@
 package com.huimv.secure.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.entity.BaseDevice;
+import com.huimv.secure.service.IBaseDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +20,40 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/base-device")
+@CrossOrigin
 public class BaseDeviceController {
+    @Autowired
+    private IBaseDeviceService deviceService;
+    @Autowired
+    private IBaseDeviceService baseDeviceService;
 
+    @PostMapping("/addDevice")
+    public Result addDevice(@RequestBody BaseDevice baseDevice){
+        return  baseDeviceService.addDevice(baseDevice);
+    }
+
+    @PostMapping("/updateDevice")
+    public Result updateDevice(@RequestBody BaseDevice baseDevice){
+        return  baseDeviceService.updateDevice(baseDevice);
+    }
+
+    @PostMapping("/listSelect")
+    public Result listSelect( @RequestBody Map<String, String> paramsMap) {
+        return deviceService.listSelect( paramsMap);
+    }
+
+    @PostMapping("/listCount")
+    public Result listCount( @RequestBody Map<String, String> paramsMap) {
+        return deviceService.listCount(paramsMap);
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody Map<String, String> paramsMap){
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            deviceService.removeById(s);
+        }
+        return new Result(10000,"删除成功！",true);
+    }
 }

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

@@ -1,9 +1,14 @@
 package com.huimv.secure.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.service.IBillCleanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +20,34 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-clean")
+@CrossOrigin
 public class BillCleanController {
 
+    @Autowired
+    private IBillCleanService cleanService;
+    //
+    @RequestMapping("/listCount")
+    public Result listCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return cleanService.listCount( paramsMap);
+    }
+
+    @PostMapping("/allList")
+    public Result listAll(@RequestBody Map<String, String> paramsMap) {
+        return cleanService.AllClean( paramsMap);
+    }
+
+    @PostMapping("/CleanSelect")
+    public Result CleanSelect(@RequestBody Map<String, String> paramsMap) {
+        return cleanService.CleanSelect(paramsMap);
+    }
+
+    @PostMapping("/delete")
+    public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            cleanService.removeById(s);
+        }
+        return new Result(10000, "删除成功！", true);
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.huimv.secure.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.service.IBillIsolateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +19,29 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-isolate")
+@CrossOrigin
 public class BillIsolateController {
 
+    @Autowired
+    private IBillIsolateService billIsolateService;
+    //后台
+    @PostMapping("/isolateList")
+    public Result isolateList(@RequestBody Map<String, String> paramsMap){
+        return billIsolateService.Isolate(paramsMap);
+    }
+
+    @PostMapping("/isolateSelect")
+    public Result isolateSelect(@RequestBody Map<String, String> paramsMap){
+        return billIsolateService.IsolateSelect( paramsMap);
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody Map<String, String> paramsMap){
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            billIsolateService.removeById(s);
+        }
+        return new Result(10000,"删除成功！",true);
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.huimv.secure.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.service.IBillLuggageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +19,28 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-luggage")
+@CrossOrigin
 public class BillLuggageController {
 
+    @Autowired
+    private IBillLuggageService billLuggageService;
+    @PostMapping("/listLuggage")
+    public Result listLuggage( @RequestBody Map<String, String> paramsMap){
+        return billLuggageService.listLuggage( paramsMap);
+    }
+
+    @PostMapping("/selectLuggage")
+    public Result selectLuggage(@RequestBody Map<String, String> paramsMap){
+        return billLuggageService.selectLuggage( paramsMap);
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody Map<String, String> paramsMap){
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            billLuggageService.removeById(s);
+        }
+        return new Result(10000,"删除成功！",true);
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.huimv.secure.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.service.IBillPcrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +19,33 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-pcr")
+@CrossOrigin
 public class BillPcrController {
 
+    @Autowired
+    private IBillPcrService billPcrService;
+    //后台
+    @PostMapping("/pcrWhole")
+    public Result pcrWhole(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billPcrService.pcrWhole(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/listType")
+    public Result listType(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billPcrService.listType(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/listLocation")
+    public Result listLocation(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billPcrService.listLocation(httpServletRequest, paramsMap);
+    }
+    @PostMapping("/listAll")
+    public Result listAll(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billPcrService.listAll(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/selectList")
+    public Result selectList(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billPcrService.selectList(httpServletRequest, paramsMap);
+    }
 }

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

@@ -1,10 +1,19 @@
 package com.huimv.secure.controller;
 
 
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.service.IBillPersonnelAdmissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
  * 入场申请 前端控制器
@@ -15,6 +24,36 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-personnel-admission")
+@CrossOrigin
 public class BillPersonnelAdmissionController {
+    @Autowired
+    private IBillPersonnelAdmissionService admissionService;
+
 
+    //后台
+    @RequestMapping("/countAdmission")
+    public Result countAdmission( @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.countAdmission(paramsMap);
+    }
+    @RequestMapping("/listTop")
+    public Result listTop( @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.listTop( paramsMap);
+    }
+    @RequestMapping("/admissionTail")
+    public Result admissionTail(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.admissionTail( paramsMap);
+    }
+    @RequestMapping("/selectList")
+    public Result selectList( @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.selectList( paramsMap);
+    }
+    @RequestMapping("/delete")
+    public Result delete( @RequestBody Map<String, String> paramsMap) throws ParseException {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            admissionService.removeById(s);
+        }
+        return new Result(10000, "删除成功！", true);
+    }
 }

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

@@ -1,10 +1,21 @@
 package com.huimv.secure.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
+import com.huimv.secure.entity.Exist;
+import com.huimv.secure.service.IExistService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -15,6 +26,37 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/exist")
+@CrossOrigin
 public class ExistController {
 
+    @Autowired
+    private IExistService existService;
+
+    @RequestMapping("/editExist")
+    public Result edit(@RequestBody Map<String, String> paramsMap) {
+        String result = paramsMap.get("result");
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<Exist> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Exist one = existService.getOne(queryWrapper);
+        one.setExist(Integer.parseInt(result));
+        existService.updateById(one);
+        return new Result(10000, "修改成功！", true);
+    }
+
+    @RequestMapping("/listExist")
+    public Result listExist(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<Exist> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Exist one = existService.getOne(queryWrapper);
+        if (ObjectUtil.isEmpty(one)) {
+            Exist exist = new Exist();
+            exist.setExist(0);
+            exist.setFarmId(farmId);
+            existService.save(exist);
+            return new Result(ResultCode.SUCCESS, exist);
+        }
+        return new Result(ResultCode.SUCCESS,one);
+    }
 }

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

@@ -5,10 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.huimv.secure.common.utils.IDCardValidator;
-import com.huimv.secure.common.utils.PhoneNumberValidator;
-import com.huimv.secure.common.utils.Result;
-import com.huimv.secure.common.utils.UploadImage;
+import com.huimv.secure.common.utils.*;
 import com.huimv.secure.entity.SysAccountMultilevel;
 import com.huimv.secure.entity.SysUser;
 import com.huimv.secure.entity.pojo.UserPagePojo;
@@ -90,10 +87,10 @@ public class SysUserController {
                 sysUser.setImgUrl(imageCom);
             }
         }
-        if (!IDCardValidator.isValidIDCard(cardNum)) {
-            return new Result(10001,"身份证格式不正确",false);
+        if (StringUtils.isNotBlank(cardNum) && !IDCardValidator.isValidIDCard(cardNum)) {
+            return new Result(10001, "身份证格式不正确", false);
         }
-        if (!PhoneNumberValidator.isValidPhoneNumber(userPhone)) {
+        if (StringUtils.isNotBlank(userPhone)&&!PhoneNumberValidator.isValidPhoneNumber(userPhone)) {
             return new Result(10001,"手机号格式不正确",false);
         }
         int count = sysUserService.count(new QueryWrapper<SysUser>().eq("card_num", cardNum));
@@ -199,6 +196,12 @@ public class SysUserController {
     }
 
 
+    ///*根据员工账号查询信息*/
+    @PostMapping("/listDetail")
+    public Result listDetail(@RequestBody  Map<String,String> paramsMap) {
+        return sysUserService.listDetail(paramsMap);
+    }
+
 
     //员工分页查询
     @PostMapping("/page")
@@ -220,4 +223,10 @@ public class SysUserController {
     public Result listWorkLocation(@RequestBody Map map) {
         return sysUserService.listWorkLocation(map);
     }
+    /*员工信息详情*/
+    @PostMapping("/getOneById")
+    public Result getOneById(@RequestBody Map<String,Integer> map) {
+        Integer id = map.get("id");
+        return new Result(ResultCode.SUCCESS,sysUserService.getById(id));
+    }
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/pojo/UserPagePojo.java

@@ -5,8 +5,8 @@ import lombok.Data;
 @Data
 public class UserPagePojo {
 
-    private Integer pageNum;
-    private Integer pageSize;
+    private Integer current;
+    private Integer size;
     private Integer gender;
     private String searchStr;
     private Integer job;

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

@@ -1,7 +1,13 @@
 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.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 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2024-01-03
  */
 public interface BillCleanMapper extends BaseMapper<BillClean> {
-
+    List<CleanVo> listAll(@Param(Constants.WRAPPER) QueryWrapper<BillClean> queryWrapper);
 }

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

@@ -1,7 +1,13 @@
 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.BillIsolate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.vo.IsolateVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2024-01-04
  */
 public interface BillIsolateMapper extends BaseMapper<BillIsolate> {
-
+    List<IsolateVo> Isolate(@Param(Constants.WRAPPER) QueryWrapper<BillIsolate> queryWrapper);
 }

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

@@ -1,7 +1,13 @@
 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.BillLuggage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.vo.LuggageVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BillLuggageMapper extends BaseMapper<BillLuggage> {
 
+    List<LuggageVo> list(@Param(Constants.WRAPPER) QueryWrapper<BillLuggage> queryWrapper);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/mapper/BillPcrMapper.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.BillPcr;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.vo.PcrVo;
+import com.huimv.secure.entity.vo.PcrVo1;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +19,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2024-01-03
  */
 public interface BillPcrMapper extends BaseMapper<BillPcr> {
+    List<PcrVo> listPcr(@Param(Constants.WRAPPER) QueryWrapper<BillPcr> queryWrapper);
+
+    List<PcrVo> listLocation(@Param(Constants.WRAPPER) QueryWrapper<BillPcr> queryWrapper);
 
+    List<PcrVo1> listAll(@Param(Constants.WRAPPER) QueryWrapper<BillPcr> queryWrapper);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/mapper/BillPersonnelAdmissionMapper.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.BillPersonnelAdmission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.vo.BillAdmissionVo;
+import com.huimv.secure.entity.vo.ListAdmissionVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2024-01-03
  */
 public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAdmission> {
+    List<ListAdmissionVo> countAdmission(@Param(Constants.WRAPPER) QueryWrapper<BillPersonnelAdmission> queryWrapper);
 
+    List<BillAdmissionVo> admissionTail(@Param(Constants.WRAPPER) QueryWrapper<BillPersonnelAdmission> queryWrapper);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.secure.service;
 
+import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.entity.BaseDevice;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +17,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBaseDeviceService extends IService<BaseDevice> {
 
+    //后台
+    Result listCount(Map<String, String> paramsMap);
+    Result listSelect(Map<String, String> paramsMap);
+
+    Result addDevice(BaseDevice baseDevice);
+
+    Result updateDevice(BaseDevice baseDevice);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.secure.service;
 
+import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.entity.BillClean;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务类
@@ -12,5 +16,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2024-01-03
  */
 public interface IBillCleanService extends IService<BillClean> {
+    //后台
+    Result listCount(Map<String, String> paramsMap);
+
+    Result AllClean(Map<String, String> paramsMap);
 
+    Result CleanSelect( Map<String, String> paramsMap);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.secure.service;
 
+import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.entity.BillIsolate;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 隔离 服务类
@@ -13,4 +17,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillIsolateService extends IService<BillIsolate> {
 
+    //后台隔离曲线
+    Result Isolate(Map<String, String> paramsMap);
+
+    Result IsolateSelect( Map<String, String> paramsMap);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.secure.service;
 
+import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.entity.BillLuggage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillLuggageService extends IService<BillLuggage> {
 
+    Result listLuggage(Map<String, String> paramsMap);
+
+    Result selectLuggage( Map<String, String> paramsMap);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.secure.service;
 
+import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.entity.BillPcr;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * pcr 表 服务类
@@ -13,4 +17,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillPcrService extends IService<BillPcr> {
 
+
+    //后台总体概况
+    Result pcrWhole(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listType(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listLocation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    //详细数据查询
+    Result selectList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.secure.service;
 
+import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.entity.BillPersonnelAdmission;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 入场申请 服务类
@@ -12,5 +16,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2024-01-03
  */
 public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAdmission> {
+    //后台入场申请报表
+    Result countAdmission(Map<String, String> paramsMap);
+
+    //提交申请排名
+    Result listTop( Map<String, String> paramsMap);
+
+    //入场申请数量曲线
+    Result admissionTail(Map<String, String> paramsMap);
 
+    //详细数据查询
+    Result selectList( Map<String, String> paramsMap);
 }

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

@@ -28,4 +28,7 @@ public interface ISysUserService extends IService<SysUser> {
     Result userJob(Map<String, String> map);
 
     Result listWorkLocation(Map map);
+
+    /*根据员工账号查询信息*/
+    Result listDetail(Map<String,String> paramsMap);
 }

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

@@ -1,11 +1,22 @@
 package com.huimv.secure.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.entity.BaseDevice;
 import com.huimv.secure.mapper.BaseDeviceMapper;
 import com.huimv.secure.service.IBaseDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +28,74 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseDeviceServiceImpl extends ServiceImpl<BaseDeviceMapper, BaseDevice> implements IBaseDeviceService {
 
+    @Autowired
+    private BaseDeviceMapper deviceMapper;
+    @Override
+    public Result listCount( Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<BaseDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        queryWrapper.eq("device_status", 0);
+        Integer count = deviceMapper.selectCount(queryWrapper);//在线
+        QueryWrapper<BaseDevice> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId);
+        queryWrapper1.eq("device_status", 1);
+        Integer count1 = deviceMapper.selectCount(queryWrapper1);//离线
+        Integer allCount = count + count1;
+        DecimalFormat def = new DecimalFormat("0.00");
+        String rank;
+        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);
+        jsonObject.put("rank", rank);
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
+    @Override
+    public Result listSelect(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String word = paramsMap.get("word");
+        String locationId = paramsMap.get("locationId");
+        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<BaseDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        if (StringUtils.isNotBlank(word)) {
+            queryWrapper.and(i -> i.like("device_code", word)
+                    .or().like( "device_name", word));
+        }
+        queryWrapper.eq(StringUtils.isNotBlank(locationId),"work_location_type", locationId);
+        Page<BaseDevice> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, deviceMapper.selectPage(page, queryWrapper));
+    }
+    @Override
+    public Result addDevice(BaseDevice baseDevice) {
+        String deviceCode = baseDevice.getDeviceCode();
+        int deviceCodeCount = this.count(new QueryWrapper<BaseDevice>().eq("device_code", deviceCode));
+        if (deviceCodeCount>0){
+            return new Result(10001,"设备编码已存在",false);
+        }
+        this.save(baseDevice);
+        return new Result(10000,"添加成功",true);
+    }
+
+    @Override
+    public Result updateDevice(BaseDevice baseDevice) {
+        this.updateById(baseDevice);
+        return new Result(10000,"修改成功",true);
+    }
 }

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

@@ -1,11 +1,27 @@
 package com.huimv.secure.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.entity.BillClean;
+import com.huimv.secure.entity.vo.CleanVo;
 import com.huimv.secure.mapper.BillCleanMapper;
 import com.huimv.secure.service.IBillCleanService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务实现类
@@ -17,4 +33,99 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean> implements IBillCleanService {
 
+    @Resource
+    private BillCleanMapper billCleanMapper;
+    @Override
+    public Result listCount( Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        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");
+        String rank;
+        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);
+        jsonObject.put("rank", rank);
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
+    @Override
+    public Result AllClean(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        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) {
+
+        } 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());
+        }
+        return new Result(ResultCode.SUCCESS, pcrVos);
+    }
+
+    @Override
+    public Result CleanSelect(Map<String, String> paramsMap) {
+        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);
+        }
+        queryWrapper.lambda().orderByDesc(BillClean::getId);
+        queryWrapper.eq("farm_id", farmId);
+        if ("".equals(type) || null == type) {
+        } else {
+            queryWrapper.eq("vistit_type", type);
+        }
+        Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, billCleanMapper.selectPage(page, queryWrapper));
+    }
 }

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

@@ -1,11 +1,26 @@
 package com.huimv.secure.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.secure.common.utils.DataUill;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.entity.BillIsolate;
+import com.huimv.secure.entity.vo.IsolateVo;
 import com.huimv.secure.mapper.BillIsolateMapper;
 import com.huimv.secure.service.IBillIsolateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 隔离 服务实现类
@@ -17,4 +32,77 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillIsolateServiceImpl extends ServiceImpl<BillIsolateMapper, BillIsolate> implements IBillIsolateService {
 
+    @Resource
+    private BillIsolateMapper billIsolateMapper;
+    @Override
+    public Result Isolate(Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");//0全部  1为人员二级洗消站 2为生产区
+        if ("".equals(type) || null == type) {
+            type = "0";
+        }
+        String dateType = paramsMap.get("dateType");
+        if ("".equals(dateType) || null == dateType) {
+            dateType = "3";
+        }
+        List<IsolateVo> isolateVos = null;
+        QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
+        if ("0".equals(type)) {
+            queryWrapper.in("isolate_location_id", 3, 4);
+        } else if ("1".equals(type)) {
+            queryWrapper.eq("isolate_location_id", 3);
+        } else if ("2".equals(type)) {
+            queryWrapper.eq("isolate_location_id", 4);
+        }
+        //今日
+        if ("1".equals(dateType)) {
+            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 timesMonthmorning = DataUill.getTimesMonthmorning();
+            queryWrapper.ge("sub_date", timesMonthmorning);
+        }
+        isolateVos = billIsolateMapper.Isolate(queryWrapper);
+        return new Result(ResultCode.SUCCESS, isolateVos);
+    }
+
+    @Override
+    public Result IsolateSelect(Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");//隔离状态
+        String locationId = paramsMap.get("locationId");//隔离地点
+        String word = paramsMap.get("word");
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+        String farmId = paramsMap.get("farmId");
+        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<BillIsolate> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("sub_date", startTime, endTime);
+        }
+        queryWrapper.eq("farm_id", farmId);
+        if (StringUtils.isNotBlank(word)){
+            queryWrapper.and(i -> i.like("phone", word)
+                    .or().like( "admission_user_name", word));
+        }
+        queryWrapper.lambda().orderByDesc(BillIsolate::getId);
+        queryWrapper.eq(StringUtils.isNotBlank(locationId), "isolate_location_id", locationId);
+        queryWrapper.eq(StringUtils.isNotBlank(type), "bill_status", type);
+        Page<BillIsolate> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, billIsolateMapper.selectPage(page, queryWrapper));
+    }
+
 }

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

@@ -1,11 +1,26 @@
 package com.huimv.secure.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.secure.common.utils.DataUill;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.entity.BillLuggage;
+import com.huimv.secure.entity.vo.LuggageVo;
 import com.huimv.secure.mapper.BillLuggageMapper;
 import com.huimv.secure.service.IBillLuggageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +32,61 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillLuggageServiceImpl extends ServiceImpl<BillLuggageMapper, BillLuggage> implements IBillLuggageService {
 
+
+    @Resource
+    private BillLuggageMapper billLuggageMapper;
+    @Override
+    public Result listLuggage( Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || null == type) {
+            type = "3";
+        }
+        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);
+        }
+        luggageVos = billLuggageMapper.list(queryWrapper);
+        return new Result(ResultCode.SUCCESS, luggageVos);
+    }
+
+    @Override
+    public Result selectLuggage(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String word = paramsMap.get("word");
+        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<BillLuggage> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("luggage_date", startTime, endTime);
+        }
+        queryWrapper.lambda().orderByDesc(BillLuggage::getId);
+        queryWrapper.eq("farm_id", farmId);
+        if (StringUtils.isNotBlank(word)) {
+            queryWrapper.and(i -> i.like( "phone", word)
+                    .or().like("user_name", word));
+        }
+        Page<BillLuggage> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, billLuggageMapper.selectPage(page, queryWrapper));
+    }
 }

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

@@ -1,11 +1,28 @@
 package com.huimv.secure.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.secure.common.utils.DataUill;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.entity.BillPcr;
+import com.huimv.secure.entity.dto.PcrDto;
+import com.huimv.secure.entity.vo.PcrVo;
+import com.huimv.secure.entity.vo.PcrVo1;
 import com.huimv.secure.mapper.BillPcrMapper;
 import com.huimv.secure.service.IBillPcrService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * pcr 表 服务实现类
@@ -17,4 +34,157 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> implements IBillPcrService {
 
+    @Resource
+    private BillPcrMapper billPcrMapper;
+
+    @Override
+    public Result pcrWhole(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        Date timesmorning = DataUill.getTimesmorning();
+        QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("bill_status", 1).ge("sub_date", timesmorning);//今日合格
+        Integer count = billPcrMapper.selectCount(queryWrapper);
+        QueryWrapper<BillPcr> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).eq("bill_status", 2).ge("sub_date", timesmorning);//今日异常
+        Integer count1 = billPcrMapper.selectCount(queryWrapper1);
+        QueryWrapper<BillPcr> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("farm_id", farmId).eq("bill_status", 3).ge("sub_date", timesmorning);//今日失效
+        Integer count2 = billPcrMapper.selectCount(queryWrapper2);
+        PcrDto dto = new PcrDto();
+        dto.setWholeCount(count + count1);
+        dto.setPassCount(count);
+        dto.setRefuseCount(count1);
+        dto.setLoseCount(count2);
+        return new Result(ResultCode.SUCCESS, dto);
+    }
+
+    @Override
+    public Result listType(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || null == type) {
+            type = "1";
+        }
+        List<PcrVo> pcrVos = null;
+        QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).in("bill_status", 1, 2);
+        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 = billPcrMapper.listPcr(queryWrapper);
+        for (PcrVo pcrVo : pcrVos) {
+            if (pcrVo.getType().equals("0")) {
+                pcrVo.setType("人员");
+            } else if (pcrVo.getType().equals("1")) {
+                pcrVo.setType("环保车");
+            } else if (pcrVo.getType().equals("2")) {
+                pcrVo.setType("拉猪车");
+            } else if (pcrVo.getType().equals("3")) {
+                pcrVo.setType("饲料车");
+            } else if (pcrVo.getType().equals("4")) {
+                pcrVo.setType("送猪车");
+            } else if (pcrVo.getType().equals("5")) {
+                pcrVo.setType("物资车");
+            }
+        }
+        return new Result(ResultCode.SUCCESS, pcrVos);
+    }
+
+    @Override
+    public Result listLocation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || null == type) {
+            type = "1";
+        }
+        List<PcrVo> pcrVos = null;
+        QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).in("bill_status", 1, 2);
+        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 = billPcrMapper.listLocation(queryWrapper);
+        return new Result(ResultCode.SUCCESS, pcrVos);
+    }
+
+    @Override
+    public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String personType = paramsMap.get("personType");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || null == type) {
+            type = "1";
+        }
+        List<PcrVo1> pcrVos = null;
+        QueryWrapper<BillPcr> 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 = billPcrMapper.listAll(queryWrapper);
+        for (PcrVo1 pcrVo : pcrVos) {
+            pcrVo.setAllCount(pcrVo.getPassCount() + pcrVo.getRefuseCount());
+        }
+        return new Result(ResultCode.SUCCESS, pcrVos);
+    }
+
+    @Override
+    public Result selectList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");//来访类型
+        String destId = paramsMap.get("destId");//目的地
+        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<BillPcr> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("check_date", startTime, endTime);
+        }
+        queryWrapper.in("bill_status", 1, 2);
+        queryWrapper.lambda().orderByDesc(BillPcr::getId);
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(destId), "dest_id", destId).eq(StringUtils.isNotBlank(type), "vistit_type", type);
+        Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, billPcrMapper.selectPage(page, queryWrapper));
+    }
 }

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

@@ -1,11 +1,27 @@
 package com.huimv.secure.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.secure.common.utils.DataUill;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.entity.BillPersonnelAdmission;
+import com.huimv.secure.entity.vo.BillAdmissionVo;
+import com.huimv.secure.entity.vo.ListAdmissionVo;
 import com.huimv.secure.mapper.BillPersonnelAdmissionMapper;
 import com.huimv.secure.service.IBillPersonnelAdmissionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
 /**
  * <p>
  * 入场申请 服务实现类
@@ -17,4 +33,229 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnelAdmissionMapper, BillPersonnelAdmission> implements IBillPersonnelAdmissionService {
 
+    @Resource
+    private BillPersonnelAdmissionMapper billPersonnelAdmissionMapper;
+
+    @Override
+    public Result countAdmission(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || type == null) {
+            type = "1";
+        }
+        List<ListAdmissionVo> admissionVo = null;
+        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        //默认今日
+        if ("1".equals(type)) {
+            Date timesmorning = DataUill.getTimesmorning();
+            queryWrapper.ge("sub_date", timesmorning);
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+            for (ListAdmissionVo listAdmissionVo : admissionVo) {
+                QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).ge("sub_date", timesmorning)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 1);
+                QueryWrapper<BillPersonnelAdmission> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("farm_id", farmId).ge("sub_date", timesmorning)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 2);
+                listAdmissionVo.setPassCount(billPersonnelAdmissionMapper.selectCount(queryWrapper1));
+                listAdmissionVo.setRefuseCount(billPersonnelAdmissionMapper.selectCount(queryWrapper2));
+            }
+        } else if ("2".equals(type)) {
+            // 本周
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+            queryWrapper.ge("sub_date", calendar.getTime());
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+            for (ListAdmissionVo listAdmissionVo : admissionVo) {
+                QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).ge("sub_date", calendar.getTime())
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 1);
+                QueryWrapper<BillPersonnelAdmission> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("farm_id", farmId).ge("sub_date", calendar.getTime())
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 2);
+                listAdmissionVo.setPassCount(billPersonnelAdmissionMapper.selectCount(queryWrapper1));
+                listAdmissionVo.setRefuseCount(billPersonnelAdmissionMapper.selectCount(queryWrapper2));
+            }
+        } else if ("3".equals(type)) {
+            //本月
+            Date timesMonthmorning = DataUill.getTimesMonthmorning();
+            queryWrapper.ge("sub_date", timesMonthmorning);
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+            for (ListAdmissionVo listAdmissionVo : admissionVo) {
+                QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).ge("sub_date", timesMonthmorning)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 1);
+                QueryWrapper<BillPersonnelAdmission> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("farm_id", farmId).ge("sub_date", timesMonthmorning)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 2);
+                listAdmissionVo.setPassCount(billPersonnelAdmissionMapper.selectCount(queryWrapper1));
+                listAdmissionVo.setRefuseCount(billPersonnelAdmissionMapper.selectCount(queryWrapper2));
+            }
+        }
+        return new Result(ResultCode.SUCCESS, admissionVo);
+    }
+
+    @Override
+    public Result listTop(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || type == null) {
+            type = "1";
+        }
+        List<ListAdmissionVo> admissionVo = null;
+        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        //今日
+        if ("1".equals(type)) {
+            Date timesmorning = DataUill.getTimesmorning();
+            queryWrapper.ge("sub_date", timesmorning);
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+        } else if ("2".equals(type)) {
+            // 本周
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+            queryWrapper.ge("sub_date", calendar.getTime());
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+        } else if ("3".equals(type)) {
+            //本月
+            Date timesMonthmorning = DataUill.getTimesMonthmorning();
+            queryWrapper.ge("sub_date", timesMonthmorning);
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+        }
+        JSONArray jsonArray = new JSONArray();
+        for (ListAdmissionVo listAdmissionVo : admissionVo) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("type", listAdmissionVo.getType());
+            if (listAdmissionVo.getType() == 0) {
+                jsonObject.put("name", "人员");
+            } else if (listAdmissionVo.getType() == 1) {
+                jsonObject.put("name", "环保车");
+            } else if (listAdmissionVo.getType() == 2) {
+                jsonObject.put("name", "拉猪车");
+            } else if (listAdmissionVo.getType() == 3) {
+                jsonObject.put("name", "饲料车");
+            } else if (listAdmissionVo.getType() == 4) {
+                jsonObject.put("name", "送猪车");
+            } else if (listAdmissionVo.getType() == 5) {
+                jsonObject.put("name", "物资车");
+            }
+            jsonObject.put("value", listAdmissionVo.getCount());
+            jsonArray.add(jsonObject);
+        }
+        JSONArray array = jsonArraySort(jsonArray, "value", true);
+        for (int i = 0; i < array.size(); i++) {
+            JSONObject jsonObject = array.getJSONObject(i);
+            jsonObject.put("rank", i + 1);
+        }
+
+        return new Result(ResultCode.SUCCESS, array);
+    }
+
+    @Override
+    public Result admissionTail(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || type == null) {
+            type = "3";
+        }
+        //今日
+        List<BillAdmissionVo> admissionVos = null;
+        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        if ("1".equals(type)) {
+            Date timesmorning = DataUill.getTimesmorning();
+            queryWrapper.ge("sub_date", timesmorning);
+            admissionVos = billPersonnelAdmissionMapper.admissionTail(queryWrapper);
+        } else if ("2".equals(type)) {
+            // 本周
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+            queryWrapper.ge("sub_date", calendar.getTime());
+            admissionVos = billPersonnelAdmissionMapper.admissionTail(queryWrapper);
+        } else if ("3".equals(type)) {
+            //本月
+            Date timesMonthmorning = DataUill.getTimesMonthmorning();
+            queryWrapper.ge("sub_date", timesMonthmorning);
+            admissionVos = billPersonnelAdmissionMapper.admissionTail(queryWrapper);
+        }
+        for (BillAdmissionVo admissionVo : admissionVos) {
+            admissionVo.setCommitCount(admissionVo.getPassCount() + admissionVo.getRefuseCount());
+        }
+        return new Result(ResultCode.SUCCESS, admissionVos);
+    }
+
+    @Override
+    public Result selectList(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");//来访类型
+        String destId = paramsMap.get("destId");//目的地
+        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<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(startTime)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("sub_date", startTime, endTime);
+        }
+        queryWrapper.lambda().orderByDesc(BillPersonnelAdmission::getId);
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(destId), "dest_id", destId).eq(StringUtils.isNotBlank(type), "vistit_type", type);
+        Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, billPersonnelAdmissionMapper.selectPage(page, queryWrapper));
+    }
+
+    /*数组排序*/
+    public static JSONArray jsonArraySort(JSONArray jsonArr, String sortKey, boolean is_desc) {
+        //存放排序结果json数组
+        JSONArray sortedJsonArray = new JSONArray();
+        //用于排序的list
+        List<JSONObject> jsonValues = new ArrayList<JSONObject>();
+        //将参数json数组每一项取出，放入list
+
+        for (int i = 0; i < jsonArr.size(); i++) {
+            jsonValues.add(jsonArr.getJSONObject(i));
+        }
+        //快速排序，重写compare方法，完成按指定字段比较，完成排序
+        Collections.sort(jsonValues, new Comparator<JSONObject>() {
+            //排序字段
+            private final String KEY_NAME = sortKey;
+
+            //重写compare方法
+            @Override
+            public int compare(JSONObject a, JSONObject b) {
+                //如果用String接会导致一位数和两位数混合比对的时候不能准确比出来，要用int类型接
+                //String valA = new String();
+                //String valB = new String();
+                Float valA = 0.00f;
+                Float valB = 0.00f;
+                try {
+                    valA = Float.parseFloat(a.getString(KEY_NAME));
+                    valB = Float.parseFloat(b.getString(KEY_NAME));
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                //是升序还是降序
+                if (is_desc) {
+                    return -valA.compareTo(valB);
+                } else {
+                    return -valB.compareTo(valA);
+                }
+
+            }
+        });
+        //将排序后结果放入结果jsonArray
+        for (int i = 0; i < jsonArr.size(); i++) {
+            sortedJsonArray.add(jsonValues.get(i));
+        }
+
+        return sortedJsonArray;
+    }
 }

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

@@ -68,8 +68,8 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         String userName = paramsMap.get("userName");//员工工号或姓名
         String workType = paramsMap.get("workType");//工作岗位
         String workLocation = paramsMap.get("workLocation");//工作地点
-        String pageNum = paramsMap.get("pageNum");
-        String pageSize = paramsMap.get("pageSize");
+        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);

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

@@ -49,8 +49,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public Result pageAll(UserPagePojo userPagePojo) {
-        Integer pageNum = userPagePojo.getPageNum();
-        Integer pageSize = userPagePojo.getPageSize();
+        Integer pageNum = userPagePojo.getCurrent();
+        Integer pageSize = userPagePojo.getSize();
         Integer job = userPagePojo.getJob();
         Integer workLocationType = userPagePojo.getWorkLocationType();
         String workLocation = userPagePojo.getWorkLocation();
@@ -102,6 +102,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
+    public Result listDetail(Map<String, String> paramsMap) {
+        String userId = paramsMap.get("userId");//员工工号
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId).eq("farm_id", farmId);
+        SysUser user = userMapper.selectOne(queryWrapper);
+        return new Result(ResultCode.SUCCESS, user);
+    }
+
+    @Override
     public Result uploadUserImg(MultipartFile imgUrl, Integer id) throws IOException {
         String imageCom = uploadImage.getImageCom(imgUrl);
         if (ObjectUtil.isNotEmpty(imgUrl)) {

huimv.nongke.secure/huimv.nongke.secure/src/main/resources/com/huimv/secure/mapper/BillCleanMapper.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.BillCleanMapper">
 
+    <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_clean`
+
+    ${ew.customSqlSegment}
+GROUP BY
+    DATE(sub_date)
+ORDER BY
+    DATE(sub_date)
+    </select>
 </mapper>

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

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.secure.mapper.BillLuggageMapper">
 
+    <select id="list" resultType="com.huimv.secure.entity.vo.LuggageVo">
+        select count(*) count,luggage_date dateTime from bill_luggage
+        ${ew.customSqlSegment}
+        group by DATE_FORMAT(luggage_date,"%y-%m-%d")
+        order by luggage_date asc
+    </select>
 </mapper>

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

@@ -2,4 +2,25 @@
 <!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="countAdmission" resultType="com.huimv.secure.entity.vo.ListAdmissionVo">
+        select count(*) count, vistit_type type from bill_personnel_admission
+        ${ew.customSqlSegment}
+        group by vistit_type
+    </select>
+
+    <select id="admissionTail" resultType="com.huimv.secure.entity.vo.BillAdmissionVo">
+SELECT
+    DATE(sub_date) as dateTime,
+    SUM(CASE WHEN bill_status = 0 THEN 1 ELSE 0 END) AS commitCount,
+    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_personnel_admission`
+
+    ${ew.customSqlSegment}
+GROUP BY
+    DATE(sub_date)
+ORDER BY
+    DATE(sub_date)
+    </select>
 </mapper>

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

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

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

@@ -2,4 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.secure.mapper.BillPcrMapper">
 
+
+    <select id="listPcr" resultType="com.huimv.secure.entity.vo.PcrVo">
+        select count(*) count,vistit_type type from bill_pcr
+        ${ew.customSqlSegment}
+        group by vistit_type
+    </select>
+
+    <select id="listLocation" resultType="com.huimv.secure.entity.vo.PcrVo">
+        select count(*) count,test_location type from bill_pcr
+        ${ew.customSqlSegment}
+        group by test_location_id
+    </select>
+    <select id="listAll" resultType="com.huimv.secure.entity.vo.PcrVo1">
+        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_pcr`
+
+    ${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

@@ -0,0 +1,67 @@
+server:
+  port: 8015
+
+spring:
+  application:
+    name: huimv-nongke-secure
+
+
+  servlet:
+    multipart:
+      max-request-size: 100MB
+      max-file-size: 10MB
+
+  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
+      username: root
+      password: hm123456
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: config
+#   connect-properties:
+      ##        config.decrypt: true
+      ##        config.decrypt.key: ${spring.datasource.druid.publickey}
+#      remove-abandoned-timeout: 120
+    type: com.alibaba.druid.pool.DruidDataSource
+
+
+  #配置rabbitMq 服务器
+#  rabbitmq:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+
+  #redis
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+  reactor:
+    debug-agent:
+      enabled: true
+#  Nacos 配置
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 192.168.1.68:8848 #配置nacos地址
+
+
+
+
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+
+img:
+  url: https://img.ifarmcloud.com/images/
+  basePath: /home/huimv/img/
+  ip: 119.3.44.183
+  user:  huimv
+  password: "!hm123@1"
+  port: 22

huimv.nongke.secure/huimv.nongke.secure/target/classes/application.properties

@@ -0,0 +1,5 @@
+#spring.profiles.active=dev
+spring.profiles.active=prod
+
+#�����������
+management.endpoints.web.exposure.include=*