大屏+后台

huimv-huyang-admin/src/main/java/com/huimv/admin/HuimvHuyangAdminApplication.java

@@ -1,11 +1,13 @@
 package com.huimv.admin;
 
 import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.annotation.MapperScans;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 @MapperScan("com.huimv.admin.mapper")
+@MapperScan("com.huimv.admin.*.mapper")
 public class HuimvHuyangAdminApplication {
 
     public static void main(String[] args) {

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/BreedChildbirthController.java

@@ -1,8 +1,12 @@
 package com.huimv.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BreedChildbirth;
+import com.huimv.admin.entity.BreedVaccinationRecord;
+import com.huimv.admin.entity.ProtSheepInfo;
 import com.huimv.admin.service.IBreedChildbirthService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -46,4 +50,14 @@ public class BreedChildbirthController {
     public Result remove(@RequestBody Map<String, String> paramsMap) {
         return childbirthService.remove(paramsMap);
     }
+
+    //羊只管理中的分娩记录
+    @RequestMapping("/listById")
+    public Result listById(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String sheepId = paramsMap.get("sheepId");
+        QueryWrapper<BreedChildbirth> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("sheep_id", sheepId);
+        return new Result(ResultCode.SUCCESS, childbirthService.list(queryWrapper));
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/BreedEstrusController.java

@@ -1,7 +1,10 @@
 package com.huimv.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.BreedChildbirth;
 import com.huimv.admin.entity.BreedCollectSemen;
 import com.huimv.admin.entity.BreedEstrus;
 import com.huimv.admin.service.IBreedEstrusService;
@@ -48,4 +51,14 @@ public class BreedEstrusController {
     public Result remove(@RequestBody Map<String, String> paramsMap) {
         return estrusService.remove(paramsMap);
     }
+
+    //羊只管理中的查情记录
+    @RequestMapping("/listById")
+    public Result listById(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String sheepId = paramsMap.get("sheepId");
+        QueryWrapper<BreedEstrus> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("sheep_id", sheepId);
+        return new Result(ResultCode.SUCCESS, estrusService.list(queryWrapper));
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/BreedTuppingController.java

@@ -1,11 +1,12 @@
 package com.huimv.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
-import com.huimv.admin.entity.BreedEstrus;
-import com.huimv.admin.entity.BreedLeave;
-import com.huimv.admin.entity.BreedTupping;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.*;
 import com.huimv.admin.service.IBreedTuppingService;
+import com.huimv.admin.service.IProtSheepInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,6 +30,8 @@ import java.util.Map;
 public class BreedTuppingController {
     @Autowired
     private IBreedTuppingService tuppingService;
+    @Autowired
+    private IProtSheepInfoService sheepInfoService;
 
     @RequestMapping("/listPage")
     public Result listPage(@RequestBody Map<String, String> paramsMap) {
@@ -48,4 +51,19 @@ public class BreedTuppingController {
     public Result remove(@RequestBody Map<String, String> paramsMap) {
         return tuppingService.remove(paramsMap);
     }
+
+    //羊只管理中的配种记录
+    @RequestMapping("/listById")
+    public Result listById(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String sheepId = paramsMap.get("sheepId");
+        ProtSheepInfo sheepInfo = sheepInfoService.getOne(new QueryWrapper<ProtSheepInfo>().eq("farm_id", farmId).eq("sheep_id", sheepId));
+        QueryWrapper<BreedTupping> queryWrapper = new QueryWrapper<>();
+        if (sheepInfo.getSex() == 0) {
+            queryWrapper.eq("farm_id", farmId).eq("male_code", sheepInfo.getSheepId());
+        } else {
+            queryWrapper.eq("farm_id", farmId).eq("female_code", sheepInfo.getSheepId());
+        }
+        return new Result(ResultCode.SUCCESS, tuppingService.list(queryWrapper));
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/BreedVaccinationRecordController.java

@@ -8,7 +8,9 @@ import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BreedLeave;
 import com.huimv.admin.entity.BreedVaccinationRecord;
+import com.huimv.admin.entity.ProtSheepInfo;
 import com.huimv.admin.service.IBreedVaccinationRecordService;
+import com.huimv.admin.service.IProtSheepInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,6 +35,9 @@ public class BreedVaccinationRecordController {
 
     @Autowired
     private IBreedVaccinationRecordService recordService;
+    @Autowired
+    private IProtSheepInfoService sheepInfoService;
+
 
 
     @RequestMapping("/listPage")
@@ -54,4 +59,24 @@ public class BreedVaccinationRecordController {
                 .like(StringUtils.isNotBlank(batchNum), "batch_num", batchNum);
         return new Result(ResultCode.SUCCESS, recordService.page(page, queryWrapper));
     }
+
+    //大屏防疫管理
+    @RequestMapping("/listScreen")
+    public Result listScreen(@RequestBody Map<String, String> paramsMap) {
+        return recordService.listScreen(paramsMap);
+    }
+    //羊只管理中的免疫记录
+    @RequestMapping("/listById")
+    public Result listById(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String sheepId = paramsMap.get("sheepId");
+        ProtSheepInfo sheepInfo = sheepInfoService.getOne(new QueryWrapper<ProtSheepInfo>().eq("farm_id", farmId).eq("sheep_id", sheepId));
+        QueryWrapper<BreedVaccinationRecord> queryWrapper = new QueryWrapper<>();
+        if (sheepInfo.getIsBatch() == 0) {
+            queryWrapper.eq("farm_id", farmId).eq("batch_num", sheepInfo.getBatchNum());
+        } else {
+            queryWrapper.eq("farm_id", farmId).eq("sheep_id", sheepInfo.getSheepId());
+        }
+        return new Result(ResultCode.SUCCESS, recordService.list(queryWrapper));
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/EarmarkThresholdController.java

@@ -0,0 +1,42 @@
+package com.huimv.admin.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.EarmarkThreshold;
+import com.huimv.admin.entity.EnergyThreshold;
+import com.huimv.admin.service.IEarmarkThresholdService;
+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-08-23
+ */
+@RestController
+@RequestMapping("/earmark-threshold")
+@CrossOrigin
+public class EarmarkThresholdController {
+    @Autowired
+    private IEarmarkThresholdService thresholdService;
+
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        return thresholdService.listThreshold(paramsMap);
+    }
+
+    @RequestMapping("/addAndEdit")
+    public Result addAndEdit(@RequestBody EarmarkThreshold threshold) {
+        return thresholdService.addAndEdit(threshold);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/EnergyThresholdController.java

@@ -0,0 +1,41 @@
+package com.huimv.admin.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.EnergyThreshold;
+import com.huimv.admin.service.IEnergyThresholdService;
+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-08-23
+ */
+@RestController
+@RequestMapping("/energy-threshold")
+@CrossOrigin
+public class EnergyThresholdController {
+    @Autowired
+    private IEnergyThresholdService thresholdService;
+
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        return thresholdService.listThreshold(paramsMap);
+    }
+
+    @RequestMapping("/addAndEdit")
+    public Result addAndEdit(@RequestBody EnergyThreshold threshold) {
+        return thresholdService.addAndEdit(threshold);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/EnvThresholdController.java

@@ -0,0 +1,42 @@
+package com.huimv.admin.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.EnergyThreshold;
+import com.huimv.admin.entity.EnvThreshold;
+import com.huimv.admin.service.IEnvThresholdService;
+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-08-23
+ */
+@RestController
+@RequestMapping("/env-threshold")
+@CrossOrigin
+public class EnvThresholdController {
+
+    @Autowired
+    private IEnvThresholdService thresholdService;
+
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        return thresholdService.listThreshold(paramsMap);
+    }
+
+    @RequestMapping("/addAndEdit")
+    public Result addAndEdit(@RequestBody EnvThreshold threshold) {
+        return thresholdService.addAndEdit(threshold);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/ProtDiseaseController.java

@@ -42,4 +42,10 @@ public class ProtDiseaseController {
         diseaseService.save(disease);
         return new Result(10000, "添加成功！", true);
     }
+
+    //疾病统计
+    @RequestMapping("/diseaseAnalysis")
+    public Result diseaseAnalysis(@RequestBody Map<String, String> paramsMap) {
+        return diseaseService.diseaseAnalysis(paramsMap);
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/ProtInvestmentController.java

@@ -47,4 +47,15 @@ public class ProtInvestmentController {
     public Result remove(@RequestBody Map<String, String> paramsMap) {
         return iProtInvestmentService.remove(paramsMap);
     }
+    //各类型投入预算成本分析
+    @RequestMapping("/typeAnalysis")
+    public Result typeAnalysis(@RequestBody Map<String, String> paramsMap) {
+        return iProtInvestmentService.typeAnalysis(paramsMap);
+    }
+
+    //预算成本分析
+    @RequestMapping("/investmentAnalysis")
+    public Result investmentAnalysis(@RequestBody Map<String, String> paramsMap) {
+        return iProtInvestmentService.investmentAnalysis(paramsMap);
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/ProtProductionController.java

@@ -48,4 +48,17 @@ public class ProtProductionController {
         return protProductionService.remove(paramsMap);
     }
 
+    //各类型产出预算收益分析
+    @RequestMapping("/typeAnalysis")
+    public Result typeAnalysis(@RequestBody Map<String, String> paramsMap) {
+        return protProductionService.typeAnalysis(paramsMap);
+    }
+
+    //产出预算分析
+    @RequestMapping("/analysis")
+    public Result analysis(@RequestBody Map<String, String> paramsMap) {
+        return protProductionService.analysis(paramsMap);
+    }
 }
+
+

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/ProtSheepInfoController.java

@@ -106,4 +106,58 @@ public class ProtSheepInfoController {
         return new Result(10000, "修改成功！", true);
     }
 
+    //大屏羊群阶段分布
+    @RequestMapping("/sheepDetail")
+    public Result sheepDetail(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.sheepDetail(paramsMap);
+    }
+
+    //大屏存栏数
+    @RequestMapping("/stockCount")
+    public Result stockCount(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.stockCount(paramsMap);
+    }
+
+    //羊只档案管理中的基本信息
+    @RequestMapping("/sheepList")
+    public Result sheepList(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.sheepList(paramsMap);
+    }
+    //健康监测中的羊只信息
+    @RequestMapping("/sheepInfoList")
+    public Result sheepInfoList(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.sheepInfoList(paramsMap);
+    }
+    //健康监测的横栏
+    @RequestMapping("/stockList")
+    public Result stockList(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.stockList(paramsMap);
+    }
+    //健康监测中间
+    @RequestMapping("/middleCount")
+    public Result middleCount(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.middleCount(paramsMap);
+    }
+
+    //运动检测
+    @RequestMapping("/listAct")
+    public Result listAct(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.listAct(paramsMap);
+    }
+    //体温检测
+    @RequestMapping("/listTemp")
+    public Result listTemp(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.listTemp(paramsMap);
+    }
+    //预警信息
+    @RequestMapping("/listWarning")
+    public Result listWarning(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.listWarning(paramsMap);
+    }
+
+    //谱系查看
+    @RequestMapping("/pedigree")
+    public Result pedigree(@RequestBody Map<String, String> paramsMap) {
+        return sheepInfoService.pedigree(paramsMap);
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/ProtWarningController.java

@@ -0,0 +1,55 @@
+package com.huimv.admin.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.ProtWarning;
+import com.huimv.admin.service.IProtWarningService;
+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-08-22
+ */
+@RestController
+@RequestMapping("/prot-warning")
+@CrossOrigin
+public class ProtWarningController {
+    @Autowired
+    private IProtWarningService warningService;
+
+    //大屏预警信息
+    @RequestMapping("/list")
+    public Result listWarning(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String warningType = paramsMap.get("warningType");
+        return new Result(ResultCode.SUCCESS, warningService.list(new QueryWrapper<ProtWarning>()
+                .eq("farm_id", farmId).eq(StringUtils.isNotBlank(warningType), "warning_type", warningType)
+                .orderByDesc("create_time")));
+    }
+
+    //后台预警列表
+    @RequestMapping("/listType")
+    public Result listWarningType(@RequestBody Map<String,String> paramsMap) {
+        return warningService.listWarningType(paramsMap);
+    }
+
+    //预警统计
+    @RequestMapping("/warningAnalysis")
+    public Result warningAnalysis(@RequestBody Map<String,String> paramsMap) {
+        return warningService.warningAnalysis(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/controller/CooperateEmployeeController.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.cooperate.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.cooperate.entity.CooperateEmployee;
+import com.huimv.admin.cooperate.service.ICooperateEmployeeService;
+import com.huimv.admin.farm.entity.FarmCheck;
+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-08-21
+ */
+@RestController
+@RequestMapping("/cooperate-employee")
+@CrossOrigin
+public class CooperateEmployeeController {
+    @Autowired
+    private ICooperateEmployeeService employeeService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return employeeService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody CooperateEmployee employee) {
+        return employeeService.add(employee);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody CooperateEmployee employee) {
+        return employeeService.edit(employee);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return employeeService.remove(paramsMap);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/controller/CooperateMachiningController.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.cooperate.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.cooperate.entity.CooperateMachining;
+import com.huimv.admin.cooperate.service.ICooperateMachiningService;
+import com.huimv.admin.farm.entity.FarmCheck;
+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-08-21
+ */
+@RestController
+@RequestMapping("/cooperate-machining")
+@CrossOrigin
+public class CooperateMachiningController {
+
+    @Autowired
+    private ICooperateMachiningService machiningService;
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return machiningService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody CooperateMachining machining) {
+        return machiningService.add(machining);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody CooperateMachining machining) {
+        return machiningService.edit(machining);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return machiningService.remove(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/controller/CooperateProfitController.java

@@ -0,0 +1,56 @@
+package com.huimv.admin.cooperate.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.cooperate.entity.CooperateProfit;
+import com.huimv.admin.cooperate.service.ICooperateProfitService;
+import com.huimv.admin.farm.entity.FarmCheck;
+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-08-21
+ */
+@RestController
+@RequestMapping("/cooperate-profit")
+@CrossOrigin
+public class CooperateProfitController {
+    @Autowired
+    private ICooperateProfitService profitService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return profitService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody CooperateProfit  profit) {
+        return profitService.add(profit);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody CooperateProfit profit) {
+        return profitService.edit(profit);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return profitService.remove(paramsMap);
+    }
+
+    //合作创收总额
+    @RequestMapping("/moneyCount")
+    public Result moneyCount(@RequestBody Map<String, String> paramsMap) {
+        return profitService.profitCount(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/controller/CooperateRecoveryController.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.cooperate.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.cooperate.entity.CooperateRecovery;
+import com.huimv.admin.cooperate.service.ICooperateRecoveryService;
+import com.huimv.admin.farm.entity.FarmCheck;
+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-08-21
+ */
+@RestController
+@RequestMapping("/cooperate-recovery")
+@CrossOrigin
+public class CooperateRecoveryController {
+
+    @Autowired
+    private ICooperateRecoveryService recoveryService;
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return recoveryService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody CooperateRecovery recovery) {
+        return recoveryService.add(recovery);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody CooperateRecovery recovery) {
+        return recoveryService.edit(recovery);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return recoveryService.remove(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/entity/CooperateEmployee.java

@@ -0,0 +1,66 @@
+package com.huimv.admin.cooperate.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-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("cooperate_employee")
+public class CooperateEmployee implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别 0女 1男
+     */
+    private Integer sex;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 家庭住址
+     */
+    private String address;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/entity/CooperateMachining.java

@@ -0,0 +1,61 @@
+package com.huimv.admin.cooperate.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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 合作共富羊粪加工
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("cooperate_machining")
+public class CooperateMachining implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 加工日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date machiningTime;
+
+    /**
+     * 加工量
+     */
+    private String machiningValue;
+
+    /**
+     * 加工人员
+     */
+    private String machiningUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/entity/CooperateProfit.java

@@ -0,0 +1,66 @@
+package com.huimv.admin.cooperate.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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 合作共富收益分配
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("cooperate_profit")
+public class CooperateProfit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 分配日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date profitTime;
+
+    /**
+     * 受益人
+     */
+    private String profitUser;
+
+    /**
+     * 合作项目
+     */
+    private String project;
+
+    /**
+     * 收益金额
+     */
+    private String profitMoney;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/entity/CooperateRecovery.java

@@ -0,0 +1,56 @@
+package com.huimv.admin.cooperate.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-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("cooperate_recovery")
+public class CooperateRecovery implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 采收日期
+     */
+    private String recoveryTime;
+
+    /**
+     * 采收量
+     */
+    private String recoveryValue;
+
+    /**
+     * 采收人员
+     */
+    private String recoveryUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/mapper/CooperateEmployeeMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.cooperate.mapper;
+
+import com.huimv.admin.cooperate.entity.CooperateEmployee;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 合作共富助农就业 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+public interface CooperateEmployeeMapper extends BaseMapper<CooperateEmployee> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/mapper/CooperateMachiningMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.cooperate.mapper;
+
+import com.huimv.admin.cooperate.entity.CooperateMachining;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 合作共富羊粪加工 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+public interface CooperateMachiningMapper extends BaseMapper<CooperateMachining> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/mapper/CooperateProfitMapper.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.cooperate.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.admin.cooperate.entity.CooperateProfit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.farm.entity.vo.CountScreenVo;
+import org.springframework.data.repository.query.Param;
+
+/**
+ * <p>
+ * 合作共富收益分配 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+public interface CooperateProfitMapper extends BaseMapper<CooperateProfit> {
+    CountScreenVo profitCount(@Param(Constants.WRAPPER)QueryWrapper<CooperateProfit> queryWrapper);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/mapper/CooperateRecoveryMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.cooperate.mapper;
+
+import com.huimv.admin.cooperate.entity.CooperateRecovery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 合作共富秸秆采收 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+public interface CooperateRecoveryMapper extends BaseMapper<CooperateRecovery> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/service/ICooperateEmployeeService.java

@@ -0,0 +1,27 @@
+package com.huimv.admin.cooperate.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.cooperate.entity.CooperateEmployee;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.farm.entity.FarmCheck;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 合作共富助农就业 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+public interface ICooperateEmployeeService extends IService<CooperateEmployee> {
+
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(CooperateEmployee employee);
+
+    Result edit(CooperateEmployee employee);
+
+    Result remove(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/service/ICooperateMachiningService.java

@@ -0,0 +1,26 @@
+package com.huimv.admin.cooperate.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.cooperate.entity.CooperateMachining;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.farm.entity.FarmCheck;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 合作共富羊粪加工 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+public interface ICooperateMachiningService extends IService<CooperateMachining> {
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(CooperateMachining machining);
+
+    Result edit(CooperateMachining machining);
+
+    Result remove(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/service/ICooperateProfitService.java

@@ -0,0 +1,29 @@
+package com.huimv.admin.cooperate.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.cooperate.entity.CooperateProfit;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.farm.entity.FarmCheck;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 合作共富收益分配 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+public interface ICooperateProfitService extends IService<CooperateProfit> {
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(CooperateProfit profit);
+
+    Result edit(CooperateProfit profit);
+
+    Result remove(Map<String, String> paramsMap);
+
+    //大屏农民总创收
+    Result profitCount(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/service/ICooperateRecoveryService.java

@@ -0,0 +1,26 @@
+package com.huimv.admin.cooperate.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.cooperate.entity.CooperateRecovery;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.farm.entity.FarmCheck;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 合作共富秸秆采收 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+public interface ICooperateRecoveryService extends IService<CooperateRecovery> {
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(CooperateRecovery recovery);
+
+    Result edit(CooperateRecovery recovery);
+
+    Result remove(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/service/impl/CooperateEmployeeServiceImpl.java

@@ -0,0 +1,64 @@
+package com.huimv.admin.cooperate.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.cooperate.entity.CooperateEmployee;
+import com.huimv.admin.cooperate.mapper.CooperateEmployeeMapper;
+import com.huimv.admin.cooperate.service.ICooperateEmployeeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.farm.entity.FarmCheck;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 合作共富助农就业 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+@Service
+public class CooperateEmployeeServiceImpl extends ServiceImpl<CooperateEmployeeMapper, CooperateEmployee> implements ICooperateEmployeeService {
+
+    @Autowired
+    private CooperateEmployeeMapper employeeMapper;
+    @Override
+    public Result listPage(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+            pageSize = "20";
+        }
+        Page<CooperateEmployee> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<CooperateEmployee> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        return new Result(ResultCode.SUCCESS, employeeMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public Result add(CooperateEmployee employee) {
+        return new Result(ResultCode.SUCCESS, employeeMapper.insert(employee));
+    }
+
+    @Override
+    public Result edit(CooperateEmployee employee) {
+        return new Result(ResultCode.SUCCESS, employeeMapper.updateById(employee));
+    }
+
+    @Override
+    public Result remove(Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            employeeMapper.deleteById(s);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/service/impl/CooperateMachiningServiceImpl.java

@@ -0,0 +1,64 @@
+package com.huimv.admin.cooperate.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.cooperate.entity.CooperateMachining;
+import com.huimv.admin.cooperate.mapper.CooperateMachiningMapper;
+import com.huimv.admin.cooperate.service.ICooperateMachiningService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.farm.entity.FarmCheck;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 合作共富羊粪加工 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+@Service
+public class CooperateMachiningServiceImpl extends ServiceImpl<CooperateMachiningMapper, CooperateMachining> implements ICooperateMachiningService {
+
+    @Autowired
+    private CooperateMachiningMapper machiningMapper;
+    @Override
+    public Result listPage(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+            pageSize = "20";
+        }
+        Page<CooperateMachining> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<CooperateMachining> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        return new Result(ResultCode.SUCCESS, machiningMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public Result add(CooperateMachining machining) {
+        return new Result(ResultCode.SUCCESS, machiningMapper.insert(machining));
+    }
+
+    @Override
+    public Result edit(CooperateMachining machining) {
+        return new Result(ResultCode.SUCCESS, machiningMapper.updateById(machining));
+    }
+
+    @Override
+    public Result remove(Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            machiningMapper.deleteById(s);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/service/impl/CooperateProfitServiceImpl.java

@@ -0,0 +1,76 @@
+package com.huimv.admin.cooperate.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.utils.DataUill;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.cooperate.entity.CooperateProfit;
+import com.huimv.admin.cooperate.mapper.CooperateProfitMapper;
+import com.huimv.admin.cooperate.service.ICooperateProfitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.farm.entity.FarmCheck;
+import com.huimv.admin.farm.entity.FarmSale;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>
+ * 合作共富收益分配 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+@Service
+public class CooperateProfitServiceImpl extends ServiceImpl<CooperateProfitMapper, CooperateProfit> implements ICooperateProfitService {
+
+    @Autowired
+    private CooperateProfitMapper profitMapper;
+    @Override
+    public Result listPage(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+            pageSize = "20";
+        }
+        Page<CooperateProfit> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<CooperateProfit> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        return new Result(ResultCode.SUCCESS, profitMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public Result add(CooperateProfit profit) {
+        return new Result(ResultCode.SUCCESS, profitMapper.insert(profit));
+    }
+
+    @Override
+    public Result edit(CooperateProfit profit) {
+        return new Result(ResultCode.SUCCESS, profitMapper.updateById(profit));
+    }
+
+    @Override
+    public Result remove(Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            profitMapper.deleteById(s);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result profitCount(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<CooperateProfit> queryWrapper = new QueryWrapper<>();
+        Date yearStartTime = DataUill.getCurrentYearStartTime();
+        queryWrapper.eq("farm_id", farmId).ge("profit_time", yearStartTime);
+        return new Result(ResultCode.SUCCESS, profitMapper.profitCount(queryWrapper));
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/cooperate/service/impl/CooperateRecoveryServiceImpl.java

@@ -0,0 +1,64 @@
+package com.huimv.admin.cooperate.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.cooperate.entity.CooperateRecovery;
+import com.huimv.admin.cooperate.mapper.CooperateRecoveryMapper;
+import com.huimv.admin.cooperate.service.ICooperateRecoveryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.farm.entity.FarmCheck;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 合作共富秸秆采收 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-21
+ */
+@Service
+public class CooperateRecoveryServiceImpl extends ServiceImpl<CooperateRecoveryMapper, CooperateRecovery> implements ICooperateRecoveryService {
+
+    @Autowired
+    private CooperateRecoveryMapper recoveryMapper;
+    @Override
+    public Result listPage(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+            pageSize = "20";
+        }
+        Page<CooperateRecovery> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<CooperateRecovery> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        return new Result(ResultCode.SUCCESS, recoveryMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public Result add(CooperateRecovery recovery) {
+        return new Result(ResultCode.SUCCESS, recoveryMapper.insert(recovery));
+    }
+
+    @Override
+    public Result edit(CooperateRecovery recovery) {
+        return new Result(ResultCode.SUCCESS, recoveryMapper.updateById(recovery));
+    }
+
+    @Override
+    public Result remove(Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            recoveryMapper.deleteById(s);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/BaseBuilding.java

@@ -65,5 +65,9 @@ public class BaseBuilding implements Serializable {
 
     private String other3;
 
+    private Integer columnNum;
+
+    private Integer buildType;
+
 
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/BreedTupping.java

@@ -62,5 +62,9 @@ public class BreedTupping implements Serializable {
      */
     private Integer farmId;
 
+    private String tuppingMethod;
+
+    private String tuppingResult;
+
 
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/BreedVaccinationPlan.java

@@ -57,7 +57,7 @@ public class BreedVaccinationPlan implements Serializable {
     /**
      * 执行时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
     private Date performTime;
 
     /**

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/BreedVaccinationProcedure.java

@@ -5,6 +5,9 @@ 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.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -36,7 +39,8 @@ public class BreedVaccinationProcedure implements Serializable {
     /**
      * 免疫时间
      */
-    private LocalDateTime vaccinationTime;
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date vaccinationTime;
 
     /**
      * 免疫药物单位
@@ -61,7 +65,8 @@ public class BreedVaccinationProcedure implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date createTime;
 
     /**
      * 牧场编码

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/EarmarkThreshold.java

@@ -0,0 +1,66 @@
+package com.huimv.admin.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-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("earmark_threshold")
+public class EarmarkThreshold implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 耳标超时设置
+     */
+    private Integer earmarkHour;
+
+    /**
+     * 体温上线
+     */
+    private String tempUpper;
+
+    /**
+     * 体温下限
+     */
+    private String tempDown;
+
+    /**
+     * 羊只运动量上线
+     */
+    private String actUpper;
+
+    /**
+     * 羊只运动量下限
+     */
+    private String actDown;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+    /**
+     * 采集器超时设置
+     */
+    private Integer collectorHour;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/EnergyThreshold.java

@@ -0,0 +1,56 @@
+package com.huimv.admin.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-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("energy_threshold")
+public class EnergyThreshold implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 累计用水上线
+     */
+    private String waterUpper;
+
+    /**
+     * 累计用水下限
+     */
+    private String waterDown;
+
+    /**
+     * 累计用电上线
+     */
+    private String electricityUpper;
+
+    /**
+     * 累计用电下限
+     */
+    private String electricityDown;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/EnvThreshold.java

@@ -0,0 +1,86 @@
+package com.huimv.admin.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-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_threshold")
+public class EnvThreshold implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 温度上线
+     */
+    private String tempUpper;
+
+    /**
+     * 温度下限
+     */
+    private String tempDown;
+
+    /**
+     * 湿度上线
+     */
+    private String humUpper;
+
+    /**
+     * 湿度下限
+     */
+    private String humDown;
+
+    /**
+     * 氧气上线
+     */
+    private String oxygenUpper;
+
+    /**
+     * 氧气下限
+     */
+    private String oxygenDown;
+
+    /**
+     * 硫化氢上线
+     */
+    private String h2sUpper;
+
+    /**
+     * 硫化氢下限
+     */
+    private String h2sDown;
+
+    /**
+     * 光照上线
+     */
+    private String lightUpper;
+
+    /**
+     * 光照下限
+     */
+    private String lightDown;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/ProtSheepInfo.java

@@ -97,4 +97,8 @@ public class ProtSheepInfo implements Serializable {
     private String grade;
 
     private Integer isBatch;
+
+    private String sheepVariety;
+
+    private String inspectResult;
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/ProtWarning.java

@@ -0,0 +1,56 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 预警信息
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("prot_warning")
+public class ProtWarning implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 创建时间
+     */
+
+    private Date createTime;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+    private Integer warningType;
+
+    private Integer unitId;
+
+    private String unitName;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/TreeSheepInfo.java

@@ -0,0 +1,32 @@
+package com.huimv.admin.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TreeSheepInfo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private Integer id;
+
+    private String sheepId;
+
+    private Integer dayNum;
+
+    private Integer sex;
+
+    private String sheepVariety;
+
+    private String unitName;
+
+    private TreeSheepInfo fatherSheep;
+
+    private TreeSheepInfo motherSheep;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/vo/BreedVaccinationVo.java

@@ -0,0 +1,12 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BreedVaccinationVo {
+    private String medicine;
+    private Integer vaccinationCount;
+    private Date createDate;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/vo/DiseaseVo.java

@@ -0,0 +1,10 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class DiseaseVo {
+    private String diseaseName;
+
+    private String values;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/vo/ProduceVo.java

@@ -0,0 +1,9 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class ProduceVo {
+    private String produceName;
+    private String values;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/vo/ProtSheepScreenVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class ProtSheepScreenVo {
+    private String sheepId;
+    private String sheepVariety;
+    private String inspectResult;
+    private Integer sheepDay;
+    private String unitName;
+    private String act;
+    private String vaccinationResult;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmAssetsController.java

@@ -0,0 +1,63 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.BreedChildbirth;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.service.IFarmAssetsService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-assets")
+@CrossOrigin
+public class FarmAssetsController {
+    @Autowired
+    private IFarmAssetsService assetsService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return assetsService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmAssets assets) {
+        return assetsService.add(assets);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmAssets assets) {
+        return assetsService.edit(assets);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return assetsService.remove(paramsMap);
+    }
+
+    //根据编号获取设备列表
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String deviceCode = paramsMap.get("deviceCode");
+        QueryWrapper<FarmAssets> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(deviceCode), "device_code", deviceCode);
+        return new Result(ResultCode.SUCCESS, assetsService.list(queryWrapper));
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmCheckController.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmCheck;
+import com.huimv.admin.farm.service.IFarmCheckService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-check")
+@CrossOrigin
+public class FarmCheckController {
+    @Autowired
+    private IFarmCheckService farmCheckService;
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return farmCheckService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmCheck check) {
+        return farmCheckService.add(check);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmCheck check) {
+        return farmCheckService.edit(check);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return farmCheckService.remove(paramsMap);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmCustomerController.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmCustomer;
+import com.huimv.admin.farm.service.IFarmCustomerService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-customer")
+@CrossOrigin
+public class FarmCustomerController {
+
+    @Autowired
+    private IFarmCustomerService customerService;
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return customerService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmCustomer customer) {
+        return customerService.add(customer);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmCustomer customer) {
+        return customerService.edit(customer);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return customerService.remove(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmFaultController.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmFault;
+import com.huimv.admin.farm.service.IFarmFaultService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-fault")
+@CrossOrigin
+public class FarmFaultController {
+
+    @Autowired
+    private IFarmFaultService faultService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return faultService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmFault fault) {
+        return faultService.add(fault);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmFault fault) {
+        return faultService.edit(fault);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return faultService.remove(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmGoodsController.java

@@ -0,0 +1,65 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmGoods;
+import com.huimv.admin.farm.service.IFarmGoodsService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-goods")
+@CrossOrigin
+public class FarmGoodsController {
+
+    @Autowired
+    private IFarmGoodsService goodsService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return goodsService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmGoods goods) {
+        return goodsService.add(goods);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmGoods goods) {
+        return goodsService.edit(goods);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return goodsService.remove(paramsMap);
+    }
+
+
+    //根据商品编号获取商品列表
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String goodsCode = paramsMap.get("goodsCode");
+        QueryWrapper<FarmGoods> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(goodsCode), "goods_code", goodsCode);
+        return new Result(ResultCode.SUCCESS, goodsService.list(queryWrapper));
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmInStockController.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmGoods;
+import com.huimv.admin.farm.entity.FarmInStock;
+import com.huimv.admin.farm.service.IFarmInStockService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-in-stock")
+@CrossOrigin
+public class FarmInStockController {
+
+    @Autowired
+    private IFarmInStockService inStockService;
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return inStockService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmInStock inStock) {
+        return inStockService.add(inStock);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmInStock inStock) {
+        return inStockService.edit(inStock);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return inStockService.remove(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmMaintainController.java

@@ -0,0 +1,52 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmMaintain;
+import com.huimv.admin.farm.service.IFarmMaintainService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-maintain")
+@CrossOrigin
+public class FarmMaintainController {
+    @Autowired
+    private IFarmMaintainService maintainService;
+
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return maintainService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmMaintain maintain) {
+        return maintainService.add(maintain);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmMaintain maintain) {
+        return maintainService.edit(maintain);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return maintainService.remove(paramsMap);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmOutStockController.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmInStock;
+import com.huimv.admin.farm.entity.FarmOutStock;
+import com.huimv.admin.farm.service.IFarmOutStockService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-out-stock")
+@CrossOrigin
+public class FarmOutStockController {
+    @Autowired
+    private IFarmOutStockService outStockService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return outStockService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmOutStock outStock) {
+        return outStockService.add(outStock);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmOutStock outStock) {
+        return outStockService.edit(outStock);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return outStockService.remove(paramsMap);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmPurchaseController.java

@@ -0,0 +1,57 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmPurchase;
+import com.huimv.admin.farm.service.IFarmPurchaseService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-purchase")
+@CrossOrigin
+public class FarmPurchaseController {
+
+    @Autowired
+    private IFarmPurchaseService purchaseService;
+
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return purchaseService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmPurchase purchase) {
+        return purchaseService.add(purchase);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmPurchase purchase) {
+        return purchaseService.edit(purchase);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return purchaseService.remove(paramsMap);
+    }
+
+    @RequestMapping("/listAnalysis")
+    public Result listAnalysis(@RequestBody Map<String, String> paramsMap) {
+        return purchaseService.listAnalysis(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmRepairController.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmRepair;
+import com.huimv.admin.farm.service.IFarmRepairService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-repair")
+@CrossOrigin
+public class FarmRepairController {
+    @Autowired
+    private IFarmRepairService repairService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return repairService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmRepair repair) {
+        return repairService.add(repair);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmRepair repair) {
+        return repairService.edit(repair);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return repairService.remove(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmSaleController.java

@@ -0,0 +1,69 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmRepair;
+import com.huimv.admin.farm.entity.FarmSale;
+import com.huimv.admin.farm.service.IFarmSaleService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-sale")
+@CrossOrigin
+public class FarmSaleController {
+
+    @Autowired
+    private IFarmSaleService saleService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return saleService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmSale sale) {
+        return saleService.add(sale);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmSale sale) {
+        return saleService.edit(sale);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return saleService.remove(paramsMap);
+    }
+
+    //销售总额
+    @RequestMapping("/moneyCount")
+    public Result moneyCount(@RequestBody Map<String, String> paramsMap) {
+        return saleService.moneyCount(paramsMap);
+    }
+
+    //销售金额分析
+    @RequestMapping("/listAnalysis")
+    public Result listAnalysis(@RequestBody Map<String, String> paramsMap) {
+        return saleService.listAnalysis(paramsMap);
+    }
+
+    //销售分析
+    @RequestMapping("/listSaleAnalysis")
+    public Result listSaleAnalysis(@RequestBody Map<String, String> paramsMap) {
+        return saleService.listSaleAnalysis(paramsMap);
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmStockController.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmSale;
+import com.huimv.admin.farm.entity.FarmStock;
+import com.huimv.admin.farm.service.IFarmStockService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-stock")
+@CrossOrigin
+public class FarmStockController {
+    @Autowired
+    private IFarmStockService stockService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return stockService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmStock stock) {
+        return stockService.add(stock);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmStock stock) {
+        return stockService.edit(stock);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return stockService.remove(paramsMap);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmSupplierController.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmRepair;
+import com.huimv.admin.farm.entity.FarmSupplier;
+import com.huimv.admin.farm.service.IFarmSupplierService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-supplier")
+@CrossOrigin
+public class FarmSupplierController {
+    @Autowired
+    private IFarmSupplierService supplierService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return supplierService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmSupplier supplier) {
+        return supplierService.add(supplier);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmSupplier supplier) {
+        return supplierService.edit(supplier);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return supplierService.remove(paramsMap);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/controller/FarmTransferController.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.farm.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmSupplier;
+import com.huimv.admin.farm.entity.FarmTransfer;
+import com.huimv.admin.farm.service.IFarmTransferService;
+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-08-20
+ */
+@RestController
+@RequestMapping("/farm-transfer")
+@CrossOrigin
+public class FarmTransferController {
+    @Autowired
+    private IFarmTransferService farmTransferService;
+
+    @RequestMapping("/listPage")
+    public Result listPage(@RequestBody Map<String, String> paramsMap) {
+        return farmTransferService.listPage(paramsMap);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody FarmTransfer transfer) {
+        return farmTransferService.add(transfer);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody FarmTransfer transfer) {
+        return farmTransferService.edit(transfer);
+    }
+    @RequestMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) {
+        return farmTransferService.remove(paramsMap);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmAssets.java

@@ -0,0 +1,107 @@
+package com.huimv.admin.farm.entity;
+
+import java.math.BigDecimal;
+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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖设备资产管理
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_assets")
+public class FarmAssets implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 规格
+     */
+    private String format;
+
+    /**
+     * 生产厂家
+     */
+    private String manufactor;
+
+    /**
+     * 采购日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date buyTime;
+
+    /**
+     * 采购金额
+     */
+    private BigDecimal price;
+
+    /**
+     * 资产类别0 流动资产 1固定资产 2其他资产
+     */
+    private Integer assetsType;
+
+    /**
+     * 使用年限
+     */
+    private String useYear;
+
+    /**
+     * 折扣金额
+     */
+    private String discountMoney;
+
+    /**
+     * 使用状态 0在用 1待报废 2已报废
+     */
+    private Integer useStatus;
+
+    /**
+     * 安装位置
+     */
+    private String installName;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmCheck.java

@@ -0,0 +1,91 @@
+package com.huimv.admin.farm.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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖巡查
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_check")
+public class FarmCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 巡查时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date checkTime;
+
+    /**
+     * 巡查人员
+     */
+    private String checkUser;
+
+    /**
+     * 栋舍名称
+     */
+    private String unitName;
+
+    /**
+     * 环境状况
+     */
+    private String envAspect;
+
+    /**
+     * 动物健康状况
+     */
+    private String animalAspect;
+
+    /**
+     * 清洁状况
+     */
+    private String cleanAspect;
+
+    /**
+     * 设备状况
+     */
+    private String deviceAspect;
+
+    /**
+     * 其他异常情况描述
+     */
+    private String otherAspect;
+
+    /**
+     * 采取措施
+     */
+    private String takeSteps;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmCustomer.java

@@ -0,0 +1,86 @@
+package com.huimv.admin.farm.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-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_customer")
+public class FarmCustomer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 客户编号
+     */
+    private String customerCode;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String contactsNumber;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 业务范围
+     */
+    private String jobContent;
+
+    /**
+     * 开户行
+     */
+    private String bankName;
+
+    /**
+     * 银行账号
+     */
+    private String bankNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmFault.java

@@ -0,0 +1,81 @@
+package com.huimv.admin.farm.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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖排障记录
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_fault")
+public class FarmFault implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 排障日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date faultTime;
+
+    /**
+     * 故障描述
+     */
+    private String faultDescribe;
+
+    /**
+     * 排障任务描述
+     */
+    private String taskDescribe;
+
+    /**
+     * 排障人员
+     */
+    private String faultUser;
+
+    /**
+     * 工时
+     */
+    private String workingHours;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmGoods.java

@@ -0,0 +1,56 @@
+package com.huimv.admin.farm.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-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_goods")
+public class FarmGoods implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商品编码
+     */
+    private String goodsCode;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品型号
+     */
+    private String goodsType;
+
+    /**
+     * 单位
+     */
+    private String goodsUnit;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmInStock.java

@@ -0,0 +1,107 @@
+package com.huimv.admin.farm.entity;
+
+import java.math.BigDecimal;
+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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖入库
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_in_stock")
+public class FarmInStock implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 入库单号
+     */
+    private String inOrder;
+
+    /**
+     * 入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date inTime;
+
+    /**
+     * 仓库名称
+     */
+    private String stockName;
+
+    /**
+     * 商品编码
+     */
+    private String goodsCode;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 型号
+     */
+    private String goodsType;
+
+    /**
+     * 单位
+     */
+    private String goodsUnit;
+
+    /**
+     * 数量
+     */
+    private Integer number;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 总价
+     */
+    private String money;
+
+    /**
+     * 入款类型0采购入库1生产入库2退货入库
+     */
+    private Integer inType;
+
+    /**
+     * 操作人
+     */
+    private String registerUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmMaintain.java

@@ -0,0 +1,81 @@
+package com.huimv.admin.farm.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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖保养记录
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_maintain")
+public class FarmMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 保养日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date maintainTime;
+
+    /**
+     * 保养类型 0日常保养 1定期保养
+     */
+    private Integer maintainType;
+
+    /**
+     * 保养任务描述
+     */
+    private String taskDescribe;
+
+    /**
+     * 保养人员
+     */
+    private String maintainUser;
+
+    /**
+     * 工时
+     */
+    private String workingHours;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmOutStock.java

@@ -0,0 +1,104 @@
+package com.huimv.admin.farm.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖出库
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_out_stock")
+public class FarmOutStock implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 出库单号
+     */
+    private String outOrder;
+
+    /**
+     * 出库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date outTime;
+
+    /**
+     * 仓库名称
+     */
+    private String stockName;
+
+    /**
+     * 商品编码
+     */
+    private String goodsCode;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 型号
+     */
+    private String goodsType;
+
+    /**
+     * 单位
+     */
+    private String goodsUnit;
+
+    /**
+     * 数量
+     */
+    private Integer number;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 总价
+     */
+    private String money;
+
+    /**
+     * 出库类型0销售出库1领料出库2退货出库
+     */
+    private Integer outType;
+
+    /**
+     * 操作人
+     */
+    private String registerUser;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+    private String remark;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmPurchase.java

@@ -0,0 +1,99 @@
+package com.huimv.admin.farm.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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖采购
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_purchase")
+public class FarmPurchase implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 采购订单号
+     */
+    private String purchaseOrder;
+
+    /**
+     * 供应商名称
+     */
+    private String supplier;
+
+    /**
+     * 产品名称
+     */
+    private String produce;
+
+    /**
+     * 采购数量
+     */
+    private Integer number;
+
+    /**
+     * 采购金额
+     */
+    private String money;
+
+    /**
+     * 采购日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date purchaseTime;
+
+    /**
+     * 采购人员
+     */
+    private String purchaseUser;
+
+    /**
+     * 付款方式
+     */
+    private String paymentMethod;
+
+    /**
+     * 付款状态 0已付款 1未付款 2部分付款
+     */
+    private Integer paymentStatus;
+
+    /**
+     * 付款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date paymentTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+    private Integer produceType;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmRepair.java

@@ -0,0 +1,81 @@
+package com.huimv.admin.farm.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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖维修记录
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_repair")
+public class FarmRepair implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 维护日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date repairTime;
+
+    /**
+     * 维护类型0预防性维护 1预测性维护 2纠正性维护
+     */
+    private Integer repairType;
+
+    /**
+     * 维护任务描述
+     */
+    private String repairTask;
+
+    /**
+     * 维护人员
+     */
+    private String repairUser;
+
+    /**
+     * 工时
+     */
+    private String workingHours;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmSale.java

@@ -0,0 +1,98 @@
+package com.huimv.admin.farm.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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖销售
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_sale")
+public class FarmSale implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 销售订单号
+     */
+    private String saleOrder;
+
+    /**
+     * 客户名称
+     */
+    private String customer;
+
+    /**
+     * 产品名称
+     */
+    private String produce;
+
+    /**
+     * 销售数量
+     */
+    private Integer saleNumber;
+
+    /**
+     * 销售金额
+     */
+    private String saleMoney;
+
+    /**
+     * 销售日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date saleTime;
+
+    /**
+     * 销售人员
+     */
+    private String saleUser;
+
+    /**
+     * 付款方式
+     */
+    private String buyType;
+
+    /**
+     * 付款状态
+     */
+    private Integer buyStatus;
+
+    /**
+     * 付款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date buyTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+    private Integer produceType;
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmStock.java

@@ -0,0 +1,56 @@
+package com.huimv.admin.farm.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-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_stock")
+public class FarmStock implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 仓库名称
+     */
+    private String stockName;
+
+    /**
+     * 仓库地址
+     */
+    private String stockAddress;
+
+    /**
+     * 仓管员姓名
+     */
+    private String stockUser;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmSupplier.java

@@ -0,0 +1,86 @@
+package com.huimv.admin.farm.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-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_supplier")
+public class FarmSupplier implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 供应商编号
+     */
+    private String supplierCode;
+
+    /**
+     * 供应商名称
+     */
+    private String supplierName;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String contactNumber;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 供应商产品类型
+     */
+    private String supplierType;
+
+    /**
+     * 开户行
+     */
+    private String bankName;
+
+    /**
+     * 银行账号
+     */
+    private String bankNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/FarmTransfer.java

@@ -0,0 +1,112 @@
+package com.huimv.admin.farm.entity;
+
+import java.math.BigDecimal;
+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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 农场养殖调拨
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("farm_transfer")
+public class FarmTransfer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 调拨单号
+     */
+    private String transferCode;
+
+    /**
+     * 调拨日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    private Date transferTime;
+
+    /**
+     * 出库仓库
+     */
+    private String outStockName;
+
+    /**
+     * 入库仓库
+     */
+    private String inStockName;
+
+    /**
+     * 商品编码
+     */
+    private String goodsCode;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 型号
+     */
+    private String goodsType;
+
+    /**
+     * 单位
+     */
+    private String goodsUnit;
+
+    /**
+     * 数量
+     */
+    private Integer number;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 总价
+     */
+    private String money;
+
+    /**
+     * 转舍原因
+     */
+    private String transferReason;
+
+    /**
+     * 操作人
+     */
+    private String registerUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/vo/AnalysisVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.farm.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AnalysisVo {
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+
+    private String values;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/vo/AnalysisVo2.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AnalysisVo2 {
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+
+    private String values;
+
+    private String type;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/entity/vo/CountScreenVo.java

@@ -0,0 +1,9 @@
+package com.huimv.admin.farm.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class CountScreenVo {
+    private String farmId;
+    private Integer countMoney;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmAssetsMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖设备资产管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmAssetsMapper extends BaseMapper<FarmAssets> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmCheckMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmCheck;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖巡查 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmCheckMapper extends BaseMapper<FarmCheck> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmCustomerMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmCustomer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖客户 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmCustomerMapper extends BaseMapper<FarmCustomer> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmFaultMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmFault;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖排障记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmFaultMapper extends BaseMapper<FarmFault> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmGoodsMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖物资 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmGoodsMapper extends BaseMapper<FarmGoods> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmInStockMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmInStock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖入库 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmInStockMapper extends BaseMapper<FarmInStock> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmMaintainMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖保养记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmMaintainMapper extends BaseMapper<FarmMaintain> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmOutStockMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmOutStock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖出库 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmOutStockMapper extends BaseMapper<FarmOutStock> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmPurchaseMapper.java

@@ -0,0 +1,23 @@
+package com.huimv.admin.farm.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.admin.farm.entity.FarmPurchase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.farm.entity.vo.AnalysisVo;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 农场养殖采购 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmPurchaseMapper extends BaseMapper<FarmPurchase> {
+
+    List<AnalysisVo> analysis(@Param(Constants.WRAPPER) QueryWrapper<FarmPurchase> queryWrapper);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmRepairMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmRepair;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖维修记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmRepairMapper extends BaseMapper<FarmRepair> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmSaleMapper.java

@@ -0,0 +1,31 @@
+package com.huimv.admin.farm.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.admin.farm.entity.FarmPurchase;
+import com.huimv.admin.farm.entity.FarmSale;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.farm.entity.vo.AnalysisVo;
+import com.huimv.admin.farm.entity.vo.AnalysisVo2;
+import com.huimv.admin.farm.entity.vo.CountScreenVo;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 农场养殖销售 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmSaleMapper extends BaseMapper<FarmSale> {
+    //今年销售总额
+    CountScreenVo moneyCount(@Param(Constants.WRAPPER) QueryWrapper<FarmSale> queryWrapper);
+
+    //销售金额分析
+    List<AnalysisVo2> analysis(@Param(Constants.WRAPPER) QueryWrapper<FarmSale> queryWrapper);
+
+    List<AnalysisVo> saleAnalysis(@Param(Constants.WRAPPER) QueryWrapper<FarmSale> queryWrapper);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmStockMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmStock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖仓库 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmStockMapper extends BaseMapper<FarmStock> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmSupplierMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmSupplier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖供应商 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmSupplierMapper extends BaseMapper<FarmSupplier> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/mapper/FarmTransferMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.farm.mapper;
+
+import com.huimv.admin.farm.entity.FarmTransfer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 农场养殖调拨 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface FarmTransferMapper extends BaseMapper<FarmTransfer> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/service/IFarmAssetsService.java

@@ -0,0 +1,28 @@
+package com.huimv.admin.farm.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.BreedChildbirth;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 农场养殖设备资产管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface IFarmAssetsService extends IService<FarmAssets> {
+
+
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(FarmAssets farmAssets);
+
+    Result edit(FarmAssets farmAssets);
+
+    Result remove(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/service/IFarmCheckService.java

@@ -0,0 +1,27 @@
+package com.huimv.admin.farm.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmCheck;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 农场养殖巡查 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface IFarmCheckService extends IService<FarmCheck> {
+
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(FarmCheck farmCheck);
+
+    Result edit(FarmCheck farmCheck);
+
+    Result remove(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/service/IFarmCustomerService.java

@@ -0,0 +1,27 @@
+package com.huimv.admin.farm.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmCustomer;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 农场养殖客户 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface IFarmCustomerService extends IService<FarmCustomer> {
+
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(FarmCustomer customer);
+
+    Result edit(FarmCustomer customer);
+
+    Result remove(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/service/IFarmFaultService.java

@@ -0,0 +1,27 @@
+package com.huimv.admin.farm.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmFault;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.farm.entity.FarmGoods;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 农场养殖排障记录 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface IFarmFaultService extends IService<FarmFault> {
+
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(FarmFault fault);
+
+    Result edit(FarmFault fault);
+
+    Result remove(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/service/IFarmGoodsService.java

@@ -0,0 +1,28 @@
+package com.huimv.admin.farm.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmGoods;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 农场养殖物资 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface IFarmGoodsService extends IService<FarmGoods> {
+
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(FarmGoods goods);
+
+    Result edit(FarmGoods goods);
+
+    Result remove(Map<String, String> paramsMap);
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/service/IFarmInStockService.java

@@ -0,0 +1,27 @@
+package com.huimv.admin.farm.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmGoods;
+import com.huimv.admin.farm.entity.FarmInStock;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 农场养殖入库 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface IFarmInStockService extends IService<FarmInStock> {
+
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(FarmInStock inStock);
+
+    Result edit(FarmInStock inStock);
+
+    Result remove(Map<String, String> paramsMap);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/farm/service/IFarmMaintainService.java

@@ -0,0 +1,27 @@
+package com.huimv.admin.farm.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.farm.entity.FarmAssets;
+import com.huimv.admin.farm.entity.FarmMaintain;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 农场养殖保养记录 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-20
+ */
+public interface IFarmMaintainService extends IService<FarmMaintain> {
+
+    Result listPage(Map<String, String> paramsMap);
+
+    Result add(FarmMaintain maintain);
+
+    Result edit(FarmMaintain maintain);
+
+    Result remove(Map<String, String> paramsMap);
+}