暂存

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsCheckDeviceController.java

@@ -0,0 +1,72 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckDevice;
+import com.ruoyi.web.v2.v1.entity.JsCheckProject;
+import com.ruoyi.web.v2.v1.service.IJsCheckDeviceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0设备档案管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@RestController
+@RequestMapping("/js-check-device")
+@Api("2.0设备档案管理")
+public class JsCheckDeviceController {
+
+    @Autowired
+    private IJsCheckDeviceService deviceService;
+
+    @ApiOperation("设备档案管理添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsCheckDevice checkDevice){
+        return deviceService.add(checkDevice);
+    }
+
+    @ApiOperation("设备档案管理修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsCheckDevice checkDevice){
+        return deviceService.edit(checkDevice);
+    }
+
+    @ApiOperation("设备档案管理删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return deviceService.delete(ids);
+    }
+
+    @ApiOperation("设备档案管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return deviceService.listAll();
+    }
+
+    @ApiOperation("设备档案管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "deviceNum", required = false) String deviceNum,
+                           @RequestParam(value = "deviceName", required = false) String deviceName) {
+        return deviceService.page(pageNum, pageSize, deviceNum,deviceName);
+    }
+
+    @ApiOperation("设备档案管理详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(deviceService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsCheckInstrumentController.java

@@ -0,0 +1,71 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckDevice;
+import com.ruoyi.web.v2.v1.entity.JsCheckInstrument;
+import com.ruoyi.web.v2.v1.service.IJsCheckInstrumentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0检验仪器管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@RestController
+@RequestMapping("/js-check-instrument")
+@Api("2.0检验仪器管理")
+public class JsCheckInstrumentController {
+
+    @Autowired
+    private IJsCheckInstrumentService instrumentService;
+    
+    @ApiOperation("检验仪器管理添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsCheckInstrument checkDevice){
+        return instrumentService.add(checkDevice);
+    }
+
+    @ApiOperation("检验仪器管理修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsCheckInstrument checkDevice){
+        return instrumentService.edit(checkDevice);
+    }
+
+    @ApiOperation("检验仪器管理删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return instrumentService.delete(ids);
+    }
+
+    @ApiOperation("检验仪器管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return instrumentService.listAll();
+    }
+
+    @ApiOperation("检验仪器管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "deviceNum", required = false) String deviceNum,
+                           @RequestParam(value = "deviceName", required = false) String deviceName) {
+        return instrumentService.page(pageNum, pageSize, deviceNum,deviceName);
+    }
+    @ApiOperation("检验仪器管理详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(instrumentService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsCheckProjectController.java

@@ -0,0 +1,71 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckProject;
+import com.ruoyi.web.v2.v1.entity.JsDisinfectManage;
+import com.ruoyi.web.v2.v1.service.IJsCheckProjectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * 2.0检验项目管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+@RestController
+@RequestMapping("/js-check-project")
+@Api("2.0检验项目管理")
+public class JsCheckProjectController {
+
+    @Autowired
+    private IJsCheckProjectService projectService;
+
+    @ApiOperation("检验项目管理添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsCheckProject checkProject){
+        return projectService.add(checkProject);
+    }
+
+    @ApiOperation("检验项目管理修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsCheckProject checkProject){
+        return projectService.edit(checkProject);
+    }
+
+    @ApiOperation("检验项目管理删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return projectService.delete(ids);
+    }
+
+    @ApiOperation("检验项目管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return projectService.listAll();
+    }
+
+    @ApiOperation("检验项目管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "projectName", required = false) String projectName) {
+        return projectService.page(pageNum, pageSize, projectName);
+    }
+
+    @ApiOperation("检验项目管理详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(projectService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsDeviceMaintenanceController.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDeviceMaintenance;
+import com.ruoyi.web.v2.v1.entity.JsProduceCheck;
+import com.ruoyi.web.v2.v1.service.IJsDeviceMaintenanceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0设备维护登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@RestController
+@RequestMapping("/js-device-maintenance")
+@Api("2.0设备维护登记")
+public class JsDeviceMaintenanceController {
+
+    @Autowired
+    private IJsDeviceMaintenanceService deviceMaintenanceService;
+
+
+    @ApiOperation("设备维护登记添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsDeviceMaintenance deviceMaintenance) {
+        return deviceMaintenanceService.add(deviceMaintenance);
+    }
+
+    @ApiOperation("设备维护登记修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsDeviceMaintenance deviceMaintenance) {
+        return deviceMaintenanceService.edit(deviceMaintenance);
+    }
+
+    @ApiOperation("设备维护登记删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return deviceMaintenanceService.delete(ids);
+    }
+
+    @ApiOperation("设备维护登记列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return deviceMaintenanceService.listAll();
+    }
+
+    @ApiOperation("设备维护登记分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "deviceNum", required = false) String deviceNum
+            , @RequestParam(value = "deviceName", required = false) String deviceName) {
+
+        return deviceMaintenanceService.page(pageNum, pageSize, startTime, endTime, deviceNum,deviceName);
+    }
+
+    @ApiOperation("设备维护登记详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(deviceMaintenanceService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsDisinfectController.java

@@ -0,0 +1,72 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckInstrument;
+import com.ruoyi.web.v2.v1.entity.JsDisinfect;
+import com.ruoyi.web.v2.v1.service.IJsDisinfectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0消毒登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+@RestController
+@RequestMapping("/js-disinfect")
+@Api("2.0消毒登记")
+public class JsDisinfectController {
+
+    @Autowired
+    private IJsDisinfectService disinfectService;
+
+    @ApiOperation("消毒登记管理添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsDisinfect disinfect){
+        return disinfectService.add(disinfect);
+    }
+
+    @ApiOperation("消毒登记管理修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsDisinfect disinfect){
+        return disinfectService.edit(disinfect);
+    }
+
+    @ApiOperation("消毒登记管理删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return disinfectService.delete(ids);
+    }
+
+    @ApiOperation("消毒登记管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return disinfectService.listAll();
+    }
+
+    @ApiOperation("消毒登记管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime,
+                           @RequestParam(value = "disinfectLocation", required = false) String disinfectLocation) {
+        return disinfectService.page(pageNum, pageSize, startTime,endTime,disinfectLocation);
+    }
+    @ApiOperation("消毒登记管理详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(disinfectService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsDisinfectManageController.java

@@ -0,0 +1,71 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.web.v2.v1.entity.JsDisinfectManage;
+import com.ruoyi.web.v2.v1.service.IJsDisinfectManageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * 2.0消毒方式管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+@RestController
+@RequestMapping("/js-disinfect-manage")
+@Api("2.0消毒方式管理")
+public class JsDisinfectManageController extends BaseController {
+
+    @Autowired
+    private IJsDisinfectManageService disinfectManageService;
+
+    @ApiOperation("消毒方式管理添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsDisinfectManage jsDisinfectManage){
+        return disinfectManageService.add(jsDisinfectManage);
+    }
+
+    @ApiOperation("消毒方式管理修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsDisinfectManage jsDisinfectManage){
+        return disinfectManageService.edit(jsDisinfectManage);
+    }
+
+    @ApiOperation("消毒方式管理删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return disinfectManageService.delete(ids);
+    }
+
+    @ApiOperation("消毒方式管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return disinfectManageService.listAll();
+    }
+
+    @ApiOperation("消毒方式管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "disinfectMethod", required = false) String disinfectMethod) {
+        return disinfectManageService.page(pageNum, pageSize, disinfectMethod);
+    }
+    @ApiOperation("消毒方式管理详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(disinfectManageService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsDistributionController.java

@@ -0,0 +1,77 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDeviceMaintenance;
+import com.ruoyi.web.v2.v1.entity.JsDistribution;
+import com.ruoyi.web.v2.v1.service.IJsDistributionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0分销登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@RestController
+@RequestMapping("/js-distribution")
+@Api("2.0分销登记")
+public class JsDistributionController {
+
+    @Autowired
+    private IJsDistributionService distributionService;
+
+    @ApiOperation("分销登记添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsDistribution distribution) {
+        return distributionService.add(distribution);
+    }
+
+    @ApiOperation("分销登记修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsDistribution distribution) {
+        return distributionService.edit(distribution);
+    }
+
+    @ApiOperation("分销登记删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return distributionService.delete(ids);
+    }
+
+    @ApiOperation("分销登记列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return distributionService.listAll();
+    }
+
+    @ApiOperation("分销登记分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "supplierId", required = false) Integer supplierId
+            , @RequestParam(value = "purchaserId", required = false) Integer purchaserId
+            , @RequestParam(value = "animalCertNo", required = false) Integer animalCertNo) {
+
+        return distributionService.page(pageNum, pageSize, startTime, endTime,supplierId,purchaserId,animalCertNo);
+    }
+
+    @ApiOperation("分销登记详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(distributionService.getById(id));
+    }
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsDivideCircleController.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckInstrument;
+import com.ruoyi.web.v2.v1.entity.JsDivideCircle;
+import com.ruoyi.web.v2.v1.service.IJsDivideCircleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0分圈登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+@RestController
+@RequestMapping("/js-divide-circle")
+@Api("2.0分圈登记")
+public class JsDivideCircleController {
+
+    @Autowired
+    private IJsDivideCircleService divideCircleService;
+
+    @ApiOperation("分圈登记添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsDivideCircle divideCircle) {
+        return divideCircleService.add(divideCircle);
+    }
+
+    @ApiOperation("分圈登记修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsDivideCircle divideCircle) {
+        return divideCircleService.edit(divideCircle);
+    }
+
+    @ApiOperation("分圈登记删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return divideCircleService.delete(ids);
+    }
+
+    @ApiOperation("分圈登记列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return divideCircleService.listAll();
+    }
+
+    @ApiOperation("分圈登记分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "pigpenName", required = false) String pigpenName) {
+
+        return divideCircleService.page(pageNum, pageSize, startTime, endTime, pigpenName);
+    }
+
+    @ApiOperation("分圈登记详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(divideCircleService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsDrugCheckController.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDivideCircle;
+import com.ruoyi.web.v2.v1.entity.JsDrugCheck;
+import com.ruoyi.web.v2.v1.service.IJsDrugCheckService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0违禁药物登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+@RestController
+@RequestMapping("/js-drug-check")
+@Api("2.0违禁药物登记")
+public class JsDrugCheckController {
+
+    @Autowired
+    private IJsDrugCheckService drugCheckService;
+
+
+    @ApiOperation("违禁药物登记添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsDrugCheck drugCheck) {
+        return drugCheckService.add(drugCheck);
+    }
+
+    @ApiOperation("违禁药物登记修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsDrugCheck drugCheck) {
+        return drugCheckService.edit(drugCheck);
+    }
+
+    @ApiOperation("违禁药物登记删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return drugCheckService.delete(ids);
+    }
+
+    @ApiOperation("违禁药物登记列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return drugCheckService.listAll();
+    }
+
+    @ApiOperation("违禁药物登记分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "animalCertNo", required = false) String animalCertNo) {
+
+        return drugCheckService.page(pageNum, pageSize, startTime, endTime, animalCertNo);
+    }
+
+    @ApiOperation("违禁药物登记详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(drugCheckService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsDrugController.java

@@ -0,0 +1,92 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.v2.v1.entity.JsCheckProject;
+import com.ruoyi.web.v2.v1.entity.JsDrug;
+import com.ruoyi.web.v2.v1.service.IJsDrugService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0违禁药物名称 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@RestController
+@RequestMapping("/js-drug")
+@Api("2.0违禁药物名称")
+public class JsDrugController {
+
+    @Autowired
+    private IJsDrugService drugService;
+
+    @ApiOperation("违禁药物管理添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsDrug jsDrug){
+        int i = drugService.count(new QueryWrapper<JsDrug>().eq("drug_name", jsDrug.getDrugName()));
+        if (i != 0) {
+            return error("该违禁药物已存在");
+        }
+        drugService.save(jsDrug);
+        return success();
+    }
+
+    @ApiOperation("违禁药物管理修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsDrug jsDrug){
+        int i = drugService.count(new QueryWrapper<JsDrug>().eq("drug_name", jsDrug.getDrugName()).ne("id",jsDrug.getId()));
+        if (i != 0) {
+            return error("该违禁药物已存在");
+        }
+        drugService.updateById(jsDrug);
+        return success();
+    }
+
+    @ApiOperation("违禁药物管理删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            drugService.removeById(s);
+        }
+        return success();
+    }
+
+    @ApiOperation("违禁药物管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return success(drugService.list());
+    }
+
+    @ApiOperation("违禁药物管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "drugName", required = false) String drugName) {
+        Page<JsDrug> page = new Page<>(pageNum, pageSize);
+        QueryWrapper<JsDrug> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(drugName), "drug_name", drugName);
+        return success(drugService.page(page, queryWrapper));
+    }
+
+    @ApiOperation("违禁药物管理详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(drugService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsInStockController.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDeviceMaintenance;
+import com.ruoyi.web.v2.v1.entity.JsInStock;
+import com.ruoyi.web.v2.v1.service.IJsInStockService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0物料入库 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@RestController
+@RequestMapping("/js-in-stock")
+@Api("2.0物料入库")
+public class JsInStockController {
+
+    @Autowired
+    private IJsInStockService inStockService;
+
+    @ApiOperation("物料入库添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsInStock inStock) {
+        return inStockService.add(inStock);
+    }
+
+    @ApiOperation("物料入库修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsInStock inStock) {
+        return inStockService.edit(inStock);
+    }
+
+//    @ApiOperation("物料入库删除")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+//        String ids = paramsMap.get("ids");
+//        return inStockService.delete(ids);
+//    }
+
+    @ApiOperation("物料入库列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return inStockService.listAll();
+    }
+
+    @ApiOperation("物料入库分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "materialBatch", required = false) String materialBatch
+            , @RequestParam(value = "materialName", required = false) String materialName
+            , @RequestParam(value = "materialType", required = false) Integer materialType) {
+
+        return inStockService.page(pageNum, pageSize, startTime, endTime, materialBatch,materialName,materialType);
+    }
+
+    @ApiOperation("物料入库详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(inStockService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsInstrumentMaintenanceController.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDeviceMaintenance;
+import com.ruoyi.web.v2.v1.entity.JsInstrumentMaintenance;
+import com.ruoyi.web.v2.v1.service.IJsInstrumentMaintenanceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0检验仪器维护登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@RestController
+@RequestMapping("/js-instrument-maintenance")
+@Api("2.0检验仪器维护登记")
+public class JsInstrumentMaintenanceController {
+
+    @Autowired
+    private IJsInstrumentMaintenanceService maintenanceService;
+
+
+    @ApiOperation("检验仪器维护登记添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsInstrumentMaintenance deviceMaintenance) {
+        return maintenanceService.add(deviceMaintenance);
+    }
+
+    @ApiOperation("检验仪器维护登记修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsInstrumentMaintenance deviceMaintenance) {
+        return maintenanceService.edit(deviceMaintenance);
+    }
+
+    @ApiOperation("检验仪器维护登记删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return maintenanceService.delete(ids);
+    }
+
+    @ApiOperation("检验仪器维护登记列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return maintenanceService.listAll();
+    }
+
+    @ApiOperation("检验仪器维护登记分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "deviceNum", required = false) String deviceNum
+            , @RequestParam(value = "deviceName", required = false) String deviceName) {
+
+        return maintenanceService.page(pageNum, pageSize, startTime, endTime, deviceNum,deviceName);
+    }
+
+    @ApiOperation("检验仪器维护登记详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(maintenanceService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsMaterialController.java

@@ -0,0 +1,73 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsMaterial;
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+import com.ruoyi.web.v2.v1.service.IJsMaterialService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0物料管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@RestController
+@RequestMapping("/js-material")
+@Api("2.0物料管理")
+public class JsMaterialController {
+
+    @Autowired
+    private IJsMaterialService materialService;
+
+    @ApiOperation("物料管理添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsMaterial material){
+        return materialService.add(material);
+    }
+
+    @ApiOperation("物料管理修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsMaterial material){
+        return materialService.edit(material);
+    }
+
+    @ApiOperation("物料管理删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return materialService.delete(ids);
+    }
+
+    @ApiOperation("物料管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return materialService.listAll();
+    }
+
+    @ApiOperation("物料管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "materialName", required = false) String materialName
+            ,@RequestParam(value = "materialType", required = false) Integer materialType) {
+        return materialService.page(pageNum, pageSize, materialName,materialType);
+    }
+
+    @ApiOperation("物料管理详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(materialService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsOtherProduceController.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDistribution;
+import com.ruoyi.web.v2.v1.entity.JsOtherProduce;
+import com.ruoyi.web.v2.v1.service.IJsOtherProduceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0其他产品记录 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@RestController
+@RequestMapping("/js-other-produce")
+@Api("2.0其他产品记录")
+public class JsOtherProduceController {
+
+    @Autowired
+    private IJsOtherProduceService otherProduceService;
+
+    @ApiOperation("其他产品记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsOtherProduce otherProduce) {
+        return otherProduceService.add(otherProduce);
+    }
+
+    @ApiOperation("其他产品记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsOtherProduce otherProduce) {
+        return otherProduceService.edit(otherProduce);
+    }
+
+    @ApiOperation("其他产品记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return otherProduceService.delete(ids);
+    }
+
+    @ApiOperation("其他产品记录列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return otherProduceService.listAll();
+    }
+
+    @ApiOperation("其他产品记录分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "produceName", required = false) String produceName) {
+        return otherProduceService.page(pageNum, pageSize, startTime, endTime,produceName);
+    }
+
+    @ApiOperation("其他产品记录详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(otherProduceService.getById(id));
+    }
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsOutStockController.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsInStock;
+import com.ruoyi.web.v2.v1.entity.JsOutStock;
+import com.ruoyi.web.v2.v1.service.IJsOutStockService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0物料领用 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@RestController
+@RequestMapping("/js-out-stock")
+@Api("2.0物料领用")
+public class JsOutStockController {
+
+    @Autowired
+    private IJsOutStockService outStockService;
+
+    @ApiOperation("物料领用添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsOutStock outStock) {
+        return outStockService.add(outStock);
+    }
+
+    @ApiOperation("物料领用修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsOutStock outStock) {
+        return outStockService.edit(outStock);
+    }
+
+//    @ApiOperation("物料领用删除")
+//    @PostMapping("/delete")
+//    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+//        String ids = paramsMap.get("ids");
+//        return outStockService.delete(ids);
+//    }
+
+    @ApiOperation("物料领用列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return outStockService.listAll();
+    }
+
+    @ApiOperation("物料领用分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "materialBatch", required = false) String materialBatch
+            , @RequestParam(value = "materialName", required = false) String materialName
+            , @RequestParam(value = "materialType", required = false) Integer materialType) {
+
+        return outStockService.page(pageNum, pageSize, startTime, endTime, materialBatch,materialName,materialType);
+    }
+
+    @ApiOperation("物料领用详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(outStockService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsPatrolController.java

@@ -0,0 +1,20 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * v2.0质量巡查 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@RestController
+@RequestMapping("/js-patrol")
+public class JsPatrolController {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsProduceCheckController.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDrugCheck;
+import com.ruoyi.web.v2.v1.entity.JsProduceCheck;
+import com.ruoyi.web.v2.v1.service.IJsProduceCheckService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0生产检验检疫登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@RestController
+@RequestMapping("/js-produce-check")
+@Api("2.0生产检验检疫登记")
+public class JsProduceCheckController {
+
+    @Autowired
+    private IJsProduceCheckService produceCheckService;
+
+
+    @ApiOperation("生产检验检疫登记添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsProduceCheck produceCheck) {
+        return produceCheckService.add(produceCheck);
+    }
+
+    @ApiOperation("生产检验检疫登记修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsProduceCheck produceCheck) {
+        return produceCheckService.edit(produceCheck);
+    }
+
+    @ApiOperation("生产检验检疫登记删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return produceCheckService.delete(ids);
+    }
+
+    @ApiOperation("生产检验检疫登记列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return produceCheckService.listAll();
+    }
+
+    @ApiOperation("生产检验检疫登记分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "animalCertNo", required = false) String animalCertNo) {
+
+        return produceCheckService.page(pageNum, pageSize, startTime, endTime, animalCertNo);
+    }
+
+    @ApiOperation("生产检验检疫登记详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(produceCheckService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsProduceRecallController.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsOtherProduce;
+import com.ruoyi.web.v2.v1.entity.JsProduceRecall;
+import com.ruoyi.web.v2.v1.service.IJsProduceRecallService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0产品召回 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@RestController
+@RequestMapping("/js-produce-recall")
+@Api("2.0产品召回")
+public class JsProduceRecallController {
+
+    @Autowired
+    private IJsProduceRecallService recallService;
+
+    @ApiOperation("产品召回添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsProduceRecall produceRecall) {
+        return recallService.add(produceRecall);
+    }
+
+    @ApiOperation("产品召回修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsProduceRecall produceRecall) {
+        return recallService.edit(produceRecall);
+    }
+
+    @ApiOperation("产品召回删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return recallService.delete(ids);
+    }
+
+    @ApiOperation("产品召回列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return recallService.listAll();
+    }
+
+    @ApiOperation("产品召回分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "produceName", required = false) String produceName) {
+        return recallService.page(pageNum, pageSize, startTime, endTime,produceName);
+    }
+
+    @ApiOperation("产品召回详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(recallService.getById(id));
+    }
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsRestInspectionController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDivideCircle;
+import com.ruoyi.web.v2.v1.entity.JsRestInspection;
+import com.ruoyi.web.v2.v1.service.IJsRestInspectionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0静养巡查登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+@RestController
+@RequestMapping("/js-rest-inspection")
+@Api("2.0静养巡查登记")
+public class JsRestInspectionController {
+
+    @Autowired
+    private IJsRestInspectionService inspectionService;
+/*
+    @ApiOperation("静养巡查添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestParam(value = "restInspectionTime") String restInspectionTime
+            , @RequestParam(value = "pigpenName") String pigpenName, @RequestParam(value = "files") MultipartFile files
+            , @RequestParam(value = "restInspectionContent") String restInspectionContent
+            , @RequestParam(value = "handle") String handle
+            , @RequestParam(value = "dealAmount") Integer dealAmount, @RequestParam(value = "userName") String userName
+            , @RequestParam(value = "divideCircleId") Integer divideCircleId) throws IOException {
+        return inspectionService.add(restInspectionTime, pigpenName, files, restInspectionContent, handle, dealAmount, userName, divideCircleId);
+    }
+
+    @ApiOperation("静养巡查修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestParam(value = "restInspectionTime") String restInspectionTime
+            , @RequestParam(value = "files") MultipartFile files
+            , @RequestParam(value = "restInspectionContent") String restInspectionContent
+            , @RequestParam(value = "handle") String handle
+            , @RequestParam(value = "dealAmount") Integer dealAmount, @RequestParam(value = "userName") String userName
+            , @RequestParam(value = "id") Integer id) throws IOException {
+        return inspectionService.edit(id, restInspectionTime, files, restInspectionContent, handle, dealAmount, userName);
+    }*/
+
+    @ApiOperation("静养巡查添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsRestInspection restInspection) throws IOException {
+        return inspectionService.add(restInspection);
+    }
+
+    @ApiOperation("静养巡查修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsRestInspection restInspection) throws IOException {
+        return inspectionService.edit(restInspection);
+    }
+
+    @ApiOperation("静养巡查删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return inspectionService.delete(ids);
+    }
+
+    @ApiOperation("静养巡查列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return inspectionService.listAll();
+    }
+
+    @ApiOperation("静养巡查分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            , @RequestParam(value = "endTime", required = false) String endTime
+            , @RequestParam(value = "pigpenName", required = false) String pigpenName) {
+
+        return inspectionService.page(pageNum, pageSize, startTime, endTime, pigpenName);
+    }
+
+    @ApiOperation("静养巡查详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return success(inspectionService.getById(id));
+    }
+
+    @ApiOperation("静养巡查详情通过传分圈id")
+    @PostMapping("/listByDivideCircleId")
+    public AjaxResult listByDivideCircleId(@RequestBody Map<String, String> paramsMap) {
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String id = paramsMap.get("id");
+        Page<JsRestInspection> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<JsRestInspection> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("divide_circle_id",id);
+        return success(inspectionService.page(page, queryWrapper));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsSampleController.java

@@ -0,0 +1,73 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsSample;
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+import com.ruoyi.web.v2.v1.service.IJsSampleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0样品留存登记 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@RestController
+@RequestMapping("/js-sample")
+@Api("2.0样品留存登记")
+public class JsSampleController {
+
+    @Autowired
+    private IJsSampleService sampleService;
+
+    @ApiOperation("样品留存登记添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsSample sample){
+        return sampleService.add(sample);
+    }
+
+    @ApiOperation("样品留存登记修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsSample sample){
+        return sampleService.edit(sample);
+    }
+
+    @ApiOperation("样品留存登记删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return sampleService.delete(ids);
+    }
+
+    @ApiOperation("样品留存登记列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return sampleService.listAll();
+    }
+
+    @ApiOperation("样品留存登记分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "startTime", required = false) String startTime
+            ,@RequestParam(value = "endTime", required = false) String endTime
+            ,@RequestParam(value = "sampleNum", required = false) String sampleNum) {
+        return sampleService.page(pageNum, pageSize, startTime,endTime,sampleNum);
+    }
+
+    @ApiOperation("样品留存登记详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(sampleService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsStockController.java

@@ -0,0 +1,43 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.service.IJsStockService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * v2.0库存管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@RestController
+@RequestMapping("/js-stock")
+@Api("2.0库存管理")
+public class JsStockController {
+
+    @Autowired
+    private IJsStockService stockService;
+
+    @ApiOperation("库存管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll() {
+        return stockService.listAll();
+    }
+
+    @ApiOperation("库存管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "materialBatch", required = false) String materialBatch
+            , @RequestParam(value = "materialName", required = false) String materialName
+            , @RequestParam(value = "materialType", required = false) Integer materialType) {
+
+        return stockService.page(pageNum, pageSize, materialBatch,materialName,materialType);
+    }
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsStoreController.java

@@ -0,0 +1,20 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * v2.0无害化暂存 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@RestController
+@RequestMapping("/js-store")
+public class JsStoreController {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsTransportController.java

@@ -0,0 +1,20 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * v2.0无害化转运 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@RestController
+@RequestMapping("/js-transport")
+public class JsTransportController {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsWorkshopController.java

@@ -0,0 +1,73 @@
+package com.ruoyi.web.v2.v1.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckProject;
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+import com.ruoyi.web.v2.v1.service.IJsWorkshopService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0生产车间管理 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@RestController
+@RequestMapping("/js-workshop")
+@Api("2.0生产车间管理")
+public class JsWorkshopController {
+
+    @Autowired
+    private IJsWorkshopService workshopService;
+
+    @ApiOperation("生产车间管理管理添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody JsWorkshop workshop){
+        return workshopService.add(workshop);
+    }
+
+    @ApiOperation("生产车间管理管理修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody JsWorkshop workshop){
+        return workshopService.edit(workshop);
+    }
+
+    @ApiOperation("生产车间管理管理删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return workshopService.delete(ids);
+    }
+
+    @ApiOperation("生产车间管理管理列表")
+    @PostMapping("/list")
+    public AjaxResult listAll(){
+        return workshopService.listAll();
+    }
+
+    @ApiOperation("生产车间管理管理分页")
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize
+            , @RequestParam(value = "workshopName", required = false) String workshopName
+            ,@RequestParam(value = "workshopNum", required = false) String workshopNum
+            ,@RequestParam(value = "workshopType", required = false) String workshopType) {
+        return workshopService.page(pageNum, pageSize, workshopName,workshopNum,workshopType);
+    }
+
+    @ApiOperation("生产车间管理管理详情")
+    @PostMapping("/listById")
+    public AjaxResult listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return success(workshopService.getById(id));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsCheckDevice.java

@@ -0,0 +1,58 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0设备档案管理
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_check_device")
+@ApiModel(value="JsCheckDevice对象", description="v2.0设备档案管理")
+public class JsCheckDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "设备编号")
+    private String deviceNum;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    @ApiModelProperty(value = "厂家")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "投入使用日期")
+    private String investmentTime;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "联系人")
+    private String userName;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsCheckInstrument.java

@@ -0,0 +1,58 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0检验仪器管理
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_check_instrument")
+@ApiModel(value="JsCheckInstrument对象", description="v2.0检验仪器管理")
+public class JsCheckInstrument implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "仪器编号")
+    private String deviceNum;
+
+    @ApiModelProperty(value = "仪器名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    @ApiModelProperty(value = "厂家")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "投入使用日期")
+    private String investmentTime;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "联系人")
+    private String userName;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsCheckProject.java

@@ -0,0 +1,52 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 2.0检验项目管理
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_check_project")
+@ApiModel(value="JsCheckProject对象", description="2.0检验项目管理")
+public class JsCheckProject implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @ApiModelProperty(value = "检验内容")
+    private String checkContent;
+
+    @ApiModelProperty(value = "检验方法")
+    private String checkMethod;
+
+    @ApiModelProperty(value = "结果选项0正常1异常")
+    private Integer result;
+
+    @ApiModelProperty(value = "检验时间")
+    private String createTime;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDeviceMaintenance.java

@@ -0,0 +1,53 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0设备维护登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_device_maintenance")
+@ApiModel(value="JsDeviceMaintenance对象", description="v2.0设备维护登记")
+public class JsDeviceMaintenance implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "维护时间")
+    private String maintenanceTime;
+
+    @ApiModelProperty(value = "设备编号")
+    private String deviceNum;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "维护项目")
+    private String maintenanceProject;
+
+    @ApiModelProperty(value = "维护情况描述")
+    private String maintenanceSituation;
+
+    @ApiModelProperty(value = "责任人")
+    private String userName;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDisinfect.java

@@ -0,0 +1,60 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0消毒登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_disinfect")
+@ApiModel(value="JsDisinfect对象", description="v2.0消毒登记")
+public class JsDisinfect implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "消毒时间")
+    private String disinfectTime;
+
+
+    @ApiModelProperty(value = "消毒位置")
+    private String disinfectLocation;
+
+    @ApiModelProperty(value = "待宰间")
+    private String pigpenName;
+
+    @ApiModelProperty(value = "车牌号")
+    private String car;
+
+    @ApiModelProperty(value = "消毒方式")
+    private String disinfectMethod;
+
+    @ApiModelProperty(value = "消毒药剂")
+    private String disinfectDose;
+
+    @ApiModelProperty(value = "消毒人员")
+    private String disinfectUser;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDisinfectManage.java

@@ -0,0 +1,53 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.SwaggerDefinition;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 2.0消毒方式管理
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_disinfect_manage")
+public class JsDisinfectManage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 消毒方法
+     */
+    @ApiModelProperty(value = "消毒方法")
+    private String disinfectMethod;
+
+    /**
+     * 消毒药剂
+     */
+    @ApiModelProperty(value = "消毒药剂")
+    private String disinfectDose;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDistribution.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0分销登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_distribution")
+@ApiModel(value="JsDistribution对象", description="v2.0分销登记")
+public class JsDistribution implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "分销时间")
+    private String distributionTime;
+
+    @ApiModelProperty(value = "供应商id")
+    private Integer supplierId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty(value = "检疫证号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "肉商id")
+    private Integer purchaserId;
+
+    @ApiModelProperty(value = "肉商")
+    private String purchaserName;
+
+    @ApiModelProperty(value = "产品名称")
+    private String produceName;
+
+    @ApiModelProperty(value = "数量")
+    private String amount;
+
+    @ApiModelProperty(value = "吊钩类型")
+    private String hookType;
+
+    @ApiModelProperty(value = "吊钩扣重")
+    private String hookWeight;
+
+    @ApiModelProperty(value = "称显重量")
+    private String weight;
+
+    @ApiModelProperty(value = "干损重量")
+    private String dryWeight;
+
+    @ApiModelProperty(value = "宰后重量")
+    private String afterWeight;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDivideCircle.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0分圈登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_divide_circle")
+@ApiModel(value="JsDivideCircle对象", description="v2.0分圈登记")
+public class JsDivideCircle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "分圈日期")
+    private String divideTime;
+
+    @ApiModelProperty(value = "待宰圈号")
+    private String pigpenName;
+
+    @ApiModelProperty(value = "待宰圈号id")
+    private Integer pigpenId;
+
+    @ApiModelProperty(value = "供应商id")
+    private Integer supplierId;
+
+    @ApiModelProperty(value = "供应商")
+    private String supplierName;
+
+    @ApiModelProperty(value = "检疫证号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "动物品种")
+    private String variety;
+
+    @ApiModelProperty(value = "数量")
+    private Integer amount;
+
+    @ApiModelProperty(value = "静养巡查id")
+    private String restInspectionId;
+
+    @ApiModelProperty(value = "消毒情况：已消毒/未消毒")
+    private Integer disinfect;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "批次id")
+    private Integer entranceBatchId;
+
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDrug.java

@@ -0,0 +1,37 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0违禁药物名称
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_drug")
+@ApiModel(value="JsDrug对象", description="v2.0违禁药物名称")
+public class JsDrug implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "药物名称")
+    private String drugName;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDrugCheck.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0违禁药物登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_drug_check")
+@ApiModel(value="JsDrugCheck对象", description="v2.0违禁药物登记")
+public class JsDrugCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "检验日期")
+    private String checkTime;
+
+    @ApiModelProperty(value = "供应商")
+    private String supplierName;
+
+    @ApiModelProperty(value = "供应商id")
+    private Integer supplierId;
+
+    @ApiModelProperty(value = "检疫证号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "抽检头数")
+    private Integer checkAmount;
+
+    @ApiModelProperty(value = "检验项目")
+    private String checkProject;
+
+    @ApiModelProperty(value = "检验内容")
+    private String checkConten;
+
+    @ApiModelProperty(value = "抽检结果")
+    private Integer result;
+
+    @ApiModelProperty(value = "批次号")
+    private Integer entranceBatchId;
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsInStock.java

@@ -0,0 +1,65 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0物料入库
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_in_stock")
+@ApiModel(value="JsInStock对象", description="v2.0物料入库")
+public class JsInStock implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "入库时间")
+    private String inTime;
+
+    @ApiModelProperty(value = "物料批次号")
+    private String materialBatch;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "物料类型")
+    private Integer materialType;
+
+    @ApiModelProperty(value = "入库数量")
+    private String stockAmount;
+
+    @ApiModelProperty(value = "计量单位")
+    private String unit;
+
+    @ApiModelProperty(value = "型号规格")
+    private String model;
+
+    @ApiModelProperty(value = "存储位置")
+    private String location;
+
+    @ApiModelProperty(value = "保存条件")
+    private String saveCondition;
+
+    @ApiModelProperty(value = "保管人")
+    private String saveUser;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsInstrumentMaintenance.java

@@ -0,0 +1,53 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0检验仪器维护登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_instrument_maintenance")
+@ApiModel(value="JsInstrumentMaintenance对象", description="v2.0检验仪器维护登记")
+public class JsInstrumentMaintenance implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "维护时间")
+    private String maintenanceTime;
+
+    @ApiModelProperty(value = "仪器编号")
+    private String deviceNum;
+
+    @ApiModelProperty(value = "仪器名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "维护项目")
+    private String maintenanceProject;
+
+    @ApiModelProperty(value = "维护情况描述")
+    private String maintenanceSituation;
+
+    @ApiModelProperty(value = "责任人")
+    private String userName;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsMaterial.java

@@ -0,0 +1,40 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0物料管理
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_material")
+@ApiModel(value="JsMaterial对象", description="v2.0物料管理")
+public class JsMaterial implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "物料类型（原材料、产品、包材、危险化学品、检验检疫试剂、消毒药剂）")
+    private Integer materialType;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsOtherProduce.java

@@ -0,0 +1,56 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0其他产品记录
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_other_produce")
+@ApiModel(value="JsOtherProduce对象", description="v2.0其他产品记录")
+public class JsOtherProduce implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "出场日期")
+    private String exitTime;
+
+    @ApiModelProperty(value = "产品名称")
+    private String produceName;
+
+    @ApiModelProperty(value = "生产日期")
+    private String produceTime;
+
+    @ApiModelProperty(value = "重量")
+    private String weight;
+
+    @ApiModelProperty(value = "处理人")
+    private String dealUser;
+
+    @ApiModelProperty(value = "去向")
+    private String destination;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsOutStock.java

@@ -0,0 +1,56 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0物料领用
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_out_stock")
+@ApiModel(value="JsOutStock对象", description="v2.0物料领用")
+public class JsOutStock implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "领用时间")
+    private String outTime;
+
+    @ApiModelProperty(value = "物料批次号")
+    private String materialBatch;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "物料类型")
+    private Integer materialType;
+
+    @ApiModelProperty(value = "领用数量")
+    private String stockAmount;
+
+    @ApiModelProperty(value = "计量单位")
+    private String unit;
+
+    @ApiModelProperty(value = "领用人")
+    private String saveUser;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsPatrol.java

@@ -0,0 +1,56 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0质量巡查
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_patrol")
+@ApiModel(value="JsPatrol对象", description="v2.0质量巡查")
+public class JsPatrol implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "巡查时间")
+    private String patrolTime;
+
+    @ApiModelProperty(value = "巡查点位")
+    private String patrolLocation;
+
+    @ApiModelProperty(value = "巡查内容")
+    private String patrolContent;
+
+    @ApiModelProperty(value = "异常情况描述")
+    private String abnormalCondition;
+
+    @ApiModelProperty(value = "处置方式")
+    private String dealMethod;
+
+    @ApiModelProperty(value = "处置结果")
+    private String dealResult;
+
+    @ApiModelProperty(value = "巡查人")
+    private String patrolUser;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsProduceCheck.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0生产检验检疫登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_produce_check")
+@ApiModel(value="JsProduceCheck对象", description="v2.0生产检验检疫登记")
+public class JsProduceCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "检验日期")
+    private String checkTime;
+
+    @ApiModelProperty(value = "供应商id")
+    private Integer supplierId;
+
+    @ApiModelProperty(value = "供应商")
+    private String supplierName;
+
+    @ApiModelProperty(value = "检疫证号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "产品名称")
+    private String produceName;
+
+    @ApiModelProperty(value = "检验项目")
+    private String checkProject;
+
+    @ApiModelProperty(value = "数量（重量）")
+    private String number;
+
+    @ApiModelProperty(value = "合格数量（重量）")
+    private String qualifiedNum;
+
+    @ApiModelProperty(value = "不合格数量（重量）")
+    private String unqualifiedNum;
+
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "不合格原因")
+    private String unqualifiedReason;
+
+    @ApiModelProperty(value = "处理方式（高温、化制、焚烧、深埋、委托处理）")
+    private Integer method;
+
+    @ApiModelProperty(value = "检验人")
+    private String userName;
+
+    private Integer entranceBatchId;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsProduceRecall.java

@@ -0,0 +1,59 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0产品召回
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_produce_recall")
+@ApiModel(value="JsProduceRecall对象", description="v2.0产品召回")
+public class JsProduceRecall implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "召回日期")
+    private String recallTime;
+
+    @ApiModelProperty(value = "产品名称")
+    private String produceName;
+
+    @ApiModelProperty(value = "肉商id")
+    private Integer purchaserId;
+
+    @ApiModelProperty(value = "肉商")
+    private String purchaserName;
+
+    @ApiModelProperty(value = "消费者")
+    private String consumer;
+
+    @ApiModelProperty(value = "召回数量")
+    private String recallAmount;
+
+    @ApiModelProperty(value = "召回原因")
+    private String recallReason;
+
+    @ApiModelProperty(value = "召回后处理")
+    private String recallDeal;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsRestInspection.java

@@ -0,0 +1,57 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0静养巡查登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_rest_inspection")
+@ApiModel(value="JsRestInspection对象", description="v2.0静养巡查登记")
+public class JsRestInspection implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "巡查时间")
+    private String restInspectionTime;
+
+    @ApiModelProperty(value = "待宰圈号")
+    private String pigpenName;
+
+    @ApiModelProperty(value = "巡查照片")
+    private String restInspectionImg;
+
+    @ApiModelProperty(value = "巡查内容描述")
+    private String restInspectionContent;
+
+    @ApiModelProperty(value = "处理情况")
+    private String handle;
+
+    @ApiModelProperty(value = "病死病害数量")
+    private Integer dealAmount;
+
+    @ApiModelProperty(value = "巡查人")
+    private String userName;
+
+    @ApiModelProperty(value = "分圈id")
+    private Integer divideCircleId;
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsSample.java

@@ -0,0 +1,64 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0样品留存登记
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_sample")
+@ApiModel(value="JsSample对象", description="v2.0样品留存登记")
+public class JsSample implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "留存日期")
+    private String keepTime;
+
+    @ApiModelProperty(value = "样品编号")
+    private String sampleNum;
+
+    @ApiModelProperty(value = "产品名称")
+    private String produceName;
+
+    @ApiModelProperty(value = "供应商id")
+    private Integer supplierId;
+
+    @ApiModelProperty(value = "供应商")
+    private String supplierName;
+
+    @ApiModelProperty(value = "检疫证号")
+    private String animalCertNo;
+
+    @ApiModelProperty(value = "留样人")
+    private String userName;
+
+    @ApiModelProperty(value = "样品处理去向")
+    private String sampleDeal;
+
+    @ApiModelProperty(value = "处理时间")
+    private String dealTime;
+
+    private Integer entranceBatchId;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsStock.java

@@ -0,0 +1,67 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0库存管理
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_stock")
+@ApiModel(value="JsStock对象", description="v2.0库存管理")
+public class JsStock implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "物料批次号")
+    private String materialBatch;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "物料类型")
+    private Integer materialType;
+
+    @ApiModelProperty(value = "库存数量")
+    private String stockAmount;
+
+    @ApiModelProperty(value = "计量单位")
+    private String unit;
+
+    @ApiModelProperty(value = "型号规格")
+    private String model;
+
+    @ApiModelProperty(value = "存储位置")
+    private String location;
+
+    @ApiModelProperty(value = "保存条件")
+    private String saveCondition;
+
+    @ApiModelProperty(value = "保管人")
+    private String saveUser;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsStore.java

@@ -0,0 +1,53 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0无害化暂存
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_store")
+@ApiModel(value="JsStore对象", description="v2.0无害化暂存")
+public class JsStore implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "暂存日期")
+    private String storeTime;
+
+    @ApiModelProperty(value = "无害化批次id")
+    private Integer harmlessTreatmentId;
+
+    @ApiModelProperty(value = "病死病害头数")
+    private Integer illnessAmount;
+
+    @ApiModelProperty(value = "不合格产品数量")
+    private String unqualifiedWeight;
+
+    @ApiModelProperty(value = "暂存位置")
+    private String storeLocation;
+
+    @ApiModelProperty(value = "责任人")
+    private String userName;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsTransport.java

@@ -0,0 +1,59 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0无害化转运
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_transport")
+@ApiModel(value="JsTransport对象", description="v2.0无害化转运")
+public class JsTransport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "转运日期")
+    private String transportTime;
+
+    @ApiModelProperty(value = "无害化批次id")
+    private Integer harmlessTreatmentId;
+
+    @ApiModelProperty(value = "病死病害头数")
+    private Integer illnessAmount;
+
+    @ApiModelProperty(value = "不合格产品数量")
+    private String unqualifiedWeight;
+
+    @ApiModelProperty(value = "目的地")
+    private String destination;
+
+    @ApiModelProperty(value = "车牌号码")
+    private String carNum;
+
+    @ApiModelProperty(value = "联系人")
+    private String userName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsWorkshop.java

@@ -0,0 +1,43 @@
+package com.ruoyi.web.v2.v1.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * v2.0生产车间管理
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("js_workshop")
+@ApiModel(value="JsWorkshop对象", description="v2.0生产车间管理")
+public class JsWorkshop implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "车间编号")
+    private String workshopNum;
+
+    @ApiModelProperty(value = "车间名称")
+    private String workshopName;
+
+    @ApiModelProperty(value = "车间类型（待宰间、白条屠宰间、副产品间、晾肉间、速冻间、消毒间、冻库）")
+    private Integer workshopType;
+
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsCheckDeviceMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsCheckDevice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0设备档案管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface JsCheckDeviceMapper extends BaseMapper<JsCheckDevice> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsCheckInstrumentMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsCheckInstrument;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0检验仪器管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface JsCheckInstrumentMapper extends BaseMapper<JsCheckInstrument> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsCheckProjectMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsCheckProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 2.0检验项目管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+public interface JsCheckProjectMapper extends BaseMapper<JsCheckProject> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsDeviceMaintenanceMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsDeviceMaintenance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0设备维护登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface JsDeviceMaintenanceMapper extends BaseMapper<JsDeviceMaintenance> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsDisinfectManageMapper.java

@@ -0,0 +1,17 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsDisinfectManage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * <p>
+ * 2.0消毒方式管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+public interface JsDisinfectManageMapper extends BaseMapper<JsDisinfectManage> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsDisinfectMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsDisinfect;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0消毒登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+public interface JsDisinfectMapper extends BaseMapper<JsDisinfect> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsDistributionMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsDistribution;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0分销登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface JsDistributionMapper extends BaseMapper<JsDistribution> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsDivideCircleMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsDivideCircle;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0分圈登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+public interface JsDivideCircleMapper extends BaseMapper<JsDivideCircle> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsDrugCheckMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsDrugCheck;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0违禁药物登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+public interface JsDrugCheckMapper extends BaseMapper<JsDrugCheck> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsDrugMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsDrug;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0违禁药物名称 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface JsDrugMapper extends BaseMapper<JsDrug> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsInStockMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsInStock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0物料入库 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface JsInStockMapper extends BaseMapper<JsInStock> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsInstrumentMaintenanceMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsInstrumentMaintenance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0检验仪器维护登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface JsInstrumentMaintenanceMapper extends BaseMapper<JsInstrumentMaintenance> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsMaterialMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsMaterial;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0物料管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface JsMaterialMapper extends BaseMapper<JsMaterial> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsOtherProduceMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsOtherProduce;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0其他产品记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface JsOtherProduceMapper extends BaseMapper<JsOtherProduce> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsOutStockMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsOutStock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0物料领用 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface JsOutStockMapper extends BaseMapper<JsOutStock> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsPatrolMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsPatrol;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0质量巡查 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface JsPatrolMapper extends BaseMapper<JsPatrol> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsProduceCheckMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsProduceCheck;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0生产检验检疫登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface JsProduceCheckMapper extends BaseMapper<JsProduceCheck> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsProduceRecallMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsProduceRecall;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0产品召回 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface JsProduceRecallMapper extends BaseMapper<JsProduceRecall> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsRestInspectionMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsRestInspection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0静养巡查登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+public interface JsRestInspectionMapper extends BaseMapper<JsRestInspection> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsSampleMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsSample;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0样品留存登记 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface JsSampleMapper extends BaseMapper<JsSample> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsStockMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsStock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0库存管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface JsStockMapper extends BaseMapper<JsStock> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsStoreMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsStore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0无害化暂存 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface JsStoreMapper extends BaseMapper<JsStore> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsTransportMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsTransport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0无害化转运 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface JsTransportMapper extends BaseMapper<JsTransport> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsWorkshopMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.mapper;
+
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * v2.0生产车间管理 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface JsWorkshopMapper extends BaseMapper<JsWorkshop> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsCheckDeviceService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckDevice;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+
+/**
+ * <p>
+ * v2.0设备档案管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface IJsCheckDeviceService extends IService<JsCheckDevice> {
+
+    AjaxResult add(JsCheckDevice checkDevice);
+
+    AjaxResult edit(JsCheckDevice checkDevice);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String deviceNum, String deviceName);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsCheckInstrumentService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckDevice;
+import com.ruoyi.web.v2.v1.entity.JsCheckInstrument;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0检验仪器管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface IJsCheckInstrumentService extends IService<JsCheckInstrument> {
+
+    AjaxResult add(JsCheckInstrument checkDevice);
+
+    AjaxResult edit(JsCheckInstrument checkDevice);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String deviceNum, String deviceName);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsCheckProjectService.java

@@ -0,0 +1,28 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckProject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.v2.v1.entity.JsDisinfectManage;
+
+/**
+ * <p>
+ * 2.0检验项目管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+public interface IJsCheckProjectService extends IService<JsCheckProject> {
+
+
+    AjaxResult add(JsCheckProject checkProject);
+
+    AjaxResult edit(JsCheckProject checkProject);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String projectName);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsDeviceMaintenanceService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDeviceMaintenance;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.v2.v1.entity.JsProduceCheck;
+
+/**
+ * <p>
+ * v2.0设备维护登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface IJsDeviceMaintenanceService extends IService<JsDeviceMaintenance> {
+
+    AjaxResult add(JsDeviceMaintenance deviceMaintenance);
+
+    AjaxResult edit(JsDeviceMaintenance deviceMaintenance);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String deviceNum, String deviceName);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsDisinfectManageService.java

@@ -0,0 +1,28 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDisinfectManage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.swagger.models.auth.In;
+
+/**
+ * <p>
+ * 2.0消毒方式管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+public interface IJsDisinfectManageService extends IService<JsDisinfectManage> {
+
+    AjaxResult add(JsDisinfectManage jsDisinfectManage);
+
+    AjaxResult edit(JsDisinfectManage jsDisinfectManage);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String disinfectMethod);
+
+    AjaxResult listAll();
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsDisinfectService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDisinfect;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.v2.v1.entity.JsDivideCircle;
+
+/**
+ * <p>
+ * v2.0消毒登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+public interface IJsDisinfectService extends IService<JsDisinfect> {
+
+    AjaxResult add(JsDisinfect disinfect);
+
+    AjaxResult edit(JsDisinfect disinfect);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String disinfectLocation);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsDistributionService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDeviceMaintenance;
+import com.ruoyi.web.v2.v1.entity.JsDistribution;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0分销登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface IJsDistributionService extends IService<JsDistribution> {
+
+    AjaxResult add(JsDistribution distribution);
+
+    AjaxResult edit(JsDistribution distribution);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, Integer supplierId, Integer purchaserId, Integer animalCertNo);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsDivideCircleService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDivideCircle;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+
+/**
+ * <p>
+ * v2.0分圈登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+public interface IJsDivideCircleService extends IService<JsDivideCircle> {
+
+    AjaxResult add(JsDivideCircle divideCircle);
+
+    AjaxResult edit(JsDivideCircle divideCircle);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String pigpenName);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsDrugCheckService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDivideCircle;
+import com.ruoyi.web.v2.v1.entity.JsDrugCheck;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0违禁药物登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+public interface IJsDrugCheckService extends IService<JsDrugCheck> {
+
+    AjaxResult add(JsDrugCheck drugCheck);
+
+    AjaxResult edit(JsDrugCheck drugCheck);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String animalCertNo);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsDrugService.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.web.v2.v1.entity.JsDrug;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0违禁药物名称 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface IJsDrugService extends IService<JsDrug> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsInStockService.java

@@ -0,0 +1,28 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsInStock;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.v2.v1.entity.JsInstrumentMaintenance;
+
+/**
+ * <p>
+ * v2.0物料入库 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface IJsInStockService extends IService<JsInStock> {
+
+    AjaxResult add(JsInStock inStock);
+
+    AjaxResult edit(JsInStock inStock);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String materialBatch, String materialName, Integer materialType);
+
+    AjaxResult listAll();
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsInstrumentMaintenanceService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDeviceMaintenance;
+import com.ruoyi.web.v2.v1.entity.JsInstrumentMaintenance;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0检验仪器维护登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface IJsInstrumentMaintenanceService extends IService<JsInstrumentMaintenance> {
+
+    AjaxResult add(JsInstrumentMaintenance deviceMaintenance);
+
+    AjaxResult edit(JsInstrumentMaintenance deviceMaintenance);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String deviceNum, String deviceName);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsMaterialService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsMaterial;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+
+/**
+ * <p>
+ * v2.0物料管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface IJsMaterialService extends IService<JsMaterial> {
+
+    AjaxResult add(JsMaterial material);
+
+    AjaxResult edit(JsMaterial material);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String materialName, Integer materialType);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsOtherProduceService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsMaterial;
+import com.ruoyi.web.v2.v1.entity.JsOtherProduce;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0其他产品记录 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface IJsOtherProduceService extends IService<JsOtherProduce> {
+
+    AjaxResult add(JsOtherProduce otherProduce);
+
+    AjaxResult edit(JsOtherProduce otherProduce);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String produceName);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsOutStockService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsInStock;
+import com.ruoyi.web.v2.v1.entity.JsOutStock;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0物料领用 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface IJsOutStockService extends IService<JsOutStock> {
+
+    AjaxResult add(JsOutStock outStock);
+
+    AjaxResult edit(JsOutStock outStock);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String materialBatch, String materialName, Integer materialType);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsPatrolService.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.web.v2.v1.entity.JsPatrol;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0质量巡查 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface IJsPatrolService extends IService<JsPatrol> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsProduceCheckService.java

@@ -0,0 +1,28 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDisinfect;
+import com.ruoyi.web.v2.v1.entity.JsProduceCheck;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0生产检验检疫登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface IJsProduceCheckService extends IService<JsProduceCheck> {
+
+
+    AjaxResult add(JsProduceCheck produceCheck);
+
+    AjaxResult edit(JsProduceCheck produceCheck);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String animalCertNo);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsProduceRecallService.java

@@ -0,0 +1,28 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsOtherProduce;
+import com.ruoyi.web.v2.v1.entity.JsProduceRecall;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0产品召回 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface IJsProduceRecallService extends IService<JsProduceRecall> {
+
+    AjaxResult add(JsProduceRecall produceRecall);
+
+    AjaxResult edit(JsProduceRecall produceRecall);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String produceName);
+
+    AjaxResult listAll();
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsRestInspectionService.java

@@ -0,0 +1,38 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsDivideCircle;
+import com.ruoyi.web.v2.v1.entity.JsRestInspection;
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.swagger.models.auth.In;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * <p>
+ * v2.0静养巡查登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-22
+ */
+public interface IJsRestInspectionService extends IService<JsRestInspection> {
+
+
+//    AjaxResult add(String restInspectionTime, String pigpenName, MultipartFile files, String restInspectionContent,
+//                   String handle,Integer dealAmount, String userName, Integer divideCircleId) throws IOException;
+//
+//    AjaxResult edit(Integer id,String restInspectionTime, MultipartFile files,String restInspectionContent,
+//                    String handle,Integer dealAmount,String userName) throws IOException;
+
+    AjaxResult add(JsRestInspection jsRestInspection);
+
+    AjaxResult edit(JsRestInspection jsRestInspection);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String pigpenName);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsSampleService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsMaterial;
+import com.ruoyi.web.v2.v1.entity.JsSample;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0样品留存登记 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface IJsSampleService extends IService<JsSample> {
+
+    AjaxResult add(JsSample sample);
+
+    AjaxResult edit(JsSample sample);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String startTime, String endTime, String sampleNum);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsStockService.java

@@ -0,0 +1,21 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsSample;
+import com.ruoyi.web.v2.v1.entity.JsStock;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0库存管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-23
+ */
+public interface IJsStockService extends IService<JsStock> {
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String materialBatch, String materialName, Integer materialType);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsStoreService.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.web.v2.v1.entity.JsStore;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0无害化暂存 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface IJsStoreService extends IService<JsStore> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsTransportService.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.web.v2.v1.entity.JsTransport;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0无害化转运 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-26
+ */
+public interface IJsTransportService extends IService<JsTransport> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/IJsWorkshopService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.v2.v1.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v2.v1.entity.JsCheckProject;
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * v2.0生产车间管理 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+public interface IJsWorkshopService extends IService<JsWorkshop> {
+
+    AjaxResult add(JsWorkshop workshop);
+
+    AjaxResult edit(JsWorkshop workshop);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(Integer pageNum, Integer pageSize, String workshopName, String workshopNum, String workshopType);
+
+    AjaxResult listAll();
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsCheckDeviceServiceImpl.java

@@ -0,0 +1,85 @@
+package com.ruoyi.web.v2.v1.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.web.v2.v1.entity.JsCheckDevice;
+import com.ruoyi.web.v2.v1.entity.JsWorkshop;
+import com.ruoyi.web.v2.v1.mapper.JsCheckDeviceMapper;
+import com.ruoyi.web.v2.v1.service.IJsCheckDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0设备档案管理 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@Service
+public class JsCheckDeviceServiceImpl extends ServiceImpl<JsCheckDeviceMapper, JsCheckDevice> implements IJsCheckDeviceService {
+
+    @Autowired
+    private JsCheckDeviceMapper checkDeviceMapper;
+
+    @Override
+    public AjaxResult add(JsCheckDevice checkDevice) {
+        String deviceName = checkDevice.getDeviceName();
+        Integer count = checkDeviceMapper.selectCount(new QueryWrapper<JsCheckDevice>().eq("device_name", deviceName));
+        if (count != 0) {
+            return error("设备档案已存在！");
+        } else {
+            UUID uuid = UUID.randomUUID();
+            String uuidStr = uuid.toString();
+            String randomNum = uuidStr.substring(0, 6);
+            checkDevice.setDeviceNum(randomNum);
+            checkDeviceMapper.insert(checkDevice);
+        }
+        return success("添加成功");
+    }
+
+    @Override
+    public AjaxResult edit(JsCheckDevice checkDevice) {
+        String deviceName = checkDevice.getDeviceName();
+        Integer count = checkDeviceMapper.selectCount(new QueryWrapper<JsCheckDevice>().eq("device_name", deviceName).ne("id",checkDevice.getId()));
+        if (count != 0) {
+            return error("车间名称已存在！");
+        } else {
+            checkDeviceMapper.updateById(checkDevice);
+        }
+        return success("修改成功");
+    }
+
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] split = ids.split(",");
+        for (String s : split) {
+            checkDeviceMapper.deleteById(s);
+        }
+
+        return success("删除成功");
+    }
+
+    @Override
+    public AjaxResult page(Integer pageNum, Integer pageSize, String deviceNum, String deviceName) {
+        QueryWrapper<JsCheckDevice> queryWrapper = new QueryWrapper<>();
+        Page<JsCheckDevice> page = new Page<>(pageNum, pageSize);
+        queryWrapper.eq(StringUtils.isNotEmpty(deviceNum), "device_num", deviceNum).or()
+                .like(StringUtils.isNotEmpty(deviceName), "device_name", deviceName);
+        return success(checkDeviceMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(checkDeviceMapper.selectList(null));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsCheckInstrumentServiceImpl.java

@@ -0,0 +1,83 @@
+package com.ruoyi.web.v2.v1.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.web.v2.v1.entity.JsCheckDevice;
+import com.ruoyi.web.v2.v1.entity.JsCheckInstrument;
+import com.ruoyi.web.v2.v1.mapper.JsCheckInstrumentMapper;
+import com.ruoyi.web.v2.v1.service.IJsCheckInstrumentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v2.0检验仪器管理 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-21
+ */
+@Service
+public class JsCheckInstrumentServiceImpl extends ServiceImpl<JsCheckInstrumentMapper, JsCheckInstrument> implements IJsCheckInstrumentService {
+
+    @Autowired
+    private JsCheckInstrumentMapper instrumentMapper;
+
+    @Override
+    public AjaxResult add(JsCheckInstrument checkDevice) {
+        String deviceName = checkDevice.getDeviceName();
+        Integer count = instrumentMapper.selectCount(new QueryWrapper<JsCheckInstrument>().eq("device_name", deviceName));
+        if (count != 0) {
+            return error("设备档案已存在！");
+        } else {
+            UUID uuid = UUID.randomUUID();
+            String uuidStr = uuid.toString();
+            String randomNum = uuidStr.substring(0, 6);
+            checkDevice.setDeviceNum(randomNum);
+            instrumentMapper.insert(checkDevice);
+        }
+        return success("添加成功");
+    }
+
+    @Override
+    public AjaxResult edit(JsCheckInstrument checkDevice) {
+        String deviceName = checkDevice.getDeviceName();
+        Integer count = instrumentMapper.selectCount(new QueryWrapper<JsCheckInstrument>().eq("device_name", deviceName).ne("id",checkDevice.getId()));
+        if (count != 0) {
+            return error("车间名称已存在！");
+        } else {
+            instrumentMapper.updateById(checkDevice);
+        }
+        return success("修改成功");
+    }
+
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] split = ids.split(",");
+        for (String s : split) {
+            instrumentMapper.deleteById(s);
+        }
+        return success("删除成功");
+    }
+
+    @Override
+    public AjaxResult page(Integer pageNum, Integer pageSize, String deviceNum, String deviceName) {
+        QueryWrapper<JsCheckInstrument> queryWrapper = new QueryWrapper<>();
+        Page<JsCheckInstrument> page = new Page<>(pageNum, pageSize);
+        queryWrapper.eq(StringUtils.isNotEmpty(deviceNum), "device_num", deviceNum).or()
+                .like(StringUtils.isNotEmpty(deviceName), "device_name", deviceName);
+        return success(instrumentMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(instrumentMapper.selectList(null));
+    }
+}

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsCheckProjectServiceImpl.java

@@ -0,0 +1,77 @@
+package com.ruoyi.web.v2.v1.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.v2.v1.entity.JsCheckProject;
+import com.ruoyi.web.v2.v1.entity.JsDisinfectManage;
+import com.ruoyi.web.v2.v1.mapper.JsCheckProjectMapper;
+import com.ruoyi.web.v2.v1.service.IJsCheckProjectService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * 2.0检验项目管理 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2025-05-20
+ */
+@Service
+public class JsCheckProjectServiceImpl extends ServiceImpl<JsCheckProjectMapper, JsCheckProject> implements IJsCheckProjectService {
+
+    @Autowired
+    private JsCheckProjectMapper projectMapper;
+
+    @Override
+    public AjaxResult add(JsCheckProject checkProject) {
+        String projectName = checkProject.getProjectName();
+        Integer count = projectMapper.selectCount(new QueryWrapper<JsCheckProject>().eq("project_name", projectName));
+        if (count != 0) {
+            return error("消毒方式已存在！");
+        } else {
+            projectMapper.insert(checkProject);
+        }
+        return success("添加成功");
+    }
+
+    @Override
+    public AjaxResult edit(JsCheckProject checkProject) {
+        String projectName = checkProject.getProjectName();
+        Integer count = projectMapper.selectCount(new QueryWrapper<JsCheckProject>().eq("project_name", projectName).ne("id",checkProject.getId()));
+        if (count != 0) {
+            return error("消毒方式已存在！");
+        } else {
+            projectMapper.updateById(checkProject);
+        }
+        return success("修改成功");
+    }
+
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] split = ids.split(",");
+        for (String s : split) {
+            projectMapper.deleteById(s);
+        }
+        return success("删除成功");
+    }
+
+    @Override
+    public AjaxResult page(Integer pageNum, Integer pageSize, String projectName) {
+        QueryWrapper<JsCheckProject> queryWrapper = new QueryWrapper<>();
+        Page<JsCheckProject> page = new Page<>(pageNum, pageSize);
+        queryWrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName);
+        return success(projectMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(projectMapper.selectList(null));
+    }
+}