wwh преди 2 месеца
родител
ревизия
f6cb11071e
променени са 87 файла, в които са добавени 4670 реда и са изтрити 5 реда
  1. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbAnteMortemInspectionController.java
  2. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbCheckClenbuterolController.java
  3. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbCheckMeatQualifiedController.java
  4. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbCheckResidueController.java
  5. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbCheckTrichinellaController.java
  6. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbDisinfectController.java
  7. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbEntranceCheckController.java
  8. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbEquipMaintenanceDailyController.java
  9. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbEquipMaintenanceMonthlyController.java
  10. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbEquipMaintenanceWeeklyController.java
  11. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbHarmlessStagingController.java
  12. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbHarmlessTreatmentController.java
  13. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbReleaseRecordController.java
  14. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbSamplingRetainedController.java
  15. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbSlaughterSummaryMonthlyController.java
  16. 56 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbAnteMortemInspectionEntity.java
  17. 16 2
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckAsfEntity.java
  18. 66 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckClenbuterolEntity.java
  19. 74 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckMeatQualifiedEntity.java
  20. 66 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckResidueEntity.java
  21. 54 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckTrichinellaEntity.java
  22. 52 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbDisinfectEntity.java
  23. 71 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbEntranceCheckEntity.java
  24. 80 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbEquipMaintenanceDailyEntity.java
  25. 80 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbEquipMaintenanceMonthlyEntity.java
  26. 80 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbEquipMaintenanceWeeklyEntity.java
  27. 47 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbHarmlessStagingEntity.java
  28. 95 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbHarmlessTreatmentEntity.java
  29. 75 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbReleaseRecordEntity.java
  30. 71 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbSamplingRetainedEntity.java
  31. 73 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbSlaughterSummaryMonthlyEntity.java
  32. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbAnteMortemInspectionMapper.java
  33. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbCheckClenbuterolMapper.java
  34. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbCheckMeatQualifiedMapper.java
  35. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbCheckResidueMapper.java
  36. 15 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbCheckTrichinellaMapper.java
  37. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbDisinfectMapper.java
  38. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbEntranceCheckMapper.java
  39. 15 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbEquipMaintenanceDailyMapper.java
  40. 15 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbEquipMaintenanceMonthlyMapper.java
  41. 15 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbEquipMaintenanceWeeklyMapper.java
  42. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbHarmlessStagingMapper.java
  43. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbHarmlessTreatmentMapper.java
  44. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbReleaseRecordMapper.java
  45. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbSamplingRetainedMapper.java
  46. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbSlaughterSummaryMonthlyMapper.java
  47. 57 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbAnteMortemInspectionPageReq.java
  48. 1 3
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckAsfPageReq.java
  49. 67 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckClenbuterolPageReq.java
  50. 72 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckMeatQualifiedPageReq.java
  51. 66 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckResiduePageReq.java
  52. 54 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckTrichinellaPageReq.java
  53. 54 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbDisinfectPageReq.java
  54. 71 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbEntranceCheckPageReq.java
  55. 74 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbEquipMaintenanceDailyPageReq.java
  56. 74 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbEquipMaintenanceMonthlyPageReq.java
  57. 74 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbEquipMaintenanceWeeklyPageReq.java
  58. 51 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbHarmlessStagingPageReq.java
  59. 95 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbHarmlessTreatmentPageReq.java
  60. 72 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbReleaseRecordPageReq.java
  61. 74 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbSamplingRetainedPageReq.java
  62. 72 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbSlaughterSummaryMonthlyPageReq.java
  63. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbAnteMortemInspectionService.java
  64. 26 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbCheckClenbuterolService.java
  65. 26 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbCheckMeatQualifiedService.java
  66. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbCheckResidueService.java
  67. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbCheckTrichinellaService.java
  68. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbDisinfectService.java
  69. 26 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbEntranceCheckService.java
  70. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbEquipMaintenanceDailyService.java
  71. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbEquipMaintenanceMonthlyService.java
  72. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbEquipMaintenanceWeeklyService.java
  73. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbHarmlessStagingService.java
  74. 26 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbHarmlessTreatmentService.java
  75. 26 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbReleaseRecordService.java
  76. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbSamplingRetainedService.java
  77. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbSlaughterSummaryMonthlyService.java
  78. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbCheckClenbuterolServiceImpl.java
  79. 73 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbCheckMeatQualifiedServiceImpl.java
  80. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEntranceCheckServiceImpl.java
  81. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceDailyServiceImpl.java
  82. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceMonthlyServiceImpl.java
  83. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceWeeklyServiceImpl.java
  84. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbHarmlessTreatmentServiceImpl.java
  85. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbReleaseRecordServiceImpl.java
  86. 79 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbSlaughterSummaryMonthlyServiceImpl.java
  87. 403 0
      sql/v3_biz_20250814.sql

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbAnteMortemInspectionController.java

@@ -0,0 +1,61 @@
+//package com.ruoyi.web.v3.controller;
+//
+//
+//import com.ruoyi.common.core.domain.AjaxResult;
+//import com.ruoyi.web.v3.entity.HbAnteMortemInspectionEntity;
+//import com.ruoyi.web.v3.model.request.HbAnteMortemInspectionPageReq;
+//import com.ruoyi.web.v3.service.IHbAnteMortemInspectionService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.annotation.Resource;
+//import java.util.Map;
+//
+///**
+// * <p>
+// * v3.0宰前检验 前端控制器
+// * </p>
+// *
+// */
+//@RestController
+//@RequestMapping("/v3/hb-antemortem-inspection")
+//@Api("3.0宰前检验管理")
+//public class HbAnteMortemInspectionController {
+//
+//    @Resource
+//    private IHbAnteMortemInspectionService anteMortemInspectionService;
+//
+//    @ApiOperation("宰前检验记录添加")
+//    @PostMapping("/add")
+//    public AjaxResult add(@RequestBody HbAnteMortemInspectionEntity request){
+//        return anteMortemInspectionService.add(request);
+//    }
+//
+//    @ApiOperation("宰前检验记录修改")
+//    @PostMapping("/edit")
+//    public AjaxResult edit(@RequestBody HbAnteMortemInspectionEntity request){
+//        return anteMortemInspectionService.edit(request);
+//    }
+//
+//    @ApiOperation("宰前检验记录删除")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+//        String ids = paramsMap.get("ids");
+//        return anteMortemInspectionService.delete(ids);
+//    }
+//
+//    @ApiOperation("宰前检验记录分页查询")
+//    @GetMapping("/page")
+//    public AjaxResult page(@ModelAttribute HbAnteMortemInspectionPageReq request) {
+//        return anteMortemInspectionService.page(request);
+//    }
+//
+//
+//    @ApiOperation("宰前检验记录列表全量查询")
+//    @GetMapping("/list")
+//    public AjaxResult listAll(){
+//        return anteMortemInspectionService.listAll();
+//    }
+//
+//}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbCheckClenbuterolController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbCheckClenbuterolEntity;
+import com.ruoyi.web.v3.model.request.HbCheckClenbuterolPageReq;
+import com.ruoyi.web.v3.service.IHbCheckClenbuterolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0瘦肉精检测登记 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-check-clenbuterol")
+@Api("3.0瘦肉精检测登记管理")
+public class HbCheckClenbuterolController {
+
+    @Resource
+    private IHbCheckClenbuterolService checkClenbuterolService;
+
+    @ApiOperation("瘦肉精检测登记记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbCheckClenbuterolEntity request){
+        return checkClenbuterolService.add(request);
+    }
+
+    @ApiOperation("瘦肉精检测登记记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbCheckClenbuterolEntity request){
+        return checkClenbuterolService.edit(request);
+    }
+
+    @ApiOperation("瘦肉精检测登记记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return checkClenbuterolService.delete(ids);
+    }
+
+    @ApiOperation("瘦肉精检测登记记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbCheckClenbuterolPageReq request) {
+        return checkClenbuterolService.page(request);
+    }
+
+
+    @ApiOperation("瘦肉精检测登记记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return checkClenbuterolService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbCheckMeatQualifiedController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbCheckMeatQualifiedEntity;
+import com.ruoyi.web.v3.model.request.HbCheckMeatQualifiedPageReq;
+import com.ruoyi.web.v3.service.IHbCheckMeatQualifiedService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0肉品品质检验登记 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-check-meat-qualified")
+@Api("3.0肉品品质检验登记管理")
+public class HbCheckMeatQualifiedController {
+
+    @Resource
+    private IHbCheckMeatQualifiedService checkMeatQualifiedService;
+
+    @ApiOperation("肉品品质检验登记记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbCheckMeatQualifiedEntity request){
+        return checkMeatQualifiedService.add(request);
+    }
+
+    @ApiOperation("肉品品质检验登记记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbCheckMeatQualifiedEntity request){
+        return checkMeatQualifiedService.edit(request);
+    }
+
+    @ApiOperation("肉品品质检验登记记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return checkMeatQualifiedService.delete(ids);
+    }
+
+    @ApiOperation("肉品品质检验登记记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbCheckMeatQualifiedPageReq request) {
+        return checkMeatQualifiedService.page(request);
+    }
+
+
+    @ApiOperation("肉品品质检验登记记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return checkMeatQualifiedService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbCheckResidueController.java

@@ -0,0 +1,61 @@
+//package com.ruoyi.web.v3.controller;
+//
+//
+//import com.ruoyi.common.core.domain.AjaxResult;
+//import com.ruoyi.web.v3.entity.HbCheckResidueEntity;
+//import com.ruoyi.web.v3.model.request.HbCheckResiduePageReq;
+//import com.ruoyi.web.v3.service.IHbCheckResidueService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.annotation.Resource;
+//import java.util.Map;
+//
+///**
+// * <p>
+// * v3.0 药物残留检测登记 前端控制器
+// * </p>
+// *
+// */
+//@RestController
+//@RequestMapping("/v3/hb-check-residue")
+//@Api("3.0 药物残留检测登记")
+//public class HbCheckResidueController {
+//
+//    @Resource
+//    private IHbCheckResidueService checkResidueService;
+//
+//    @ApiOperation("药物残留检测登记记录添加")
+//    @PostMapping("/add")
+//    public AjaxResult add(@RequestBody HbCheckResidueEntity request){
+//        return checkResidueService.add(request);
+//    }
+//
+//    @ApiOperation("药物残留检测登记记录修改")
+//    @PostMapping("/edit")
+//    public AjaxResult edit(@RequestBody HbCheckResidueEntity request){
+//        return checkResidueService.edit(request);
+//    }
+//
+//    @ApiOperation("药物残留检测登记记录删除")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+//        String ids = paramsMap.get("ids");
+//        return checkResidueService.delete(ids);
+//    }
+//
+//    @ApiOperation("药物残留检测登记记录分页查询")
+//    @GetMapping("/page")
+//    public AjaxResult page(@ModelAttribute HbCheckResiduePageReq request) {
+//        return checkResidueService.page(request);
+//    }
+//
+//
+//    @ApiOperation("药物残留检测登记记录列表全量查询")
+//    @GetMapping("/list")
+//    public AjaxResult listAll(){
+//        return checkResidueService.listAll();
+//    }
+//
+//}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbCheckTrichinellaController.java

@@ -0,0 +1,61 @@
+//package com.ruoyi.web.v3.controller;
+//
+//
+//import com.ruoyi.common.core.domain.AjaxResult;
+//import com.ruoyi.web.v3.entity.HbCheckTrichinellaEntity;
+//import com.ruoyi.web.v3.model.request.HbCheckTrichinellaPageReq;
+//import com.ruoyi.web.v3.service.IHbCheckTrichinellaService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.annotation.Resource;
+//import java.util.Map;
+//
+///**
+// * <p>
+// * v3.0 旋毛虫检测登记 前端控制器
+// * </p>
+// *
+// */
+//@RestController
+//@RequestMapping("/v3/hb-check-trichinella")
+//@Api("3.0 旋毛虫检测登记")
+//public class HbCheckTrichinellaController {
+//
+//    @Resource
+//    private IHbCheckTrichinellaService checkTrichinellaService;
+//
+//    @ApiOperation("旋毛虫检测登记记录添加")
+//    @PostMapping("/add")
+//    public AjaxResult add(@RequestBody HbCheckTrichinellaEntity request){
+//        return checkTrichinellaService.add(request);
+//    }
+//
+//    @ApiOperation("旋毛虫检测登记记录修改")
+//    @PostMapping("/edit")
+//    public AjaxResult edit(@RequestBody HbCheckTrichinellaEntity request){
+//        return checkTrichinellaService.edit(request);
+//    }
+//
+//    @ApiOperation("旋毛虫检测登记记录删除")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+//        String ids = paramsMap.get("ids");
+//        return checkTrichinellaService.delete(ids);
+//    }
+//
+//    @ApiOperation("旋毛虫检测登记记录分页查询")
+//    @GetMapping("/page")
+//    public AjaxResult page(@ModelAttribute HbCheckTrichinellaPageReq request) {
+//        return checkTrichinellaService.page(request);
+//    }
+//
+//
+//    @ApiOperation("旋毛虫检测登记记录列表全量查询")
+//    @GetMapping("/list")
+//    public AjaxResult listAll(){
+//        return checkTrichinellaService.listAll();
+//    }
+//
+//}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbDisinfectController.java

@@ -0,0 +1,61 @@
+//package com.ruoyi.web.v3.controller;
+//
+//
+//import com.ruoyi.common.core.domain.AjaxResult;
+//import com.ruoyi.web.v3.entity.HbDisinfectEntity;
+//import com.ruoyi.web.v3.model.request.HbDisinfectPageReq;
+//import com.ruoyi.web.v3.service.IHbDisinfectService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.annotation.Resource;
+//import java.util.Map;
+//
+///**
+// * <p>
+// * v3.0 消毒记录 前端控制器
+// * </p>
+// *
+// */
+//@RestController
+//@RequestMapping("/v3/hb-disinfect")
+//@Api("3.0消毒管理")
+//public class HbDisinfectController {
+//
+//    @Resource
+//    private IHbDisinfectService disinfectService;
+//
+//    @ApiOperation("消毒记录添加")
+//    @PostMapping("/add")
+//    public AjaxResult add(@RequestBody HbDisinfectEntity request){
+//        return disinfectService.add(request);
+//    }
+//
+//    @ApiOperation("消毒记录修改")
+//    @PostMapping("/edit")
+//    public AjaxResult edit(@RequestBody HbDisinfectEntity request){
+//        return disinfectService.edit(request);
+//    }
+//
+//    @ApiOperation("消毒记录删除")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+//        String ids = paramsMap.get("ids");
+//        return disinfectService.delete(ids);
+//    }
+//
+//    @ApiOperation("消毒记录分页查询")
+//    @GetMapping("/page")
+//    public AjaxResult page(@ModelAttribute HbDisinfectPageReq request) {
+//        return disinfectService.page(request);
+//    }
+//
+//
+//    @ApiOperation("消毒记录列表全量查询")
+//    @GetMapping("/list")
+//    public AjaxResult listAll(){
+//        return disinfectService.listAll();
+//    }
+//
+//}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbEntranceCheckController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEntranceCheckEntity;
+import com.ruoyi.web.v3.model.request.HbEntranceCheckPageReq;
+import com.ruoyi.web.v3.service.IHbEntranceCheckService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0进场查验登记 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-entrance-check")
+@Api("3.0进场查验登记管理")
+public class HbEntranceCheckController {
+
+    @Resource
+    private IHbEntranceCheckService entranceCheckService;
+
+    @ApiOperation("进场查验登记记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbEntranceCheckEntity request){
+        return entranceCheckService.add(request);
+    }
+
+    @ApiOperation("进场查验登记记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbEntranceCheckEntity request){
+        return entranceCheckService.edit(request);
+    }
+
+    @ApiOperation("进场查验登记记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return entranceCheckService.delete(ids);
+    }
+
+    @ApiOperation("进场查验登记记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbEntranceCheckPageReq request) {
+        return entranceCheckService.page(request);
+    }
+
+
+    @ApiOperation("进场查验登记记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return entranceCheckService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbEquipMaintenanceDailyController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceDailyEntity;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceDailyPageReq;
+import com.ruoyi.web.v3.service.IHbEquipMaintenanceDailyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(日次) 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-maintenance-daily")
+@Api("3.0 设备维保记录(日次)")
+public class HbEquipMaintenanceDailyController {
+
+    @Resource
+    private IHbEquipMaintenanceDailyService equipMaintenanceService;
+
+    @ApiOperation("设备维保记录(日次)记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbEquipMaintenanceDailyEntity request){
+        return equipMaintenanceService.add(request);
+    }
+
+    @ApiOperation("设备维保记录(日次)记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbEquipMaintenanceDailyEntity request){
+        return equipMaintenanceService.edit(request);
+    }
+
+    @ApiOperation("设备维保记录(日次)记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return equipMaintenanceService.delete(ids);
+    }
+
+    @ApiOperation("设备维保记录(日次)记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbEquipMaintenanceDailyPageReq request) {
+        return equipMaintenanceService.page(request);
+    }
+
+
+    @ApiOperation("设备维保记录(日次)记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return equipMaintenanceService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbEquipMaintenanceMonthlyController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceMonthlyEntity;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceMonthlyPageReq;
+import com.ruoyi.web.v3.service.IHbEquipMaintenanceMonthlyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(月次) 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-maintenance-monthly")
+@Api("3.0 设备维保记录(月次)")
+public class HbEquipMaintenanceMonthlyController {
+
+    @Resource
+    private IHbEquipMaintenanceMonthlyService equipMaintenanceService;
+
+    @ApiOperation("设备维保记录(月次)记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbEquipMaintenanceMonthlyEntity request){
+        return equipMaintenanceService.add(request);
+    }
+
+    @ApiOperation("设备维保记录(月次)记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbEquipMaintenanceMonthlyEntity request){
+        return equipMaintenanceService.edit(request);
+    }
+
+    @ApiOperation("设备维保记录(月次)记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return equipMaintenanceService.delete(ids);
+    }
+
+    @ApiOperation("设备维保记录(月次)记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbEquipMaintenanceMonthlyPageReq request) {
+        return equipMaintenanceService.page(request);
+    }
+
+
+    @ApiOperation("设备维保记录(月次)记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return equipMaintenanceService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbEquipMaintenanceWeeklyController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceWeeklyEntity;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceWeeklyPageReq;
+import com.ruoyi.web.v3.service.IHbEquipMaintenanceWeeklyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(周次) 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-maintenance-weekly")
+@Api("3.0 设备维保记录(周次)")
+public class HbEquipMaintenanceWeeklyController {
+
+    @Resource
+    private IHbEquipMaintenanceWeeklyService equipMaintenanceService;
+
+    @ApiOperation("设备维保记录(周次)记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbEquipMaintenanceWeeklyEntity request){
+        return equipMaintenanceService.add(request);
+    }
+
+    @ApiOperation("设备维保记录(周次)记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbEquipMaintenanceWeeklyEntity request){
+        return equipMaintenanceService.edit(request);
+    }
+
+    @ApiOperation("设备维保记录(周次)记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return equipMaintenanceService.delete(ids);
+    }
+
+    @ApiOperation("设备维保记录(周次)记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbEquipMaintenanceWeeklyPageReq request) {
+        return equipMaintenanceService.page(request);
+    }
+
+
+    @ApiOperation("设备维保记录(周次)记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return equipMaintenanceService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbHarmlessStagingController.java

@@ -0,0 +1,61 @@
+//package com.ruoyi.web.v3.controller;
+//
+//
+//import com.ruoyi.common.core.domain.AjaxResult;
+//import com.ruoyi.web.v3.entity.HbHarmlessStagingEntity;
+//import com.ruoyi.web.v3.model.request.HbHarmlessStagingPageReq;
+//import com.ruoyi.web.v3.service.IHbHarmlessStagingService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.annotation.Resource;
+//import java.util.Map;
+//
+///**
+// * <p>
+// * v3.0无害化暂存 前端控制器
+// * </p>
+// *
+// */
+//@RestController
+//@RequestMapping("/v3/hb-harmless-staging")
+//@Api("3.0无害化暂存管理")
+//public class HbHarmlessStagingController {
+//
+//    @Resource
+//    private IHbHarmlessStagingService harmlessStagingService;
+//
+//    @ApiOperation("无害化暂存记录添加")
+//    @PostMapping("/add")
+//    public AjaxResult add(@RequestBody HbHarmlessStagingEntity request){
+//        return harmlessStagingService.add(request);
+//    }
+//
+//    @ApiOperation("无害化暂存记录修改")
+//    @PostMapping("/edit")
+//    public AjaxResult edit(@RequestBody HbHarmlessStagingEntity request){
+//        return harmlessStagingService.edit(request);
+//    }
+//
+//    @ApiOperation("无害化暂存记录删除")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+//        String ids = paramsMap.get("ids");
+//        return harmlessStagingService.delete(ids);
+//    }
+//
+//    @ApiOperation("无害化暂存记录分页查询")
+//    @GetMapping("/page")
+//    public AjaxResult page(@ModelAttribute HbHarmlessStagingPageReq request) {
+//        return harmlessStagingService.page(request);
+//    }
+//
+//
+//    @ApiOperation("无害化暂存记录列表全量查询")
+//    @GetMapping("/list")
+//    public AjaxResult listAll(){
+//        return harmlessStagingService.listAll();
+//    }
+//
+//}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbHarmlessTreatmentController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbHarmlessTreatmentEntity;
+import com.ruoyi.web.v3.model.request.HbHarmlessTreatmentPageReq;
+import com.ruoyi.web.v3.service.IHbHarmlessTreatmentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0无害化处理登记 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-harmless-treatment")
+@Api("3.0无害化处理登记管理")
+public class HbHarmlessTreatmentController {
+
+    @Resource
+    private IHbHarmlessTreatmentService harmlessTreatmentService;
+
+    @ApiOperation("无害化处理登记记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbHarmlessTreatmentEntity request){
+        return harmlessTreatmentService.add(request);
+    }
+
+    @ApiOperation("无害化处理登记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbHarmlessTreatmentEntity request){
+        return harmlessTreatmentService.edit(request);
+    }
+
+    @ApiOperation("无害化处理登记记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return harmlessTreatmentService.delete(ids);
+    }
+
+    @ApiOperation("无害化处理登记记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbHarmlessTreatmentPageReq request) {
+        return harmlessTreatmentService.page(request);
+    }
+
+
+    @ApiOperation("无害化处理登记记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return harmlessTreatmentService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbReleaseRecordController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbReleaseRecordEntity;
+import com.ruoyi.web.v3.model.request.HbReleaseRecordPageReq;
+import com.ruoyi.web.v3.service.IHbReleaseRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0出厂情况登记 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-release-record")
+@Api("3.0出厂情况登记管理")
+public class HbReleaseRecordController {
+
+    @Resource
+    private IHbReleaseRecordService releaseRecordService;
+
+    @ApiOperation("出厂情况登记记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbReleaseRecordEntity request){
+        return releaseRecordService.add(request);
+    }
+
+    @ApiOperation("出厂情况登记记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbReleaseRecordEntity request){
+        return releaseRecordService.edit(request);
+    }
+
+    @ApiOperation("出厂情况登记记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return releaseRecordService.delete(ids);
+    }
+
+    @ApiOperation("出厂情况登记记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbReleaseRecordPageReq request) {
+        return releaseRecordService.page(request);
+    }
+
+
+    @ApiOperation("出厂情况登记记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return releaseRecordService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbSamplingRetainedController.java

@@ -0,0 +1,61 @@
+//package com.ruoyi.web.v3.controller;
+//
+//
+//import com.ruoyi.common.core.domain.AjaxResult;
+//import com.ruoyi.web.v3.entity.HbSamplingRetainedEntity;
+//import com.ruoyi.web.v3.model.request.HbSamplingRetainedPageReq;
+//import com.ruoyi.web.v3.service.IHbSamplingRetainedService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.annotation.Resource;
+//import java.util.Map;
+//
+///**
+// * <p>
+// * v3.0留样记录 前端控制器
+// * </p>
+// *
+// */
+//@RestController
+//@RequestMapping("/v3/hb-sampling-retained")
+//@Api("3.0留样记录管理")
+//public class HbSamplingRetainedController {
+//
+//    @Resource
+//    private IHbSamplingRetainedService samplingRetainedService;
+//
+//    @ApiOperation("留样记录添加")
+//    @PostMapping("/add")
+//    public AjaxResult add(@RequestBody HbSamplingRetainedEntity request){
+//        return samplingRetainedService.add(request);
+//    }
+//
+//    @ApiOperation("留样记录修改")
+//    @PostMapping("/edit")
+//    public AjaxResult edit(@RequestBody HbSamplingRetainedEntity request){
+//        return samplingRetainedService.edit(request);
+//    }
+//
+//    @ApiOperation("留样记录删除")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+//        String ids = paramsMap.get("ids");
+//        return samplingRetainedService.delete(ids);
+//    }
+//
+//    @ApiOperation("留样记录分页查询")
+//    @GetMapping("/page")
+//    public AjaxResult page(@ModelAttribute HbSamplingRetainedPageReq request) {
+//        return samplingRetainedService.page(request);
+//    }
+//
+//
+//    @ApiOperation("留样记录列表全量查询")
+//    @GetMapping("/list")
+//    public AjaxResult listAll(){
+//        return samplingRetainedService.listAll();
+//    }
+//
+//}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbSlaughterSummaryMonthlyController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbSlaughterSummaryMonthlyEntity;
+import com.ruoyi.web.v3.model.request.HbSlaughterSummaryMonthlyPageReq;
+import com.ruoyi.web.v3.service.IHbSlaughterSummaryMonthlyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 屠宰情况月汇总 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb-slaughter-summary-monthly")
+@Api("3.0 屠宰情况月汇总")
+public class HbSlaughterSummaryMonthlyController {
+
+    @Resource
+    private IHbSlaughterSummaryMonthlyService slaughterSummaryMonthlyService;
+
+    @ApiOperation("屠宰情况月汇总记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbSlaughterSummaryMonthlyEntity request){
+        return slaughterSummaryMonthlyService.add(request);
+    }
+
+    @ApiOperation("屠宰情况月汇总记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbSlaughterSummaryMonthlyEntity request){
+        return slaughterSummaryMonthlyService.edit(request);
+    }
+
+    @ApiOperation("屠宰情况月汇总记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return slaughterSummaryMonthlyService.delete(ids);
+    }
+
+    @ApiOperation("屠宰情况月汇总记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbSlaughterSummaryMonthlyPageReq request) {
+        return slaughterSummaryMonthlyService.page(request);
+    }
+
+
+    @ApiOperation("屠宰情况月汇总记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return slaughterSummaryMonthlyService.listAll();
+    }
+
+}

+ 56 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbAnteMortemInspectionEntity.java

@@ -0,0 +1,56 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_ante_mortem_inspection")
+@ApiModel(value="hbAnteMortemInspection", description="v3.0 宰前检验记录")
+public class HbAnteMortemInspectionEntity extends AbstractEntity implements Serializable {
+
+    @ApiModelProperty(value = "生猪批次")
+    private String batchSeriesNo;
+
+    @ApiModelProperty(value = "入圈时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime divideTime;
+
+    @ApiModelProperty(value = "检验数量")
+    private Integer examineQuantity;
+
+    @ApiModelProperty(value = "准宰数量")
+    private Integer permissionSlaughterQuantity;
+
+    @ApiModelProperty(value = "急宰数量")
+    private Integer emergencySlaughterQuantity;
+
+    @ApiModelProperty(value = "死亡数量")
+    private Integer deadQuantity;
+
+    @ApiModelProperty(value = "处理情况")
+    private String processDetail;
+
+    @ApiModelProperty(value = "检验人")
+    private String examinerName;
+
+
+}

+ 16 - 2
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckAsfEntity.java

@@ -1,12 +1,18 @@
 package com.ruoyi.web.v3.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.common.core.domain.AbstractEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -66,12 +72,20 @@ public class HbCheckAsfEntity extends AbstractEntity implements Serializable {
     private String ownerName;
 
     @ApiModelProperty(value = "屠宰厂签名日期")
-    private String chargeTime;
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime chargeTime;
 
     @ApiModelProperty(value = "官方兽医确认(签名)")
     private String veterinaryName;
 
     @ApiModelProperty(value = "兽医签名日期")
-    private String veterinaryTime;
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime veterinaryTime;
 
 }

+ 66 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckClenbuterolEntity.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_check_clenbuterol")
+@ApiModel(value="hbCheckClenbuterol", description="v3.0 瘦肉精检测登记")
+public class HbCheckClenbuterolEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "记录时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordTime;
+
+    @ApiModelProperty(value = "货主名称")
+    private String cargoOwnerName;
+
+    @ApiModelProperty(value = "动物检疫证明编号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "溯源单编号")
+    private String traceRecordNo;
+
+    @ApiModelProperty(value = "畜禽数量(头/只/羽)")
+    private Integer livestockQuantity;
+
+    @ApiModelProperty(value = "抽检数量")
+    private Integer spotcheckQuantity;
+
+    @ApiModelProperty(value = "盐酸克伦特罗检测结果")
+    private String clenbuterol;
+
+    @ApiModelProperty(value = "莱克多巴胺检测结果")
+    private String ractopamine;
+
+    @ApiModelProperty(value = "沙丁胺醇检测结果")
+    private String salbutamol;
+
+    @ApiModelProperty(value = "处理方式")
+    private String processMethod;
+
+    @ApiModelProperty(value = "检测人员(签字)")
+    private String examinerConfirm;
+
+}

+ 74 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckMeatQualifiedEntity.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_check_meat_qualified")
+@ApiModel(value="HbCheckMeatQualified", description="v3.0 肉品品质检验登记")
+public class HbCheckMeatQualifiedEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "记录日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "准宰证号")
+    private String slaughterPermitNo;
+
+    @ApiModelProperty(value = "屠宰开始时间(格式:HH:mm:ss)")
+    private String startTime;
+
+    @ApiModelProperty(value = "屠宰结束时间(格式:HH:mm:ss)")
+    private String endTime;
+
+    @ApiModelProperty(value = "屠宰数量(头/只/羽)")
+    private Integer slaughterQuantity = 0;
+
+    @ApiModelProperty(value = "肉品品质检验合格数")
+    private Integer qualifiedQuantity = 0;
+
+    @ApiModelProperty(value = "肉品品质检验不合格数")
+    private Integer unqualifiedQuantity = 0;
+
+    @ApiModelProperty(value = "不合格原因说明")
+    private String unqualifiedReason;
+
+    @ApiModelProperty(value = "三腺等不可食用废弃物重量(公斤)")
+    private Integer wasteWeight = 0;
+
+    @ApiModelProperty(value = "兽医卫生检验人员签字")
+    private String veterinaryConfirm;
+
+    @ApiModelProperty(value = "备注信息")
+    private String remarks;
+
+    @ApiModelProperty(value = "企业名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "建档日期(建议格式:YYYY-MM)")
+    private String archiveDuration;
+
+
+
+}

+ 66 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckResidueEntity.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_check_residue")
+@ApiModel(value="hbCheckResidue", description="v3.0 药物残留检测登记")
+public class HbCheckResidueEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "记录时间", required = true)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "供货单位名称或供货人名称")
+    private String providerUnitName;
+
+    @ApiModelProperty(value = "数量(头/只/羽)")
+    private Integer supplyQuantity;
+
+    @ApiModelProperty(value = "抽检数量")
+    private Integer samplingQuantity;
+
+    @ApiModelProperty(value = "溯源单编号")
+    private String traceRecordNo;
+
+    @ApiModelProperty(value = "磺胺类检测结果")
+    private String sulfonamides;
+
+    @ApiModelProperty(value = "氟喹诺酮类检测结果")
+    private String fluoroquinolones;
+
+    @ApiModelProperty(value = "四环素类检测结果")
+    private String tetracyclines;
+
+    @ApiModelProperty(value = "处理方法说明")
+    private String processMethod;
+
+    @ApiModelProperty(value = "检测人员(签字)")
+    private String examinerConfirm;
+
+    @ApiModelProperty(value = "货主(签字)")
+    private String cargoOwnerConfirm;
+
+}

+ 54 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckTrichinellaEntity.java

@@ -0,0 +1,54 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_check_trichinella")
+@ApiModel(value="hbCheckTrichinella", description="v3.0 旋毛虫检测登记")
+public class HbCheckTrichinellaEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "抽检批次")
+    private String spotCheckNo;
+
+    @ApiModelProperty(value = "采样头数")
+    private Integer samplingQuantity;
+
+    @ApiModelProperty(value = "镜检份数")
+    private Integer mirrorExamQuantity;
+
+    @ApiModelProperty(value = "化验结果")
+    private String examineResult;
+
+    @ApiModelProperty(value = "检疫员")
+    private String examinerName;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

+ 52 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbDisinfectEntity.java

@@ -0,0 +1,52 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_disinfect")
+@ApiModel(value="hbDisinfect", description="v3.0 消毒记录")
+public class HbDisinfectEntity extends AbstractEntity implements Serializable {
+
+    @ApiModelProperty(value = "消毒日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "车辆车牌号")
+    private String vehiclePlatNo;
+
+    @ApiModelProperty(value = "消毒方法")
+    private String disinfectMethod;
+
+    @ApiModelProperty(value = "消毒药品")
+    private String disinfectDrug;
+
+    @ApiModelProperty(value = "溶液浓度")
+    private String doseConcentration;
+
+    @ApiModelProperty(value = "消毒工(签字)")
+    private String disinfectUser;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

+ 71 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbEntranceCheckEntity.java

@@ -0,0 +1,71 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_entrance_check")
+@ApiModel(value="hbEntranceCheck", description="v3.0 进场查验登记")
+public class HbEntranceCheckEntity extends AbstractEntity implements Serializable {
+
+    @ApiModelProperty(value = "入厂(场点)时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime entranceTime;
+
+    @ApiModelProperty(value = "动物检疫证明标注单位或名称")
+    private String quarantineUnitName;
+
+    @ApiModelProperty(value = "畜禽产地")
+    private String originRegion;
+
+    @ApiModelProperty(value = "动物检疫证明编号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "联系电话")
+    private String contactMobile;
+
+    @ApiModelProperty(value = "数量")
+    private Integer entranceQuantity;
+
+    @ApiModelProperty(value = "合格数")
+    private Integer qualifiedQuantity;
+
+    @ApiModelProperty(value = "圈编(烫号)")
+    private String pigpenName;
+
+    @ApiModelProperty(value = "隔离数")
+    private Integer quarantineQuantity;
+
+    @ApiModelProperty(value = "急宰数")
+    private Integer emergencySlaughterQuantity;
+
+    @ApiModelProperty(value = "无害化处理数")
+    private Integer disposeQuantity;
+
+    @ApiModelProperty(value = "查验接收人(签字)")
+    private String examinerConfirm;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+}

+ 80 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbEquipMaintenanceDailyEntity.java

@@ -0,0 +1,80 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * v3.0 设备维保记录(日次)
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_equip_maintenance_daily")
+@ApiModel(value="HbEquipMaintenanceDaily", description="v3.0 设备维保记录(日次)")
+public class HbEquipMaintenanceDailyEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "屠宰设备名称")
+    private String equipNameGroup;
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationNoGroup;
+
+    @ApiModelProperty(value = "维护记录")
+    private String maintenanceDetail;
+
+    @ApiModelProperty(value = "维护人")
+    private String maintenanceEmployee;
+
+    @ApiModelProperty(value = "维护日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenanceDate;
+
+    @ApiModelProperty(value = "故障描述")
+    private String faultDetail;
+
+    @ApiModelProperty(value = "维修结果")
+    private String repairDetail;
+
+    @ApiModelProperty(value = "维修人")
+    private String repairEmployee;
+
+    @ApiModelProperty(value = "维修日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime repairDate;
+
+}

+ 80 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbEquipMaintenanceMonthlyEntity.java

@@ -0,0 +1,80 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * v3.0 设备维保记录(月次)
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_equip_maintenance_monthly")
+@ApiModel(value="HbEquipMaintenanceMonthly", description="v3.0 设备维保记录(月次)")
+public class HbEquipMaintenanceMonthlyEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "屠宰设备名称")
+    private String equipNameGroup;
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationNoGroup;
+
+    @ApiModelProperty(value = "维护记录")
+    private String maintenanceDetail;
+
+    @ApiModelProperty(value = "维护人")
+    private String maintenanceEmployee;
+
+    @ApiModelProperty(value = "维护日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenanceDate;
+
+    @ApiModelProperty(value = "故障描述")
+    private String faultDetail;
+
+    @ApiModelProperty(value = "维修结果")
+    private String repairDetail;
+
+    @ApiModelProperty(value = "维修人")
+    private String repairEmployee;
+
+    @ApiModelProperty(value = "维修日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime repairDate;
+
+}

+ 80 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbEquipMaintenanceWeeklyEntity.java

@@ -0,0 +1,80 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * v3.0 设备维保记录(周次)
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_equip_maintenance_weekly")
+@ApiModel(value="HbEquipMaintenanceWeekly", description="v3.0 设备维保记录(周次)")
+public class HbEquipMaintenanceWeeklyEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "屠宰设备名称")
+    private String equipNameGroup;
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationNoGroup;
+
+    @ApiModelProperty(value = "维护记录")
+    private String maintenanceDetail;
+
+    @ApiModelProperty(value = "维护人")
+    private String maintenanceEmployee;
+
+    @ApiModelProperty(value = "维护日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenanceDate;
+
+    @ApiModelProperty(value = "故障描述")
+    private String faultDetail;
+
+    @ApiModelProperty(value = "维修结果")
+    private String repairDetail;
+
+    @ApiModelProperty(value = "维修人")
+    private String repairEmployee;
+
+    @ApiModelProperty(value = "维修日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime repairDate;
+
+}

+ 47 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbHarmlessStagingEntity.java

@@ -0,0 +1,47 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_harmless_staging")
+@ApiModel(value="hbHarmlessStaging", description="v3.0 无害化暂存记录")
+public class HbHarmlessStagingEntity {
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "修割三腺")
+    private String cutOfGlands;
+
+    @ApiModelProperty(value = "生猪不合格产品")
+    private String unqualifiedPartName;
+
+    @ApiModelProperty(value = "重量/数量")
+    private Integer weightQuantity;
+
+    @ApiModelProperty(value = "负责人")
+    private String chargePerson;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

+ 95 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbHarmlessTreatmentEntity.java

@@ -0,0 +1,95 @@
+package com.ruoyi.web.v3.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_harmless_treatment")
+@ApiModel(value="HbHarmlessTreatment", description="v3.0无害化处理登记")
+public class HbHarmlessTreatmentEntity extends AbstractEntity implements Serializable {
+
+    @ApiModelProperty(value = "货主姓名")
+    private String cargoOwnerName;
+
+    @ApiModelProperty(value = "处理时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime disposeTime;
+
+    @ApiModelProperty(value = "待宰前死亡畜禽.死亡原因")
+    private String deathReason;
+
+    @ApiModelProperty(value = "待宰前死亡畜禽.处理数量")
+    private Integer preDisposeQuantity;
+
+    @ApiModelProperty(value = "待宰前死亡畜禽.处理方式")
+    private String preDisposeMethod;
+
+    @ApiModelProperty(value = "病害畜禽.处理原因")
+    private String disposeReason;
+
+    @ApiModelProperty(value = "病害畜禽.处理数量")
+    private Integer disposeQuantity;
+
+    @ApiModelProperty(value = "病害畜禽.处理方式")
+    private String disposeMethod;
+
+    @ApiModelProperty(value = "肉品检验不合格产品.产品(部位)名称")
+    private String unfitPartName;
+
+    @ApiModelProperty(value = "肉品检验不合格产品.处理原因")
+    private String unfitProcessReason;
+
+    @ApiModelProperty(value = "肉品检验不合格产品.处理数量(公斤)")
+    private Integer unfitProcessQuantity;
+
+    @ApiModelProperty(value = "肉品检验不合格产品.处理方式")
+    private String unfitProcessMethod;
+
+    @ApiModelProperty(value = "无害化处理人员签字")
+    private String examinerName;
+
+    @ApiModelProperty(value = "兽医卫生检验人员签字")
+    private String veterinaryName;
+
+    @ApiModelProperty(value = "农业农村部门监管人员签字")
+    private String supervisorConfirm;
+
+    @ApiModelProperty(value = "货主签字")
+    private String cargoOwnerConfirm;
+
+    @ApiModelProperty(value = "填表人")
+    private String clerkName;
+
+    @ApiModelProperty(value = "屠宰企业负责人签字")
+    private String directorConfirm;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "企业名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "建档日期范围")
+    private String archiveDuration;
+
+}

+ 75 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbReleaseRecordEntity.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.v3.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_release_record")
+@ApiModel(value="hbReleaseRecord", description="v3.0 出厂情况登记")
+public class HbReleaseRecordEntity extends AbstractEntity implements Serializable {
+
+
+
+    @ApiModelProperty(value = "记录日期时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordTime;
+
+    @ApiModelProperty(value = "畜禽产品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "购货人姓名")
+    private String cargoOwnerName;
+
+    @ApiModelProperty(value = "联系方式")
+    private String contactMobile;
+
+    @ApiModelProperty(value = "销售地详细地址")
+    private String sellAddress;
+
+    @ApiModelProperty(value = "销售数量")
+    private Integer sellQuantity;
+
+    @ApiModelProperty(value = "动物检疫证明编号(产品B)")
+    private String animalCertNoB;
+
+    @ApiModelProperty(value = "动物检疫证明编号(产品A)")
+    private String animalCertNoA;
+
+    @ApiModelProperty(value = "肉品品质检验证号")
+    private String meatQualityCertNo;
+
+    @ApiModelProperty(value = "退回数量(公斤)")
+    private Integer returnQuantity;
+
+    @ApiModelProperty(value = "退回原因")
+    private String returnReason;
+
+    @ApiModelProperty(value = "企业名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "建档日期")
+    private String archiveDuration;
+
+
+
+}

+ 71 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbSamplingRetainedEntity.java

@@ -0,0 +1,71 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_sampling_retained")
+@ApiModel(value="hbSamplingRetained", description="v3.0 留样记录")
+public class HbSamplingRetainedEntity {
+
+    @ApiModelProperty(value = "序号")
+    private Integer sequenceNo;
+
+    @ApiModelProperty(value = "留样编号")
+    private String samplingNo;
+
+    @ApiModelProperty(value = "生产日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime productionDate;
+
+    @ApiModelProperty(value = "留样时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime samplingDate;
+
+    @ApiModelProperty(value = "留样数量")
+    private Integer samplingQuantity;
+
+    @ApiModelProperty(value = "留样人")
+    private String chargePerson;
+
+    @ApiModelProperty(value = "检测项目")
+    private String examineItem;
+
+    @ApiModelProperty(value = "水分值")
+    private String moisture;
+
+    @ApiModelProperty(value = "清除时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime clearDate;
+
+    @ApiModelProperty(value = "清除人")
+    private String clearPerson;
+
+    @ApiModelProperty(value = "留样去向")
+    private String samplingDestination;
+
+
+}

+ 73 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbSlaughterSummaryMonthlyEntity.java

@@ -0,0 +1,73 @@
+package com.ruoyi.web.v3.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_slaughter_summary_monthly")
+@ApiModel(value="hbSlaughterSummaryMonthly", description="v3.0 屠宰情况月汇总")
+public class HbSlaughterSummaryMonthlyEntity  extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "汇总日期(年月日)", required = true)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime summaryDate;
+
+    @ApiModelProperty(value = "进厂数量(头/只/羽)")
+    private Integer entranceQuantity = 0;
+
+    @ApiModelProperty(value = "合格数量(头/只/羽)")
+    private Integer qualifiedQuantity = 0;
+
+    @ApiModelProperty(value = "急宰数量(头/只/羽)")
+    private Integer emergencySlaughterQuantity = 0;
+
+    @ApiModelProperty(value = "检出病害数(头/只/羽)")
+    private Integer quarantineQuantity = 0;
+
+    @ApiModelProperty(value = "宰前不合格数(头/只/羽)")
+    private Integer unqualifiedQuantity = 0;
+
+    @ApiModelProperty(value = "肉品检验不合格公斤数")
+    private Integer meatUnqualifiedKilograms = 0;
+
+    @ApiModelProperty(value = "出场数量(头/只/羽)")
+    private Integer releaseQuantity = 0;
+
+    @ApiModelProperty(value = "结转下月数(头/只/羽)")
+    private Integer transferNextMonthQuantity = 0;
+
+    @ApiModelProperty(value = "兽医卫生检验负责人")
+    private String veterinaryName;
+
+    @ApiModelProperty(value = "畜禽定点屠宰企业负责人")
+    private String directorName;
+
+    @ApiModelProperty(value = "填表人")
+    private String clerkName;
+
+    @ApiModelProperty(value = "备注信息")
+    private String remarks;
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbAnteMortemInspectionMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbAnteMortemInspectionEntity;
+
+/**
+ * <p>
+ * v3.0  宰前检验记录 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbAnteMortemInspectionMapper extends BaseMapper<HbAnteMortemInspectionEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbCheckClenbuterolMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbCheckClenbuterolEntity;
+
+/**
+ * <p>
+ * v3.0瘦肉精检测登记 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbCheckClenbuterolMapper extends BaseMapper<HbCheckClenbuterolEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbCheckMeatQualifiedMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbCheckMeatQualifiedEntity;
+
+/**
+ * <p>
+ * v3.0肉品品质检验登记 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbCheckMeatQualifiedMapper extends BaseMapper<HbCheckMeatQualifiedEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbCheckResidueMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbCheckResidueEntity;
+
+/**
+ * <p>
+ * v3.0  药物残留检测登记 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbCheckResidueMapper extends BaseMapper<HbCheckResidueEntity> {
+
+}

+ 15 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbCheckTrichinellaMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbCheckTrichinellaEntity;
+import com.ruoyi.web.v3.entity.HbSlaughterSummaryMonthlyEntity;
+
+/**
+ * <p>
+ * v3.0  旋毛虫检测登记 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbCheckTrichinellaMapper extends BaseMapper<HbCheckTrichinellaEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbDisinfectMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbDisinfectEntity;
+
+/**
+ * <p>
+ * v3.0  消毒记录 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbDisinfectMapper extends BaseMapper<HbDisinfectEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbEntranceCheckMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbEntranceCheckEntity;
+
+/**
+ * <p>
+ * v3.0进场查验登记 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbEntranceCheckMapper extends BaseMapper<HbEntranceCheckEntity> {
+
+}

+ 15 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbEquipMaintenanceDailyMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbCheckAsfEntity;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceDailyEntity;
+
+/**
+ * <p>
+ * v3.0设备维保记录(日次) Mapper 接口
+ * </p>
+ *
+ */
+public interface HbEquipMaintenanceDailyMapper extends BaseMapper<HbEquipMaintenanceDailyEntity> {
+
+}

+ 15 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbEquipMaintenanceMonthlyMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceMonthlyEntity;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceWeeklyEntity;
+
+/**
+ * <p>
+ * v3.0设备维保记录(月次) Mapper 接口
+ * </p>
+ *
+ */
+public interface HbEquipMaintenanceMonthlyMapper extends BaseMapper<HbEquipMaintenanceMonthlyEntity> {
+
+}

+ 15 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbEquipMaintenanceWeeklyMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceDailyEntity;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceWeeklyEntity;
+
+/**
+ * <p>
+ * v3.0设备维保记录(周次) Mapper 接口
+ * </p>
+ *
+ */
+public interface HbEquipMaintenanceWeeklyMapper extends BaseMapper<HbEquipMaintenanceWeeklyEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbHarmlessStagingMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbHarmlessStagingEntity;
+
+/**
+ * <p>
+ * v3.0  无害化暂存记录 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbHarmlessStagingMapper extends BaseMapper<HbHarmlessStagingEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbHarmlessTreatmentMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbHarmlessTreatmentEntity;
+
+/**
+ * <p>
+ * v3.0无害化处理登记 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbHarmlessTreatmentMapper extends BaseMapper<HbHarmlessTreatmentEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbReleaseRecordMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbReleaseRecordEntity;
+
+/**
+ * <p>
+ * v3.0非洲猪瘟检测登记 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbReleaseRecordMapper extends BaseMapper<HbReleaseRecordEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbSamplingRetainedMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbSamplingRetainedEntity;
+
+/**
+ * <p>
+ * v3.0  留样记录 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbSamplingRetainedMapper extends BaseMapper<HbSamplingRetainedEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbSlaughterSummaryMonthlyMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbSlaughterSummaryMonthlyEntity;
+
+/**
+ * <p>
+ * v3.0  屠宰情况月汇总 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbSlaughterSummaryMonthlyMapper extends BaseMapper<HbSlaughterSummaryMonthlyEntity> {
+
+}

+ 57 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbAnteMortemInspectionPageReq.java

@@ -0,0 +1,57 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbAnteMortemInspectionPageReq", description="v3.0 宰前检验记录")
+public class HbAnteMortemInspectionPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "生猪批次")
+    private String batchSeriesNo;
+
+    @ApiModelProperty(value = "入圈时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime divideTime;
+
+    @ApiModelProperty(value = "检验数量")
+    private Integer examineQuantity;
+
+    @ApiModelProperty(value = "准宰数量")
+    private Integer permissionSlaughterQuantity;
+
+    @ApiModelProperty(value = "急宰数量")
+    private Integer emergencySlaughterQuantity;
+
+    @ApiModelProperty(value = "死亡数量")
+    private Integer deadQuantity;
+
+    @ApiModelProperty(value = "处理情况")
+    private String processDetail;
+
+    @ApiModelProperty(value = "检验人")
+    private String examinerName;
+
+}

+ 1 - 3
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckAsfPageReq.java

@@ -1,6 +1,5 @@
 package com.ruoyi.web.v3.model.request;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.web.v3.model.BasePageRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,8 +14,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("hb_check_asf")
-@ApiModel(value="HbCheckAsf", description="v3.0非洲猪瘟检测登记")
+@ApiModel(value="HbCheckAsfPageReq", description="v3.0非洲猪瘟检测登记")
 public class HbCheckAsfPageReq extends BasePageRequest implements Serializable {
 
     @ApiModelProperty(value = "数据唯一性标识id")

+ 67 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckClenbuterolPageReq.java

@@ -0,0 +1,67 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbCheckClenbuterolPageReq", description="v3.0 ")
+public class HbCheckClenbuterolPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "记录时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordTime;
+
+    @ApiModelProperty(value = "货主名称")
+    private String cargoOwnerName;
+
+    @ApiModelProperty(value = "动物检疫证明编号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "溯源单编号")
+    private String traceRecordNo;
+
+    @ApiModelProperty(value = "畜禽数量(头/只/羽)")
+    private Integer livestockQuantity;
+
+    @ApiModelProperty(value = "抽检数量")
+    private Integer spotcheckQuantity;
+
+    @ApiModelProperty(value = "盐酸克伦特罗检测结果")
+    private String clenbuterol;
+
+    @ApiModelProperty(value = "莱克多巴胺检测结果")
+    private String ractopamine;
+
+    @ApiModelProperty(value = "沙丁胺醇检测结果")
+    private String salbutamol;
+
+    @ApiModelProperty(value = "处理方式")
+    private String processMethod;
+
+    @ApiModelProperty(value = "检测人员(签字)")
+    private String examinerConfirm;
+
+
+}

+ 72 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckMeatQualifiedPageReq.java

@@ -0,0 +1,72 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbCheckMeatQualifiedPageReq", description="v3.0 ")
+public class HbCheckMeatQualifiedPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "记录日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "准宰证号")
+    private String slaughterPermitNo;
+
+    @ApiModelProperty(value = "屠宰开始时间(格式:HH:mm:ss)")
+    private String startTime;
+
+    @ApiModelProperty(value = "屠宰结束时间(格式:HH:mm:ss)")
+    private String endTime;
+
+    @ApiModelProperty(value = "屠宰数量(头/只/羽)")
+    private Integer slaughterQuantity = 0;
+
+    @ApiModelProperty(value = "肉品品质检验合格数")
+    private Integer qualifiedQuantity = 0;
+
+    @ApiModelProperty(value = "肉品品质检验不合格数")
+    private Integer unqualifiedQuantity = 0;
+
+    @ApiModelProperty(value = "不合格原因说明")
+    private String unqualifiedReason;
+
+    @ApiModelProperty(value = "三腺等不可食用废弃物重量(公斤)")
+    private Integer wasteWeight = 0;
+
+    @ApiModelProperty(value = "兽医卫生检验人员签字")
+    private String veterinaryConfirm;
+
+    @ApiModelProperty(value = "备注信息")
+    private String remarks;
+
+    @ApiModelProperty(value = "企业名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "建档日期(建议格式:YYYY-MM)")
+    private String archiveDuration;
+
+}

+ 66 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckResiduePageReq.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbCheckResiduePageReq", description="v3.0 药物残留检测登记分页查询报文")
+public class HbCheckResiduePageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "记录时间", required = true)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "供货单位名称或供货人名称")
+    private String providerUnitName;
+
+    @ApiModelProperty(value = "数量(头/只/羽)")
+    private Integer supplyQuantity;
+
+    @ApiModelProperty(value = "抽检数量")
+    private Integer samplingQuantity;
+
+    @ApiModelProperty(value = "溯源单编号")
+    private String traceRecordNo;
+
+    @ApiModelProperty(value = "磺胺类检测结果")
+    private String sulfonamides;
+
+    @ApiModelProperty(value = "氟喹诺酮类检测结果")
+    private String fluoroquinolones;
+
+    @ApiModelProperty(value = "四环素类检测结果")
+    private String tetracyclines;
+
+    @ApiModelProperty(value = "处理方法说明")
+    private String processMethod;
+
+    @ApiModelProperty(value = "检测人员(签字)")
+    private String examinerConfirm;
+
+    @ApiModelProperty(value = "货主(签字)")
+    private String cargoOwnerConfirm;
+
+}

+ 54 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbCheckTrichinellaPageReq.java

@@ -0,0 +1,54 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbCheckTrichinellaPageReq", description="v3.0 旋毛虫检测登记分页查询报文")
+public class HbCheckTrichinellaPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "抽检批次")
+    private String spotCheckNo;
+
+    @ApiModelProperty(value = "采样头数")
+    private Integer samplingQuantity;
+
+    @ApiModelProperty(value = "镜检份数")
+    private Integer mirrorExamQuantity;
+
+    @ApiModelProperty(value = "化验结果")
+    private String examineResult;
+
+    @ApiModelProperty(value = "检疫员")
+    private String examinerName;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

+ 54 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbDisinfectPageReq.java

@@ -0,0 +1,54 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbDisinfectPageReq", description="v3.0 消毒记录")
+public class HbDisinfectPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "消毒日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "车辆车牌号")
+    private String vehiclePlatNo;
+
+    @ApiModelProperty(value = "消毒方法")
+    private String disinfectMethod;
+
+    @ApiModelProperty(value = "消毒药品")
+    private String disinfectDrug;
+
+    @ApiModelProperty(value = "溶液浓度")
+    private String doseConcentration;
+
+    @ApiModelProperty(value = "消毒工(签字)")
+    private String disinfectUser;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

+ 71 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbEntranceCheckPageReq.java

@@ -0,0 +1,71 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbEntranceCheckPageReq", description="v3.0 ")
+public class HbEntranceCheckPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "入厂(场点)时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime entranceTime;
+
+    @ApiModelProperty(value = "动物检疫证明标注单位或名称")
+    private String quarantineUnitName;
+
+    @ApiModelProperty(value = "畜禽产地")
+    private String originRegion;
+
+    @ApiModelProperty(value = "动物检疫证明编号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "联系电话")
+    private String contactMobile;
+
+    @ApiModelProperty(value = "数量")
+    private Integer entranceQuantity;
+
+    @ApiModelProperty(value = "合格数")
+    private Integer qualifiedQuantity;
+
+    @ApiModelProperty(value = "圈编(烫号)")
+    private String pigpenName;
+
+    @ApiModelProperty(value = "隔离数")
+    private Integer quarantineQuantity;
+
+    @ApiModelProperty(value = "急宰数")
+    private Integer emergencySlaughterQuantity;
+
+    @ApiModelProperty(value = "无害化处理数")
+    private Integer disposeQuantity;
+
+    @ApiModelProperty(value = "查验接收人(签字)")
+    private String examinerConfirm;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+}

+ 74 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbEquipMaintenanceDailyPageReq.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbEquipMaintenanceDailyPageReq", description="v3.0 设备维保记录(日次)")
+public class HbEquipMaintenanceDailyPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "屠宰设备名称")
+    private String equipNameGroup;
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationNoGroup;
+
+    @ApiModelProperty(value = "维护记录")
+    private String maintenanceDetail;
+
+    @ApiModelProperty(value = "维护人")
+    private String maintenanceEmployee;
+
+    @ApiModelProperty(value = "维护日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenanceDate;
+
+    @ApiModelProperty(value = "故障描述")
+    private String faultDetail;
+
+    @ApiModelProperty(value = "维修结果")
+    private String repairDetail;
+
+    @ApiModelProperty(value = "维修人")
+    private String repairEmployee;
+
+    @ApiModelProperty(value = "维修日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime repairDate;
+
+}

+ 74 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbEquipMaintenanceMonthlyPageReq.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbEquipMaintenanceMonthlyPageReq", description="v3.0 设备维保记录(月次)")
+public class HbEquipMaintenanceMonthlyPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "屠宰设备名称")
+    private String equipNameGroup;
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationNoGroup;
+
+    @ApiModelProperty(value = "维护记录")
+    private String maintenanceDetail;
+
+    @ApiModelProperty(value = "维护人")
+    private String maintenanceEmployee;
+
+    @ApiModelProperty(value = "维护日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenanceDate;
+
+    @ApiModelProperty(value = "故障描述")
+    private String faultDetail;
+
+    @ApiModelProperty(value = "维修结果")
+    private String repairDetail;
+
+    @ApiModelProperty(value = "维修人")
+    private String repairEmployee;
+
+    @ApiModelProperty(value = "维修日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime repairDate;
+
+}

+ 74 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbEquipMaintenanceWeeklyPageReq.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbEquipMaintenanceWeeklyPageReq", description="v3.0 设备维保记录(周次)")
+public class HbEquipMaintenanceWeeklyPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "屠宰设备名称")
+    private String equipNameGroup;
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationNoGroup;
+
+    @ApiModelProperty(value = "维护记录")
+    private String maintenanceDetail;
+
+    @ApiModelProperty(value = "维护人")
+    private String maintenanceEmployee;
+
+    @ApiModelProperty(value = "维护日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenanceDate;
+
+    @ApiModelProperty(value = "故障描述")
+    private String faultDetail;
+
+    @ApiModelProperty(value = "维修结果")
+    private String repairDetail;
+
+    @ApiModelProperty(value = "维修人")
+    private String repairEmployee;
+
+    @ApiModelProperty(value = "维修日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime repairDate;
+
+}

+ 51 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbHarmlessStagingPageReq.java

@@ -0,0 +1,51 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbHarmlessStagingPageReq", description="v3.0 无害化暂存记录")
+public class HbHarmlessStagingPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordDate;
+
+    @ApiModelProperty(value = "修割三腺")
+    private String cutOfGlands;
+
+    @ApiModelProperty(value = "生猪不合格产品")
+    private String unqualifiedPartName;
+
+    @ApiModelProperty(value = "重量/数量")
+    private Integer weightQuantity;
+
+    @ApiModelProperty(value = "负责人")
+    private String chargePerson;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

+ 95 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbHarmlessTreatmentPageReq.java

@@ -0,0 +1,95 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbHarmlessTreatmentPageReq", description="v3.0 ")
+public class HbHarmlessTreatmentPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "货主姓名")
+    private String cargoOwnerName;
+
+    @ApiModelProperty(value = "处理时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime disposeTime;
+
+    @ApiModelProperty(value = "待宰前死亡畜禽.死亡原因")
+    private String deathReason;
+
+    @ApiModelProperty(value = "待宰前死亡畜禽.处理数量")
+    private Integer preDisposeQuantity;
+
+    @ApiModelProperty(value = "待宰前死亡畜禽.处理方式")
+    private String preDisposeMethod;
+
+    @ApiModelProperty(value = "病害畜禽.处理原因")
+    private String disposeReason;
+
+    @ApiModelProperty(value = "病害畜禽.处理数量")
+    private Integer disposeQuantity;
+
+    @ApiModelProperty(value = "病害畜禽.处理方式")
+    private String disposeMethod;
+
+    @ApiModelProperty(value = "肉品检验不合格产品.产品(部位)名称")
+    private String unfitPartName;
+
+    @ApiModelProperty(value = "肉品检验不合格产品.处理原因")
+    private String unfitProcessReason;
+
+    @ApiModelProperty(value = "肉品检验不合格产品.处理数量(公斤)")
+    private Integer unfitProcessQuantity;
+
+    @ApiModelProperty(value = "肉品检验不合格产品.处理方式")
+    private String unfitProcessMethod;
+
+    @ApiModelProperty(value = "无害化处理人员签字")
+    private String examinerName;
+
+    @ApiModelProperty(value = "兽医卫生检验人员签字")
+    private String veterinaryName;
+
+    @ApiModelProperty(value = "农业农村部门监管人员签字")
+    private String supervisorConfirm;
+
+    @ApiModelProperty(value = "货主签字")
+    private String cargoOwnerConfirm;
+
+    @ApiModelProperty(value = "填表人")
+    private String clerkName;
+
+    @ApiModelProperty(value = "屠宰企业负责人签字")
+    private String directorConfirm;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "企业名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "建档日期范围")
+    private String archiveDuration;
+}

+ 72 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbReleaseRecordPageReq.java

@@ -0,0 +1,72 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbReleaseRecordPageReq", description="v3.0 ")
+public class HbReleaseRecordPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "记录日期时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime recordTime;
+
+    @ApiModelProperty(value = "畜禽产品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "购货人姓名")
+    private String cargoOwnerName;
+
+    @ApiModelProperty(value = "联系方式")
+    private String contactMobile;
+
+    @ApiModelProperty(value = "销售地详细地址")
+    private String sellAddress;
+
+    @ApiModelProperty(value = "销售数量")
+    private Integer sellQuantity;
+
+    @ApiModelProperty(value = "动物检疫证明编号(产品B)")
+    private String animalCertNoB;
+
+    @ApiModelProperty(value = "动物检疫证明编号(产品A)")
+    private String animalCertNoA;
+
+    @ApiModelProperty(value = "肉品品质检验证号")
+    private String meatQualityCertNo;
+
+    @ApiModelProperty(value = "退回数量(公斤)")
+    private Integer returnQuantity;
+
+    @ApiModelProperty(value = "退回原因")
+    private String returnReason;
+
+    @ApiModelProperty(value = "企业名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "建档日期")
+    private String archiveDuration;
+
+}

+ 74 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbSamplingRetainedPageReq.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbSamplingRetainedPageReq", description="v3.0 留样记录分页查询报文")
+public class HbSamplingRetainedPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "序号")
+    private Integer sequenceNo;
+
+    @ApiModelProperty(value = "留样编号")
+    private String samplingNo;
+
+    @ApiModelProperty(value = "生产日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime productionDate;
+
+    @ApiModelProperty(value = "留样时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime samplingDate;
+
+    @ApiModelProperty(value = "留样数量")
+    private Integer samplingQuantity;
+
+    @ApiModelProperty(value = "留样人")
+    private String chargePerson;
+
+    @ApiModelProperty(value = "检测项目")
+    private String examineItem;
+
+    @ApiModelProperty(value = "水分值")
+    private String moisture;
+
+    @ApiModelProperty(value = "清除时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime clearDate;
+
+    @ApiModelProperty(value = "清除人")
+    private String clearPerson;
+
+    @ApiModelProperty(value = "留样去向")
+    private String samplingDestination;
+
+}

+ 72 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbSlaughterSummaryMonthlyPageReq.java

@@ -0,0 +1,72 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbSlaughterSummaryMonthlyPageReq", description="v3.0 屠宰情况月汇总分页查询报文")
+public class HbSlaughterSummaryMonthlyPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "汇总日期(年月日)", required = true)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime summaryDate;
+
+    @ApiModelProperty(value = "进厂数量(头/只/羽)")
+    private Integer entranceQuantity = 0;
+
+    @ApiModelProperty(value = "合格数量(头/只/羽)")
+    private Integer qualifiedQuantity = 0;
+
+    @ApiModelProperty(value = "急宰数量(头/只/羽)")
+    private Integer emergencySlaughterQuantity = 0;
+
+    @ApiModelProperty(value = "检出病害数(头/只/羽)")
+    private Integer quarantineQuantity = 0;
+
+    @ApiModelProperty(value = "宰前不合格数(头/只/羽)")
+    private Integer unqualifiedQuantity = 0;
+
+    @ApiModelProperty(value = "肉品检验不合格公斤数")
+    private Integer meatUnqualifiedKilograms = 0;
+
+    @ApiModelProperty(value = "出场数量(头/只/羽)")
+    private Integer releaseQuantity = 0;
+
+    @ApiModelProperty(value = "结转下月数(头/只/羽)")
+    private Integer transferNextMonthQuantity = 0;
+
+    @ApiModelProperty(value = "兽医卫生检验负责人")
+    private String veterinaryName;
+
+    @ApiModelProperty(value = "畜禽定点屠宰企业负责人")
+    private String directorName;
+
+    @ApiModelProperty(value = "填表人")
+    private String clerkName;
+
+    @ApiModelProperty(value = "备注信息")
+    private String remarks;
+
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbAnteMortemInspectionService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbAnteMortemInspectionEntity;
+import com.ruoyi.web.v3.model.request.HbAnteMortemInspectionPageReq;
+
+/**
+ * <p>
+ * v3.0 宰前检验记录 服务类
+ * </p>
+ */
+public interface IHbAnteMortemInspectionService extends IService<HbAnteMortemInspectionEntity> {
+
+    AjaxResult add(HbAnteMortemInspectionEntity request);
+
+    AjaxResult edit(HbAnteMortemInspectionEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbAnteMortemInspectionPageReq request);
+
+    AjaxResult listAll();
+}

+ 26 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbCheckClenbuterolService.java

@@ -0,0 +1,26 @@
+package com.ruoyi.web.v3.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbCheckClenbuterolEntity;
+import com.ruoyi.web.v3.model.request.HbCheckClenbuterolPageReq;
+
+
+/**
+ * <p>
+ * v3.0瘦肉精检测登记 服务类
+ * </p>
+ */
+public interface IHbCheckClenbuterolService extends IService<HbCheckClenbuterolEntity> {
+
+    AjaxResult add(HbCheckClenbuterolEntity request);
+
+    AjaxResult edit(HbCheckClenbuterolEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbCheckClenbuterolPageReq request);
+
+    AjaxResult listAll();
+}

+ 26 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbCheckMeatQualifiedService.java

@@ -0,0 +1,26 @@
+package com.ruoyi.web.v3.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbCheckMeatQualifiedEntity;
+import com.ruoyi.web.v3.model.request.HbCheckMeatQualifiedPageReq;
+
+
+/**
+ * <p>
+ * v3.0肉品品质检验登记 服务类
+ * </p>
+ */
+public interface IHbCheckMeatQualifiedService extends IService<HbCheckMeatQualifiedEntity> {
+
+    AjaxResult add(HbCheckMeatQualifiedEntity request);
+
+    AjaxResult edit(HbCheckMeatQualifiedEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbCheckMeatQualifiedPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbCheckResidueService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbCheckResidueEntity;
+import com.ruoyi.web.v3.model.request.HbCheckResiduePageReq;
+
+/**
+ * <p>
+ * v3.0 药物残留检测登记 服务类
+ * </p>
+ */
+public interface IHbCheckResidueService extends IService<HbCheckResidueEntity> {
+
+    AjaxResult add(HbCheckResidueEntity request);
+
+    AjaxResult edit(HbCheckResidueEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbCheckResiduePageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbCheckTrichinellaService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbCheckTrichinellaEntity;
+import com.ruoyi.web.v3.model.request.HbCheckTrichinellaPageReq;
+
+/**
+ * <p>
+ * v3.0 旋毛虫检测登记  服务类
+ * </p>
+ */
+public interface IHbCheckTrichinellaService extends IService<HbCheckTrichinellaEntity> {
+
+    AjaxResult add(HbCheckTrichinellaEntity request);
+
+    AjaxResult edit(HbCheckTrichinellaEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbCheckTrichinellaPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbDisinfectService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbDisinfectEntity;
+import com.ruoyi.web.v3.model.request.HbDisinfectPageReq;
+
+/**
+ * <p>
+ * v3.0 消毒记录 服务类
+ * </p>
+ */
+public interface IHbDisinfectService extends IService<HbDisinfectEntity> {
+
+    AjaxResult add(HbDisinfectEntity request);
+
+    AjaxResult edit(HbDisinfectEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbDisinfectPageReq request);
+
+    AjaxResult listAll();
+}

+ 26 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbEntranceCheckService.java

@@ -0,0 +1,26 @@
+package com.ruoyi.web.v3.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEntranceCheckEntity;
+import com.ruoyi.web.v3.model.request.HbEntranceCheckPageReq;
+
+
+/**
+ * <p>
+ * v3.0进场查验登记 服务类
+ * </p>
+ */
+public interface IHbEntranceCheckService extends IService<HbEntranceCheckEntity> {
+
+    AjaxResult add(HbEntranceCheckEntity request);
+
+    AjaxResult edit(HbEntranceCheckEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbEntranceCheckPageReq  request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbEquipMaintenanceDailyService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceDailyEntity;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceDailyPageReq;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(日次) 服务类
+ * </p>
+ */
+public interface IHbEquipMaintenanceDailyService extends IService<HbEquipMaintenanceDailyEntity> {
+
+    AjaxResult add(HbEquipMaintenanceDailyEntity request);
+
+    AjaxResult edit(HbEquipMaintenanceDailyEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbEquipMaintenanceDailyPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbEquipMaintenanceMonthlyService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceMonthlyEntity;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceMonthlyPageReq;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(月次) 服务类
+ * </p>
+ */
+public interface IHbEquipMaintenanceMonthlyService extends IService<HbEquipMaintenanceMonthlyEntity> {
+
+    AjaxResult add(HbEquipMaintenanceMonthlyEntity request);
+
+    AjaxResult edit(HbEquipMaintenanceMonthlyEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbEquipMaintenanceMonthlyPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbEquipMaintenanceWeeklyService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceWeeklyEntity;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceWeeklyPageReq;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(周次) 服务类
+ * </p>
+ */
+public interface IHbEquipMaintenanceWeeklyService extends IService<HbEquipMaintenanceWeeklyEntity> {
+
+    AjaxResult add(HbEquipMaintenanceWeeklyEntity request);
+
+    AjaxResult edit(HbEquipMaintenanceWeeklyEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbEquipMaintenanceWeeklyPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbHarmlessStagingService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbHarmlessStagingEntity;
+import com.ruoyi.web.v3.model.request.HbHarmlessStagingPageReq;
+
+/**
+ * <p>
+ * v3.0 无害化暂存记录  服务类
+ * </p>
+ */
+public interface IHbHarmlessStagingService extends IService<HbHarmlessStagingEntity> {
+
+    AjaxResult add(HbHarmlessStagingEntity request);
+
+    AjaxResult edit(HbHarmlessStagingEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbHarmlessStagingPageReq request);
+
+    AjaxResult listAll();
+}

+ 26 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbHarmlessTreatmentService.java

@@ -0,0 +1,26 @@
+package com.ruoyi.web.v3.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbHarmlessTreatmentEntity;
+import com.ruoyi.web.v3.model.request.HbHarmlessTreatmentPageReq;
+
+
+/**
+ * <p>
+ * v3.0无害化处理登记 服务类
+ * </p>
+ */
+public interface IHbHarmlessTreatmentService extends IService<HbHarmlessTreatmentEntity> {
+
+    AjaxResult add(HbHarmlessTreatmentEntity request);
+
+    AjaxResult edit(HbHarmlessTreatmentEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbHarmlessTreatmentPageReq request);
+
+    AjaxResult listAll();
+}

+ 26 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbReleaseRecordService.java

@@ -0,0 +1,26 @@
+package com.ruoyi.web.v3.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbReleaseRecordEntity;
+import com.ruoyi.web.v3.model.request.HbReleaseRecordPageReq;
+
+
+/**
+ * <p>
+ * v3.0出厂情况登记 服务类
+ * </p>
+ */
+public interface IHbReleaseRecordService extends IService<HbReleaseRecordEntity> {
+
+    AjaxResult add(HbReleaseRecordEntity request);
+
+    AjaxResult edit(HbReleaseRecordEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbReleaseRecordPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbSamplingRetainedService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbSamplingRetainedEntity;
+import com.ruoyi.web.v3.model.request.HbSamplingRetainedPageReq;
+
+/**
+ * <p>
+ * v3.0 留样记录 服务类
+ * </p>
+ */
+public interface IHbSamplingRetainedService extends IService<HbSamplingRetainedEntity> {
+
+    AjaxResult add(HbSamplingRetainedEntity request);
+
+    AjaxResult edit(HbSamplingRetainedEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbSamplingRetainedPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbSlaughterSummaryMonthlyService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbSlaughterSummaryMonthlyEntity;
+import com.ruoyi.web.v3.model.request.HbSlaughterSummaryMonthlyPageReq;
+
+/**
+ * <p>
+ * v3.0 屠宰情况月汇总 服务类
+ * </p>
+ */
+public interface IHbSlaughterSummaryMonthlyService extends IService<HbSlaughterSummaryMonthlyEntity> {
+
+    AjaxResult add(HbSlaughterSummaryMonthlyEntity request);
+
+    AjaxResult edit(HbSlaughterSummaryMonthlyEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbSlaughterSummaryMonthlyPageReq request);
+
+    AjaxResult listAll();
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbCheckClenbuterolServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbCheckClenbuterolEntity;
+import com.ruoyi.web.v3.mapper.HbCheckClenbuterolMapper;
+import com.ruoyi.web.v3.model.request.HbCheckClenbuterolPageReq;
+import com.ruoyi.web.v3.service.IHbCheckClenbuterolService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 瘦肉精检测登记 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbCheckClenbuterolServiceImpl extends ServiceImpl<HbCheckClenbuterolMapper, HbCheckClenbuterolEntity> implements IHbCheckClenbuterolService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbCheckClenbuterolEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getAnimalCertNo())) {
+            return error("请输入【动物检疫证明编号】!");
+        }
+        //防重检测,
+        Integer count = lambdaQuery().eq(HbCheckClenbuterolEntity::getAnimalCertNo, request.getAnimalCertNo()).count();
+        if (count != 0) {
+            return error("请勿重复添加!");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbCheckClenbuterolEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbCheckClenbuterolPageReq request) {
+        //将请求报文转为实体类
+        HbCheckClenbuterolEntity entity = BeanUtil.toBean(request, HbCheckClenbuterolEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbCheckClenbuterolEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 73 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbCheckMeatQualifiedServiceImpl.java

@@ -0,0 +1,73 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbCheckMeatQualifiedEntity;
+import com.ruoyi.web.v3.mapper.HbCheckMeatQualifiedMapper;
+import com.ruoyi.web.v3.model.request.HbCheckMeatQualifiedPageReq;
+import com.ruoyi.web.v3.service.IHbCheckMeatQualifiedService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 肉品品质检验登记 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbCheckMeatQualifiedServiceImpl extends ServiceImpl<HbCheckMeatQualifiedMapper, HbCheckMeatQualifiedEntity> implements IHbCheckMeatQualifiedService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbCheckMeatQualifiedEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getSlaughterPermitNo())) {
+            return error("请输入【准宰证号】!");
+        }
+        //防重检测
+        //todo
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbCheckMeatQualifiedEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbCheckMeatQualifiedPageReq request) {
+        //将请求报文转为实体类
+        HbCheckMeatQualifiedEntity entity = BeanUtil.toBean(request, HbCheckMeatQualifiedEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbCheckMeatQualifiedEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEntranceCheckServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEntranceCheckEntity;
+import com.ruoyi.web.v3.mapper.HbEntranceCheckMapper;
+import com.ruoyi.web.v3.model.request.HbEntranceCheckPageReq;
+import com.ruoyi.web.v3.service.IHbEntranceCheckService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 进场查验登记 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbEntranceCheckServiceImpl extends ServiceImpl<HbEntranceCheckMapper, HbEntranceCheckEntity> implements IHbEntranceCheckService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbEntranceCheckEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getAnimalCertNo())) {
+            return error("请输入【动物检疫证明编号】!");
+        }
+        //防重检测,
+        Integer count = lambdaQuery().eq(HbEntranceCheckEntity::getAnimalCertNo, request.getAnimalCertNo()).count();
+        if (count != 0) {
+            return error("请勿重复添加!");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbEntranceCheckEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbEntranceCheckPageReq request) {
+        //将请求报文转为实体类
+        HbEntranceCheckEntity entity = BeanUtil.toBean(request, HbEntranceCheckEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbEntranceCheckEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceDailyServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceDailyEntity;
+import com.ruoyi.web.v3.mapper.HbEquipMaintenanceDailyMapper;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceDailyPageReq;
+import com.ruoyi.web.v3.service.IHbEquipMaintenanceDailyService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(日次) 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbEquipMaintenanceDailyServiceImpl extends ServiceImpl<HbEquipMaintenanceDailyMapper, HbEquipMaintenanceDailyEntity> implements IHbEquipMaintenanceDailyService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbEquipMaintenanceDailyEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getEquipNameGroup())) {
+            return error("请输入【屠宰设备名称】!");
+        }
+        //防重检测,
+//        Integer count = lambdaQuery().eq(HbEquipMaintenanceDailyEntity::getRecordId, request.getRecordId()).count();
+//        if (count != 0) {
+//            return error("请勿重复添加!");
+//        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbEquipMaintenanceDailyEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbEquipMaintenanceDailyPageReq request) {
+        //将请求报文转为实体类
+        HbEquipMaintenanceDailyEntity entity = BeanUtil.toBean(request, HbEquipMaintenanceDailyEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbEquipMaintenanceDailyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceMonthlyServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceMonthlyEntity;
+import com.ruoyi.web.v3.mapper.HbEquipMaintenanceMonthlyMapper;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceMonthlyPageReq;
+import com.ruoyi.web.v3.service.IHbEquipMaintenanceMonthlyService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(月次) 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbEquipMaintenanceMonthlyServiceImpl extends ServiceImpl<HbEquipMaintenanceMonthlyMapper, HbEquipMaintenanceMonthlyEntity> implements IHbEquipMaintenanceMonthlyService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbEquipMaintenanceMonthlyEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getEquipNameGroup())) {
+            return error("请输入【屠宰设备名称】!");
+        }
+        //防重检测,
+//        Integer count = lambdaQuery().eq(HbEquipMaintenanceMonthlyEntity::getRecordId, request.getRecordId()).count();
+//        if (count != 0) {
+//            return error("请勿重复添加!");
+//        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbEquipMaintenanceMonthlyEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbEquipMaintenanceMonthlyPageReq request) {
+        //将请求报文转为实体类
+        HbEquipMaintenanceMonthlyEntity entity = BeanUtil.toBean(request, HbEquipMaintenanceMonthlyEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbEquipMaintenanceMonthlyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceWeeklyServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbEquipMaintenanceWeeklyEntity;
+import com.ruoyi.web.v3.mapper.HbEquipMaintenanceWeeklyMapper;
+import com.ruoyi.web.v3.model.request.HbEquipMaintenanceWeeklyPageReq;
+import com.ruoyi.web.v3.service.IHbEquipMaintenanceWeeklyService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 设备维保记录(周次) 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbEquipMaintenanceWeeklyServiceImpl extends ServiceImpl<HbEquipMaintenanceWeeklyMapper, HbEquipMaintenanceWeeklyEntity> implements IHbEquipMaintenanceWeeklyService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbEquipMaintenanceWeeklyEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getEquipNameGroup())) {
+            return error("请输入【屠宰设备名称】!");
+        }
+        //防重检测,
+//        Integer count = lambdaQuery().eq(HbEquipMaintenanceWeeklyEntity::getRecordId, request.getRecordId()).count();
+//        if (count != 0) {
+//            return error("请勿重复添加!");
+//        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbEquipMaintenanceWeeklyEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbEquipMaintenanceWeeklyPageReq request) {
+        //将请求报文转为实体类
+        HbEquipMaintenanceWeeklyEntity entity = BeanUtil.toBean(request, HbEquipMaintenanceWeeklyEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbEquipMaintenanceWeeklyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbHarmlessTreatmentServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbHarmlessTreatmentEntity;
+import com.ruoyi.web.v3.mapper.HbHarmlessTreatmentMapper;
+import com.ruoyi.web.v3.model.request.HbHarmlessTreatmentPageReq;
+import com.ruoyi.web.v3.service.IHbHarmlessTreatmentService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 无害化处理登记 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbHarmlessTreatmentServiceImpl extends ServiceImpl<HbHarmlessTreatmentMapper, HbHarmlessTreatmentEntity> implements IHbHarmlessTreatmentService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbHarmlessTreatmentEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getDisposeTime())) {
+            return error("请输入【处理时间】!");
+        }
+        //防重检测,
+        Integer count = lambdaQuery().eq(HbHarmlessTreatmentEntity::getDisposeTime, request.getDisposeTime()).count();
+        if (count != 0) {
+            return error("请勿重复添加!");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbHarmlessTreatmentEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbHarmlessTreatmentPageReq request) {
+        //将请求报文转为实体类
+        HbHarmlessTreatmentEntity entity = BeanUtil.toBean(request, HbHarmlessTreatmentEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbHarmlessTreatmentEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbReleaseRecordServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbReleaseRecordEntity;
+import com.ruoyi.web.v3.mapper.HbReleaseRecordMapper;
+import com.ruoyi.web.v3.model.request.HbReleaseRecordPageReq;
+import com.ruoyi.web.v3.service.IHbReleaseRecordService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 出厂情况登记 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbReleaseRecordServiceImpl extends ServiceImpl<HbReleaseRecordMapper, HbReleaseRecordEntity> implements IHbReleaseRecordService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbReleaseRecordEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getRecordTime())) {
+            return error("请输入【日期时间】!");
+        }
+        //防重检测,
+        Integer count = lambdaQuery().eq(HbReleaseRecordEntity::getMeatQualityCertNo, request.getMeatQualityCertNo()).count();
+        if (count != 0) {
+            return error("请勿重复添加!");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbReleaseRecordEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbReleaseRecordPageReq request) {
+        //将请求报文转为实体类
+        HbReleaseRecordEntity entity = BeanUtil.toBean(request, HbReleaseRecordEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbReleaseRecordEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 79 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbSlaughterSummaryMonthlyServiceImpl.java

@@ -0,0 +1,79 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbSlaughterSummaryMonthlyEntity;
+import com.ruoyi.web.v3.mapper.HbSlaughterSummaryMonthlyMapper;
+import com.ruoyi.web.v3.model.request.HbSlaughterSummaryMonthlyPageReq;
+import com.ruoyi.web.v3.service.IHbSlaughterSummaryMonthlyService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 屠宰情况月汇总服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbSlaughterSummaryMonthlyServiceImpl extends ServiceImpl<HbSlaughterSummaryMonthlyMapper, HbSlaughterSummaryMonthlyEntity> implements IHbSlaughterSummaryMonthlyService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbSlaughterSummaryMonthlyEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getEntranceQuantity()) || request.getEmergencySlaughterQuantity() <= 0) {
+            return error("【进厂数量】必须大于0!");
+        }
+        if(ObjectUtils.isEmpty(request.getQualifiedQuantity()) || request.getQualifiedQuantity() <= 0) {
+            return error("【合格数量】必须大于0!");
+        }
+        //防重检测,
+//        Integer count = lambdaQuery().eq(HbSlaughterSummaryMonthlyEntity::getRecordId, request.getRecordId()).count();
+//        if (count != 0) {
+//            return error("请勿重复添加!");
+//        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbSlaughterSummaryMonthlyEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbSlaughterSummaryMonthlyPageReq request) {
+        //将请求报文转为实体类
+        HbSlaughterSummaryMonthlyEntity entity = BeanUtil.toBean(request, HbSlaughterSummaryMonthlyEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbSlaughterSummaryMonthlyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 403 - 0
sql/v3_biz_20250814.sql

@@ -27,3 +27,406 @@ create table hb_check_asf (
   update_time       datetime                                   comment '更新时间',
   primary key (id)
 ) engine=innodb auto_increment=1 comment = '非洲猪瘟检测表';
+
+
+-- 无害化处理登记表
+CREATE TABLE `hb_harmless_treatment` (
+                                         `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                         `cargo_owner_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '货主姓名',
+                                         `dispose_time` DATETIME DEFAULT NULL COMMENT '处理时间',
+                                         `death_reason` VARCHAR ( 255 ) DEFAULT NULL COMMENT '待宰前死亡畜禽.死亡原因',
+                                         `pre_dispose_quantity` INT ( 11 ) DEFAULT NULL COMMENT '待宰前死亡畜禽.处理数量',
+                                         `pre_dispose_method` VARCHAR ( 255 ) DEFAULT NULL COMMENT '待宰前死亡畜禽.处理方式',
+                                         `dispose_reason` VARCHAR ( 255 ) DEFAULT NULL COMMENT '病害畜禽.处理原因',
+                                         `dispose_quantity` INT ( 11 ) DEFAULT NULL COMMENT '病害畜禽.处理数量',
+                                         `dispose_method` VARCHAR ( 255 ) DEFAULT NULL COMMENT '病害畜禽.处理方式',
+                                         `unfit_part_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '肉品检验不合格产品.产品(部位)名称',
+                                         `unfit_process_reason` VARCHAR ( 255 ) DEFAULT NULL COMMENT '肉品检验不合格产品.处理原因',
+                                         `unfit_process_quantity` INT ( 11 ) DEFAULT NULL COMMENT '肉品检验不合格产品.处理数量(公斤)',
+                                         `unfit_process_method` VARCHAR ( 255 ) DEFAULT NULL COMMENT '肉品检验不合格产品.处理方式',
+                                         `examiner_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '无害化处理人员签字',
+                                         `veterinary_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '兽医卫生检验人员签字',
+                                         `supervisor_confirm` VARCHAR ( 30 ) DEFAULT NULL COMMENT '农业农村部门监管人员签字',
+                                         `cargo_owner_confirm` VARCHAR ( 30 ) DEFAULT NULL COMMENT '货主签字',
+                                         `clerk_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '填表人',
+                                         `director_confirm` VARCHAR ( 30 ) DEFAULT NULL COMMENT '屠宰企业负责人签字',
+                                         `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注',
+                                         `org_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '企业名称',
+                                         `archive_duration` VARCHAR ( 60 ) DEFAULT NULL COMMENT '建档日期范围',
+                                         `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                         `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                         `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                         `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                         `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                         PRIMARY KEY ( `id` )
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '无害化处理登记表';
+
+-- 出厂情况登记
+CREATE TABLE `hb_release_record` (
+                                     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                     `record_time` DATETIME NOT NULL COMMENT '记录日期时间',
+                                     `product_name` VARCHAR ( 60 ) DEFAULT NULL COMMENT '畜禽产品名称',
+                                     `cargo_owner_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '购货人姓名',
+                                     `contact_mobile` VARCHAR ( 30 ) DEFAULT NULL COMMENT '联系方式',
+                                     `sell_address` VARCHAR ( 90 ) DEFAULT NULL COMMENT '销售地详细地址',
+                                     `sell_quantity` INT ( 11 ) DEFAULT NULL COMMENT '销售数量',
+                                     `animal_cert_no_b` VARCHAR ( 90 ) DEFAULT NULL COMMENT '动物检疫证明编号(产品B)',
+                                     `animal_cert_no_a` VARCHAR ( 90 ) DEFAULT NULL COMMENT '动物检疫证明编号(产品A)',
+                                     `meat_quality_cert_no` VARCHAR ( 90 ) DEFAULT NULL COMMENT '肉品品质检验证号',
+                                     `return_quantity` INT ( 11 ) DEFAULT NULL COMMENT '退回数量(公斤)',
+                                     `return_reason` VARCHAR ( 255 ) DEFAULT NULL COMMENT '退回原因',
+                                     `org_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '企业名称',
+                                     `archive_duration` VARCHAR ( 60 ) DEFAULT NULL COMMENT '建档日期',
+                                     `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                     `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                     `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                     `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                     `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                     PRIMARY KEY ( `id` )
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '出厂情况登记表';
+
+-- 肉品品质检验登记
+CREATE TABLE `hb_check_meat_qualified` (
+                                               `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                               `record_date` DATETIME NOT NULL COMMENT '记录日期',
+                                               `slaughter_permit_no` VARCHAR ( 60 ) NOT NULL COMMENT '准宰证号',
+                                               `start_time` VARCHAR ( 30 ) DEFAULT NULL COMMENT '屠宰开始时间(格式:HH:mm:ss)',
+                                               `end_time` VARCHAR ( 30 ) DEFAULT NULL COMMENT '屠宰结束时间(格式:HH:mm:ss)',
+                                               `slaughter_quantity` INT UNSIGNED DEFAULT 0 COMMENT '屠宰数量(头/只/羽)',
+                                               `qualified_quantity` INT UNSIGNED DEFAULT 0 COMMENT '肉品品质检验合格数',
+                                               `unqualified_quantity` INT UNSIGNED DEFAULT 0 COMMENT '肉品品质检验不合格数',
+                                               `unqualified_reason` VARCHAR ( 255 ) DEFAULT NULL COMMENT '不合格原因说明',
+                                               `waste_weight` INT UNSIGNED DEFAULT 0 COMMENT '三腺等不可食用废弃物重量(公斤)',
+                                               `veterinary_confirm` VARCHAR ( 30 ) DEFAULT NULL COMMENT '兽医卫生检验人员签字',
+                                               `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注信息',
+                                               `org_name` VARCHAR ( 30 ) NOT NULL COMMENT '企业名称',
+                                               `archive_duration` VARCHAR ( 60 ) DEFAULT NULL COMMENT '建档日期(建议格式:YYYY-MM)',
+                                               `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                               `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                               `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                               `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                               `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                               PRIMARY KEY ( `id` )
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '肉品品质检验登记';
+
+-- 瘦肉精检测登记
+CREATE TABLE `hb_check_clenbuterol` (
+                                      `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                      `record_time` DATETIME NOT NULL COMMENT '记录时间',
+                                      `cargo_owner_name` VARCHAR(30) DEFAULT NULL COMMENT '货主名称',
+                                      `animal_cert_no` VARCHAR(30) NOT NULL COMMENT '动物检疫证明编号',
+                                      `trace_record_no` VARCHAR(30) NOT NULL COMMENT '溯源单编号',
+                                      `livestock_quantity` INT NOT NULL COMMENT '畜禽数量(头/只/羽)',
+                                      `spotcheck_quantity` INT NOT NULL COMMENT '抽检数量',
+                                      `clenbuterol` VARCHAR(10) DEFAULT NULL COMMENT '盐酸克伦特罗检测结果',
+                                      `ractopamine` VARCHAR(10) DEFAULT NULL COMMENT '莱克多巴胺检测结果',
+                                      `salbutamol` VARCHAR(10) DEFAULT NULL COMMENT '沙丁胺醇检测结果',
+                                      `process_method` VARCHAR(255) DEFAULT NULL COMMENT '处理方式',
+                                      `examiner_confirm` VARCHAR(30) DEFAULT NULL COMMENT '检测人员(签字)',
+                                      `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                      `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                      `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                      `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                      `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                      PRIMARY KEY ( `id` )
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '瘦肉精检测登记';
+
+-- 进场查验登记
+CREATE TABLE `hb_entrance_check` (
+                                             `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                             `entrance_time` DATETIME NOT NULL COMMENT '入厂(场点)时间',
+                                             `quarantine_unit_name` VARCHAR(30) DEFAULT NULL COMMENT '动物检疫证明标注单位或名称',
+                                             `origin_region` VARCHAR(90) DEFAULT NULL COMMENT '畜禽产地',
+                                             `animal_cert_no` VARCHAR(30) NOT NULL COMMENT '动物检疫证明编号',
+                                             `contact_mobile` VARCHAR(30) DEFAULT NULL COMMENT '联系电话',
+                                             `entrance_quantity` INT NOT NULL DEFAULT 0 COMMENT '数量',
+                                             `qualified_quantity` INT NOT NULL DEFAULT 0 COMMENT '合格数',
+                                             `pigpen_name` VARCHAR(30) DEFAULT NULL COMMENT '圈编(烫号)',
+                                             `quarantine_quantity` INT NOT NULL DEFAULT 0 COMMENT '隔离数',
+                                             `emergency_slaughter_quantity` INT NOT NULL DEFAULT 0 COMMENT '急宰数',
+                                             `dispose_quantity` INT NOT NULL DEFAULT 0 COMMENT '无害化处理数',
+                                             `examiner_confirm` VARCHAR(30) DEFAULT NULL COMMENT '查验接收人(签字)',
+                                             `remarks` VARCHAR(255) DEFAULT NULL COMMENT '备注',
+                                             `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                             `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                             `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                             `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                             `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                             PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='进场查验登记表';
+
+-- 屠宰情况月汇总
+CREATE TABLE `hb_slaughter_summary_monthly` (
+                                                `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                                `summary_date` DATETIME NOT NULL  COMMENT '汇总日期(年月日)',
+                                                `entrance_quantity` INT DEFAULT 0 COMMENT '进厂数量(头/只/羽)',
+                                                `qualified_quantity` INT DEFAULT 0 COMMENT '合格数量(头/只/羽)',
+                                                `emergency_slaughter_quantity` INT DEFAULT 0 COMMENT '急宰数量(头/只/羽)',
+                                                `quarantine_quantity` INT DEFAULT 0 COMMENT '检出病害数(头/只/羽)',
+                                                `unqualified_quantity` INT DEFAULT 0 COMMENT '宰前不合格数(头/只/羽)',
+                                                `meat_unqualified_kilograms` INT DEFAULT 0 COMMENT '肉品检验不合格公斤数',
+                                                `release_quantity` INT DEFAULT 0 COMMENT '出场数量(头/只/羽)',
+                                                `transfer_next_month_quantity` INT DEFAULT 0 COMMENT '结转下月数(头/只/羽)',
+                                                `veterinary_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '兽医卫生检验负责人',
+                                                `director_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '畜禽定点屠宰企业负责人',
+                                                `clerk_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '填表人',
+                                                `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注信息',
+                                                `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                                `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                                `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                                `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                                `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                                PRIMARY KEY ( `id` )
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '屠宰情况月汇总';
+
+-- 药物残留检测登记
+CREATE TABLE hb_check_residue (
+                                 `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                                 `record_date` DATETIME NOT NULL COMMENT '记录时间',
+                                 `provider_unit_name` VARCHAR(30)  DEFAULT NULL COMMENT '供货单位名称或供货人名称',
+                                 `supply_quantity` INTEGER DEFAULT 0 COMMENT '数量(头/只/羽)',
+                                 `sampling_quantity` INTEGER DEFAULT 0 COMMENT '抽检数量',
+                                 `trace_record_no` VARCHAR(30)  DEFAULT NULL COMMENT '溯源单编号',
+                                 `sulfonamides` VARCHAR(10)  DEFAULT NULL COMMENT '磺胺类检测结果',
+                                 `fluoroquinolones` VARCHAR(10)  DEFAULT NULL COMMENT '氟喹诺酮类检测结果',
+                                 `tetracyclines` VARCHAR(10)  DEFAULT NULL COMMENT '四环素类检测结果',
+                                 `process_method` VARCHAR(255)  DEFAULT NULL COMMENT '处理方法说明',
+                                 `examiner_confirm` VARCHAR(30)  DEFAULT NULL COMMENT '检测人员(签字)',
+                                 `cargo_owner_confirm` VARCHAR(30) DEFAULT NULL  COMMENT '货主(签字)',
+                                 `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                 `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                 `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                 `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                 `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='药物残留检测登记';
+
+-- 旋毛虫检测登记
+CREATE TABLE `hb_check_trichinella` (
+                                        `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                                        `record_date` DATETIME DEFAULT NULL COMMENT '日期',
+                                        `spot_check_no` VARCHAR(60) DEFAULT NULL COMMENT '抽检批次',
+                                        `sampling_quantity` INTEGER DEFAULT 0 COMMENT '采样头数',
+                                        `mirror_exam_quantity` INTEGER DEFAULT 0 COMMENT '镜检份数',
+                                        `examine_result` VARCHAR(10) DEFAULT NULL COMMENT '化验结果',
+                                        `examiner_name` VARCHAR(30) DEFAULT NULL COMMENT '检疫员',
+                                        `remarks` VARCHAR(255) DEFAULT NULL COMMENT '备注',
+                                        `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                        `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                        `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                        `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                        `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='旋毛虫检查记录表';
+
+-- 留样记录
+CREATE TABLE hb_sampling_retained (
+                                    `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                                    `sequence_no` INTEGER DEFAULT 0 COMMENT '序号',
+                                    `sampling_no` VARCHAR ( 60 ) DEFAULT NULL COMMENT '留样编号',
+                                    `production_date` DATETIME DEFAULT NULL COMMENT '生产日期',
+                                    `sampling_date` DATETIME DEFAULT NULL COMMENT '留样时间',
+                                    `sampling_quantity` INTEGER DEFAULT 0 COMMENT '留样数量',
+                                    `charge_person` VARCHAR ( 30 ) DEFAULT NULL COMMENT '留样人',
+                                    `examine_item` VARCHAR ( 30 ) DEFAULT NULL COMMENT '检测项目',
+                                    `moisture` VARCHAR ( 30 ) DEFAULT NULL COMMENT '水分值',
+                                    `clear_date` DATETIME DEFAULT NULL COMMENT '清除时间',
+                                    `clear_person` VARCHAR ( 30 ) DEFAULT NULL COMMENT '清除人',
+                                    `sampling_destination` VARCHAR ( 255 ) DEFAULT NULL COMMENT '留样去向',
+                                    `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                    `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                    `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                    `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                    `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '留样记录表';
+
+-- 宰前检验记录
+CREATE TABLE hb_ante_mortem_inspection (
+                                        `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                                        `batch_series_no` VARCHAR ( 60 ) DEFAULT NULL COMMENT '生猪批次',
+                                        `divide_time` DATETIME DEFAULT NULL COMMENT '入圈时间',
+                                        `examine_quantity` INTEGER DEFAULT 0 COMMENT '检验数量',
+                                        `permission_slaughter_quantity` INTEGER DEFAULT 0 COMMENT '准宰数量',
+                                        `emergency_slaughter_quantity` INTEGER DEFAULT 0 COMMENT '急宰数量',
+                                        `dead_quantity` INTEGER DEFAULT 0 COMMENT '死亡数量',
+                                        `process_detail` VARCHAR ( 255 ) DEFAULT NULL COMMENT '处理情况',
+                                        `examiner_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '检验人',
+                                        `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                        `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                        `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                        `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                        `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '宰前检验记录';
+
+-- 消毒记录
+CREATE TABLE hb_disinfect (
+                             `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                             `record_date` DATETIME DEFAULT NULL COMMENT '消毒日期',
+                             `vehicle_plat_no` VARCHAR ( 30 ) DEFAULT NULL COMMENT '车辆车牌号',
+                             `disinfect_method` VARCHAR ( 30 ) DEFAULT NULL COMMENT '消毒方法',
+                             `disinfect_drug` VARCHAR ( 30 ) DEFAULT NULL COMMENT '消毒药品',
+                             `dose_concentration` VARCHAR ( 30 ) DEFAULT NULL COMMENT '溶液浓度',
+                             `disinfect_user` VARCHAR ( 30 ) DEFAULT NULL COMMENT '消毒工(签字)',
+                             `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注',
+                             `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                             `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                             `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                             `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                             `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '消毒记录';
+
+-- 无害化暂存记录
+CREATE TABLE hb_harmless_staging (
+                                   `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                                   `record_date` DATETIME DEFAULT NULL COMMENT '日期',
+                                   `cut_of_glands` VARCHAR ( 30 ) DEFAULT NULL COMMENT '修割三腺',
+                                   `unqualified_part_name` VARCHAR ( 60 ) DEFAULT NULL COMMENT '生猪不合格产品',
+                                   `weight_quantity` INTEGER DEFAULT 0 COMMENT '重量/数量',
+                                   `charge_person` VARCHAR ( 30 ) DEFAULT NULL COMMENT '负责人',
+                                   `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注',
+                                   `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                   `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                   `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                   `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                   `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '无害化暂存记录';
+
+
+-- ---------------------------------------------------------------------------------------------------------------------
+-- 隐患风险点检记录(季次)
+CREATE TABLE `hb_risk_check_quarter` (
+                                        `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                        `job_title` VARCHAR ( 30 ) DEFAULT NULL COMMENT '岗位名称',
+                                        `record_no` VARCHAR ( 30 ) DEFAULT NULL COMMENT '编号',
+                                        `check_date` DATETIME DEFAULT NULL COMMENT '排查日期',
+                                        `check_quarter` VARCHAR ( 30 ) DEFAULT NULL COMMENT '排查季度',
+                                        `is_checked` TINYINT ( 1 ) DEFAULT '1' COMMENT '排查结果(0:未通过 1:已通过)',
+                                        `inspector_confirm` VARCHAR ( 30 ) DEFAULT NULL COMMENT '检查人(签字)',
+                                        `unusual_case_detail` VARCHAR ( 255 ) DEFAULT NULL COMMENT '异常情况记录',
+                                        `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注',
+                                        `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                        `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                        `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                        `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                        `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+	                                    PRIMARY KEY ( `id` )
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '隐患风险点检记录(季次)';
+
+-- 隐患排查治理台账
+CREATE TABLE `hb_risk_check_ledger` (
+                                        `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+                                        `sequence_no` INT DEFAULT NULL COMMENT '序号',
+                                        `check_date` DATETIME DEFAULT NULL COMMENT '检查时间',
+                                        `inspector_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '检查人',
+                                        `dept` VARCHAR ( 30 ) DEFAULT NULL COMMENT '责任部门',
+                                        `potential_detail` VARCHAR ( 60 ) DEFAULT NULL COMMENT '事故隐患',
+                                        `potential_level` VARCHAR ( 30 ) DEFAULT NULL COMMENT '隐患等级',
+                                        `solution_detail` VARCHAR ( 60 ) DEFAULT NULL COMMENT '治理措施',
+                                        `deadline` VARCHAR ( 30 ) DEFAULT NULL COMMENT '完成时限',
+                                        `upgrade_owner` VARCHAR ( 30 ) DEFAULT NULL COMMENT '整改责任人',
+                                        `reviewer_name` VARCHAR ( 30 ) DEFAULT NULL COMMENT '复查人',
+                                        `review_time` DATETIME DEFAULT NULL COMMENT '复查时间',
+                                        `is_reviewed` TINYINT ( 1 ) DEFAULT '1' COMMENT '复查结果(0未通过/1已通过)',
+                                        `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                        `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                        `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                        `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                        `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+	                                    PRIMARY KEY ( `id` )
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '隐患排查治理台账';
+-- 隐患风险点检记录(日次)
+CREATE TABLE `hb_risk_check_daily` (
+                                        `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                        `job_title` VARCHAR ( 30 ) DEFAULT NULL COMMENT '岗位名称',
+                                        `record_no` VARCHAR ( 30 ) DEFAULT NULL COMMENT '编号',
+                                        `check_date` DATETIME DEFAULT NULL COMMENT '排查日期',
+                                        `is_checked` TINYINT ( 1 ) DEFAULT '1' COMMENT '排查结果(0:未通过 1:已通过)',
+                                        `inspector_confirm` VARCHAR ( 30 ) DEFAULT NULL COMMENT '检查人(签字)',
+                                        `unusual_case_detail` VARCHAR ( 255 ) DEFAULT NULL COMMENT '异常情况记录',
+                                        `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注',
+                                        `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                        `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                        `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                        `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                        `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+	                                    PRIMARY KEY ( `id` )
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '隐患风险点检记录(日次)';
+-- 隐患风险点检记录(月次)
+CREATE TABLE `hb_risk_check_monthly` (
+                                        `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                        `job_title` VARCHAR ( 30 ) DEFAULT NULL COMMENT '岗位名称',
+                                        `record_no` VARCHAR ( 30 ) DEFAULT NULL COMMENT '编号',
+                                        `check_date` DATETIME DEFAULT NULL COMMENT '排查日期',
+                                        `month_section` VARCHAR ( 30 ) DEFAULT NULL COMMENT '月份区间',
+                                        `is_checked` TINYINT ( 1 ) DEFAULT '1' COMMENT '排查结果(0:未通过 1:已通过)',
+                                        `inspector_confirm` VARCHAR ( 30 ) DEFAULT NULL COMMENT '检查人(签字)',
+                                        `unusual_case_detail` VARCHAR ( 255 ) DEFAULT NULL COMMENT '异常情况记录',
+                                        `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注',
+                                        `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                        `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                        `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                        `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                        `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+	                                    PRIMARY KEY ( `id` )
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '隐患风险点检记录(月次)';
+
+-- 设备维保记录(日次)
+CREATE TABLE `hb_equip_maintenance_daily` (
+                                            `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                                            `record_date` DATETIME DEFAULT NULL COMMENT '日期',
+                                            `equip_name_group` VARCHAR(60) DEFAULT NULL COMMENT '屠宰设备名称',
+                                            `record_no` VARCHAR(30) DEFAULT NULL COMMENT '编号',
+                                            `specification_no_group` VARCHAR(90) DEFAULT NULL COMMENT '规格型号',
+                                            `maintenance_detail` VARCHAR(255) DEFAULT NULL COMMENT '维护记录',
+                                            `maintenance_employee` VARCHAR(30) DEFAULT NULL COMMENT '维护人',
+                                            `maintenance_date` DATETIME DEFAULT NULL COMMENT '维护日期',
+                                            `fault_detail` VARCHAR(255) DEFAULT NULL COMMENT '故障描述',
+                                            `repair_detail` VARCHAR(255) DEFAULT NULL COMMENT '维修结果',
+                                            `repair_employee` VARCHAR(30) DEFAULT NULL COMMENT '维修人',
+                                            `repair_date` DATETIME DEFAULT NULL COMMENT '维修日期',
+                                            `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                            `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                            `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                            `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                            `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备维保记录(日次)';
+
+-- 设备维保记录(周次)
+CREATE TABLE `hb_equip_maintenance_weekly` (
+                                            `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                                            `record_date` DATETIME DEFAULT NULL COMMENT '日期',
+                                            `equip_name_group` VARCHAR(60) DEFAULT NULL COMMENT '屠宰设备名称',
+                                            `record_no` VARCHAR(30) DEFAULT NULL COMMENT '编号',
+                                            `specification_no_group` VARCHAR(90) DEFAULT NULL COMMENT '规格型号',
+                                            `maintenance_detail` VARCHAR(255) DEFAULT NULL COMMENT '维护记录',
+                                            `maintenance_employee` VARCHAR(30) DEFAULT NULL COMMENT '维护人',
+                                            `maintenance_date` DATETIME DEFAULT NULL COMMENT '维护日期',
+                                            `fault_detail` VARCHAR(255) DEFAULT NULL COMMENT '故障描述',
+                                            `repair_detail` VARCHAR(255) DEFAULT NULL COMMENT '维修结果',
+                                            `repair_employee` VARCHAR(30) DEFAULT NULL COMMENT '维修人',
+                                            `repair_date` DATETIME DEFAULT NULL COMMENT '维修日期',
+                                            `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                            `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                            `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                            `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                            `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备维保记录(周次)';
+
+-- 设备维保记录(月次)
+CREATE TABLE `hb_equip_maintenance_monthly` (
+                                            `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+                                            `record_date` DATETIME DEFAULT NULL COMMENT '日期',
+                                            `equip_name_group` VARCHAR(60) DEFAULT NULL COMMENT '屠宰设备名称',
+                                            `record_no` VARCHAR(30) DEFAULT NULL COMMENT '编号',
+                                            `specification_no_group` VARCHAR(90) DEFAULT NULL COMMENT '规格型号',
+                                            `maintenance_detail` VARCHAR(255) DEFAULT NULL COMMENT '维护记录',
+                                            `maintenance_employee` VARCHAR(30) DEFAULT NULL COMMENT '维护人',
+                                            `maintenance_date` DATETIME DEFAULT NULL COMMENT '维护日期',
+                                            `fault_detail` VARCHAR(255) DEFAULT NULL COMMENT '故障描述',
+                                            `repair_detail` VARCHAR(255) DEFAULT NULL COMMENT '维修结果',
+                                            `repair_employee` VARCHAR(30) DEFAULT NULL COMMENT '维修人',
+                                            `repair_date` DATETIME DEFAULT NULL COMMENT '维修日期',
+                                            `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志,0否1是',
+                                            `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                            `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                            `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                            `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备维保记录(月次)';