1.质控样表重构 2.统计功能查询逻辑使用本地表 3.涉及修改、删除、新增、导出接口增加日志保存功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/BizDeviceController.java

@@ -62,7 +62,7 @@ public class BizDeviceController extends BaseController
      * 导出【请填写功能名称】列表
      */
 //    @PreAuthorize("@ss.hasPermi('business:device:export')")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizDevice bizDevice)
     {
@@ -85,7 +85,7 @@ public class BizDeviceController extends BaseController
      * 新增【请填写功能名称】
      */
 //    @PreAuthorize("@ss.hasPermi('business:device:add')")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BizDevice bizDevice)
     {
@@ -97,7 +97,7 @@ public class BizDeviceController extends BaseController
      * 修改【请填写功能名称】
      */
 //    @PreAuthorize("@ss.hasPermi('business:device:edit')")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BizDevice bizDevice)
     {
@@ -109,7 +109,7 @@ public class BizDeviceController extends BaseController
      * 删除【请填写功能名称】
      */
 //    @PreAuthorize("@ss.hasPermi('business:device:remove')")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{deviceIds}")
     public AjaxResult remove(@PathVariable Long[] deviceIds)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/SysRegionController.java

@@ -50,7 +50,7 @@ public class SysRegionController extends BaseController
      * 导出【请填写功能名称】列表
      */
 //    @PreAuthorize("@ss.hasPermi('business:region:export')")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysRegion sysRegion)
     {
@@ -73,7 +73,7 @@ public class SysRegionController extends BaseController
      * 新增【请填写功能名称】
      */
 //    @PreAuthorize("@ss.hasPermi('business:region:add')")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysRegion sysRegion)
     {
@@ -85,7 +85,7 @@ public class SysRegionController extends BaseController
      * 修改【请填写功能名称】
      */
 //    @PreAuthorize("@ss.hasPermi('business:region:edit')")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysRegion sysRegion)
     {
@@ -97,7 +97,7 @@ public class SysRegionController extends BaseController
      * 删除【请填写功能名称】
      */
 //    @PreAuthorize("@ss.hasPermi('business:region:remove')")
-//    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{regionIds}")
     public AjaxResult remove(@PathVariable Long[] regionIds)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/ZQualityValueController.java

@@ -0,0 +1,106 @@
+package com.ruoyi.web.controller.business;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.business.domain.ZQualityValue;
+import com.ruoyi.business.service.IZQualityValueService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 水厂质控值Controller
+ * 
+ * @author slibra
+ * @date 2025-03-13
+ */
+@RestController
+@RequestMapping("/business/value")
+public class ZQualityValueController extends BaseController
+{
+    @Autowired
+    private IZQualityValueService zQualityValueService;
+
+    /**
+     * 查询水厂质控值列表
+     */
+//    @PreAuthorize("@ss.hasPermi('business:value:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZQualityValue zQualityValue)
+    {
+        startPage();
+        List<ZQualityValue> list = zQualityValueService.selectZQualityValueList(zQualityValue);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出水厂质控值列表
+     */
+//    @PreAuthorize("@ss.hasPermi('business:value:export')")
+    @Log(title = "水厂质控值", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZQualityValue zQualityValue)
+    {
+        List<ZQualityValue> list = zQualityValueService.selectZQualityValueList(zQualityValue);
+        ExcelUtil<ZQualityValue> util = new ExcelUtil<ZQualityValue>(ZQualityValue.class);
+        util.exportExcel(response, list, "水厂质控值数据");
+    }
+
+    /**
+     * 获取水厂质控值详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('business:value:query')")
+    @GetMapping(value = "/{valueId}")
+    public AjaxResult getInfo(@PathVariable("valueId") Long valueId)
+    {
+        return success(zQualityValueService.selectZQualityValueByValueId(valueId));
+    }
+
+    /**
+     * 新增水厂质控值
+     */
+//    @PreAuthorize("@ss.hasPermi('business:value:add')")
+    @Log(title = "水厂质控值", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZQualityValue zQualityValue)
+    {
+        zQualityValue.setCreateBy(getUsername());
+        return toAjax(zQualityValueService.insertZQualityValue(zQualityValue));
+    }
+
+    /**
+     * 修改水厂质控值
+     */
+//    @PreAuthorize("@ss.hasPermi('business:value:edit')")
+    @Log(title = "水厂质控值", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZQualityValue zQualityValue)
+    {
+        zQualityValue.setUpdateBy(getUsername());
+        return toAjax(zQualityValueService.updateZQualityValue(zQualityValue));
+    }
+
+    /**
+     * 删除水厂质控值
+     */
+//    @PreAuthorize("@ss.hasPermi('business:value:remove')")
+    @Log(title = "水厂质控值", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{valueIds}")
+    public AjaxResult remove(@PathVariable Long[] valueIds)
+    {
+        return toAjax(zQualityValueService.deleteZQualityValueByValueIds(valueIds));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -29,8 +29,8 @@ public class BusinessServiceImpl implements IBusinessService {
     @Autowired
     private BizDeviceMapper bizDeviceMapper;
 
-    @Autowired
-    private BizWaterWorkMapper bizWaterWorkMapper;
+    /*@Autowired
+    private BizWaterWorkMapper bizWaterWorkMapper;*/
 
     @Autowired
     private ZAssayMapper zAssayMapper;
@@ -41,6 +41,13 @@ public class BusinessServiceImpl implements IBusinessService {
     @Autowired
     private ZQualityValueMapper zQualityValueMapper;
 
+    @Autowired
+    private TOrganizationMapper organizationMapper;
+
+    //2025年03月13日17:35:36  因为设计改动地方太多，并且qualityConfMapper和zQualityValueMapper操作对象基本一致，此表不再重构
+    @Autowired
+    private TQualityConfMapper qualityConfMapper;
+
 
     /**
      * 2024年10月25日09:46:36  新增逻辑：type可以不传。
@@ -258,9 +265,14 @@ public class BusinessServiceImpl implements IBusinessService {
                     if(Objects.isNull(deviceWorks)){
                         log.error("通过化验结果的化验设备编号查询设备记录时，没有查询到设备记录，导致无法获取水厂信息");
                     }else{
-                        BizWaterWork bizWaterWork = this.bizWaterWorkMapper.selectBizWaterWorkByWorksId(deviceWorks);
+                        //2025年03月13日17:26:10 用本地的表
+                        /*BizWaterWork bizWaterWork = this.bizWaterWorkMapper.selectBizWaterWorkByWorksId(deviceWorks);
                         if(!Objects.isNull(bizWaterWork)){
                             assayQualityDetailRes.setWorksName(bizWaterWork.getWorksName());
+                        }*/
+                        TOrganization organization = this.organizationMapper.selectTOrganizationById(deviceWorks);
+                        if(!Objects.isNull(organization)){
+                            assayQualityDetailRes.setWorksName(organization.getName());
                         }
                     }
                 }
@@ -398,9 +410,14 @@ public class BusinessServiceImpl implements IBusinessService {
             if(Objects.isNull(deviceWorks)){
                 log.error("通过化验结果的化验设备编号查询设备记录时，没有查询到设备记录id，导致无法获取水厂信息");
             }else{
-                BizWaterWork bizWaterWork = this.bizWaterWorkMapper.selectBizWaterWorkByWorksId(deviceWorks);
+                //2025年03月13日17:26:10 用本地的表
+                /*BizWaterWork bizWaterWork = this.bizWaterWorkMapper.selectBizWaterWorkByWorksId(deviceWorks);
                 if(!Objects.isNull(bizWaterWork)){
                     assayDetailRes.setWorksName(bizWaterWork.getWorksName());
+                }*/
+                TOrganization organization = this.organizationMapper.selectTOrganizationById(deviceWorks);
+                if(!Objects.isNull(organization)){
+                    assayDetailRes.setWorksName(organization.getName());
                 }
             }
         }