农科院生物安全

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/common/utils/FlowUtil.java

@@ -0,0 +1,133 @@
+package com.huimv.secure.common.utils;
+
+import com.huimv.secure.entity.*;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+@Component
+public class FlowUtil {
+    public Object getEntity(Integer nextFlowId, Integer vistitType, String destName, Integer destId, Integer userId, String userName, String phone, LocalDateTime vistitDate, Integer locationId, String locationName, String farmId, Integer processId, String departureName, Integer departureId) {
+        if (nextFlowId == 1) {
+            BillSampling billSampling = new BillSampling();
+            billSampling.setVistitType(vistitType);
+            billSampling.setDestName(destName);
+            billSampling.setDestId(destId);
+            billSampling.setAdmissionUserName(userName);
+            billSampling.setAdmissionUserId(userId);
+            billSampling.setVistitDate(vistitDate);
+            billSampling.setSubDate(LocalDateTime.now());
+            billSampling.setPhone(phone);
+            billSampling.setTestLocation(locationName);
+            billSampling.setTestLocationId(locationId);
+            billSampling.setProcessId(processId);
+            billSampling.setFarmId(String.valueOf(farmId));
+            billSampling.setDepartureId(departureId);
+            billSampling.setDepartureName(departureName);
+            return billSampling;
+        } else if (nextFlowId == 2) {
+            BillPcr billPcr = new BillPcr();
+            billPcr.setVistitType(vistitType);
+            billPcr.setDestName(destName);
+            billPcr.setDestId(destId);
+            billPcr.setAdmissionUserName(userName);
+            billPcr.setAdmissionUserId(userId);
+            billPcr.setVistitDate(vistitDate);
+            billPcr.setSubDate(LocalDateTime.now());
+            billPcr.setPhone(phone);
+            billPcr.setTestLocation(locationName);
+            billPcr.setTestLocationId(locationId);
+            billPcr.setProcessId(processId);
+            billPcr.setFarmId(farmId);
+            billPcr.setDepartureId(departureId);
+            billPcr.setDepartureName(departureName);
+            return billPcr;
+        } else if (nextFlowId == 3) {
+            BillClean billClean = new BillClean();
+            billClean.setVistitType(vistitType);
+            billClean.setDestName(destName);
+            billClean.setDestId(destId);
+            billClean.setAdmissionUserName(userName);
+            billClean.setAdmissionUserId(userId);
+            billClean.setVistitDate(vistitDate);
+            billClean.setSubDate(LocalDateTime.now());
+            billClean.setPhone(phone);
+            billClean.setTestLocation(locationName);
+            billClean.setTestLocationId(locationId);
+            billClean.setProcessId(processId);
+            billClean.setFarmId(farmId);
+            billClean.setDepartureId(departureId);
+            billClean.setDepartureName(departureName);
+            return billClean;
+        } else if (nextFlowId == 4) {
+            BillIsolate billIsolate = new BillIsolate();
+            billIsolate.setVistitType(vistitType);
+            billIsolate.setDestName(destName);
+            billIsolate.setDestId(destId);
+            billIsolate.setAdmissionUserName(userName);
+            billIsolate.setAdmissionUserId(userId);
+            billIsolate.setVistitDate(vistitDate);
+            billIsolate.setSubDate(LocalDateTime.now());
+            billIsolate.setPhone(phone);
+            billIsolate.setIsolateLocation(locationName);
+            billIsolate.setIsolateLocationId(locationId);
+            billIsolate.setProcessId(processId);
+            billIsolate.setFarmId(farmId);
+            billIsolate.setDepartureId(departureId);
+            billIsolate.setDepartureName(departureName);
+            return billIsolate;
+        } else if (nextFlowId == 5) {
+            BillDry billDry = new BillDry();
+            billDry.setVistitType(vistitType);
+            billDry.setDestName(destName);
+            billDry.setDestId(destId);
+            billDry.setAdmissionUserName(userName);
+            billDry.setAdmissionUserId(userId);
+            billDry.setVistitDate(vistitDate);
+            billDry.setSubDate(LocalDateTime.now());
+            billDry.setPhone(phone);
+            billDry.setTestLocation(locationName);
+            billDry.setTestLocationId(locationId);
+            billDry.setProcessId(processId);
+            billDry.setFarmId(farmId);
+            billDry.setDepartureId(departureId);
+            billDry.setDepartureName(departureName);
+            return billDry;
+        } else if (nextFlowId == 6) {
+            BillCleanBefore billCleanBefore = new BillCleanBefore();
+            billCleanBefore.setVistitType(vistitType);
+            billCleanBefore.setDestName(destName);
+            billCleanBefore.setDestId(destId);
+            billCleanBefore.setAdmissionUserName(userName);
+            billCleanBefore.setAdmissionUserId(userId);
+            billCleanBefore.setVistitDate(vistitDate);
+            billCleanBefore.setSubDate(LocalDateTime.now());
+            billCleanBefore.setPhone(phone);
+            billCleanBefore.setTestLocation(locationName);
+            billCleanBefore.setTestLocationId(locationId);
+            billCleanBefore.setProcessId(processId);
+            billCleanBefore.setFarmId(String.valueOf(farmId));
+            billCleanBefore.setDepartureId(departureId);
+            billCleanBefore.setDepartureName(departureName);
+            return billCleanBefore;
+        } else{
+            BillGoodsInventory billCleanBefore = new BillGoodsInventory();
+            billCleanBefore.setVistitType(vistitType);
+            billCleanBefore.setDestName(destName);
+            billCleanBefore.setDestId(destId);
+            billCleanBefore.setAdmissionUserName(userName);
+            billCleanBefore.setAdmissionUserId(userId);
+            billCleanBefore.setVistitDate(vistitDate);
+            billCleanBefore.setSubDate(LocalDateTime.now());
+            billCleanBefore.setPhone(phone);
+            billCleanBefore.setTestLocation(locationName);
+            billCleanBefore.setTestLocationId(locationId);
+            billCleanBefore.setBillAdmission(processId);
+            billCleanBefore.setFarmId(String.valueOf(farmId));
+            billCleanBefore.setDepartureId(departureId);
+            billCleanBefore.setDepartureName(departureName);
+            billCleanBefore.setProcessId(processId);
+            return billCleanBefore;
+        }
+    }
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/common/utils/Print.java

@@ -1,331 +1,332 @@
-//package com.huimv.secure.common.utils;
-//
-//
-//import com.huimv.secure.entity.*;
-//import com.huimv.secure.entity.dto.PrintAdmissionDto;
-//import com.huimv.secure.entity.dto.PrintLuggageDto;
-//import com.huimv.secure.entity.vo.AccountVo;
-//import com.huimv.secure.entity.vo.DeviceVo;
-//import com.huimv.secure.entity.vo.SysUserVo;
-//import org.jxls.common.Context;
-//import org.jxls.util.JxlsHelper;
-//
-//import java.io.FileInputStream;
-//import java.io.FileOutputStream;
-//import java.io.InputStream;
-//import java.io.OutputStream;
-//import java.text.SimpleDateFormat;
-//import java.time.LocalDateTime;
-//import java.time.format.DateTimeFormatter;
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-//public class Print {
-//    /**
-//     * 打印方法  不插入图片
-//     *
-//     * @return
-//     * @throws Exception
-//     */
-//    public static void printAdmission(List<BillPersonnelAdmission> admissionList) throws Exception {
-//
-//        //准备数据
-//        String path = "/opt/huatong/admission.xls";
-//        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-//        InputStream is = new FileInputStream("/opt/huatong/admission.xlsx");
-//        //根据模板生成的文件保存路径  我这里保存在本地D盘
-//        OutputStream os = new FileOutputStream(path);
-//        //绑定数据
-//        Context context = new Context();
-//        List<PrintAdmissionDto> list = new ArrayList<>();
-//        for (BillPersonnelAdmission admission : admissionList) {
-//            PrintAdmissionDto dto = new PrintAdmissionDto();
-//            dto.setUserName(admission.getAdmissionUserName());
-//            dto.setCarNum(admission.getCarNum());
-//            dto.setPhone(admission.getPhone());
-//            dto.setDestName(admission.getDestName());
-//            LocalDateTime date = admission.getVistitDate();
-//            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-//            dto.setVistitDate(dtf.format(date));
-//            dto.setVistitReason(admission.getVistitReson());
-//            if (admission.getBillStatus() == 0) {
-//                dto.setBillStatus("待审核");
-//            } else if (admission.getBillStatus() == 1) {
-//                dto.setBillStatus("通过");
-//            } else if (admission.getBillStatus() == 2) {
-//                dto.setBillStatus("拒绝");
-//            }
-//
-//            if (admission.getVistitType() == 0) {
-//                dto.setVistitType("人员");
-//            } else if (admission.getVistitType() == 1) {
-//                dto.setVistitType("环保车");
-//            } else if (admission.getVistitType() == 2) {
-//                dto.setVistitType("拉猪车");
-//            } else if (admission.getVistitType() == 3) {
-//                dto.setVistitType("饲料车");
-//            } else if (admission.getVistitType() == 4) {
-//                dto.setVistitType("送猪车");
-//            } else if (admission.getVistitType() == 5) {
-//                dto.setVistitType("物资车");
-//            }
-//            list.add(dto);
-//        }
-//        context.putVar("list", list);
-//        //生成
-//        JxlsHelper.getInstance().processTemplate(is, os, context);
-//    }
-//
-////    public static void printIsolate(List<BillIsolate> isolateList) throws Exception {
-////
-////        //准备数据
-////        String path = "/opt/huatong/isolate.xls";
-////        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-////        InputStream is = new FileInputStream("/opt/huatong/isolate.xlsx");
-////        //根据模板生成的文件保存路径  我这里保存在本地D盘
-////        OutputStream os = new FileOutputStream(path);
-////        //绑定数据
-////        Context context = new Context();
-////        List<PrintIsolateDto> list = new ArrayList<>();
-////        for (BillIsolate billIsolate : isolateList) {
-////            PrintIsolateDto dto = new PrintIsolateDto();
-////            dto.setDestName(billIsolate.getDestName());
-////            dto.setPhone(billIsolate.getPhone());
-////            dto.setUserName(billIsolate.getAdmissionUserName());
-////            if (billIsolate.getBillStatus() == 0) {
-////                dto.setStatus("待隔离");
-////            } else if (billIsolate.getBillStatus() == 1) {
-////                dto.setStatus("隔离中");
-////            } else if (billIsolate.getBillStatus() == 2) {
-////                dto.setStatus("已完成");
-////            } else if (billIsolate.getBillStatus() == 3) {
-////                dto.setStatus("提前解除");
-////            }
-////            dto.setLocation(billIsolate.getIsolateLocation());
-////            dto.setNum(billIsolate.getIsolateDayNum());
-////            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-////            dto.setStartTime(sdf.format(billIsolate.getIsolateStartDate()));
-////            dto.setEndTime(sdf.format(billIsolate.getIsolateEndDate()));
-////            list.add(dto);
-////        }
-////        context.putVar("list", list);
-////        //生成
-////        JxlsHelper.getInstance().processTemplate(is, os, context);
-////    }
-//
-//    public static void printPcr(List<BillPcr> admissionList) throws Exception {
-//
-//        //准备数据
-//        String path = "/opt/huatong/pcr.xls";
-//        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-//        InputStream is = new FileInputStream("/opt/huatong/pcr.xlsx");
-//        //根据模板生成的文件保存路径  我这里保存在本地D盘
-//        OutputStream os = new FileOutputStream(path);
-//        //绑定数据
-//        Context context = new Context();
-//        List<PrintAdmissionDto> list = new ArrayList<>();
-//        for (BillPcr admission : admissionList) {
-//            PrintAdmissionDto dto = new PrintAdmissionDto();
-//            dto.setUserName(admission.getAdmissionUserName());
-//            dto.setCarNum(admission.getCarNum());
-//            dto.setPhone(admission.getPhone());
-//            dto.setDestName(admission.getDestName());
-//            Date date = admission.getCheckDate();
-//            SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            dto.setVistitDate(dtf.format(date));
-//            dto.setVistitReason(admission.getTestLocation());
-//            if (admission.getBillStatus() == 0) {
-//                dto.setBillStatus("待审核");
-//            } else if (admission.getBillStatus() == 1) {
-//                dto.setBillStatus("合格");
-//            } else if (admission.getBillStatus() == 2) {
-//                dto.setBillStatus("异常");
-//            } else if (admission.getBillStatus() == 3) {
-//                dto.setBillStatus("失效");
-//            }
-//
-//            if (admission.getVistitType() == 0) {
-//                dto.setVistitType("人员");
-//            } else if (admission.getVistitType() == 1) {
-//                dto.setVistitType("环保车");
-//            } else if (admission.getVistitType() == 2) {
-//                dto.setVistitType("拉猪车");
-//            } else if (admission.getVistitType() == 3) {
-//                dto.setVistitType("饲料车");
-//            } else if (admission.getVistitType() == 4) {
-//                dto.setVistitType("送猪车");
-//            } else if (admission.getVistitType() == 5) {
-//                dto.setVistitType("物资车");
-//            }
-//            list.add(dto);
-//        }
-//        context.putVar("list", list);
-//        //生成
-//        JxlsHelper.getInstance().processTemplate(is, os, context);
-//    }
-//
-//    public static void printClean(List<BillClean> admissionList) throws Exception {
-//
-//        //准备数据
-//        String path = "/opt/huatong/clean.xls";
-//        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-//        InputStream is = new FileInputStream("/opt/huatong/clean.xlsx");
-//        //根据模板生成的文件保存路径  我这里保存在本地D盘
-//        OutputStream os = new FileOutputStream(path);
-//        //绑定数据
-//        Context context = new Context();
-//        List<PrintAdmissionDto> list = new ArrayList<>();
-//        for (BillClean admission : admissionList) {
-//            PrintAdmissionDto dto = new PrintAdmissionDto();
-//            dto.setUserName(admission.getAdmissionUserName());
-//            dto.setCarNum(admission.getCarNum());
-//            dto.setPhone(admission.getPhone());
-//            dto.setDestName(admission.getDestName());
-//            Date date = admission.getCheckDate();
-//            SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            dto.setVistitDate(dtf.format(date));
-//            dto.setVistitReason(admission.getTestLocation());
-//            if (admission.getBillStatus() == 0) {
-//                dto.setBillStatus("待审核");
-//            } else if (admission.getBillStatus() == 1) {
-//                dto.setBillStatus("合格");
-//            } else if (admission.getBillStatus() == 2) {
-//                dto.setBillStatus("异常");
-//            } else if (admission.getBillStatus() == 3) {
-//                dto.setBillStatus("失效");
-//            }
-//
-//            if (admission.getVistitType() == 0) {
-//                dto.setVistitType("人员");
-//            } else if (admission.getVistitType() == 1) {
-//                dto.setVistitType("环保车");
-//            } else if (admission.getVistitType() == 2) {
-//                dto.setVistitType("拉猪车");
-//            } else if (admission.getVistitType() == 3) {
-//                dto.setVistitType("饲料车");
-//            } else if (admission.getVistitType() == 4) {
-//                dto.setVistitType("送猪车");
-//            } else if (admission.getVistitType() == 5) {
-//                dto.setVistitType("物资车");
-//            }
-//            list.add(dto);
-//        }
-//        context.putVar("list", list);
-//        //生成
-//        JxlsHelper.getInstance().processTemplate(is, os, context);
-//    }
-//
-//    public static void printLuggage(List<BillLuggage> admissionList) throws Exception {
-//
-//        //准备数据
-//        String path = "/opt/huatong/luggage.xls";
-//        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-//        InputStream is = new FileInputStream("/opt/huatong/luggage.xlsx");
-//        //根据模板生成的文件保存路径  我这里保存在本地D盘
-//        OutputStream os = new FileOutputStream(path);
-//        //绑定数据
-//        Context context = new Context();
-//        List<PrintLuggageDto> list = new ArrayList<>();
-//        for (BillLuggage admission : admissionList) {
-//            PrintLuggageDto dto = new PrintLuggageDto();
-//            dto.setUserName(admission.getUserName());
-//            dto.setPhone(admission.getPhone());
-//            LocalDateTime date = admission.getLuggageDate();
-//            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-//            dto.setVistitDate(dtf.format(date));
-//            dto.setVistitReason(admission.getLuggageLocation());
-//            dto.setBillStatus(admission.getLuggageNum().toString());
-//            list.add(dto);
-//        }
-//        context.putVar("list", list);
-//        //生成
-//        JxlsHelper.getInstance().processTemplate(is, os, context);
-//    }
-//
-//    public static void printUser(List<SysUser> users) throws Exception {
-//
-//        //准备数据
-//        String path = "/opt/huatong/user.xls";
-//        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-//        InputStream is = new FileInputStream("/opt/huatong/user.xlsx");
-//        //根据模板生成的文件保存路径  我这里保存在本地D盘
-//        OutputStream os = new FileOutputStream(path);
-//        //绑定数据
-//        Context context = new Context();
-//        List<SysUserVo> list = new ArrayList<>();
-//        for (SysUser user : users) {
-//            SysUserVo userVo = new SysUserVo();
-//            userVo.setPhone(user.getUserPhone());
-//            userVo.setUserName(user.getUserName());
-//            userVo.setUserNum(user.getUserId());
-//            if (user.getJob().equals("1")) {
-//                userVo.setWorkName("场长");
-//            } else if (user.getJob().equals("3")) {
-//                userVo.setWorkName("生物安全负责人");
-//            } else if (user.getJob().equals("4")) {
-//                userVo.setWorkName("pcr检测人员");
-//            } else if (user.getJob().equals("5")) {
-//                userVo.setWorkName("洗消点工作人员");
-//            }
-//            if (user.getGender() == 0) {
-//                userVo.setSex("男");
-//            } else {
-//                userVo.setSex("女");
-//            }
-//            userVo.setWorkLocation(user.getWorkLocation());
-//            list.add(userVo);
-//        }
-//
-//        context.putVar("list", list);
-//        //生成
-//        JxlsHelper.getInstance().processTemplate(is, os, context);
-//    }
-//
-//    public static void printAccount(List<AccountVo> accountVos) throws Exception {
-//
-//        //准备数据
-//        String path = "/opt/huatong/account.xls";
-//        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-//        InputStream is = new FileInputStream("/opt/huatong/account.xlsx");
-//        //根据模板生成的文件保存路径  我这里保存在本地D盘
-//        OutputStream os = new FileOutputStream(path);
-//        //绑定数据
-//        Context context = new Context();
-//
-//        context.putVar("list", accountVos);
-//        //生成
-//        JxlsHelper.getInstance().processTemplate(is, os, context);
-//    }
-//
-//    public static void printDevice(List<BaseDevice> devices) throws Exception {
-//
-//        //准备数据
-//        String path = "/opt/huatong/device.xls";
-//        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-//        InputStream is = new FileInputStream("/opt/huatong/device.xlsx");
-//        //根据模板生成的文件保存路径  我这里保存在本地D盘
-//        OutputStream os = new FileOutputStream(path);
-//        //绑定数据
-//        Context context = new Context();
-//        List<DeviceVo> deviceVos = new ArrayList<>();
-//
-//        for (BaseDevice device : devices) {
-//            DeviceVo deviceVo = new DeviceVo();
-//            deviceVo.setDeviceName(device.getDeviceName());
-//            deviceVo.setDeviceNum(device.getDeviceCode());
-//            deviceVo.setLocation(device.getWorkLocation());
-//            deviceVo.setUserName(device.getUserName());
-//            if (device.getDeviceStatus() == 0) {
-//                deviceVo.setStatus("离线");
-//            } else {
-//                deviceVo.setStatus("在线");
-//            }
-//            deviceVos.add(deviceVo);
-//        }
-//        context.putVar("list", deviceVos);
-//        //生成
-//        JxlsHelper.getInstance().processTemplate(is, os, context);
-//    }
-//
-//}
+package com.huimv.secure.common.utils;
+
+
+import com.huimv.secure.entity.*;
+import com.huimv.secure.entity.dto.PrintAdmissionDto;
+import com.huimv.secure.entity.dto.PrintIsolateDto;
+import com.huimv.secure.entity.dto.PrintLuggageDto;
+import com.huimv.secure.entity.vo.AccountVo;
+import com.huimv.secure.entity.vo.DeviceVo;
+import com.huimv.secure.entity.vo.SysUserVo;
+import org.jxls.common.Context;
+import org.jxls.util.JxlsHelper;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Print {
+    /**
+     * 打印方法  不插入图片
+     *
+     * @return
+     * @throws Exception
+     */
+    public static void printAdmission(List<BillPersonnelAdmission> admissionList) throws Exception {
+
+        //准备数据
+        String path = "/opt/huatong/admission.xls";
+        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
+        InputStream is = new FileInputStream("/opt/huatong/admission.xlsx");
+        //根据模板生成的文件保存路径  我这里保存在本地D盘
+        OutputStream os = new FileOutputStream(path);
+        //绑定数据
+        Context context = new Context();
+        List<PrintAdmissionDto> list = new ArrayList<>();
+        for (BillPersonnelAdmission admission : admissionList) {
+            PrintAdmissionDto dto = new PrintAdmissionDto();
+            dto.setUserName(admission.getAdmissionUserName());
+            dto.setCarNum(admission.getCarNum());
+            dto.setPhone(admission.getPhone());
+            dto.setDestName(admission.getDestName());
+            LocalDateTime date = admission.getVistitDate();
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            dto.setVistitDate(dtf.format(date));
+            dto.setVistitReason(admission.getVistitReson());
+            if (admission.getBillStatus() == 0) {
+                dto.setBillStatus("待审核");
+            } else if (admission.getBillStatus() == 1) {
+                dto.setBillStatus("通过");
+            } else if (admission.getBillStatus() == 2) {
+                dto.setBillStatus("拒绝");
+            }
+
+            if (admission.getVistitType() == 0) {
+                dto.setVistitType("人员");
+            } else if (admission.getVistitType() == 1) {
+                dto.setVistitType("环保车");
+            } else if (admission.getVistitType() == 2) {
+                dto.setVistitType("拉猪车");
+            } else if (admission.getVistitType() == 3) {
+                dto.setVistitType("饲料车");
+            } else if (admission.getVistitType() == 4) {
+                dto.setVistitType("送猪车");
+            } else if (admission.getVistitType() == 5) {
+                dto.setVistitType("物资车");
+            }
+            list.add(dto);
+        }
+        context.putVar("list", list);
+        //生成
+        JxlsHelper.getInstance().processTemplate(is, os, context);
+    }
+
+    public static void printIsolate(List<BillIsolate> isolateList) throws Exception {
+
+        //准备数据
+        String path = "/opt/huatong/isolate.xls";
+        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
+        InputStream is = new FileInputStream("/opt/huatong/isolate.xlsx");
+        //根据模板生成的文件保存路径  我这里保存在本地D盘
+        OutputStream os = new FileOutputStream(path);
+        //绑定数据
+        Context context = new Context();
+        List<PrintIsolateDto> list = new ArrayList<>();
+        for (BillIsolate billIsolate : isolateList) {
+            PrintIsolateDto dto = new PrintIsolateDto();
+            dto.setDestName(billIsolate.getDestName());
+            dto.setPhone(billIsolate.getPhone());
+            dto.setUserName(billIsolate.getAdmissionUserName());
+            if (billIsolate.getBillStatus() == 0) {
+                dto.setStatus("待隔离");
+            } else if (billIsolate.getBillStatus() == 1) {
+                dto.setStatus("隔离中");
+            } else if (billIsolate.getBillStatus() == 2) {
+                dto.setStatus("已完成");
+            } else if (billIsolate.getBillStatus() == 3) {
+                dto.setStatus("提前解除");
+            }
+            dto.setLocation(billIsolate.getIsolateLocation());
+            dto.setNum(billIsolate.getIsolateDayNum());
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            dto.setStartTime(sdf.format(billIsolate.getIsolateStartDate()));
+            dto.setEndTime(sdf.format(billIsolate.getIsolateEndDate()));
+            list.add(dto);
+        }
+        context.putVar("list", list);
+        //生成
+        JxlsHelper.getInstance().processTemplate(is, os, context);
+    }
+
+    public static void printPcr(List<BillPcr> admissionList) throws Exception {
+
+        //准备数据
+        String path = "/opt/huatong/pcr.xls";
+        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
+        InputStream is = new FileInputStream("/opt/huatong/pcr.xlsx");
+        //根据模板生成的文件保存路径  我这里保存在本地D盘
+        OutputStream os = new FileOutputStream(path);
+        //绑定数据
+        Context context = new Context();
+        List<PrintAdmissionDto> list = new ArrayList<>();
+        for (BillPcr admission : admissionList) {
+            PrintAdmissionDto dto = new PrintAdmissionDto();
+            dto.setUserName(admission.getAdmissionUserName());
+            dto.setCarNum(admission.getCarNum());
+            dto.setPhone(admission.getPhone());
+            dto.setDestName(admission.getDestName());
+            Date date = admission.getCheckDate();
+            SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            dto.setVistitDate(dtf.format(date));
+            dto.setVistitReason(admission.getTestLocation());
+            if (admission.getBillStatus() == 0) {
+                dto.setBillStatus("待审核");
+            } else if (admission.getBillStatus() == 1) {
+                dto.setBillStatus("合格");
+            } else if (admission.getBillStatus() == 2) {
+                dto.setBillStatus("异常");
+            } else if (admission.getBillStatus() == 3) {
+                dto.setBillStatus("失效");
+            }
+
+            if (admission.getVistitType() == 0) {
+                dto.setVistitType("人员");
+            } else if (admission.getVistitType() == 1) {
+                dto.setVistitType("环保车");
+            } else if (admission.getVistitType() == 2) {
+                dto.setVistitType("拉猪车");
+            } else if (admission.getVistitType() == 3) {
+                dto.setVistitType("饲料车");
+            } else if (admission.getVistitType() == 4) {
+                dto.setVistitType("送猪车");
+            } else if (admission.getVistitType() == 5) {
+                dto.setVistitType("物资车");
+            }
+            list.add(dto);
+        }
+        context.putVar("list", list);
+        //生成
+        JxlsHelper.getInstance().processTemplate(is, os, context);
+    }
+
+    public static void printClean(List<BillClean> admissionList) throws Exception {
+
+        //准备数据
+        String path = "/opt/huatong/clean.xls";
+        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
+        InputStream is = new FileInputStream("/opt/huatong/clean.xlsx");
+        //根据模板生成的文件保存路径  我这里保存在本地D盘
+        OutputStream os = new FileOutputStream(path);
+        //绑定数据
+        Context context = new Context();
+        List<PrintAdmissionDto> list = new ArrayList<>();
+        for (BillClean admission : admissionList) {
+            PrintAdmissionDto dto = new PrintAdmissionDto();
+            dto.setUserName(admission.getAdmissionUserName());
+            dto.setCarNum(admission.getCarNum());
+            dto.setPhone(admission.getPhone());
+            dto.setDestName(admission.getDestName());
+            Date date = admission.getCheckDate();
+            SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            dto.setVistitDate(dtf.format(date));
+            dto.setVistitReason(admission.getTestLocation());
+            if (admission.getBillStatus() == 0) {
+                dto.setBillStatus("待审核");
+            } else if (admission.getBillStatus() == 1) {
+                dto.setBillStatus("合格");
+            } else if (admission.getBillStatus() == 2) {
+                dto.setBillStatus("异常");
+            } else if (admission.getBillStatus() == 3) {
+                dto.setBillStatus("失效");
+            }
+
+            if (admission.getVistitType() == 0) {
+                dto.setVistitType("人员");
+            } else if (admission.getVistitType() == 1) {
+                dto.setVistitType("环保车");
+            } else if (admission.getVistitType() == 2) {
+                dto.setVistitType("拉猪车");
+            } else if (admission.getVistitType() == 3) {
+                dto.setVistitType("饲料车");
+            } else if (admission.getVistitType() == 4) {
+                dto.setVistitType("送猪车");
+            } else if (admission.getVistitType() == 5) {
+                dto.setVistitType("物资车");
+            }
+            list.add(dto);
+        }
+        context.putVar("list", list);
+        //生成
+        JxlsHelper.getInstance().processTemplate(is, os, context);
+    }
+
+    public static void printLuggage(List<BillLuggage> admissionList) throws Exception {
+
+        //准备数据
+        String path = "/opt/huatong/luggage.xls";
+        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
+        InputStream is = new FileInputStream("/opt/huatong/luggage.xlsx");
+        //根据模板生成的文件保存路径  我这里保存在本地D盘
+        OutputStream os = new FileOutputStream(path);
+        //绑定数据
+        Context context = new Context();
+        List<PrintLuggageDto> list = new ArrayList<>();
+        for (BillLuggage admission : admissionList) {
+            PrintLuggageDto dto = new PrintLuggageDto();
+            dto.setUserName(admission.getUserName());
+            dto.setPhone(admission.getPhone());
+            LocalDateTime date = admission.getLuggageDate();
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            dto.setVistitDate(dtf.format(date));
+            dto.setVistitReason(admission.getLuggageLocation());
+            dto.setBillStatus(admission.getLuggageNum().toString());
+            list.add(dto);
+        }
+        context.putVar("list", list);
+        //生成
+        JxlsHelper.getInstance().processTemplate(is, os, context);
+    }
+
+    public static void printUser(List<SysUser> users) throws Exception {
+
+        //准备数据
+        String path = "/opt/huatong/user.xls";
+        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
+        InputStream is = new FileInputStream("/opt/huatong/user.xlsx");
+        //根据模板生成的文件保存路径  我这里保存在本地D盘
+        OutputStream os = new FileOutputStream(path);
+        //绑定数据
+        Context context = new Context();
+        List<SysUserVo> list = new ArrayList<>();
+        for (SysUser user : users) {
+            SysUserVo userVo = new SysUserVo();
+            userVo.setPhone(user.getUserPhone());
+            userVo.setUserName(user.getUserName());
+            userVo.setUserNum(user.getUserId());
+            if (user.getJob().equals("1")) {
+                userVo.setWorkName("场长");
+            } else if (user.getJob().equals("3")) {
+                userVo.setWorkName("生物安全负责人");
+            } else if (user.getJob().equals("4")) {
+                userVo.setWorkName("pcr检测人员");
+            } else if (user.getJob().equals("5")) {
+                userVo.setWorkName("洗消点工作人员");
+            }
+            if (user.getGender() == 0) {
+                userVo.setSex("男");
+            } else {
+                userVo.setSex("女");
+            }
+            userVo.setWorkLocation(user.getWorkLocation());
+            list.add(userVo);
+        }
+
+        context.putVar("list", list);
+        //生成
+        JxlsHelper.getInstance().processTemplate(is, os, context);
+    }
+
+    public static void printAccount(List<AccountVo> accountVos) throws Exception {
+
+        //准备数据
+        String path = "/opt/huatong/account.xls";
+        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
+        InputStream is = new FileInputStream("/opt/huatong/account.xlsx");
+        //根据模板生成的文件保存路径  我这里保存在本地D盘
+        OutputStream os = new FileOutputStream(path);
+        //绑定数据
+        Context context = new Context();
+
+        context.putVar("list", accountVos);
+        //生成
+        JxlsHelper.getInstance().processTemplate(is, os, context);
+    }
+
+    public static void printDevice(List<BaseDevice> devices) throws Exception {
+
+        //准备数据
+        String path = "/opt/huatong/device.xls";
+        //获取模板文件，你自己当前模板的位置  我这里为当前项目下
+        InputStream is = new FileInputStream("/opt/huatong/device.xlsx");
+        //根据模板生成的文件保存路径  我这里保存在本地D盘
+        OutputStream os = new FileOutputStream(path);
+        //绑定数据
+        Context context = new Context();
+        List<DeviceVo> deviceVos = new ArrayList<>();
+
+        for (BaseDevice device : devices) {
+            DeviceVo deviceVo = new DeviceVo();
+            deviceVo.setDeviceName(device.getDeviceName());
+            deviceVo.setDeviceNum(device.getDeviceCode());
+            deviceVo.setLocation(device.getWorkLocation());
+            deviceVo.setUserName(device.getUserName());
+            if (device.getDeviceStatus() == 0) {
+                deviceVo.setStatus("离线");
+            } else {
+                deviceVo.setStatus("在线");
+            }
+            deviceVos.add(deviceVo);
+        }
+        context.putVar("list", deviceVos);
+        //生成
+        JxlsHelper.getInstance().processTemplate(is, os, context);
+    }
+
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/common/utils/UploadImage.java

@@ -178,6 +178,107 @@ public class UploadImage {
         }
     }
 
+    //上传压缩的视频
+    public  String getVideoCom(MultipartFile video) throws IOException {
+        String originalFilename = video.getOriginalFilename();
+        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+        String path = DateUtil.format(new Date(), "yyyy-MM");
+        try {
+            InputStream inputStream = video.getInputStream();
+            BufferedInputStream in = new BufferedInputStream(inputStream);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+
+            byte[] temp = new byte[1024];
+            int size = 0;
+            while ((size = in.read(temp)) != -1) {
+                out.write(temp, 0, size);
+            }
+            in.close();
+            byte[] content = out.toByteArray();
+            String videoName = UUID.randomUUID() + "." + filenameExtension;
+            sshSftp(content, path, videoName);
+            return url + path + "/" + videoName;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "上传失败";
+        }
+
+//        //获取文件输入流
+//        InputStream inputStream = image.getInputStream();
+//        String originalFilename = image.getOriginalFilename();
+//        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+//        String path = DateUtil.format(new Date(), "yyyy-MM");
+//
+//        try {
+//
+//            File tempFile = new File("tempVideo.mp4");
+//            image.transferTo(tempFile);
+////
+////            // 使用FFmpegFrameGrabber读取视频信息
+////            FFmpegFrameGrabber grabber = new FFmpegFrameGrabber(tempFile);
+////            grabber.start();
+////
+////            // 创建输出文件
+////            File compressedFile = new File("compressedVideo.mp4");
+////
+////            // 使用FFmpegFrameRecorder进行压缩
+////            FFmpegFrameRecorder recorder = new FFmpegFrameRecorder(compressedFile, grabber.getImageWidth(), grabber.getImageHeight(), grabber.getAudioChannels());
+////            recorder.setInterleaved(true);
+////            recorder.setVideoOption("preset", "ultrafast"); // 设置压缩速度，可以根据需要调整
+////            recorder.setVideoOption("crf", "40"); // 设置视频质量，范围通常是0-51，值越大压缩率越高，质量越低
+////            recorder.setVideoCodec(findH264Encoder(recorder)); // 查找并设置H.264编解码器
+////            recorder.setFormat("mp4");
+////            recorder.setFrameRate(grabber.getFrameRate());
+////            recorder.setSampleRate(grabber.getSampleRate());
+////            recorder.setAudioBitrate(grabber.getAudioBitrate());
+////            recorder.setVideoBitrate(grabber.getVideoBitrate() / 2); // 压缩一半的视频比特率
+////
+////            // 开始录制并压缩视频
+////            recorder.start();
+////            Frame frame;
+////            while ((frame = grabber.grabFrame()) != null) {
+////                recorder.record(frame);
+////            }
+////            recorder.stop();
+////            grabber.stop();
+////
+////            // 读取压缩后的视频为字节数组
+////            byte[] compressedVideoBytes = Files.readAllBytes(compressedFile.toPath());
+////
+////            // 删除临时文件
+////            tempFile.delete();
+////            compressedFile.delete();
+////
+//            String imgname = UUID.randomUUID() + "." + filenameExtension;
+//            sshSftp(image, path, imgname);
+//            return url+ path + "/" + imgname;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return "上传失败";
+//        } finally {
+//            inputStream.close();
+//        }
+    }
+
+//    private int findH264Encoder(FFmpegFrameRecorder recorder) {
+//        AVCodec codec = null;
+//
+//        AVCodec.avcodec_register_all(); // 注册所有编解码器
+//        for (AVCodec.AVCodecDescriptor desc : AVCodec.avcodec_descriptor_get(null)) {
+//            if (desc.type() == AVCodec.AVMEDIA_TYPE_VIDEO &&
+//                    desc.id() != AVCodec.AV_CODEC_ID_NONE &&
+//                    desc.name().equals("libx264")) { // libx264是H.264的常用编码器名称
+//                codec = AVCodec.avcodec_find_encoder(desc.id());
+//                break;
+//            }
+//        }
+//        if (codec == null) {
+//            throw new RuntimeException("H.264 encoder not found");
+//        }
+//        return codec.id();
+//    }
+
+
 }
 
 

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

@@ -1,20 +0,0 @@
-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/ApiPrefixAutoConfiguration.java

@@ -10,7 +10,7 @@
 //
 //    @Override
 //    public void configurePathMatch(PathMatchConfigurer configurer) {
-//        configurer.addPathPrefix("/secureApi",  c -> c.isAnnotationPresent(RestController.class));
+//        configurer.addPathPrefix("/huimvFarmSecureApi",  c -> c.isAnnotationPresent(RestController.class));
 //    }
 //
 //}

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

@@ -1,4 +1,4 @@
-package com.huimv.secure.config;//package com.huimv.receive.config;
+package com.huimv.secure.config;
 //
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.data.redis.core.RedisTemplate;

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

@@ -1,44 +0,0 @@
-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

@@ -22,7 +22,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/admin/my/*","/bill-access-door/getDoorData","/bill-gate/getGateData", "/swagger-resources/**")
+                excludePathPatterns("/admin/my/*","/bill-access-door/getDoorData","/bill-gate/getGateData")
                 .excludePathPatterns("/receive/feed","/bill-personnel-admission/printAdmission"
                         ,"/bill-personnel-admission/printAdmission"
                         ,"/bill-pcr/printPcr"
@@ -57,6 +57,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/bill-clean/listScreen"
 
 
+
                         ,"/bill-isolate/isolateList"
                         ,"/bill-isolate/isolateSelect"
                         ,"/bill-isolate/delete"
@@ -72,13 +73,28 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/bill-personnel-admission/allCount"
                         ,"/bill-pcr/pcrList"
                         ,"/bill-goods-inventory/listAll"
-                        ,"/sys-user/*"
-                        ,"/sys-account-multilevel/*"
+
+                        ,"/admin/user/listWorkLocation"
+                        ,"/admin/user/page"
+                        ,"/admin/user/userAgeAndGender"
+                        ,"/admin/user/userJob"
+                        ,"/admin/user/pageAccount"
                         ,"/base-farm/getFarm"
+                        ,"/base-location/*"
+                        ,"/admin/farm/*"
+                        ,"/base-visiting/*"
+                        ,"/base-flow/*"
+                        ,"/base-washout-point/*"
+                        ,"/bill-sampling/listSampling2"
+                        ,"/bill-clean-before/listCleanBefore2"
+                        ,"/base-job/list"
+                        ,"/admin/user/add"
+                        ,"/admin/user/update"
+                        ,"/admin/user/remove"
+                        ,"/admin/user/*"
+                        ,"/admin/accountMultilevel/*"
+                        ,"/bill-goods-inventory/*"
                         ,"/bill-personnel-admission/screenCount"
-                        ,"/bill-personnel-admission/screenWarning"
-                        ,"/base-location/listAll"
-                        ,"/bill-pcr/listConfiguration"
-                        );
+                        ,"/bill-personnel-admission/screenWarning");
     }
 }

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

@@ -1,32 +0,0 @@
-package com.huimv.secure.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends WebMvcConfigurerAdapter {
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("swagger-ui.html")
-                .addResourceLocations("classpath:/META-INF/resources/");
-
-    }
-    @Bean
-    public Docket api() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.huimv.secure.controller")) // 替换为你的控制器包路径
-                .paths(PathSelectors.any())
-                .build();
-    }
-
-}

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

@@ -1,30 +0,0 @@
-package com.huimv.secure.controller;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2024-01-03
- */
-@RestController
-@RequestMapping("/age-ranges")
-@Api(tags = "测试")
-public class AgeRangesController {
-    @GetMapping("/hello")
-    @ApiOperation("你好")
-    public String sayHello() {
-        return "Hello, World!";
-    }
-
-
-}

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

@@ -0,0 +1,107 @@
+package com.huimv.secure.controller;
+
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
+import com.huimv.secure.entity.Menu;
+import com.huimv.secure.service.IAuthorizeService;
+import com.huimv.secure.service.IMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/admin/auth")
+@CrossOrigin
+public class AuthorizeController {
+
+    @Autowired
+    IAuthorizeService iAuthorizeService;
+    @Autowired
+    IMenuService iMenuService;
+
+    @PostMapping("/saveAccountGroup")
+    public Result saveAccountGroup(@RequestBody Map<String, String> map){
+        /*
+         * 保存账号关联权限组数据
+         */
+        String accountId = map.get("accountId");
+        String groupIds = map.get("groupIds");
+        return iAuthorizeService.saveAccountGroup(accountId,groupIds);
+    }
+
+    @PostMapping("/saveGroupMenu")
+    public Result saveGroupMenu(@RequestBody Map<String, String> map){
+        /*
+         * 保存权限组关联菜单数据
+         */
+        String groupId = map.get("groupId");
+        String menuIds = map.get("menuIds");
+        String isAll = map.get("isAll");
+        return iAuthorizeService.saveGroupMenu(groupId,menuIds,isAll);
+    }
+
+    @RequestMapping("/getGroupByAccount")
+    public Result getGroupByAccount(@RequestParam(name = "accountId", required = true) String accountId){
+        /*
+         * 根据账号获取权限组
+         */
+        return iAuthorizeService.getGroupByAccount (accountId);
+    }
+
+    @PostMapping("/getMenuByGroup")
+    public Result getMenuByGroup(@RequestBody Map<String, String> map){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getMenuByGroup(map);
+    }
+
+    @PostMapping("/getMenuByGroupAndFarm")
+    public Result getMenuByGroupAndFarm(@RequestBody Map<String, String> map){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getMenuByGroupAndFarm(map);
+    }
+
+    @PostMapping("/getMyMenu")
+    public Result getMyMenuAndButton(@RequestBody  Map<String,String> map){
+        /*
+         * 获取用户的菜单数据
+         */
+        String userId = map.get("userId");
+        String farmId = map.get("farmId");
+        List<Menu> myMenu = iAuthorizeService.getMyMenuAll(userId,farmId);
+
+        List<Map> list = iMenuService.optimizeListUtil(0,myMenu);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+//    //获取菜单-多级
+//    @RequestMapping("/getMyMenuMultilevel")
+//    public Result getMyMenuMultilevel(@RequestParam(name = "userId", required = true) String userId){
+//        return new Result(ResultCode.SUCCESS,iAuthorizeService.getMyMenuMultilevel(userId));
+//    }
+
+
+    @PostMapping("/getMyButton")
+    public Result getMyButton(@RequestBody Map<String,String> map){
+        /*
+         * 获取用户的菜单数据
+         */
+        String userId = map.get("userId");
+        String farmId = map.get("farmId");
+        List list = iAuthorizeService.getMyButton(userId,farmId);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+
+    @GetMapping("/getAcountByGroup")
+    public Result getAccountByGroup(String groupId){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getAccountByGroup(groupId);
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.huimv.secure.controller;
 
 
+import com.huimv.secure.common.utils.PdfUtil;
 import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.entity.BaseDevice;
 import com.huimv.secure.service.IBaseDeviceService;
@@ -8,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -16,17 +19,16 @@ import java.util.Map;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-04
  */
 @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);
@@ -37,18 +39,30 @@ public class BaseDeviceController {
         return  baseDeviceService.updateDevice(baseDevice);
     }
 
+
+    @Autowired
+    private IBaseDeviceService deviceService;
+    @GetMapping("/printDevice")
+    public void printDevice(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        deviceService.printDevice(response, map);
+        String path = "/opt/huatong/device.xls";
+        PdfUtil.returnPdfStream3(response, path, "设备列表");
+    }
+
     @PostMapping("/listSelect")
-    public Result listSelect( @RequestBody Map<String, String> paramsMap) {
-        return deviceService.listSelect( paramsMap);
+    public Result listSelect(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return deviceService.listSelect(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/listCount")
-    public Result listCount( @RequestBody Map<String, String> paramsMap) {
-        return deviceService.listCount(paramsMap);
+    public Result listCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return deviceService.listCount(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/delete")
-    public Result delete(@RequestBody Map<String, String> paramsMap){
+    public Result delete(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
         String ids = paramsMap.get("ids");
         String[] split = ids.split(",");
         for (String s : split) {
@@ -56,4 +70,5 @@ public class BaseDeviceController {
         }
         return new Result(10000,"删除成功！",true);
     }
+
 }

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

@@ -4,7 +4,6 @@ package com.huimv.secure.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.secure.entity.BaseFarm;
-import com.huimv.secure.entity.Configuration;
 import com.huimv.secure.entity.Exist;
 import com.huimv.secure.entity.vo.GetFarmIdVo;
 import com.huimv.secure.entity.vo.GetFarmVo2;
@@ -12,30 +11,26 @@ import com.huimv.secure.service.IBaseFarmService;
 import com.huimv.secure.service.IConfigurationService;
 import com.huimv.secure.service.IExistService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
- * 前端控制器
+ *  前端控制器
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2024-03-06
  */
 @RestController
 @RequestMapping("/base-farm")
-@CrossOrigin
 public class BaseFarmController {
-
     @Autowired
     private IBaseFarmService farmService;
-    @Autowired
-    private IExistService existService;
-    @Autowired
-    private IConfigurationService configurationService;
 
     //接收来自后台的牧场列表
     @PostMapping("/getFarm")
@@ -47,21 +42,12 @@ public class BaseFarmController {
             BaseFarm farm = farmService.getOne(queryWrapper);
             if (ObjectUtil.isEmpty(farm)) {
                 BaseFarm baseFarm = new BaseFarm();
+                baseFarm.setParentId(getFarmIdVo.getParentId());
                 baseFarm.setId(getFarmIdVo.getFarmId());
                 baseFarm.setFarmName(getFarmIdVo.getName());
+                baseFarm.setFarmMenu("53,143,297,298,299,300,301,302,303,304,305,306,307,308,311,312,309,310,313,314,315,316,60,61,64,67,139,65,66,228,229,235,236,237,230,231,232,233,234,63,76,141,77,78,79,80");
+                baseFarm.setFarmTopMenu("首页,基础管理,智能环控,环保管理,生产管理,能耗管理,气体检测,视频监控,系统管理,入场管理,PCR管理,洗消管理,隔离管理,行李寄存,设备管理,员工管理,账号管理,员工详情,员工表单");
                 farmService.save(baseFarm);
-
-                Exist exist = new Exist();
-                exist.setExist(0);
-                exist.setFarmId(getFarmIdVo.getFarmId());
-                existService.save(exist);
-
-                Configuration configuration = new Configuration();
-                configuration.setPcr(2);
-                configuration.setClean(10);
-                configuration.setDry(70);
-                configuration.setFarmId(getFarmIdVo.getFarmId());
-                configurationService.save(configuration);
             }
         }
     }

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

@@ -0,0 +1,41 @@
+package com.huimv.secure.controller;
+
+
+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.BaseFlow;
+import com.huimv.secure.service.IBaseFlowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-06
+ */
+@RestController
+@RequestMapping("/base-flow")
+@CrossOrigin
+public class BaseFlowController {
+    @Autowired
+    private IBaseFlowService baseFlowService;
+
+    @PostMapping("/page")
+    public Result list(@RequestBody Map<String,String> paramsMap){
+        String pageNum = paramsMap.get("current");
+        String pageSize = paramsMap.get("size");
+        Page<BaseFlow> baseFlowPage = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,baseFlowService.page(baseFlowPage));
+    }
+
+    @PostMapping("/list")
+    public Result list(){
+        return new Result(ResultCode.SUCCESS,baseFlowService.list());
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.huimv.secure.controller;
+
+
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
+import com.huimv.secure.service.IBaseJobService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-13
+ */
+@RestController
+@RequestMapping("/base-job")
+@CrossOrigin
+public class BaseJobController {
+    @Autowired
+    private IBaseJobService baseJobService;
+
+    @PostMapping("/list")
+    public Result listAll(@RequestBody Map<String, String> paramsMap) {
+        return new Result(ResultCode.SUCCESS,baseJobService.list());
+    }
+
+}

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

@@ -2,105 +2,95 @@ package com.huimv.secure.controller;
 
 
 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.BaseLocation;
-import com.huimv.secure.entity.Exist;
+import com.huimv.secure.service.IBaseFarmService;
 import com.huimv.secure.service.IBaseLocationService;
-import com.huimv.secure.service.IExistService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @RestController
 @RequestMapping("/base-location")
 @CrossOrigin
 public class BaseLocationController {
-
-    @Autowired
-    private IBaseLocationService locationService;
     @Autowired
     private IBaseLocationService baseLocationService;
     @Autowired
-    private IExistService existService;
+    private IBaseFarmService baseFarmService;
 
     @PostMapping("/listAll")
     public Result listAll(@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)));
+        return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>().lambda()
+                .like(BaseLocation::getFarmIds, farmId)));
     }
-    @PostMapping("/listAll1")
-    public Result listAll1(@RequestBody Map<String, String> paramsMap) {
+
+    @PostMapping("/page")
+    public Result page(@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)));
+        String pageNo = "";
+        String pageSizes = "";
+        String current = paramsMap.get("current");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String size = paramsMap.get("size");
+        if (StringUtils.isNotBlank(current)) {
+            pageNo = current;
+            pageSizes = size;
+        }
+        if (StringUtils.isNotBlank(pageNum)) {
+            pageNo = pageNum;
+            pageSizes = pageSize;
+        }
+        Page<BaseLocation> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSizes));
+        Page<BaseLocation> baseLocationPage = baseLocationService.page(page, new QueryWrapper<BaseLocation>().lambda()
+                .like(BaseLocation::getFarmIds, farmId));
+        for (BaseLocation record : baseLocationPage.getRecords()) {
+            String[] strings = record.getFarmIds().split(",");
+            List farmNameList = new ArrayList();
+            for (String farm : strings) {
+                farmNameList.add(baseFarmService.getById(farm).getFarmName());
+            }
+            record.setFarmNames(String.join(",", farmNameList));
+        }
+        return new Result(ResultCode.SUCCESS, baseLocationPage);
     }
+
     @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("location_type", 1)));
+                .eq("is_luggage", 1).like("farm_Ids", farmId)));
     }
 
+    @PostMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody BaseLocation baseLocation) {
+        return baseLocationService.add(httpServletRequest, baseLocation);
+    }
 
-    /*获取工作地点的列表*/
-    @GetMapping("/getListWorkLocation")
-    public Result getLocation(@RequestParam("farmId") String farmId) {
-        QueryWrapper<BaseLocation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
-        List<BaseLocation> baseLocations = locationService.list(queryWrapper);
-        return new Result(ResultCode.SUCCESS,baseLocations);
+    @PostMapping("/edit")
+    public Result edit(HttpServletRequest httpServletRequest, @RequestBody BaseLocation baseLocation) {
+        return baseLocationService.edit(httpServletRequest, baseLocation);
     }
 
+    @PostMapping("/delete")
+    public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return baseLocationService.delete(httpServletRequest, paramsMap);
+    }
 }

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

@@ -6,6 +6,7 @@ import com.huimv.secure.service.IBaseProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -14,7 +15,7 @@ import java.util.Map;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @RestController
 @RequestMapping("/base-process")
@@ -33,4 +34,14 @@ public class BaseProcessController {
     public Result pageByLocationId(@RequestBody Map<String,String> map) {
         return processService.pageByLocationId(map);
     }
+
+    @PostMapping("/listAll")
+    public Result listAll(@RequestBody Map<String,String> map) {
+        return processService.listAll(map);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> map) {
+        return processService.edit(httpServletRequest,map);
+    }
 }

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

@@ -0,0 +1,65 @@
+package com.huimv.secure.controller;
+
+
+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.entity.BaseVisiting;
+import com.huimv.secure.entity.BaseWashoutPoint;
+import com.huimv.secure.service.IBaseVisitingService;
+import com.huimv.secure.service.IBaseWashoutPointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-06
+ */
+@RestController
+@RequestMapping("/base-visiting")
+@CrossOrigin
+public class BaseVisitingController {
+
+    @Autowired
+    private IBaseVisitingService baseVisitingService;
+    @Autowired
+    private IBaseWashoutPointService baseWashoutPointService;
+
+    @PostMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody BaseVisiting baseVisiting){
+        return baseVisitingService.add(httpServletRequest,baseVisiting);
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody Map<String,String> paramsMap){
+        String id = paramsMap.get("id");
+        if (baseWashoutPointService.count(new QueryWrapper<BaseWashoutPoint>().lambda().eq(BaseWashoutPoint::getVisitingType,id)) > 0) {
+            return new Result(10001,"请先删除该来访类型相关洗消点!",false);
+        }
+        return baseVisitingService.delete(id);
+    }
+
+    @PostMapping("/page")
+    public Result page(@RequestBody Map<String,String> paramsMap){
+        String pageNum = paramsMap.get("current");
+        String pageSize = paramsMap.get("size");
+        Page<BaseVisiting> baseVisitingPage = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,baseVisitingService.page(baseVisitingPage,new QueryWrapper<>()));
+    }
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String,String> paramsMap){
+        return new Result(ResultCode.SUCCESS,baseVisitingService.list(new QueryWrapper<>()));
+    }
+
+
+}

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

@@ -0,0 +1,56 @@
+package com.huimv.secure.controller;
+
+
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.entity.vo.WashOutVo;
+import com.huimv.secure.service.IBaseWashoutPointService;
+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.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-06
+ */
+@RestController
+@RequestMapping("/base-washout-point")
+@CrossOrigin
+public class BaseWashoutPointController {
+    @Autowired
+    private IBaseWashoutPointService washoutPointService;
+
+    @RequestMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest,
+                      @RequestBody WashOutVo washOutVo) {
+        return washoutPointService.add(httpServletRequest, washOutVo);
+    }
+
+    @RequestMapping("/list")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return washoutPointService.list(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/delete")
+    public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return washoutPointService.delete(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listDest")
+    public Result listDest(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+       return washoutPointService.listDest(paramsMap);
+    }
+
+    @RequestMapping("/listWash")
+    public Result listWash(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return washoutPointService.listWash(paramsMap);
+    }
+}

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

@@ -1,37 +0,0 @@
-package com.huimv.secure.controller;
-
-
-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.BaseWorkType;
-import com.huimv.secure.service.IBaseWorkTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 工作岗位列表 前端控制器
- * </p>
- *
- * @author author
- * @since 2024-01-04
- */
-@RestController
-@RequestMapping("/base-work-type")
-@CrossOrigin
-public class BaseWorkTypeController {
-    @Autowired
-    private IBaseWorkTypeService workTypeService;
-
-    /*
-    * 获取工作岗位的列表
-    * */
-    @GetMapping("/getWorkType")
-    public Result getWorkType(@RequestParam("farmId") String farmId) {
-        List<BaseWorkType> list = workTypeService.list(new QueryWrapper<BaseWorkType>().eq("farm_id", farmId));
-        return new Result(ResultCode.SUCCESS,list);
-    }
-}

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

@@ -15,7 +15,6 @@ import com.huimv.secure.service.IDeviceListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
-
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -31,12 +30,13 @@ import java.util.Map;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-25
  */
 @RestController
 @RequestMapping("/bill-access-door")
 @CrossOrigin
 public class BillAccessDoorController {
+
     @Autowired
     private IBillAccessDoorService doorService;
     @Autowired

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

@@ -0,0 +1,63 @@
+package com.huimv.secure.controller;
+
+
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
+import com.huimv.secure.service.IBillCleanBeforeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ * 洗消表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-11
+ */
+@RestController
+@RequestMapping("/bill-clean-before")
+@CrossOrigin
+public class BillCleanBeforeController {
+
+    @Autowired
+    private IBillCleanBeforeService billCleanBeforeService;
+
+    @RequestMapping("/listCleanBefore")
+    public Result listCleanBefore(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billCleanBeforeService.list(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listCleanBefore2")
+    public Result listCleanBefore2(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billCleanBeforeService.list2(httpServletRequest, paramsMap);
+    }
+    @RequestMapping("/listById")
+    public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billCleanBeforeService.listById(httpServletRequest, paramsMap);
+    }
+
+
+    @PostMapping("/listPersonalCleanBefore")
+    public Result listPersonalCleanBefore(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billCleanBeforeService.listPersonalCleanBefore(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,billCleanBeforeService.getById(paramsMap.get("id")));
+    }
+    @PostMapping("/edit")
+    public Result goodsCarClean(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
+                                @RequestParam("date") String data,
+                                @RequestParam(value = "img", required = false) MultipartFile img,
+                                @RequestParam("farmId") String farmId) throws IOException, ParseException {
+        return billCleanBeforeService.edit(httpServletRequest, farmId, id, data, img);
+    }
+}

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

@@ -1,24 +1,33 @@
 package com.huimv.secure.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
 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.PdfUtil;
 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.BillDry;
+import com.huimv.secure.entity.BillGoodsInventory;
 import com.huimv.secure.entity.Configuration;
+import com.huimv.secure.entity.vo.BillCleanVo;
+import com.huimv.secure.entity.vo.BillDryVo;
+import com.huimv.secure.entity.vo.GoodsVo;
 import com.huimv.secure.service.IBillCleanService;
 import com.huimv.secure.service.IBillDryService;
+import com.huimv.secure.service.IBillGoodsInventoryService;
 import com.huimv.secure.service.IConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -27,21 +36,19 @@ import java.util.Map;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @RestController
 @RequestMapping("/bill-clean")
 @CrossOrigin
 public class BillCleanController {
-
-    @Autowired
-    private IBillCleanService cleanService;
     @Autowired
     private IBillCleanService billCleanService;
     @Autowired
     private IBillDryService billDryService;
     @Autowired
-    private IConfigurationService configurationService;
+    private IBillGoodsInventoryService goodsInventoryService;
+
     @PostMapping("/listPersonalClean")
     public Result listPersonalClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return billCleanService.listPersonalClean(httpServletRequest, paramsMap);
@@ -70,28 +77,57 @@ public class BillCleanController {
             if (ObjectUtil.isEmpty(billClean.getImgUrl())) {
                 billClean.setImgUrl("");
             }
-            return new Result(ResultCode.SUCCESS, billClean);
+            BillCleanVo billCleanVo = new BillCleanVo();
+            BeanUtil.copyProperties(billClean, billCleanVo);
+            billCleanVo.setType("");
+            return new Result(ResultCode.SUCCESS, billCleanVo);
         }
         if ("1".equals(type)) {
             BillClean billClean = billCleanService.getById(paramsMap.get("id"));
             if (ObjectUtil.isEmpty(billClean.getImgUrl())) {
                 billClean.setImgUrl("");
             }
-            return new Result(ResultCode.SUCCESS, billClean);
-        } else {
+            BillCleanVo billCleanVo = new BillCleanVo();
+            BeanUtil.copyProperties(billClean, billCleanVo);
+            billCleanVo.setType(type);
+            return new Result(ResultCode.SUCCESS, billCleanVo);
+        } else if ("2".equals(type)) {
             BillDry billDry = billDryService.getById(paramsMap.get("id"));
             if (ObjectUtil.isEmpty(billDry.getImgUrl())) {
                 billDry.setImgUrl("");
             }
-            return new Result(ResultCode.SUCCESS, billDry);
+            BillDryVo billCleanVo = new BillDryVo();
+            BeanUtil.copyProperties(billDry, billCleanVo);
+            billCleanVo.setType(type);
+            return new Result(ResultCode.SUCCESS, billCleanVo);
+        } else {
+            BillGoodsInventory goodsInventory = goodsInventoryService.getById(paramsMap.get("id"));
+            if (ObjectUtil.isEmpty(goodsInventory.getImgUrl())) {
+                goodsInventory.setImgUrl("");
+            }
+            GoodsVo billCleanVo = new GoodsVo();
+            BeanUtil.copyProperties(goodsInventory, billCleanVo);
+            billCleanVo.setType(type);
+            return new Result(ResultCode.SUCCESS, billCleanVo);
         }
 
     }
+
+    @Autowired
+    private IBillCleanService cleanService;
+    @Autowired
+    private IConfigurationService configurationService;
+
     @RequestMapping("/listClean")
     public Result listClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return cleanService.listAll(httpServletRequest, paramsMap);
     }
 
+    @RequestMapping("/listPersonCleanAndDryAndGoods")
+    public Result listPersonCleanAndDryAndGoods(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return cleanService.listPersonCleanAndDryAndGoods(httpServletRequest, paramsMap);
+    }
+
     @RequestMapping("/listById")
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return cleanService.listById(httpServletRequest, paramsMap);
@@ -102,35 +138,35 @@ public class BillCleanController {
         return cleanService.listByIdDry(httpServletRequest, paramsMap);
     }
 
-    @RequestMapping("/editClean")
-    public Result editClean(HttpServletRequest httpServletRequest,
-                            @RequestParam("farmId") String farmId,
-                            @RequestParam("id") String id,
-                            @RequestParam("date") String date,
-                            @RequestParam("result") String result,
-                            @RequestParam(value = "img1",required = false) MultipartFile img1,
-                            @RequestParam(value = "img2",required = false) MultipartFile img2,
-                            @RequestParam(value = "img3",required = false) MultipartFile img3
-    ) throws ParseException, IOException {
-        return cleanService.commitClean(httpServletRequest, farmId, id, date, result, img1,img2,img3);
-    }
-
-    @PostMapping("/carCommit")
-    public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
-                               @RequestParam("data") String data,
-                               @RequestParam(value = "img1", required = false) MultipartFile img1,
-                               @RequestParam(value = "img2", required = false) MultipartFile img2,
-                               @RequestParam(value = "img3", required = false) MultipartFile img3,
-                               @RequestParam(value = "img4", required = false) MultipartFile img4,
-                               @RequestParam(value = "img5", required = false) MultipartFile img5,
-                               @RequestParam("farmId") String farmId,
-                               @RequestParam("type") String type) throws IOException, ParseException {
-        return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5, type);
-    }
+//    @RequestMapping("/editClean")
+//    public Result editClean(HttpServletRequest httpServletRequest,
+//                            @RequestParam("farmId") String farmId,
+//                            @RequestParam("id") String id,
+//                            @RequestParam("date") String date,
+//                            @RequestParam("result") String result,
+//                            @RequestParam(value = "img1",required = false) MultipartFile img1,
+//                            @RequestParam(value = "img2",required = false) MultipartFile img2,
+//                            @RequestParam(value = "img3",required = false) MultipartFile img3
+//    ) throws ParseException, IOException {
+//        return cleanService.commitClean(httpServletRequest, farmId, id, date, result, img1,img2,img3);
+//    }
+//
+//    @PostMapping("/carCommit")
+//    public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
+//                               @RequestParam("data") String data,
+//                               @RequestParam(value = "img1", required = false) MultipartFile img1,
+//                               @RequestParam(value = "img2", required = false) MultipartFile img2,
+//                               @RequestParam(value = "img3", required = false) MultipartFile img3,
+//                               @RequestParam(value = "img4", required = false) MultipartFile img4,
+//                               @RequestParam(value = "img5", required = false) MultipartFile img5,
+//                               @RequestParam("farmId") String farmId,
+//                               @RequestParam("type") String type) throws IOException, ParseException {
+//        return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5, type);
+//    }
 
     @PostMapping("/goodsCarClean")
     public Result goodsCarClean(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
-                                @RequestParam("data") String data,
+                                @RequestParam("date") String date,
                                 @RequestParam(value = "img1", required = false) MultipartFile img1,
                                 @RequestParam(value = "img2", required = false) MultipartFile img2,
                                 @RequestParam(value = "img3", required = false) MultipartFile img3,
@@ -139,8 +175,45 @@ public class BillCleanController {
                                 @RequestParam("farmId") String farmId,
                                 @RequestParam("type") String type,
                                 @RequestParam("result") String result) throws IOException, ParseException {
-        return cleanService.goodsCarClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5, type, result);
+        return cleanService.goodsCarClean(httpServletRequest, farmId, id, date, img1, img2, img3, img4, img5, type, result);
+    }
+
+
+    //
+    @RequestMapping("/listCount")
+    public Result listCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return cleanService.listCount(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/allList")
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return cleanService.AllClean(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/CleanSelect")
+    public Result CleanSelect(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return cleanService.CleanSelect(httpServletRequest, paramsMap);
+    }
+
+    @GetMapping("/printClean")
+    public void printClean(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        billCleanService.printClean(response, map);
+        String path = "/opt/huatong/clean.xls";
+        PdfUtil.returnPdfStream3(response, path, "洗消详情列表");
     }
+
+    @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) {
+            billCleanService.removeById(s);
+        }
+        return new Result(10000, "删除成功！", true);
+    }
+
     @PostMapping("/editTime")
     public Result editTime(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String time = paramsMap.get("time");
@@ -164,32 +237,6 @@ public class BillCleanController {
         return new Result(10000, "保存成功！", true);
     }
 
-    //
-    @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);
-    }
-
     @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/BillDryController.java

@@ -2,7 +2,6 @@ package com.huimv.secure.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -11,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author author
- * @since 2024-01-04
+ * @since 2023-08-18
  */
 @RestController
 @RequestMapping("/bill-dry")

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

@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -30,7 +29,7 @@ import java.text.SimpleDateFormat;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-25
  */
 @RestController
 @RequestMapping("/bill-gate")
@@ -78,4 +77,5 @@ public class BillGateController {
         gateService.save(gate);
         return new Result(ResultCode.SUCCESS, time, imageCom);
     }
+
 }

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

@@ -2,29 +2,29 @@ package com.huimv.secure.controller;
 
 
 import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.service.IBillGoodsInventoryService;
 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 org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-08-22
  */
 @RestController
 @RequestMapping("/bill-goods-inventory")
 @CrossOrigin
 public class BillGoodsInventoryController {
+
     @Autowired
     private IBillGoodsInventoryService goodsInventoryService;
 
@@ -32,4 +32,22 @@ public class BillGoodsInventoryController {
     public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return goodsInventoryService.listAll(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/edit")
+    public Result edit(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
+                       @RequestParam("goods") String goods,
+                       @RequestParam("imgUrl")MultipartFile imgUrl) throws IOException {
+        return goodsInventoryService.edit(httpServletRequest, id,goods,imgUrl);
+    }
+
+    @RequestMapping("/list")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return goodsInventoryService.list(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listById")
+    public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return new Result(ResultCode.SUCCESS,goodsInventoryService.getById(id));
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.huimv.secure.controller;
 
 
+import com.huimv.secure.common.utils.PdfUtil;
 import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.service.IBillIsolateService;
@@ -8,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -16,13 +19,12 @@ import java.util.Map;
  * </p>
  *
  * @author author
- * @since 2024-01-04
+ * @since 2023-07-21
  */
 @RestController
 @RequestMapping("/bill-isolate")
 @CrossOrigin
 public class BillIsolateController {
-
     @Autowired
     private IBillIsolateService billIsolateService;
 
@@ -38,17 +40,17 @@ public class BillIsolateController {
 
     //后台
     @PostMapping("/isolateList")
-    public Result isolateList(@RequestBody Map<String, String> paramsMap){
-        return billIsolateService.Isolate(paramsMap);
+    public Result isolateList(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billIsolateService.Isolate(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/isolateSelect")
-    public Result isolateSelect(@RequestBody Map<String, String> paramsMap){
-        return billIsolateService.IsolateSelect( paramsMap);
+    public Result isolateSelect(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billIsolateService.IsolateSelect(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/delete")
-    public Result delete(@RequestBody Map<String, String> paramsMap){
+    public Result delete(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
         String ids = paramsMap.get("ids");
         String[] split = ids.split(",");
         for (String s : split) {
@@ -56,4 +58,14 @@ public class BillIsolateController {
         }
         return new Result(10000,"删除成功！",true);
     }
+
+    @GetMapping("/printIsolate")
+    public void printIsolate(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        billIsolateService.printIsolate(response, map);
+        String path = "/opt/huatong/isolate.xls";
+        PdfUtil.returnPdfStream3(response, path, "隔离详情列表");
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.huimv.secure.controller;
 
 
+import com.huimv.secure.common.utils.PdfUtil;
 import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.service.IBillLuggageService;
@@ -9,7 +10,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -18,13 +21,12 @@ import java.util.Map;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-24
  */
 @RestController
 @RequestMapping("/bill-luggage")
 @CrossOrigin
 public class BillLuggageController {
-
     @Autowired
     private IBillLuggageService billLuggageService;
 
@@ -56,17 +58,16 @@ public class BillLuggageController {
     }
 
     @PostMapping("/listLuggage")
-    public Result listLuggage( @RequestBody Map<String, String> paramsMap){
-        return billLuggageService.listLuggage( paramsMap);
+    public Result listLuggage(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billLuggageService.listLuggage(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/selectLuggage")
-    public Result selectLuggage(@RequestBody Map<String, String> paramsMap){
-        return billLuggageService.selectLuggage( paramsMap);
+    public Result selectLuggage(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billLuggageService.selectLuggage(httpServletRequest, paramsMap);
     }
-
     @PostMapping("/delete")
-    public Result delete(@RequestBody Map<String, String> paramsMap){
+    public Result delete(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
         String ids = paramsMap.get("ids");
         String[] split = ids.split(",");
         for (String s : split) {
@@ -74,4 +75,12 @@ public class BillLuggageController {
         }
         return new Result(10000,"删除成功！",true);
     }
+    @GetMapping("/printLuggage")
+    public void printLuggage(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        billLuggageService.printLuggage(response, map);
+        String path = "/opt/huatong/luggage.xls";
+        PdfUtil.returnPdfStream3(response, path, "行李详情列表");
+    }
 }

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

@@ -3,6 +3,7 @@ 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.PdfUtil;
 import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.entity.Configuration;
@@ -13,8 +14,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -23,7 +26,7 @@ import java.util.Map;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @RestController
 @RequestMapping("/bill-pcr")
@@ -31,8 +34,6 @@ import java.util.Map;
 public class BillPcrController {
 
     @Autowired
-    private IBillPcrService billPcrService;
-    @Autowired
     private IBillPcrService pcrService;
     @Autowired
     private IConfigurationService configurationService;
@@ -56,11 +57,14 @@ public class BillPcrController {
                           @RequestParam(value = "img3",required = false) MultipartFile img3) throws ParseException, IOException {
         return pcrService.edit(httpServletRequest, farmId,id,date,result,img1,img2,img3);
     }
+    @Autowired
+    private IBillPcrService billPcrService;
 
     @PostMapping("/listPersonalPcr")
     public Result listPersonalPcr(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
         return billPcrService.listPersonalPcr(httpServletRequest,paramsMap);
     }
+
     @PostMapping("/getDetail")
     public Result getDetail(@RequestBody Map<String, String> paramsMap){
         return new Result(ResultCode.SUCCESS, billPcrService.getById(paramsMap.get("id")));
@@ -68,7 +72,7 @@ public class BillPcrController {
 
     //后台
     @PostMapping("/pcrWhole")
-    public Result pcrWhole(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+    public Result pcrWhole(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
         return billPcrService.pcrWhole(httpServletRequest, paramsMap);
     }
 
@@ -90,6 +94,15 @@ public class BillPcrController {
     public Result selectList(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
         return billPcrService.selectList(httpServletRequest, paramsMap);
     }
+
+    @GetMapping("/printPcr")
+    public void printPcr(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        billPcrService.printPcr(response, map);
+        String path = "/opt/huatong/pcr.xls";
+        PdfUtil.returnPdfStream3(response, path, "pcr详情列表");
+    }
     @PostMapping("/delete")
     public Result delete(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
         String ids = paramsMap.get("ids");
@@ -119,9 +132,14 @@ 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)));
     }
+    @PostMapping("/pcrList")
+    public Result PcrList(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billPcrService.PcrList(httpServletRequest, paramsMap);
+    }
 }

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

@@ -3,13 +3,17 @@ package com.huimv.secure.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.secure.common.utils.PdfUtil;
 import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.common.utils.ResultCode;
+import com.huimv.secure.entity.BaseProcess;
 import com.huimv.secure.entity.BillGoodsInventory;
 import com.huimv.secure.entity.BillIsolate;
 import com.huimv.secure.entity.BillPersonnelAdmission;
 import com.huimv.secure.entity.vo.BillAdmissionAndGoods;
+import com.huimv.secure.entity.vo.BillPersonnelAdmissionVo;
 import com.huimv.secure.mapper.BillGoodsInventoryMapper;
+import com.huimv.secure.service.IBaseProcessService;
 import com.huimv.secure.service.IBillPersonnelAdmissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,8 +21,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,18 +34,18 @@ import java.util.Map;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @RestController
-@RequestMapping("/bill-personnel-admission")
 @CrossOrigin
+@RequestMapping("/bill-personnel-admission")
 public class BillPersonnelAdmissionController {
-
-    //app
     @Autowired
     private IBillPersonnelAdmissionService billPersonnelAdmissionService;
     @Resource
     private BillGoodsInventoryMapper billGoodsInventoryMapper;
+    @Autowired
+    private IBaseProcessService processService;
 
     @PostMapping("/addAdmission")
     public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("admissionType") String admissionType,
@@ -49,35 +55,122 @@ public class BillPersonnelAdmissionController {
                                @RequestParam("workName") String workName,
                                @RequestParam("papersType") String papersType,
                                @RequestParam("papersCode") String papersCode,
-                               @RequestParam(value = "imgUrl",required = false) MultipartFile imgUrl,
-                               @RequestParam(value = "img",required = false) String img,
+                               @RequestParam(value = "imgUrl", required = false) MultipartFile imgUrl,
+                               @RequestParam(value = "img", required = false) String img,
                                @RequestParam("vistitDate") String vistitDate,
                                @RequestParam("vistitReson") String vistitReson,
+                               @RequestParam("departureId") String departureId,
+                               @RequestParam("departureName") String departureName,
                                @RequestParam("destId") String destId,
                                @RequestParam("destName") String destName,
-                               @RequestParam(value = "carNum",required = false) String carNum,
-                               @RequestParam(value = "source",required = false) String source,
-                               @RequestParam(value = "goods",required = false) String goods,
-                               @RequestParam("farmId") String farmId) throws IOException, ParseException {
-        return billPersonnelAdmissionService.addAdmission(httpServletRequest,admissionType,vistitType,userName,phone,workName,papersType,papersCode,imgUrl,img,vistitDate,vistitReson,destId,destName,farmId,carNum,source,goods);
+                               @RequestParam(value = "carNum", required = false) String carNum,
+                               @RequestParam(value = "source", required = false) String source,
+                               @RequestParam(value = "goods", required = false) String goods,
+                               @RequestParam("farmId") String farmId) throws IOException {
+        return billPersonnelAdmissionService.addAdmission(httpServletRequest, admissionType, vistitType, userName, phone, workName, papersType, papersCode, imgUrl, img, vistitDate, vistitReson, destId, destName, farmId, carNum, source, goods, departureId, departureName);
+    }
+
+    @PostMapping("/addAdmissionFeed")
+    public Result addAdmissionFeed(HttpServletRequest httpServletRequest, @RequestParam("admissionType") String admissionType,
+                                   @RequestParam("vistitType") String vistitType,
+                                   @RequestParam("userName") String userName,
+                                   @RequestParam("phone") String phone,
+                                   @RequestParam("workName") String workName,
+                                   @RequestParam("papersType") String papersType,
+                                   @RequestParam("papersCode") String papersCode,
+                                   @RequestParam(value = "imgUrl", required = false) MultipartFile imgUrl,
+                                   @RequestParam(value = "img", required = false) String img,
+                                   @RequestParam("vistitDate") String vistitDate,
+                                   @RequestParam("vistitReson") String vistitReson,
+                                   @RequestParam("departureId") String departureId,
+                                   @RequestParam("departureName") String departureName,
+                                   @RequestParam("destId") String destId,
+                                   @RequestParam("destName") String destName,
+                                   @RequestParam(value = "carNum", required = false) String carNum,
+                                   @RequestParam(value = "source", required = false) String source,
+                                   @RequestParam(value = "goods", required = false) String goods,
+                                   @RequestParam("farmId") String farmId,
+                                   @RequestParam("resource") String resource,
+                                   @RequestParam("feedImgUrl") MultipartFile feedImgUrl,
+                                   @RequestParam(value = "cleanId", required = false) Integer cleanId,
+                                   @RequestParam(value = "cleanName", required = false) String cleanName,
+                                   @RequestParam("remark") String remark) throws IOException {
+        return billPersonnelAdmissionService.addAdmissionFeed(httpServletRequest, admissionType,
+                vistitType, userName, phone, workName, papersType, papersCode, imgUrl, img, vistitDate, vistitReson, destId
+                , destName, farmId, carNum, source, goods, departureId, departureName,resource,feedImgUrl,cleanId,cleanName,remark);
+    }
+
+    @PostMapping("/listPersonalAdmission")
+    public Result listPersonalAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billPersonnelAdmissionService.listPersonalAdmission(httpServletRequest, paramsMap);
     }
 
+    @PostMapping("/listAdmission")
+    public Result listAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billPersonnelAdmissionService.listAdmission(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/uploadImgAndAdmissin")
+    public Result uploadImgAndAdmissin(@RequestParam(value = "imgUrl") MultipartFile imgUrl,
+                                       @RequestParam(value = "id") Integer id) throws IOException {
+        return billPersonnelAdmissionService.uploadImgAndAdmissin(imgUrl, id);
+    }
+
+    @PostMapping("/handleAdmission")
+    public Result handleAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws IOException {
+        return billPersonnelAdmissionService.handleAdmission(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/listAll")
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billPersonnelAdmissionService.listAll(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billPersonnelAdmissionService.getDetail(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/getById")
+    public Result getById(@RequestBody Map<String, String> paramsMap) {
+        BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionService.getById(paramsMap.get("id"));
+        QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", billPersonnelAdmission.getProcessId());
+        BaseProcess process = processService.getOne(queryWrapper);
+
+        BillPersonnelAdmissionVo admissionVo = new BillPersonnelAdmissionVo();
+        BeanUtil.copyProperties(billPersonnelAdmission, admissionVo);
+        admissionVo.setProcessType(process.getProcessType());
+        BillAdmissionAndGoods billAdmissionAndGoods = new BillAdmissionAndGoods();
+        BeanUtil.copyProperties(admissionVo, billAdmissionAndGoods);
+        List<BillGoodsInventory> billGoodsInventories = billGoodsInventoryMapper.selectList(new QueryWrapper<BillGoodsInventory>().eq("bill_admission", paramsMap.get("id")));
+        billAdmissionAndGoods.setGoods(billGoodsInventories);
+        return new Result(ResultCode.SUCCESS, billAdmissionAndGoods);
+    }
+
+    @Autowired
+    private IBillPersonnelAdmissionService admissionService;
+
     @RequestMapping("/listPrc")
     public Result listAll2(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listPrc(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listById")
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listById(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/editStatus")
     public Result editStatus(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.editStatus(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listIsolate")
     public Result listIsolate(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listIsolate(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/IsolateById")
     public Result isolateById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.isolateById(httpServletRequest, paramsMap);
@@ -87,10 +180,12 @@ public class BillPersonnelAdmissionController {
     public Result listAll(HttpServletRequest httpServletRequest, @RequestBody BillIsolate billIsolate) throws IOException {
         return admissionService.commitIsolate(httpServletRequest, billIsolate);
     }
+
     @RequestMapping("/editIsolate")
     public Result editIsolate(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.editIsolate(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listClean")
     public Result listClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listClean(httpServletRequest, paramsMap);
@@ -100,6 +195,7 @@ public class BillPersonnelAdmissionController {
     public Result cleanById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listByIdClean(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/editClean")
     public Result editClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.editClean(httpServletRequest, paramsMap);
@@ -110,83 +206,27 @@ public class BillPersonnelAdmissionController {
         return admissionService.editDry(httpServletRequest, paramsMap);
     }
 
-    @PostMapping("/listPersonalAdmission")
-    public Result listPersonalAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billPersonnelAdmissionService.listPersonalAdmission(httpServletRequest,paramsMap);
-    }
-
-    @PostMapping("/listAdmission")
-    public Result listAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billPersonnelAdmissionService.listAdmission(httpServletRequest,paramsMap);
-    }
-    @PostMapping("/uploadImgAndAdmissin")
-    public Result uploadImgAndAdmissin(@RequestParam(value = "imgUrl") MultipartFile imgUrl,
-                                       @RequestParam(value = "id") Integer id) throws IOException {
-        return billPersonnelAdmissionService.uploadImgAndAdmissin(imgUrl,id);
-    }
-
-    @PostMapping("/handleAdmission")
-    public Result handleAdmission (HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) throws IOException {
-        return billPersonnelAdmissionService.handleAdmission(httpServletRequest,paramsMap);
-    }
-
-    @PostMapping("/listAll")
-    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billPersonnelAdmissionService.listAll(httpServletRequest,paramsMap);
-    }
-
-    @PostMapping("/getDetail")
-    public Result getDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billPersonnelAdmissionService.getDetail(httpServletRequest,paramsMap);
-    }
-
-    @PostMapping("/getById")
-    public Result getById(@RequestBody Map<String, String> paramsMap){
-        BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionService.getById(paramsMap.get("id"));
-        BillAdmissionAndGoods billAdmissionAndGoods = new BillAdmissionAndGoods();
-        BeanUtil.copyProperties(billPersonnelAdmission,billAdmissionAndGoods);
-        List<BillGoodsInventory> billGoodsInventories = billGoodsInventoryMapper.selectList(new QueryWrapper<BillGoodsInventory>().eq("bill_admission", paramsMap.get("id")));
-        billAdmissionAndGoods.setGoods(billGoodsInventories);
-        return new Result(ResultCode.SUCCESS,billAdmissionAndGoods);
-    }
-
-    @RequestMapping("/listDoor")
-    public Result listDoor(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
-        return admissionService.listDoor(httpServletRequest, paramsMap);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-    @Autowired
-    private IBillPersonnelAdmissionService admissionService;
-
-
     //后台
     @RequestMapping("/countAdmission")
-    public Result countAdmission( @RequestBody Map<String, String> paramsMap) throws ParseException {
-        return admissionService.countAdmission(paramsMap);
+    public Result countAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.countAdmission(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listTop")
-    public Result listTop( @RequestBody Map<String, String> paramsMap) throws ParseException {
-        return admissionService.listTop( paramsMap);
+    public Result listTop(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.listTop(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/admissionTail")
-    public Result admissionTail(@RequestBody Map<String, String> paramsMap) throws ParseException {
-        return admissionService.admissionTail( paramsMap);
+    public Result admissionTail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.admissionTail(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/selectList")
-    public Result selectList( @RequestBody Map<String, String> paramsMap) throws ParseException {
-        return admissionService.selectList( paramsMap);
+    public Result selectList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.selectList(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/screenCount")
     public Result screenCount( @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.screenCount( paramsMap);
@@ -195,8 +235,9 @@ public class BillPersonnelAdmissionController {
     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 {
+    public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         String ids = paramsMap.get("ids");
         String[] split = ids.split(",");
         for (String s : split) {
@@ -204,4 +245,28 @@ public class BillPersonnelAdmissionController {
         }
         return new Result(10000, "删除成功！", true);
     }
+
+    @GetMapping("/printAdmission")
+    public void printAdmission(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        admissionService.printAdmission(response, map);
+        String path = "/opt/huatong/admission.xls";
+        PdfUtil.returnPdfStream3(response, path, "人员管理列表");
+    }
+
+    @RequestMapping("/jingJiAdmission")
+    public Result jingJiAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.jingJiAdmission(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/allCount")
+    public Result allCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.allCount(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listDoor")
+    public Result listDoor(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.listDoor(httpServletRequest, paramsMap);
+    }
 }

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

@@ -0,0 +1,63 @@
+package com.huimv.secure.controller;
+
+
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
+import com.huimv.secure.service.IBillSamplingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ * 洗消表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-11
+ */
+@RestController
+@RequestMapping("/bill-sampling")
+@CrossOrigin
+public class BillSamplingController {
+
+    @Autowired
+    private IBillSamplingService billSamplingService;
+
+    @RequestMapping("/listSampling")
+    public Result listSampling(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billSamplingService.list(httpServletRequest, paramsMap);
+    }
+    @RequestMapping("/listSampling2")
+    public Result listSampling2(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billSamplingService.list2(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listById")
+    public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billSamplingService.listById(httpServletRequest, paramsMap);
+    }
+
+    @PostMapping("/listPersonalSample")
+    public Result listPersonalSample(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billSamplingService.listPersonalSample(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,billSamplingService.getById(paramsMap.get("id")));
+    }
+
+    @PostMapping("/edit")
+    public Result goodsCarClean(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
+                                @RequestParam("date") String data,
+                                @RequestParam(value = "video", required = false) MultipartFile video,
+                                @RequestParam("farmId") String farmId) throws IOException, ParseException {
+        return billSamplingService.edit(httpServletRequest, farmId, id, data, video);
+    }
+}

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

@@ -2,7 +2,6 @@ package com.huimv.secure.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -11,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-04
  */
 @RestController
 @RequestMapping("/configuration")

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

@@ -2,7 +2,6 @@ package com.huimv.secure.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -11,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-10-16
  */
 @RestController
 @RequestMapping("/device-list")

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

@@ -11,18 +11,17 @@ 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>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-08
  */
 @RestController
 @RequestMapping("/exist")

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

@@ -37,6 +37,13 @@ public class FarmController {
         return  farmService.getFarm(userId);
     }
 
+    @GetMapping("/getFarm3")
+    public Result getFarm3(HttpServletRequest request, @RequestParam("farmId") String farmId) {
+        Farm farm = farmService.getById(farmId);
+        List<Farm> farms = farmService.list(new QueryWrapper<Farm>().eq("parent_id", farm.getParentId()));
+        return new Result(ResultCode.SUCCESS, farms);
+    }
+
     @PostMapping("/listByRowStatus")
     public Result listByRowStatus(){
 

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

@@ -11,6 +11,7 @@ import com.huimv.secure.common.token.TokenSign;
 import com.huimv.secure.common.utils.*;
 import com.huimv.secure.entity.SysAccountMultilevel;
 import com.huimv.secure.entity.dto.WeCahtVo;
+import com.huimv.secure.service.IBaseJobService;
 import com.huimv.secure.service.ILoginService;
 import com.huimv.secure.service.ISysAccountMultilevelService;
 import com.huimv.secure.session.AccessToken;
@@ -40,18 +41,18 @@ public class LoginController {
     private ISysAccountMultilevelService accountMultilevelService;
 
     @Autowired
-    private UploadImage uploadImage;
+    private IBaseJobService baseJobService;
 
-    @RequestMapping("/test")
-    public String logout() {
-        return "线上服务器1";
-    }
+    @Autowired
+    private UploadImage uploadImage;
 
     @RequestMapping("/logout")
     public Result logout(@RequestParam(name = "accountName", required = true) String accountName, @RequestParam(name = "password", required = true) String password) {
         return iLoginService.logout();
     }
 
+
+
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
@@ -84,9 +85,17 @@ public class LoginController {
 
         String accountName = map.get("accountName");
         String password = map.get("password");
+//        String code = map.get("code");
 
         String remoteHost = req.getRemoteHost();
 
+//        String redisCode = redisTemplate.opsForValue().get(remoteHost);
+//        if (redisCode == null) {
+//            return  new Result(10005,"验证码过期,点击刷新",false);
+//        }
+//        if (!redisCode.equals(code.toUpperCase())) {
+//            return  new Result(10006,"验证码错误,登录失败",false);
+//        }
         // 未对密码加密
         Result result = iLoginService.loginMultilevel(accountName, password);
         if (result.getCode() == 10000) {
@@ -97,8 +106,8 @@ public class LoginController {
             AccessToken accessToken = new AccessToken();
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountName);
-            accessToken.setFarmId(accountEntity.getFarmId());
-            String token = TokenSign.sign(accountName, id, accountEntity.getFarmId(), null, null);
+            accessToken.setFarmId(accountEntity.getFarmIds());
+            String token = TokenSign.sign(accountName, id, accountEntity.getLastFarmId().toString(), null, null);
             accessToken.setToken(token);
 
             accessToken.setId(id);
@@ -127,14 +136,15 @@ public class LoginController {
 
             accountEntity.setType(Integer.parseInt(type));
             accountMultilevelService.updateById(accountEntity);
+            accountEntity.setJobName(baseJobService.getById(type).getJobName());
 
             Integer id = accountEntity.getId();
             IpTools.getRemoteHost(req);
             AccessToken accessToken = new AccessToken();
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountEntity.getAccount());
-            accessToken.setFarmId(accountEntity.getFarmId());
-            String token = TokenSign.sign(accountEntity.getAccount(), id, accountEntity.getFarmId(), accountEntity.getWorkLocationType()+"", accountEntity.getType());
+            accessToken.setFarmId(accountEntity.getFarmIds());
+            String token = TokenSign.sign(accountEntity.getUserName(), id, accountEntity.getFarmIds(), accountEntity.getWorkLocationType()+"", accountEntity.getType());
             accessToken.setToken(token);
 
             accessToken.setId(id);
@@ -164,10 +174,19 @@ public class LoginController {
 
         String accountName = map.get("accountName");
         String password = map.get("password");
+//        String code = map.get("code");
+
         String remoteHost = req.getRemoteHost();
 
+//        String redisCode = redisTemplate.opsForValue().get(remoteHost);
+//        if (redisCode == null) {
+//            return  new Result(10005,"验证码过期,点击刷新",false);
+//        }
+//        if (!redisCode.equals(code.toUpperCase())) {
+//            return  new Result(10006,"验证码错误,登录失败",false);
+//        }
         // 未对密码加密
-        Result result = iLoginService.loginMultilevel(accountName, password);
+        Result result = iLoginService.loginMultilevelClient(accountName, password);
         if (result.getCode() == 10000) {
 
             SysAccountMultilevel accountEntity = (SysAccountMultilevel) result.getData();
@@ -176,8 +195,8 @@ public class LoginController {
             AccessToken accessToken = new AccessToken();
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountName);
-            accessToken.setFarmId(accountEntity.getFarmId());
-            String token = TokenSign.sign(accountEntity.getUserName(), id, accountEntity.getFarmId(), null, null);
+            accessToken.setFarmId(accountEntity.getFarmIds());
+            String token = TokenSign.sign(accountName, id, accountEntity.getLastFarmId().toString(), accountEntity.getWorkLocationType().toString(),accountEntity.getType());
             accessToken.setToken(token);
 
             accessToken.setId(id);
@@ -207,10 +226,10 @@ public class LoginController {
             accessToken.setSysAccountMultilevel(data);
             accessToken.setAccountName(accountName);
             accessToken.setUserName(data.getUserName());
-            accessToken.setFarmId(data.getFarmId());
+            accessToken.setFarmId(data.getFarmIds());
             accessToken.setType(data.getType());
             accessToken.setId(data.getId());
-            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmId(), data.getWorkLocationType()+"", data.getType());
+            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getLastFarmId().toString(), data.getWorkLocationType()+"", data.getType());
             accessToken.setToken(token);
             String lastFarmId = data.getLastFarmId();
             if (ObjectUtil.isEmpty(lastFarmId)) {
@@ -225,12 +244,75 @@ public class LoginController {
     }
 
 
+/*    @RequestMapping("/logoutWeChat")
+    public Result logoutWeChat(HttpServletRequest req, @RequestBody Map<String, String> map) {
+        String remark = map.get("remark");
+        QueryWrapper<SysAccountMultilevel> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("account", remark);
+        SysAccountMultilevel one = accountMultilevelService.getOne(queryWrapper);
+        AccessToken accessToken = new AccessToken();
+        if (ObjectUtil.isEmpty(one)) {
+            SysAccountMultilevel accountMultilevel = new SysAccountMultilevel();
+            accountMultilevel.setAccount(remark);
+            accountMultilevel.setFarmIds("25");
+            accountMultilevel.setColor("");
+            accountMultilevel.setMode(true);
+            accountMultilevel.setUserName("访客");
+            accountMultilevel.setType(7);
+            accountMultilevelService.save(accountMultilevel);
+            QueryWrapper<SysAccountMultilevel> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("account", remark);
+            SysAccountMultilevel one1 = accountMultilevelService.getOne(queryWrapper1);
+
+            accessToken.setAccountName(remark);
+            accessToken.setUserName("访客");
+            accessToken.setFarmId("25");
+            accessToken.setType(7);
+            accessToken.setId(one1.getId());
+            String token = TokenSign.sign(remark, one1.getId(), one1.getFarmIds(), null,7);
+            accessToken.setToken(token);
+        } else {
+            accessToken.setAccountName(one.getUserName());
+            accessToken.setUserName("访客");
+            accessToken.setFarmId("25");
+            accessToken.setType(7);
+            accessToken.setId(one.getId());
+            String token = TokenSign.sign(remark, one.getId(), one.getFarmIds(), one.getWorkLocationId(),7);
+            accessToken.setToken(token);
+        }
+        return new Result(ResultCode.SUCCESS,accessToken);
+  *      String accountName = map.get("accountName");
+        String password = map.get("password");
+        String remoteHost = req.getRemoteHost();
+        Result result = iLoginService.loginMultilevel(accountName, password);
+        if (result.getCode() == 10000) {
+            SysAccountMultilevel data = (SysAccountMultilevel) result.getData();
+            AccessToken accessToken = new AccessToken();
+            accessToken.setAccountName(accountName);
+            accessToken.setUserName(data.getUserName());
+            accessToken.setFarmId(data.getFarmIds());
+            accessToken.setType(data.getType());
+            accessToken.setId(data.getId());
+            String token = TokenSign.sign(accountName,data.getId(),data.getFarmIds(),data.getWorkLocationId());
+            accessToken.setToken(token);
+            Integer lastFarmId = data.getLastFarmId();
+            if (ObjectUtil.isEmpty(lastFarmId)){
+                lastFarmId = Integer.parseInt(data.getFarmIds().split(",")[0]);
+            }
+            accessToken.setLastFarmId(lastFarmId);
+            accessToken.setLoginIp(remoteHost);
+            return new Result(ResultCode.SUCCESS,accessToken);
+        } else {
+            return result;
+        }*//*
+    }*/
+
     @GetMapping("/logoutWeChat")
     public Result logoutWeChat(HttpServletRequest req, @RequestParam String jsCode) {
         String remoteHost = req.getRemoteHost();
         Map<String, Object> paramsMap = new HashMap<>();
-        paramsMap.put("appid", "wxb68dc341b4212c77");
-        paramsMap.put("secret", "ced18a31c7f2250cba4673733029f70a");
+        paramsMap.put("appid", "wxa28e45fe5cb10ff1");
+        paramsMap.put("secret", "c16e584ec6e69fd35edd98ec21ec5e94");
         paramsMap.put("js_code", jsCode);
         paramsMap.put("grant_type", "authorization_code");
         String result = HttpUtil.get("https://api.weixin.qq.com/sns/jscode2session", paramsMap);
@@ -254,14 +336,14 @@ public class LoginController {
             accessToken.setSysAccountMultilevel(data);
             accessToken.setAccountName(data.getAccount());
             accessToken.setUserName(data.getUserName());
-            accessToken.setFarmId(data.getFarmId());
+            accessToken.setFarmId(data.getFarmIds());
             accessToken.setType(data.getType());
             accessToken.setId(data.getId());
-            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmId(), data.getWorkLocationType()+"", 7);
+            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getLastFarmId().toString(), data.getWorkLocationType()+"", 7);
             accessToken.setToken(token);
             String lastFarmId = data.getLastFarmId();
             if (ObjectUtil.isEmpty(lastFarmId)) {
-                lastFarmId = data.getFarmIds().split(",")[0];
+                lastFarmId =data.getFarmIds().split(",")[0];
             }
             accessToken.setLastFarmId(lastFarmId);
             accessToken.setLoginIp(remoteHost);
@@ -273,7 +355,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=wxb68dc341b4212c77&secret=ced18a31c7f2250cba4673733029f70a&grant_type=client_credential");
+            String result = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/token?appid=wxa28e45fe5cb10ff1&secret=c16e584ec6e69fd35edd98ec21ec5e94&grant_type=client_credential");
             System.out.println(result);
             JSONObject jsonObject = JSON.parseObject(result);
             access_token =  (String) jsonObject.get("access_token");
@@ -290,7 +372,10 @@ public class LoginController {
         System.out.println(stringResponseEntity.getBody());
         return new Result(ResultCode.SUCCESS,JSON.parseObject(stringResponseEntity.getBody()));
     }
-
+    @PostMapping("/register2")
+    public String register2( @RequestParam(value = "video", required = false) MultipartFile video) throws IOException {
+        return   uploadImage.getVideoCom(video);
+    }
 
     @PostMapping("/register")
     public Result addAdmission(HttpServletRequest req, @RequestParam("userName") String userName,
@@ -302,7 +387,7 @@ public class LoginController {
                                @RequestParam("openId") String openId) throws IOException {
         String remoteHost = req.getRemoteHost();
         QueryWrapper<SysAccountMultilevel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone", phone).or().eq("papers_code", papersCode);
+        queryWrapper.eq("type",7).and(i->i.eq("phone", phone).or().eq("papers_code", papersCode));
         if (ObjectUtil.isNotEmpty(accountMultilevelService.getOne(queryWrapper))) {
             return new Result(10001, "该手机号或身份证号已被使用！", false);
         }
@@ -317,18 +402,17 @@ 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.setPid(0);
+        sysAccountMultilevel.setPids("0");
         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.setWechatId(openId);
         sysAccountMultilevel.setType(7);
         String imageCom = uploadImage.getImageCom(imgUrl);
         if (imageCom.equals("上传失败")) {
@@ -340,12 +424,16 @@ public class LoginController {
         accessToken.setSysAccountMultilevel(sysAccountMultilevel);
         accessToken.setAccountName(sysAccountMultilevel.getAccount());
         accessToken.setUserName(sysAccountMultilevel.getUserName());
-        accessToken.setFarmId(sysAccountMultilevel.getFarmId());
+        accessToken.setFarmId(sysAccountMultilevel.getFarmIds());
         accessToken.setType(sysAccountMultilevel.getType());
         accessToken.setId(sysAccountMultilevel.getId());
-        String token = TokenSign.sign(sysAccountMultilevel.getUserName(), sysAccountMultilevel.getId(), sysAccountMultilevel.getFarmId(), sysAccountMultilevel.getWorkLocationType()+"", sysAccountMultilevel.getType());
+        String token = TokenSign.sign(sysAccountMultilevel.getUserName(), sysAccountMultilevel.getId(), sysAccountMultilevel.getLastFarmId().toString(), sysAccountMultilevel.getWorkLocationType()+"", sysAccountMultilevel.getType());
         accessToken.setToken(token);
-
+        String lastFarmId = sysAccountMultilevel.getLastFarmId();
+        if (ObjectUtil.isEmpty(lastFarmId)) {
+            lastFarmId =sysAccountMultilevel.getFarmIds().split(",")[0];
+        }
+        accessToken.setLastFarmId(lastFarmId);
         accessToken.setLoginIp(remoteHost);
         return new Result(ResultCode.SUCCESS, accessToken);
     }

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

@@ -0,0 +1,47 @@
+package com.huimv.secure.controller;
+
+import com.huimv.secure.common.token.TokenSign;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.entity.Menu;
+import com.huimv.secure.service.IMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/admin/menu")
+@CrossOrigin
+public class MenuController {
+    @Autowired
+    private IMenuService menuService;
+
+    @PostMapping("/add")
+    public Result addMenu(@RequestBody Menu menu , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        return menuService.addMenu(menu,userId);
+    }
+
+
+    @PostMapping("/edit")
+    public Result editMenu(@RequestBody Menu menu){
+        return menuService.editMenu(menu);
+    }
+
+
+    @RequestMapping("/remove")
+    public Result removeMenu(@RequestParam(name = "menuId") Integer menuId){
+        return menuService.removeMenu(menuId);
+    }
+
+    @PostMapping("/list")
+    public Result optimizeList() {
+        return menuService.optimizeList();
+    }
+
+    @PostMapping("/list1")
+    public Result list1() {
+        return menuService.list1();
+    }
+}

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

@@ -2,7 +2,6 @@ package com.huimv.secure.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -11,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-10-16
  */
 @RestController
 @RequestMapping("/people-list")

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

@@ -1,11 +1,15 @@
 package com.huimv.secure.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.secure.common.token.TokenSign;
+import com.huimv.secure.common.utils.PdfUtil;
 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.AccountGroup;
 import com.huimv.secure.entity.SysAccountMultilevel;
+import com.huimv.secure.service.IAccountGroupService;
 import com.huimv.secure.service.ISysAccountMultilevelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,45 +18,102 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
  * <p>
- * 前端控制器
+ *  前端控制器
  * </p>
  *
- * @author author
- * @since 2024-01-03
+ * @author astupidcoder
+ * @since 2021-10-14
  */
-@RestController
-@RequestMapping("/sys-account-multilevel")
 @CrossOrigin
+@RestController
+@RequestMapping("/admin/accountMultilevel")
 public class SysAccountMultilevelController {
     @Autowired
     private ISysAccountMultilevelService accountMultilevelService;
+
+    @Autowired
+    private IAccountGroupService accountGroupService;
     @Autowired
     private UploadImage uploadImage;
 
 
+    @PostMapping("/list")
+    public Result list(@RequestBody Map map , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        int pageNum = (Integer)map.get("current");
+        int pageSize = (Integer)map.get("size");
+        String searchStr = (String)map.get("searchStr");
+
+        return accountMultilevelService.findUserAccount(searchStr,pageNum,pageSize,userId);
+
+    }
+
+    @PostMapping("/listSubordinate")
+    public Result listSubordinate(@RequestBody Map map , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        Integer pageNo = 1;
+        Integer pageSizes = 20;
+        Integer current = (Integer) map.get("current");
+        Integer pageNum = (Integer) map.get("pageNum");
+        Integer pageSize = (Integer) map.get("pageSize");
+        Integer size = (Integer) map.get("size");
+        if (current!=null) {
+            pageNo = current;
+            pageSizes = size;
+        }
+        if (pageNum!=null) {
+            pageNo = pageNum;
+            pageSizes = pageSize;
+        }
+        String searchStr = (String)map.get("searchStr");
+        return accountMultilevelService.listSubordinate(searchStr,pageNo,pageSizes,userId);
+    }
+
+    @PostMapping("/listSubordinateByFarm")
+    public Result listSubordinateByFarm(@RequestBody Map map , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        String farmId = (String)map.get("farmId");
+        return accountMultilevelService.listSubordinateByFarm(farmId,userId);
+    }
+
     @PostMapping("/add")
-    public Result add(@RequestBody SysAccountMultilevel sysAccountMultilevel ){
-        return accountMultilevelService.add(sysAccountMultilevel);
+    public Result add(@RequestBody SysAccountMultilevel sysAccountMultilevel , HttpServletRequest request){
+
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return accountMultilevelService.add(sysAccountMultilevel,userId);
+
     }
 
     @PostMapping("/update")
-    public Result update(@RequestBody Map<String,String> paramsMap ){
-        return accountMultilevelService.update(paramsMap);
+    public Result update(@RequestBody SysAccountMultilevel sysAccountMultilevel){
+        accountMultilevelService.updateById(sysAccountMultilevel);
+
+        return new Result(10000,"修改成功",true);
+
     }
 
-    @PostMapping("/listAccount")
-    public Result listAccount(@RequestBody Map<String,String> paramsMap){
-        return accountMultilevelService.listAccount(paramsMap);
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name ="userIds") List<Integer> userIds){
+
+        accountGroupService.remove(new QueryWrapper<AccountGroup>().in("account_id",userIds));
+        accountMultilevelService.removeByIds(userIds);
+
+        return new Result(10000,"删除成功",true);
+
     }
 
-    @PostMapping("/deleteAccount")
-    public Result deleteAccount(@RequestBody Map<String,String> paramsMap ){
-        return accountMultilevelService.deleteAccount(paramsMap);
+    @GetMapping("/setAccountStatus")
+    public Result setAccountStatus(@RequestParam(name = "ids") List<Integer> ids, @RequestParam(name = "status") Integer status){
+        /* 设置账号状态 */
+        return accountMultilevelService.setAccountStatus(ids,status);
     }
 
     @GetMapping("/findOne")
@@ -60,19 +121,13 @@ public class SysAccountMultilevelController {
         return new Result(ResultCode.SUCCESS, accountMultilevelService.getById(id));
     }
 
+
     @GetMapping("/getLastFarmId")
     public Result getLastFarmId(HttpServletRequest request){
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
         return  accountMultilevelService.getLastFarmId(userId);
     }
 
-    @PostMapping("/listSubordinateByFarm")
-    public Result listSubordinateByFarm(@RequestBody Map map , HttpServletRequest request){
-        Integer userId = TokenSign.getMemberIdByJwtToken(request);
-        String farmId = (String)map.get("farmId");
-        return accountMultilevelService.listSubordinateByFarm(farmId,userId);
-    }
-
     @PostMapping("/editImg")
     @Transactional(rollbackFor = Exception.class)
     public Result editImg(HttpServletRequest httpServletRequest, @RequestParam("img") MultipartFile img) throws IOException {
@@ -86,6 +141,23 @@ public class SysAccountMultilevelController {
         return Result.SUCCESS();
     }
 
+    @PostMapping("/updateUserName")
+    public Result updateUserName(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        sysAccountMultilevel.setUserName(paramsMap.get("userName"));
+        accountMultilevelService.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/updatePaper")
+    public Result updatePaper(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        sysAccountMultilevel.setPapersType(paramsMap.get("papersType"));
+        sysAccountMultilevel.setPapersCode(paramsMap.get("papersCode"));
+        accountMultilevelService.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
+
     @PostMapping("/updateUser")
     public Result updateUser(HttpServletRequest httpServletRequest,
                              @RequestParam(value = "img", required = false) MultipartFile img,
@@ -99,4 +171,18 @@ public class SysAccountMultilevelController {
                              @RequestParam(value = "papersCode", required = false) String papersCode) throws IOException {
         return accountMultilevelService.updateUser(httpServletRequest,img,userName,phone,workPost,workLocation,workLocationId,workName,papersType,papersCode);
     }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(HttpServletRequest httpServletRequest){
+        return new Result(ResultCode.SUCCESS,accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest)));
+    }
+
+    @GetMapping("/printAccount")
+    public void printAccount(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        accountMultilevelService.printAccount(response, map);
+        String path = "/opt/huatong/account.xls";
+        PdfUtil.returnPdfStream3(response, path, "账号列表");
+    }
 }

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

@@ -1,20 +1,62 @@
 package com.huimv.secure.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.secure.common.token.TokenSign;
+import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.entity.AccountGroup;
+import com.huimv.secure.entity.Group;
+import com.huimv.secure.service.IAccountGroupService;
+import com.huimv.secure.service.IGroupService;
+import com.huimv.secure.service.ISysAccountMultilevelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
-import org.springframework.web.bind.annotation.RestController;
 
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2024-01-03
- */
 @RestController
-@RequestMapping("/sys-group")
+@RequestMapping("/admin/group")
+@CrossOrigin
 public class SysGroupController {
 
+    @Autowired
+    private IGroupService groupService;
+
+    @Autowired
+    private IAccountGroupService accountGroupService;
+    @Autowired
+    private ISysAccountMultilevelService accountMultilevelService;
+
+    @PostMapping("/add")
+    public Result addGroup (@RequestBody Group group, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return groupService.addGroup(group,userId);
+    }
+
+    @PostMapping("/edit")
+    public Result updateGroup(@RequestBody Group group ){
+        return groupService.updateGroup( group);
+    }
+
+    @RequestMapping("/remove")
+    public Result removeGroup(@RequestParam("groupId") Integer groupId) {
+        accountGroupService.remove(new QueryWrapper<AccountGroup>().in("group_id",groupId));
+        return groupService.removeGroup(groupId);
+    }
+
+    @PostMapping("/list")
+    public Result listGroup(@RequestBody Map map , HttpServletRequest request) {
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        List<Integer> allChildId = accountMultilevelService.getAllChildId(userId);
+        return groupService.listGroup(map,allChildId);
+    }
+
+    //根据角色查权限组
+    @PostMapping("/getGroupByUserId")
+    public Result getGroupByUserId(@RequestBody Map map){
+        Integer userId  =  (Integer) map.get("userId");
+        return  groupService.getGroupByUserId(userId);
+    }
 }

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

@@ -1,20 +0,0 @@
-package com.huimv.secure.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2024-01-03
- */
-@RestController
-@RequestMapping("/sys-group-menu")
-public class SysGroupMenuController {
-
-}

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

@@ -18,68 +18,122 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2024-01-03
- */
 @RestController
-@RequestMapping("/sys-user")
+@RequestMapping("/admin/user")
 @CrossOrigin
 public class SysUserController {
+
     @Autowired
     private ISysUserService sysUserService;
 
     @Autowired
-    private UploadImage uploadImage;
-    @Autowired
     private ISysAccountMultilevelService accountMultilevelService;
 
+    @Autowired
+    private UploadImage uploadImage;
+
+
+//    @PostMapping("/list")
+//    public JSONObject listUser(@RequestBody Map map) {
+//        System.out.println();
+//        int pageNum = (Integer)map.get("pageNum");
+//        int pageSize = (Integer)map.get("pageSize");
+//        String searchStr = (String)map.get("searchStr");
+//        return iUserService.findUserAccount(searchStr,pageNum,pageSize);
+//    }
+    //员工分页查询
+    @PostMapping("/page")
+    public Result page(@RequestBody UserPagePojo userPagePojo) {
+        return sysUserService.pageAll(userPagePojo);
+    }
+    //员工查询
+    @PostMapping("/list")
+    public Result list(@RequestBody Map map) {
+        return sysUserService.list(map);
+    }
+
+    @PostMapping("/getOneById")
+    public Result getOneById(@RequestBody Map<String,Integer> map) {
+        Integer id = map.get("id");
+
+        return new Result(ResultCode.SUCCESS,sysUserService.getById(id));
+    }
+
     //员工新增
     @PostMapping("/add")
     public Result add(@RequestParam("userId") String userId,
                       @RequestParam(value = "userName",required = false) String userName,
                       @RequestParam(value = "gender",required = false) String gender,
+                      @RequestParam(value = "nation",required = false) String nation,
+                      @RequestParam(value = "nativePlace",required = false) String nativePlace,
                       @RequestParam(value = "birthday",required = false) String birthday,
+                      @RequestParam(value = "politicsPace",required = false) String politicsPace,
+                      @RequestParam(value = "peopleType",required = false) String peopleType,
+                      @RequestParam(value = "educationalLevel",required = false) String educationalLevel,
+                      @RequestParam(value = "cardType",required = false) String cardType,
                       @RequestParam(value = "cardNum",required = false) String cardNum,
                       @RequestParam(value = "userPhone",required = false) String userPhone,
                       @RequestParam(value = "publicPhone",required = false) String publicPhone,
+                      @RequestParam(value = "userMali",required = false) String userMali,
+                      @RequestParam(value = "publicMali",required = false) String publicMali,
                       @RequestParam(value = "entryTime",required = false) String entryTime,
+                      @RequestParam(value = "probation",required = false) String probation,
+                      @RequestParam(value = "department",required = false) String department,
                       @RequestParam(value = "job",required = false) String job,
+                      @RequestParam(value = "jobType",required = false) String jobType,
                       @RequestParam(value = "workLocation",required = false) String workLocation,
-                      @RequestParam(value = "workLocationType",required = false) Integer workLocationType,
+                      @RequestParam(value = "workLocationType",required = false) String workLocationType,
                       @RequestParam(value = "farmId",required = false) String farmId,
+                      @RequestParam(value = "emergentUser",required = false) String emergentUser,
+                      @RequestParam(value = "emergentUserPhone",required = false) String emergentUserPhone,
                       @RequestParam(value = "sheng",required = false) String sheng,
                       @RequestParam(value = "shi",required = false) String shi,
                       @RequestParam(value = "xxdz",required = false) String xxdz,
+                      @RequestParam(value = "yzbm",required = false) String yzbm,
                       @RequestParam("imgUrl") MultipartFile imgUrl) throws IOException {
         SysUser sysUser = new SysUser();
         sysUser.setUserName(userName);
         sysUser.setUserId(userId);
         sysUser.setGender(Integer.parseInt(gender));
+        sysUser.setNation(nation);
+        sysUser.setNativePlace(nativePlace);
+
         sysUser.setBirthday(DateUtil.parse(birthday,"yyyy-MM-dd"));
+        sysUser.setPoliticsPace(politicsPace);
+        sysUser.setPeopleType(peopleType);
+        sysUser.setEducationalLevel(educationalLevel);
+        sysUser.setCardType(cardType);
         sysUser.setCardNum(cardNum);
         sysUser.setUserPhone(userPhone);
         sysUser.setPublicPhone(publicPhone);
+        sysUser.setUserMali(userMali);
+        sysUser.setPublicMali(publicMali);
         if (StringUtils.isNotBlank(entryTime)){
             sysUser.setEntryTime(DateUtil.parse(entryTime,"yyyy-MM-dd"));
         }
+
+        sysUser.setProbation(probation);
+        sysUser.setDepartment(department);
         sysUser.setJob(job);
+        sysUser.setJobType(jobType);
         sysUser.setWorkLocation(workLocation);
         sysUser.setWorkLocationType(workLocationType);
         sysUser.setFarmId(farmId);
+        sysUser.setEmergentUser(emergentUser);
+        sysUser.setEmergentUserPhone(emergentUserPhone);
         sysUser.setSheng(sheng);
         sysUser.setShi(shi);
         sysUser.setXxdz(xxdz);
+        sysUser.setYzbm(yzbm);
+
         if (ObjectUtil.isNotEmpty(imgUrl)) {
             String imageCom = uploadImage.getImageCom(imgUrl);
             if ("上传失败".equals(imageCom)) {
@@ -89,16 +143,19 @@ public class SysUserController {
                 sysUser.setImgUrl(imageCom);
             }
         }
-        if (StringUtils.isNotBlank(cardNum) && !IDCardValidator.isValidIDCard(cardNum)) {
-            return new Result(10001, "身份证格式不正确", false);
+        if ("身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum)) {
+            return new Result(10001,"身份证格式不正确",false);
         }
-        if (StringUtils.isNotBlank(userPhone)&&!PhoneNumberValidator.isValidPhoneNumber(userPhone)) {
+
+        if (!PhoneNumberValidator.isValidPhoneNumber(userPhone)) {
             return new Result(10001,"手机号格式不正确",false);
         }
-        int count = sysUserService.count(new QueryWrapper<SysUser>().eq("card_num", cardNum));
+
+        int count = sysUserService.count(new QueryWrapper<SysUser>().eq("card_type", cardType).eq("card_num", cardNum));
         if (count >0) {
             return new Result(10001,"身份证已存在",false);
         }
+
         int countUserPhone = sysUserService.count(new QueryWrapper<SysUser>().eq("user_phone", userPhone));
         if (countUserPhone >0) {
             return new Result(10001,"手机号已存在",false);
@@ -110,10 +167,18 @@ public class SysUserController {
         return new Result(10000,"保存成功",true);
     }
 
-    /*员工修改*/
+
+    //查询工作地点
+    @PostMapping("/listWorkLocation")
+    public Result listWorkLocation(@RequestBody Map map) {
+        return sysUserService.listWorkLocation(map);
+    }
+
     @PostMapping("/update")
     public Result update(@RequestBody UserVo sysUser) {
+        String cardType = sysUser.getCardType();
         String cardNum = sysUser.getCardNum();
+
         String userPhone = sysUser.getUserPhone();
         if(StringUtils.isNotBlank(userPhone)){
             if (!PhoneNumberValidator.isValidPhoneNumber(userPhone)) {
@@ -125,14 +190,15 @@ public class SysUserController {
             }
         }
         if(StringUtils.isNotBlank(cardNum)){
-            if (!IDCardValidator.isValidIDCard(cardNum)) {
+            if (StringUtils.isNotBlank(cardNum) && "身份证".equals(cardType) && !IDCardValidator.isValidIDCard(cardNum)) {
                 return new Result(10001,"身份证格式不正确",false);
             }
-            int countUserPhone = sysUserService.count(new QueryWrapper<SysUser>().eq("card_num", cardNum));
+            int countUserPhone = sysUserService.count(new QueryWrapper<SysUser>().eq("card_type", cardType).eq("card_num", cardNum));
             if (countUserPhone >1) {
                 return new Result(10001,"身份证已存在",false);
             }
         }
+
         if (ObjectUtil.isNotEmpty(sysUser.getBirthday())){
             sysUser.setAge(DateUtil.ageOfNow(sysUser.getBirthday()));
         }
@@ -141,50 +207,55 @@ public class SysUserController {
         user.setAge(sysUser.getAge());
         user.setBirthday(sysUser.getBirthday());
         user.setCardNum(sysUser.getCardNum());
+        user.setCardType(sysUser.getCardType());
+        user.setDepartment(sysUser.getDepartment());
+        user.setEducationalLevel(sysUser.getEducationalLevel());
+        user.setEmergentUser(sysUser.getEmergentUser());
+        user.setEmergentUserPhone(sysUser.getEmergentUserPhone());
         user.setEntryTime(sysUser.getEntryTime());
         user.setFarmId(sysUser.getFarmId());
         user.setGender(sysUser.getGender());
+        user.setNation(sysUser.getNation());
+        user.setNativePlace(sysUser.getNativePlace());
+        user.setPeopleType(sysUser.getPeopleType());
+        user.setPoliticsPace(sysUser.getPoliticsPace());
+        user.setProbation(sysUser.getProbation());
+        user.setPublicMali(sysUser.getPublicMali());
         user.setPublicPhone(sysUser.getPublicPhone());
         user.setSheng(sysUser.getSheng());
         user.setShi(sysUser.getShi());
         user.setUserId(sysUser.getUserId());
+        user.setUserMali(sysUser.getUserMali());
         user.setUserName(sysUser.getUserName());
         user.setUserPhone(sysUser.getUserPhone());
         user.setWorkLocation(sysUser.getWorkLocation());
+        user.setWorkLocationType(sysUser.getWorkLocationType());
         user.setXxdz(sysUser.getXxdz());
-        String s = "";
-        String job = sysUser.getJob();
-        //TODO 判空
-        if(ObjectUtil.isNotEmpty(job)){
-            String[] split = job.split(",");
-            for (String s1 : split) {
-                s = s+s1 + ",";
-            }
+        user.setYzbm(sysUser.getYzbm());
+        user.setImgUrl(sysUser.getImgUrl());
+        user.setJobType(sysUser.getJobType());
+
+        if (ObjectUtil.isNotEmpty(sysUser.getJob())){
+            String s = "";
+            List<String> job = sysUser.getJob();
+            //TODO 判空
+            s = String.join(",",job);
+            user.setJob(s);
         }
-        user.setJob(s.substring(0, s.length() - 1));
         sysUserService.updateById(user);
-        QueryWrapper<SysAccountMultilevel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id", sysUser.getUserId());
-        SysAccountMultilevel one = accountMultilevelService.getOne(queryWrapper);
-        if (ObjectUtil.isNotEmpty(one)) {
-            one.setUserName(sysUser.getUserName());
-            one.setType(Integer.parseInt(s.substring(0, s.length() - 1).split(",")[0]));
-            one.setWorkLocation(sysUser.getWorkLocation());
-            accountMultilevelService.updateById(one);
-        }
+
+        accountMultilevelService.updateByUser(user);
         return new Result(10000,"修改成功",true);
     }
 
-    /*员工修改照片*/
     @PostMapping("/uploadUserImg")
     public Result uploadUserImg(@RequestParam("imgUrl") MultipartFile imgUrl,
-                                @RequestParam("id") Integer id) throws IOException {
+                         @RequestParam("id") Integer id) throws IOException {
 
-        return sysUserService.uploadUserImg(imgUrl,id);
+       return sysUserService.uploadUserImg(imgUrl,id);
 
     }
 
-    /*员工删除*/
     @PostMapping("/remove")
     @Transactional
     public Result remove(@RequestBody Map<String,String> map) {
@@ -194,50 +265,57 @@ public class SysUserController {
         }
         List<String> collection = Arrays.stream(ids.split(","))
                 .collect(Collectors.toList());
-        sysUserService.removeByIds(collection);
-        //删除账号
+         sysUserService.removeByIds(collection);
+         //删除账号
         accountMultilevelService.remove(new QueryWrapper<SysAccountMultilevel>().in("user_id",collection));
         return new Result(10000,"删除成功",true);
     }
 
-
-    ///*根据员工账号查询信息*/
-    @PostMapping("/listDetail")
-    public Result listDetail(@RequestBody  Map<String,String> paramsMap) {
-        return sysUserService.listDetail(paramsMap);
+    //账号查询
+    @PostMapping("/pageAccount")
+    public Result pageAccount(@RequestBody UserPagePojo userPagePojo) {
+        return  sysUserService.pageAccount( userPagePojo);
     }
 
 
-    //员工分页查询
-    @PostMapping("/page")
-    public Result page(@RequestBody UserPagePojo userPagePojo) {
-        return sysUserService.pageAll(userPagePojo);
+
+    //账号增加
+    @PostMapping("/addAccount")
+    public Result addAccount(@RequestBody Map<String,Object> map) {
+        return  sysUserService.addAccount(map);
     }
 
-    //员工查询
-    @PostMapping("/list")
-    public Result list(@RequestBody Map map) {
-        return sysUserService.list(map);
+    //账号修改
+    @PostMapping("/updateAccount")
+    public Result updateAccount(@RequestBody Map<String,Object> map) {
+        return  sysUserService.updateAccount(map);
     }
+
+    @GetMapping("/printUser")
+    public void printUser(HttpServletResponse response, @RequestParam(name = "ids") String ids) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("ids", ids);
+        sysUserService.printUser(response, map);
+        String path = "/opt/huatong/user.xls";
+        PdfUtil.returnPdfStream3(response, path, "人员列表");
+    }
+    //账号删除
+    @PostMapping("/removeAccount")
+    @Transactional
+    public Result removeAccount(@RequestBody Map<String,String> map) {
+        return  sysUserService.removeAccount(map);
+    }
+
     //性别年龄分布
     @PostMapping("/userAgeAndGender")
     public Result userAgeAndGender(@RequestBody Map<String,String> map) {
         return  sysUserService.userAgeAndGender(map);
     }
+
     //岗位分布
     @PostMapping("/userJob")
     public Result userJob(@RequestBody Map<String,String> map) {
         return  sysUserService.userJob(map);
     }
-    //查询工作地点
-    @PostMapping("/listWorkLocation")
-    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/AccountGroup.java

@@ -0,0 +1,35 @@
+package com.huimv.secure.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_account_group")
+public class AccountGroup extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer accountId;
+
+    private Integer groupId;
+
+
+}

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

@@ -1,30 +0,0 @@
-package com.huimv.secure.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author author
- * @since 2024-01-03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("age_ranges")
-public class AgeRanges implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String ageRange;
-
-
-}

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

@@ -1,21 +1,22 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-04
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -66,7 +67,7 @@ public class BaseDevice implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     private String farmId;
 

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

@@ -1,20 +1,21 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2024-03-06
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -41,5 +42,7 @@ public class BaseFarm implements Serializable {
 
     private String function;
 
+    private String parentId;
+
 
 }

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

@@ -0,0 +1,41 @@
+package com.huimv.secure.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_flow")
+public class BaseFlow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String flowName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+
+    private Integer createUser;
+
+
+}

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

@@ -1,35 +1,40 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2024-03-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("sys_account_group")
-public class SysAccountGroup implements Serializable {
+@TableName("base_job")
+public class BaseJob implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    private Integer accountId;
-
-    private Integer groupId;
+    /**
+     * 工作名称
+     */
+    private String jobName;
 
 
 }

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

@@ -1,20 +1,22 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -32,36 +34,12 @@ public class BaseLocation implements Serializable {
      */
     private String locationName;
 
-    private String farmId;
-
-    /**
-     * 1人员初级洗消站 2净区 3人员二级洗消站 4场内 5生产区 6车辆初级洗消站 7车辆二级洗消站 8中转料塔外围 9车辆三级洗消站 10销售中转站 11环保区洗消中心 12环保区净区 13洗消中心净区
-     */
-    private Integer locationType;
-
-    private Integer parentId;
-
-    private String parentIds;
+    private Integer isLuggage;
 
-    /**
-     * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
-     */
-    private Integer vistitType;
-
-    /**
-     * 下一站
-     */
-    private Integer nextId;
+    private String farmIds;
 
-    /**
-     * 位置序号
-     */
-    private Integer serialNumber;
-
-    /**
-     * 下一站位置名称
-     */
-    private String nextLocation;
+    @TableField(exist = false)
+    private String farmNames;
 
 
 }

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

@@ -1,23 +1,23 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 流程表
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -53,25 +53,27 @@ public class BaseProcess implements Serializable {
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date subDate;
 
     /**
-     * 用，分割  修改时间
+     * 修改时间
      */
     private String updateDate;
 
+
     /**
-     * 用，分割  0进行中 1通过 2异常
+     * 当前位置 状态
      */
     private String currentStatus;
 
     /**
-     * 用，分割  当前位置
+     * 当前位置
      */
     private String currentLocation;
 
     /**
-     * 用，分割  当前位置id
+     * 当前位置id
      */
     private String currentLocationId;
 
@@ -81,18 +83,13 @@ public class BaseProcess implements Serializable {
      * 0 进行中，1已完成，2拒绝（提前结束）
      */
     private Integer processType;
-
-    /**
-     * 流程所有地点
-     */
     private String allLocation;
-
     private String allLocationId;
-
-    /**
-     * 0 未进行 1进行中 2已完成 3已拒绝
-     */
     private String allLocationStatus;
 
+    private String allFlowId;
+    private String currentFlowId;
+
+
 
 }

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

@@ -0,0 +1,46 @@
+package com.huimv.secure.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.validation.annotation.Validated;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@Validated
+@TableName("base_visiting")
+public class BaseVisiting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 来访名字
+     */
+    private String visitingName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+
+    private Integer createUser;
+
+
+}

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

@@ -0,0 +1,89 @@
+package com.huimv.secure.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_washout_point")
+public class BaseWashoutPoint implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 地点id
+     */
+    private Integer locationId;
+
+    /**
+     * 地点名称
+     */
+    @TableField(exist = false)
+    private String locationName;
+
+    /**
+     * 所属牧场
+     */
+    private String farmIds;
+
+    /**
+     * 流程列表
+     */
+    private String flowList;
+
+    /**
+     * 前面地点名称
+     */
+    private String headLocationName;
+
+    /**
+     * 后面地点名称
+     */
+    private String tailLocationName;
+
+    /**
+     * 洗消点等级
+     */
+    private Integer pointLevel;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * pcr有效时长(分钟)
+     */
+    private Integer pcrTime;
+
+    /**
+     * 来访类型
+     */
+    private Integer visitingType;
+
+
+}

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

@@ -1,24 +1,23 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 车辆闸机信息记录
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -39,7 +38,7 @@ public class BillAccessDoor implements Serializable {
     /**
      * 检测时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @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/BillClean.java

@@ -1,24 +1,24 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * <p>
  * 洗消表
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -60,11 +60,12 @@ public class BillClean implements Serializable {
      * 来访时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
-    private Date vistitDate;
+    private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     private String farmId;
@@ -95,43 +96,37 @@ public class BillClean implements Serializable {
      */
     private Integer processId;
 
-    /**
-     * 检测时间
-     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date checkDate;
-
     /**
      * 检测地点
      */
     private String testLocation;
 
+
     private Integer testLocationId;
 
-    /**
-     * 手机号
-     */
     private String phone;
 
-    /**
-     * 车牌号
-     */
     private String carNum;
 
-    /**
-     * 清洗照片
-     */
     private String imgUrl;
 
-    /**
-     * 0 待上传 1已上传 
-     */
     private Integer imgStatus;
 
-    /**
-     * 洗消时长
-     */
     private String cleanTime;
 
+    private String departureName;
+
+    private Integer departureId;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
 
+    private String remark;
 }

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

@@ -0,0 +1,143 @@
+package com.huimv.secure.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 洗消表
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_clean_before")
+public class BillCleanBefore implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
+     */
+    private Integer vistitType;
+
+    /**
+     * 目的地
+     */
+    private String destName;
+
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
+
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 来访时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime vistitDate;
+
+    /**
+     * 提交时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime subDate;
+
+    private String farmId;
+
+    /**
+     * 当前状态 0待审批 1合格  2异常
+     */
+    private Integer billStatus;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime passDate;
+
+    /**
+     * 处理人
+     */
+    private String passUserName;
+
+    /**
+     * 处理人id
+     */
+    private Integer passUserId;
+
+    /**
+     * 进程id
+     */
+    private Integer processId;
+
+    /**
+     * 检测时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime checkDate;
+
+    /**
+     * 检测地点
+     */
+    private String testLocation;
+
+    private Integer testLocationId;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 车牌号
+     */
+    private String carNum;
+
+    /**
+     * 视频地址
+     */
+    private String imgUrl;
+
+    /**
+     * 0待上传 1已上传
+     */
+    private Integer imgStatus;
+
+    private String departureName;
+
+    private Integer departureId;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+}

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

@@ -1,24 +1,24 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * <p>
  * 洗消表
  * </p>
  *
  * @author author
- * @since 2024-01-04
+ * @since 2023-08-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -60,11 +60,12 @@ public class BillDry implements Serializable {
      * 来访时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
-    private Date vistitDate;
+    private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     private String farmId;
@@ -123,20 +124,25 @@ public class BillDry implements Serializable {
      */
     private String imgUrl;
 
-    /**
-     * 0待上传 1已上传
-     */
     private Integer imgStatus;
 
-    /**
-     * 烘干时长
-     */
     private String dryTime;
 
-    /**
-     * 烘干温度
-     */
     private String dryTem;
 
+    private String departureName;
+
+    private Integer departureId;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+
 
 }

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

@@ -1,24 +1,23 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 车辆闸机信息记录
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -39,7 +38,7 @@ public class BillGate implements Serializable {
     /**
      * 检测时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date checkDate;
 
     /**
@@ -66,9 +65,6 @@ public class BillGate implements Serializable {
 
     private String farmId;
 
-    /**
-     * 车牌照片
-     */
     private String carUrl;
 
 

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

@@ -1,24 +1,24 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-08-22
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -32,13 +32,10 @@ public class BillGoodsInventory implements Serializable {
     private Integer id;
 
     /**
-     * 物资类型 0蔬菜食材 1药品疫苗  2生产维修工具  3生活物资 4其它
+     * 物资类型
      */
-    private Integer goodsType;
+    private String goodsType;
 
-    /**
-     * 类型名
-     */
     private String goodsTypeName;
 
     /**
@@ -46,11 +43,10 @@ public class BillGoodsInventory implements Serializable {
      */
     private String goodsNums;
 
-    /**
-     * 物资名称
-     */
     private String goodsName;
 
+    private String goodsUnit;
+
     /**
      * 申请单id
      */
@@ -59,22 +55,77 @@ public class BillGoodsInventory implements Serializable {
     /**
      * 当前位置
      */
-    private String currentLocation;
+    private String testLocation;
 
     /**
      * 当前位置 id
      */
-    private Integer currentLocationId;
+    private Integer testLocationId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+    private String farmId;
+
+    private Integer vistitType;
 
     /**
-     * 物资单元
+     * 目的地
      */
-    private String goodsUnit;
+    private String destName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createDate;
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
 
-    private String farmId;
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 来访时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime vistitDate;
+
+    /**
+     * 提交时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime subDate;
+
+    private String departureName;
+
+    private Integer departureId;
+
+    private Integer passUserId;
+
+    private String passUserName;
+
+    private String phone;
+
+    private String carNum;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+
+    private String imgUrl;
 
+    private Integer billStatus;
 
+    private Integer processId;
 }

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

@@ -1,24 +1,24 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * <p>
  * 隔离
  * </p>
  *
  * @author author
- * @since 2024-01-04
+ * @since 2023-07-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -60,7 +60,7 @@ public class BillIsolate implements Serializable {
      * 来访时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
-    private Date vistitDate;
+    private LocalDateTime vistitDate;
 
     /**
      * 提交时间
@@ -106,6 +106,7 @@ public class BillIsolate implements Serializable {
     /**
      * 隔离开始时间
      */
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date isolateStartDate;
 
@@ -131,15 +132,22 @@ public class BillIsolate implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date isolateRealEndDate;
 
-    /**
-     * 手机号
-     */
     private String phone;
 
-    /**
-     * 车牌号
-     */
+    private String departureName;
+
+    private Integer departureId;
+
     private String carNum;
 
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
 
 }

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

@@ -1,21 +1,23 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-24
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -40,6 +42,7 @@ public class BillLuggage implements Serializable {
     /**
      * 寄存日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime luggageDate;
 
     /**
@@ -47,13 +50,10 @@ public class BillLuggage implements Serializable {
      */
     private String luggageLocation;
 
-    /**
-     * 寄存件数
-     */
-    private Integer luggageNum;
-
     private Integer luggageLocationId;
 
+    private Integer luggageNum;
+
     /**
      * 照片地址
      */

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

@@ -1,24 +1,24 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * <p>
  * pcr 表
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -32,7 +32,7 @@ public class BillPcr implements Serializable {
     private Integer id;
 
     /**
-     * 0正常  1待复审 2 通过 3拒绝
+     * 0正常  1复审
      */
     private Integer pcrType;
 
@@ -64,19 +64,20 @@ public class BillPcr implements Serializable {
     /**
      * 来访时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm ss" ,timezone = "GMT+8")
-    private Date vistitDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     /**
      * 检测时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm ss" ,timezone = "GMT+8")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date checkDate;
 
     /**
@@ -87,6 +88,7 @@ public class BillPcr implements Serializable {
     /**
      * 处理时间
      */
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date passDate;
 
@@ -113,27 +115,27 @@ public class BillPcr implements Serializable {
 
     private Integer admissionId;
 
-    /**
-     * 手机号
-     */
     private String phone;
 
-    /**
-     * 车牌号
-     */
     private String carNum;
 
-    /**
-     * pcr有效期
-     */
-    private String qualifiedDate;
+    private Integer qualifiedDate;
 
-    /**
-     * pcr凭证
-     */
     private String imgUrl;
 
     private Integer imgStatus;
 
+    private String departureName;
+
+    private Integer departureId;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
 
+    private String remark;
 }

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

@@ -1,24 +1,23 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 入场申请
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-07-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -42,6 +41,16 @@ public class BillPersonnelAdmission implements Serializable {
     private Integer vistitType;
 
     /**
+     * 出发地
+     */
+    private String departureName;
+
+    /**
+     * 出发地 id
+     */
+    private Integer departureId;
+
+    /**
      * 目的地
      */
     private String destName;
@@ -64,13 +73,14 @@ public class BillPersonnelAdmission implements Serializable {
     /**
      * 来访时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm ss" ,timezone = "GMT+8")
-    private Date vistitDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
-    private Date subDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime subDate;
 
     /**
      * 手机号
@@ -105,13 +115,14 @@ public class BillPersonnelAdmission implements Serializable {
     private String farmId;
 
     /**
-     * 当前状态 0待审批 1通过  2拒绝  3待上传物资信息
+     * 当前状态 0待审批 1通过  2拒绝
      */
     private Integer billStatus;
 
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime passDate;
 
     /**
@@ -129,20 +140,22 @@ public class BillPersonnelAdmission implements Serializable {
      */
     private Integer processId;
 
-    /**
-     * 车牌号
-     */
     private String carNum;
 
-    /**
-     * 拉猪车来源
-     */
     private String source;
 
-    /**
-     * 人员照片
-     */
+
     private String userImgUrl;
 
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+
 
 }

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

@@ -0,0 +1,145 @@
+package com.huimv.secure.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 洗消表
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_sampling")
+public class BillSampling implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
+     */
+    private Integer vistitType;
+
+    /**
+     * 目的地
+     */
+    private String destName;
+
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
+
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 来访时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime vistitDate;
+
+    /**
+     * 提交时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime subDate;
+
+    private String farmId;
+
+    /**
+     * 当前状态 0待审批 1合格  2异常
+     */
+    private Integer billStatus;
+
+    /**
+     * 处理时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime passDate;
+
+    /**
+     * 处理人
+     */
+    private String passUserName;
+
+    /**
+     * 处理人id
+     */
+    private Integer passUserId;
+
+    /**
+     * 进程id
+     */
+    private Integer processId;
+
+    /**
+     * 检测时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime checkDate;
+
+    /**
+     * 检测地点
+     */
+    private String testLocation;
+
+    private Integer testLocationId;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 车牌号
+     */
+    private String carNum;
+
+    /**
+     * 视频地址
+     */
+    private String imgUrl;
+
+    /**
+     * 0待上传 1已上传
+     */
+    private Integer imgStatus;
+
+    private String departureName;
+
+    private Integer departureId;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+
+}

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

@@ -1,20 +1,21 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-04
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

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

@@ -1,21 +1,22 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 车辆闸机和人脸门禁设备列表
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-10-16
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

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

@@ -1,20 +1,21 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

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

@@ -38,5 +38,6 @@ public class Farm extends Model {
     private String farmMenu;
     private String farmTopMenu;
     private String function;
+    private String parentId;
     
 }

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

@@ -1,9 +1,9 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -13,14 +13,14 @@ import lombok.experimental.Accessors;
  * 
  * </p>
  *
- * @author author
- * @since 2024-01-03
+ * @author astupidcoder
+ * @since 2021-09-09
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_group")
-public class SysGroup implements Serializable {
+public class Group extends Model {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,9 +1,9 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -13,14 +13,14 @@ import lombok.experimental.Accessors;
  * 
  * </p>
  *
- * @author author
- * @since 2024-01-03
+ * @author astupidcoder
+ * @since 2021-09-09
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_group_menu")
-public class SysGroupMenu implements Serializable {
+public class GroupMenu extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -30,7 +30,6 @@ public class SysGroupMenu implements Serializable {
     private Integer groupId;
 
     private Integer menuId;
-
     private Integer isAll;
 
 

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

@@ -1,9 +1,9 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -13,14 +13,14 @@ import lombok.experimental.Accessors;
  * 
  * </p>
  *
- * @author author
- * @since 2024-01-03
+ * @author astupidcoder
+ * @since 2021-09-09
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_menu")
-public class SysMenu implements Serializable {
+public class Menu extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -43,5 +43,7 @@ public class SysMenu implements Serializable {
 
     private Boolean ifShow;
 
+//    private List<Menu> children;
+
 
 }

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

@@ -1,23 +1,23 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 人脸门禁车辆闸机白名单
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-10-16
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -55,17 +55,15 @@ public class PeopleList implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 过期时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date outTime;
 
-    /**
-     * 白名单类型 0为人员 1为车辆
-     */
-    private Integer type;
-
 
+    private Integer type;
 }

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

@@ -50,7 +50,7 @@ public class SysAccountMultilevel extends Model {
     private Integer type;
 
     private String workLocation;
-    private Integer workLocationType;
+    private String workLocationType;
     //工作岗位 1 场长 2 紧急进程审核员  ，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
     private String workPost;
     private String phone;
@@ -63,5 +63,6 @@ public class SysAccountMultilevel extends Model {
     private Integer userId;
     private String farmId;
     private String jobs;
+    private String jobName;
 
 }

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

@@ -1,16 +1,16 @@
 package com.huimv.secure.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-04
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -46,16 +46,42 @@ public class SysUser implements Serializable {
      */
     private Integer gender;
 
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 籍贯
+     */
+    private String nativePlace;
 
     /**
      * 出生日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
 
+    /**
+     * 政治面貌
+     */
+    private String politicsPace;
 
+    /**
+     * 户口类型
+     */
+    private String peopleType;
 
+    /**
+     * 教育水平
+     */
+    private String educationalLevel;
 
+    /**
+     * 证件类型
+     */
+    private String cardType;
 
     /**
      * 年龄
@@ -77,20 +103,42 @@ public class SysUser implements Serializable {
      */
     private String publicPhone;
 
+    /**
+     * 个人邮箱
+     */
+    private String userMali;
 
+    /**
+     * 办公邮箱
+     */
+    private String publicMali;
 
     /**
      * 入职时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entryTime;
 
+    /**
+     * 试用期
+     */
+    private String probation;
+
+    /**
+     * 部门
+     */
+    private String department;
 
     /**
      * 工作岗位 1 场长，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
      */
     private String job;
 
-
+    /**
+     * 工作性质
+     */
+    private String jobType;
 
     /**
      * 工作地点
@@ -100,31 +148,14 @@ public class SysUser implements Serializable {
     /**
      * 1人员初级洗消站 2净区 3人员二级洗消站 4场内 5生产区 6车辆初级洗消站 7车辆二级洗消站 8中转料塔外围 9车辆三级洗消站 10销售中转站 11环保区洗消中心 12环保区净区 13洗消中心净区
      */
-    private Integer workLocationType;
-
+    private String workLocationType;
     private String farmId;
-
-
-
-    /**
-     * 省
-     */
+    private String emergentUser;
+    private String emergentUserPhone;
     private String sheng;
-
-    /**
-     * 市
-     */
     private String shi;
-
-    /**
-     * 详细地址
-     */
     private String xxdz;
-
-
-    /**
-     * 图片
-     */
+    private String yzbm;
     private String imgUrl;
 
 

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

@@ -0,0 +1,47 @@
+package com.huimv.secure.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_user")
+public class User extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String userName;
+
+    private Integer male;
+
+    private String birthday;
+
+    private String mobile;
+
+    private String address;
+
+    private String job;
+
+    private String remark;
+
+    private String userId;
+
+
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/dto/GetFlowListDto.java

@@ -0,0 +1,8 @@
+package com.huimv.secure.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class GetFlowListDto {
+    private Integer flowIds;
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/dto/GetWashoutPointDto.java

@@ -0,0 +1,20 @@
+package com.huimv.secure.entity.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetWashoutPointDto {
+    /*访问类型*/
+    private Integer visitingType;
+
+    /*洗消站个数*/
+    private Integer number;
+
+    /*牧场编码*/
+    private String farmIds;
+
+    /*洗消点集合*/
+    private List<WashListDto> washListDtos;
+}

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/dto/WashListDto.java

@@ -0,0 +1,18 @@
+package com.huimv.secure.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class WashListDto {
+    /*洗消点位置id*/
+    private Integer addressId;
+
+    /*洗消点对应的后面的目的地名称*/
+    private String nextName;
+
+    /*pcr有效时长*/
+    private Integer pcrTime;
+
+    /*洗消流程列表*/
+    private String flowLists;
+}

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

@@ -1,5 +1,6 @@
 package com.huimv.secure.entity.pojo;
 
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 @Data
@@ -9,8 +10,10 @@ public class UserPagePojo {
     private Integer size;
     private Integer gender;
     private String searchStr;
-    private String job;
+    private Integer job;
     private String workLocation;
     private Integer workLocationType;
     private String farmId;
+    private Integer pageNum;
+    private Integer pageSize;
 }

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

@@ -44,5 +44,10 @@ public class BaseProcessByLocationVo {
     private String dryTem;
     private List<String> imgUrls;
 
+    private String goodsType;
+    private String feedImgUrl;
+
+
+
 
 }

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

@@ -1,13 +1,11 @@
 package com.huimv.secure.entity.vo;
 
-
 import com.huimv.secure.entity.BillGoodsInventory;
-import com.huimv.secure.entity.BillPersonnelAdmission;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class BillAdmissionAndGoods extends BillPersonnelAdmission {
+public class BillAdmissionAndGoods extends BillPersonnelAdmissionVo {
     private List<BillGoodsInventory> goods;
 }

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

@@ -0,0 +1,9 @@
+package com.huimv.secure.entity.vo;
+
+import com.huimv.secure.entity.BillClean;
+import lombok.Data;
+
+@Data
+public class BillCleanVo extends BillClean {
+    private String type;
+}

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

@@ -0,0 +1,9 @@
+package com.huimv.secure.entity.vo;
+
+import com.huimv.secure.entity.BillDry;
+import lombok.Data;
+
+@Data
+public class BillDryVo extends BillDry {
+    private String type;
+}

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

@@ -0,0 +1,9 @@
+package com.huimv.secure.entity.vo;
+
+import com.huimv.secure.entity.BillPersonnelAdmission;
+import lombok.Data;
+
+@Data
+public class BillPersonnelAdmissionVo extends BillPersonnelAdmission {
+    private Integer processType;
+}

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 String farmId;
+    private Integer farmId;
 
     /**
      * 当前状态 0待审批 1合格  2异常

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

@@ -0,0 +1,37 @@
+package com.huimv.secure.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class CleanDryGoodsVo {
+    private Integer id;
+
+    private Integer vistitType;
+
+    private String testLocation;
+
+    private String admissionUserName;
+
+    private String carNum;
+
+    private String cleanTime;
+
+    private String dryTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date checkDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime subDate;
+
+    private Integer type;
+
+    private Integer billStatus;
+
+    private Integer imgStatus;
+
+}

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

@@ -0,0 +1,9 @@
+package com.huimv.secure.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class DestVo {
+    private Integer id;
+    private String locationName;
+}

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

@@ -1,9 +1,12 @@
 package com.huimv.secure.entity.vo;
 
+
 import lombok.Data;
 
 @Data
 public class GetFarmIdVo {
     private String farmId;
     private String name;
+    private String parentId;
+
 }

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

@@ -0,0 +1,9 @@
+package com.huimv.secure.entity.vo;
+
+import com.huimv.secure.entity.BillGoodsInventory;
+import lombok.Data;
+
+@Data
+public class GoodsVo extends BillGoodsInventory {
+    private String type;
+}

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

@@ -1,15 +1,15 @@
-package com.huimv.secure.entity.vo;
+    package com.huimv.secure.entity.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+    import com.fasterxml.jackson.annotation.JsonFormat;
+    import lombok.Data;
 
-import java.util.Date;
+    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;
+    @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/ProcessVo.java

@@ -0,0 +1,17 @@
+package com.huimv.secure.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huimv.secure.entity.BaseProcess;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProcessVo extends BaseProcess {
+    private Integer vistitType;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date vistitDate;
+
+    private Integer admissionId;
+}

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

@@ -75,7 +75,7 @@ public class UserAccountVo {
     /**
      * 1人员初级洗消站 2净区 3人员二级洗消站 4场内 5生产区 6车辆初级洗消站 7车辆二级洗消站 8中转料塔外围 9车辆三级洗消站 10销售中转站 11环保区洗消中心 12环保区净区 13洗消中心净区
      */
-    private Integer workLocationType;
+    private String workLocationType;
 
     private String farmId;
 }

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

@@ -8,5 +8,4 @@ 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/entity/vo/UserVo.java

@@ -24,7 +24,6 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("sys_user")
 public class UserVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -47,7 +46,15 @@ public class UserVo implements Serializable {
      */
     private Integer gender;
 
+    /**
+     * 民族
+     */
+    private String nation;
 
+    /**
+     * 籍贯
+     */
+    private String nativePlace;
 
     /**
      * 出生日期
@@ -56,7 +63,25 @@ public class UserVo implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
 
+    /**
+     * 政治面貌
+     */
+    private String politicsPace;
+
+    /**
+     * 户口类型
+     */
+    private String peopleType;
+
+    /**
+     * 教育水平
+     */
+    private String educationalLevel;
 
+    /**
+     * 证件类型
+     */
+    private String cardType;
 
     /**
      * 年龄
@@ -78,7 +103,15 @@ public class UserVo implements Serializable {
      */
     private String publicPhone;
 
+    /**
+     * 个人邮箱
+     */
+    private String userMali;
 
+    /**
+     * 办公邮箱
+     */
+    private String publicMali;
 
     /**
      * 入职时间
@@ -87,21 +120,44 @@ public class UserVo implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entryTime;
 
+    /**
+     * 试用期
+     */
+    private String probation;
 
+    /**
+     * 部门
+     */
+    private String department;
 
     /**
      * 工作岗位 1 场长，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
      */
-    private String job;
+    private List<String> job;
 
-    private String farmId;
+
+    /**
+     * 工作性质
+     */
+    private String jobType;
 
     /**
      * 工作地点
      */
     private String workLocation;
+
+    /**
+     * 1人员初级洗消站 2净区 3人员二级洗消站 4场内 5生产区 6车辆初级洗消站 7车辆二级洗消站 8中转料塔外围 9车辆三级洗消站 10销售中转站 11环保区洗消中心 12环保区净区 13洗消中心净区
+     */
+    private String workLocationType;
+    private String farmId;
+    private String emergentUser;
+    private String emergentUserPhone;
     private String sheng;
     private String shi;
     private String xxdz;
+    private String yzbm;
+    private String imgUrl;
+
 
 }

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

@@ -0,0 +1,12 @@
+package com.huimv.secure.entity.vo;
+
+import com.huimv.secure.entity.dto.GetWashoutPointDto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WashOutVo {
+    private String farmId;
+    private List<GetWashoutPointDto> washoutPointDtos;
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.secure.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.AccountGroup;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Repository
+public interface AccountGroupMapper extends BaseMapper<AccountGroup> {
+
+    void removeAccountGroup(@Param("accountId") String accountId);
+}

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

@@ -1,7 +1,7 @@
 package com.huimv.secure.mapper;
 
-import com.huimv.secure.entity.BaseDevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.BaseDevice;
 
 /**
  * <p>
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2023-09-04
  */
 public interface BaseDeviceMapper extends BaseMapper<BaseDevice> {
 

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

@@ -1,7 +1,7 @@
 package com.huimv.secure.mapper;
 
-import com.huimv.secure.entity.BaseFarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.BaseFarm;
 
 /**
  * <p>
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2024-03-06
  */
 public interface BaseFarmMapper extends BaseMapper<BaseFarm> {
 

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

@@ -1,7 +1,7 @@
 package com.huimv.secure.mapper;
 
-import com.huimv.secure.entity.SysGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.BaseFlow;
 
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2024-03-06
  */
-public interface SysGroupMapper extends BaseMapper<SysGroup> {
+public interface BaseFlowMapper extends BaseMapper<BaseFlow> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.huimv.secure.mapper;
 
-import com.huimv.secure.entity.SysMenu;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.secure.entity.BaseJob;
 
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author author
- * @since 2024-01-03
+ * @since 2024-03-13
  */
-public interface SysMenuMapper extends BaseMapper<SysMenu> {
+public interface BaseJobMapper extends BaseMapper<BaseJob> {
 
 }