1.查询跃渊的表的基本数据出来 2.多数据源处理 3.测试接口编写

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

@@ -0,0 +1,60 @@
+package com.ruoyi.web.controller.business;
+
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.business.domain.*;
+import com.ruoyi.business.mapper.*;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@Slf4j
+@RequestMapping("/business")
+public class BusinessController {
+
+    @Autowired
+    private BizDeviceMapper bizDeviceMapper;
+
+    @Autowired
+    private BizWaterWorkMapper bizWaterWorkMapper;
+
+    @Autowired
+    private ZAssayMapper zAssayMapper;
+
+    @Autowired
+    private ZAssayResultMapper zAssayResultMapper;
+
+    @Autowired
+    private ZQualityValueMapper zQualityValueMapper;
+
+    @GetMapping("/hello")
+    public String hello() {
+        return "hello world";
+    }
+
+    /**
+     *
+     * 因为数据库和我们平常用的不一样，所以这里每个查询都要模拟一池，测试一下。
+     * @return
+     */
+    @GetMapping("/testSlaveDB")
+    public String testSlaveDB(){
+        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        List<BizDevice> bizDevices = this.bizDeviceMapper.selectBizDeviceList(null);
+        List<BizWaterWork> bizWaterWorks = bizWaterWorkMapper.selectBizWaterWorkList(BizWaterWork.builder().worksId(1L).build());
+        List<ZAssay> zAssays = this.zAssayMapper.selectZAssayList(ZAssay.builder().assayId(1L).build());
+        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().resultId(1L).build());
+        List<ZQualityValue> zQualityValues = this.zQualityValueMapper.selectZQualityValueList(ZQualityValue.builder().valueId(1L).build());
+        DynamicDataSourceContextHolder.clearDataSourceType();
+        return JSON.toJSONString(bizDevices);
+    }
+
+    //------------------------下面是需要的智能国际化验室的业务接口，汇总跃渊数据库的数据（本系统相关的，放到MySQL；从库是跃渊的SqlServer数据库）------------------------
+
+}

ruoyi-admin/src/main/resources/application-local.yml

@@ -1,4 +1,5 @@
 # 数据源配置
+# 数据源配置
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
@@ -12,10 +13,11 @@ spring:
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
+                enabled: true
+                driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+                url: jdbc:sqlserver://10.0.0.20:1433;DatabaseName=HS_TEST
+                username: sa
+                password: Abc123456
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,11 +37,11 @@ spring:
             # 配置一个连接在池中最大生存的时间，单位是毫秒
             maxEvictableIdleTimeMillis: 900000
             # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
+            validationQuery: SELECT 1
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -47,7 +49,7 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: ruoyi
+                login-username: slibra
                 login-password: 123456
             filter:
                 stat:

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 获取yml中的log地址 -->
-    <springProperty scope="context" name="logPath" source="log.logPath" defaultValue="/home/slibra/logs"/>
+    <springProperty scope="context" name="logPath" source="log.logPath" defaultValue="/home/smartrobot/logs"/>
     <!-- 日志存放路径 -->
 	<property name="log.path" value="${logPath}" />
     <!-- 日志输出格式 -->
@@ -74,7 +74,7 @@
     </appender>
 	
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.slibra" level="info" />
+	<logger name="com.ruoyi" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

ruoyi-common/pom.xml

@@ -119,6 +119,20 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- SQL Server Driver -->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <!--<scope>runtime</scope>-->
+            <version>8.1.0.jre8-preview</version>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,6 +115,7 @@ public class SecurityConfig
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                    .antMatchers("/**").permitAll()//2024年09月26日09:31:07 临时测试使用，等开发完毕以后，会注释掉 todo
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })

ruoyi-system/src/main/java/com/ruoyi/business/domain/BizDevice.java

@@ -0,0 +1,381 @@
+package com.ruoyi.business.domain;
+
+import java.util.Date;
+
+import lombok.Builder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备对象 biz_device
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Builder
+public class BizDevice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long deviceId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceNo;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceName;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceSn;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceModel;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceMaker;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long deviceWorks;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceMaintainer;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceTel;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceType;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceStatus;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String assayStatus;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date assayTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date repairTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String repairBy;
+
+    /** 故障代码 */
+    @Excel(name = "故障代码")
+    private String faultCode;
+
+    /** 结果续传文件名 */
+    @Excel(name = "结果续传文件名")
+    private String deviceXujieJieguo;
+
+    /** 报警续传文件名 */
+    @Excel(name = "报警续传文件名")
+    private String deviceXujieBaojing;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceProvince;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceCity;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceArea;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceLongitude;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceLatitude;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String deviceAddress;
+
+    /** 设备类型(1:化验室，2：连续检测) */
+    @Excel(name = "设备类型(1:化验室，2：连续检测)")
+    private String type;
+
+    public void setDeviceId(Long deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setDeviceNo(String deviceNo) 
+    {
+        this.deviceNo = deviceNo;
+    }
+
+    public String getDeviceNo() 
+    {
+        return deviceNo;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setDeviceSn(String deviceSn) 
+    {
+        this.deviceSn = deviceSn;
+    }
+
+    public String getDeviceSn() 
+    {
+        return deviceSn;
+    }
+    public void setDeviceModel(String deviceModel) 
+    {
+        this.deviceModel = deviceModel;
+    }
+
+    public String getDeviceModel() 
+    {
+        return deviceModel;
+    }
+    public void setDeviceMaker(String deviceMaker) 
+    {
+        this.deviceMaker = deviceMaker;
+    }
+
+    public String getDeviceMaker() 
+    {
+        return deviceMaker;
+    }
+    public void setDeviceWorks(Long deviceWorks) 
+    {
+        this.deviceWorks = deviceWorks;
+    }
+
+    public Long getDeviceWorks() 
+    {
+        return deviceWorks;
+    }
+    public void setDeviceMaintainer(String deviceMaintainer) 
+    {
+        this.deviceMaintainer = deviceMaintainer;
+    }
+
+    public String getDeviceMaintainer() 
+    {
+        return deviceMaintainer;
+    }
+    public void setDeviceTel(String deviceTel) 
+    {
+        this.deviceTel = deviceTel;
+    }
+
+    public String getDeviceTel() 
+    {
+        return deviceTel;
+    }
+    public void setDeviceType(String deviceType) 
+    {
+        this.deviceType = deviceType;
+    }
+
+    public String getDeviceType() 
+    {
+        return deviceType;
+    }
+    public void setDeviceStatus(String deviceStatus) 
+    {
+        this.deviceStatus = deviceStatus;
+    }
+
+    public String getDeviceStatus() 
+    {
+        return deviceStatus;
+    }
+    public void setAssayStatus(String assayStatus) 
+    {
+        this.assayStatus = assayStatus;
+    }
+
+    public String getAssayStatus() 
+    {
+        return assayStatus;
+    }
+    public void setAssayTime(Date assayTime) 
+    {
+        this.assayTime = assayTime;
+    }
+
+    public Date getAssayTime() 
+    {
+        return assayTime;
+    }
+    public void setRepairTime(Date repairTime) 
+    {
+        this.repairTime = repairTime;
+    }
+
+    public Date getRepairTime() 
+    {
+        return repairTime;
+    }
+    public void setRepairBy(String repairBy) 
+    {
+        this.repairBy = repairBy;
+    }
+
+    public String getRepairBy() 
+    {
+        return repairBy;
+    }
+    public void setFaultCode(String faultCode) 
+    {
+        this.faultCode = faultCode;
+    }
+
+    public String getFaultCode() 
+    {
+        return faultCode;
+    }
+    public void setDeviceXujieJieguo(String deviceXujieJieguo) 
+    {
+        this.deviceXujieJieguo = deviceXujieJieguo;
+    }
+
+    public String getDeviceXujieJieguo() 
+    {
+        return deviceXujieJieguo;
+    }
+    public void setDeviceXujieBaojing(String deviceXujieBaojing) 
+    {
+        this.deviceXujieBaojing = deviceXujieBaojing;
+    }
+
+    public String getDeviceXujieBaojing() 
+    {
+        return deviceXujieBaojing;
+    }
+    public void setDeviceProvince(String deviceProvince) 
+    {
+        this.deviceProvince = deviceProvince;
+    }
+
+    public String getDeviceProvince() 
+    {
+        return deviceProvince;
+    }
+    public void setDeviceCity(String deviceCity) 
+    {
+        this.deviceCity = deviceCity;
+    }
+
+    public String getDeviceCity() 
+    {
+        return deviceCity;
+    }
+    public void setDeviceArea(String deviceArea) 
+    {
+        this.deviceArea = deviceArea;
+    }
+
+    public String getDeviceArea() 
+    {
+        return deviceArea;
+    }
+    public void setDeviceLongitude(String deviceLongitude) 
+    {
+        this.deviceLongitude = deviceLongitude;
+    }
+
+    public String getDeviceLongitude() 
+    {
+        return deviceLongitude;
+    }
+    public void setDeviceLatitude(String deviceLatitude) 
+    {
+        this.deviceLatitude = deviceLatitude;
+    }
+
+    public String getDeviceLatitude() 
+    {
+        return deviceLatitude;
+    }
+    public void setDeviceAddress(String deviceAddress) 
+    {
+        this.deviceAddress = deviceAddress;
+    }
+
+    public String getDeviceAddress() 
+    {
+        return deviceAddress;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceId", getDeviceId())
+            .append("deviceNo", getDeviceNo())
+            .append("deviceName", getDeviceName())
+            .append("deviceSn", getDeviceSn())
+            .append("deviceModel", getDeviceModel())
+            .append("deviceMaker", getDeviceMaker())
+            .append("deviceWorks", getDeviceWorks())
+            .append("deviceMaintainer", getDeviceMaintainer())
+            .append("deviceTel", getDeviceTel())
+            .append("deviceType", getDeviceType())
+            .append("deviceStatus", getDeviceStatus())
+            .append("assayStatus", getAssayStatus())
+            .append("assayTime", getAssayTime())
+            .append("repairTime", getRepairTime())
+            .append("repairBy", getRepairBy())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("faultCode", getFaultCode())
+            .append("deviceXujieJieguo", getDeviceXujieJieguo())
+            .append("deviceXujieBaojing", getDeviceXujieBaojing())
+            .append("deviceProvince", getDeviceProvince())
+            .append("deviceCity", getDeviceCity())
+            .append("deviceArea", getDeviceArea())
+            .append("deviceLongitude", getDeviceLongitude())
+            .append("deviceLatitude", getDeviceLatitude())
+            .append("deviceAddress", getDeviceAddress())
+            .append("type", getType())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/business/domain/BizWaterWork.java

@@ -0,0 +1,308 @@
+package com.ruoyi.business.domain;
+
+import lombok.Builder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 水厂对象 biz_water_work
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Builder
+public class BizWaterWork extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 水厂id */
+    private Long worksId;
+
+    /** 父部门id */
+    @Excel(name = "父部门id")
+    private Long parentId;
+
+    /** 祖级列表 */
+    @Excel(name = "祖级列表")
+    private String ancestors;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String worksName;
+
+    /** 显示顺序 */
+    @Excel(name = "显示顺序")
+    private Long orderNum;
+
+    /** 水厂状态（0正常 1停用） */
+    @Excel(name = "水厂状态", readConverterExp = "0=正常,1=停用")
+    private String worksStatus;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 水厂编号 */
+    @Excel(name = "水厂编号")
+    private String worksNo;
+
+    /** 所属省区划 */
+    @Excel(name = "所属省区划")
+    private String worksProvince;
+
+    /** 所属市区划 */
+    @Excel(name = "所属市区划")
+    private String worksCity;
+
+    /** 所属区区划 */
+    @Excel(name = "所属区区划")
+    private String worksArea;
+
+    /** 水厂经度 */
+    @Excel(name = "水厂经度")
+    private String worksLongitude;
+
+    /** 水厂纬度 */
+    @Excel(name = "水厂纬度")
+    private String worksLatitude;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String worksAddress;
+
+    /** 设备数量 */
+    @Excel(name = "设备数量")
+    private Long worksCount;
+
+    /** 水厂类型（1：平台；2：集团；3：水厂 4：区域中心） */
+    @Excel(name = "水厂类型", readConverterExp = "1=：平台；2：集团；3：水厂,4=：区域中心")
+    private String worksType;
+
+    /** 是否为区域中心（0：是；1：否） */
+    @Excel(name = "是否为区域中心", readConverterExp = "0=：是；1：否")
+    private String worksCenter;
+
+    /** 水厂所属集团 */
+    @Excel(name = "水厂所属集团")
+    private Long worksBelong;
+
+    /** 水厂联系人 */
+    @Excel(name = "水厂联系人")
+    private String worksMaintainer;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String worksTel;
+
+    public void setWorksId(Long worksId) 
+    {
+        this.worksId = worksId;
+    }
+
+    public Long getWorksId() 
+    {
+        return worksId;
+    }
+    public void setParentId(Long parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId() 
+    {
+        return parentId;
+    }
+    public void setAncestors(String ancestors) 
+    {
+        this.ancestors = ancestors;
+    }
+
+    public String getAncestors() 
+    {
+        return ancestors;
+    }
+    public void setWorksName(String worksName) 
+    {
+        this.worksName = worksName;
+    }
+
+    public String getWorksName() 
+    {
+        return worksName;
+    }
+    public void setOrderNum(Long orderNum) 
+    {
+        this.orderNum = orderNum;
+    }
+
+    public Long getOrderNum() 
+    {
+        return orderNum;
+    }
+    public void setWorksStatus(String worksStatus) 
+    {
+        this.worksStatus = worksStatus;
+    }
+
+    public String getWorksStatus() 
+    {
+        return worksStatus;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setWorksNo(String worksNo) 
+    {
+        this.worksNo = worksNo;
+    }
+
+    public String getWorksNo() 
+    {
+        return worksNo;
+    }
+    public void setWorksProvince(String worksProvince) 
+    {
+        this.worksProvince = worksProvince;
+    }
+
+    public String getWorksProvince() 
+    {
+        return worksProvince;
+    }
+    public void setWorksCity(String worksCity) 
+    {
+        this.worksCity = worksCity;
+    }
+
+    public String getWorksCity() 
+    {
+        return worksCity;
+    }
+    public void setWorksArea(String worksArea) 
+    {
+        this.worksArea = worksArea;
+    }
+
+    public String getWorksArea() 
+    {
+        return worksArea;
+    }
+    public void setWorksLongitude(String worksLongitude) 
+    {
+        this.worksLongitude = worksLongitude;
+    }
+
+    public String getWorksLongitude() 
+    {
+        return worksLongitude;
+    }
+    public void setWorksLatitude(String worksLatitude) 
+    {
+        this.worksLatitude = worksLatitude;
+    }
+
+    public String getWorksLatitude() 
+    {
+        return worksLatitude;
+    }
+    public void setWorksAddress(String worksAddress) 
+    {
+        this.worksAddress = worksAddress;
+    }
+
+    public String getWorksAddress() 
+    {
+        return worksAddress;
+    }
+    public void setWorksCount(Long worksCount) 
+    {
+        this.worksCount = worksCount;
+    }
+
+    public Long getWorksCount() 
+    {
+        return worksCount;
+    }
+    public void setWorksType(String worksType) 
+    {
+        this.worksType = worksType;
+    }
+
+    public String getWorksType() 
+    {
+        return worksType;
+    }
+    public void setWorksCenter(String worksCenter) 
+    {
+        this.worksCenter = worksCenter;
+    }
+
+    public String getWorksCenter() 
+    {
+        return worksCenter;
+    }
+    public void setWorksBelong(Long worksBelong) 
+    {
+        this.worksBelong = worksBelong;
+    }
+
+    public Long getWorksBelong() 
+    {
+        return worksBelong;
+    }
+    public void setWorksMaintainer(String worksMaintainer) 
+    {
+        this.worksMaintainer = worksMaintainer;
+    }
+
+    public String getWorksMaintainer() 
+    {
+        return worksMaintainer;
+    }
+    public void setWorksTel(String worksTel) 
+    {
+        this.worksTel = worksTel;
+    }
+
+    public String getWorksTel() 
+    {
+        return worksTel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("worksId", getWorksId())
+            .append("parentId", getParentId())
+            .append("ancestors", getAncestors())
+            .append("worksName", getWorksName())
+            .append("orderNum", getOrderNum())
+            .append("worksStatus", getWorksStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("worksNo", getWorksNo())
+            .append("worksProvince", getWorksProvince())
+            .append("worksCity", getWorksCity())
+            .append("worksArea", getWorksArea())
+            .append("worksLongitude", getWorksLongitude())
+            .append("worksLatitude", getWorksLatitude())
+            .append("worksAddress", getWorksAddress())
+            .append("worksCount", getWorksCount())
+            .append("worksType", getWorksType())
+            .append("worksCenter", getWorksCenter())
+            .append("worksBelong", getWorksBelong())
+            .append("worksMaintainer", getWorksMaintainer())
+            .append("worksTel", getWorksTel())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/business/domain/ZAssay.java

@@ -0,0 +1,295 @@
+package com.ruoyi.business.domain;
+
+import lombok.Builder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 化验项目信息对象 z_assay
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Builder
+public class ZAssay extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long assayId;
+
+    /** 化验唯一编号 */
+    @Excel(name = "化验唯一编号")
+    private String assayNo;
+
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String deviceNo;
+
+    /** 化验类型 */
+    @Excel(name = "化验类型")
+    private String assayType;
+
+    /** 化验实时大流程 */
+    @Excel(name = "化验实时大流程")
+    private String assayBigprocess;
+
+    /** 化验实时小流程 */
+    @Excel(name = "化验实时小流程")
+    private String assaySmallprocess;
+
+    /** 化验开始时间 */
+    @Excel(name = "化验开始时间")
+    private String beginTime;
+
+    /** 化验结束时间 */
+    @Excel(name = "化验结束时间")
+    private String endTime;
+
+    /** 化验日期 */
+    @Excel(name = "化验日期")
+    private String assayDate;
+
+    /** 化验人 */
+    @Excel(name = "化验人")
+    private String assayBy;
+
+    /** 化验版本 */
+    @Excel(name = "化验版本")
+    private String version;
+
+    /** 流程名 */
+    @Excel(name = "流程名")
+    private String stepName;
+
+    /** 总步进 */
+    @Excel(name = "总步进")
+    private String stepTotal;
+
+    /** 当前步进 */
+    @Excel(name = "当前步进")
+    private String stepNow;
+
+    /** 步进信息1 */
+    @Excel(name = "步进信息1")
+    private String stepInfo1;
+
+    /** 步进信息2 */
+    @Excel(name = "步进信息2")
+    private String stepInfo2;
+
+    /** 步进信息3 */
+    @Excel(name = "步进信息3")
+    private String stepInfo3;
+
+    /** 化验状态 */
+    @Excel(name = "化验状态")
+    private String assayStatus;
+
+    /** 化验方式(0-自动化验，1-手动化验) */
+    @Excel(name = "化验方式(0-自动化验，1-手动化验)")
+    private String assayMethod;
+
+    public void setAssayId(Long assayId) 
+    {
+        this.assayId = assayId;
+    }
+
+    public Long getAssayId() 
+    {
+        return assayId;
+    }
+    public void setAssayNo(String assayNo) 
+    {
+        this.assayNo = assayNo;
+    }
+
+    public String getAssayNo() 
+    {
+        return assayNo;
+    }
+    public void setDeviceNo(String deviceNo) 
+    {
+        this.deviceNo = deviceNo;
+    }
+
+    public String getDeviceNo() 
+    {
+        return deviceNo;
+    }
+    public void setAssayType(String assayType) 
+    {
+        this.assayType = assayType;
+    }
+
+    public String getAssayType() 
+    {
+        return assayType;
+    }
+    public void setAssayBigprocess(String assayBigprocess) 
+    {
+        this.assayBigprocess = assayBigprocess;
+    }
+
+    public String getAssayBigprocess() 
+    {
+        return assayBigprocess;
+    }
+    public void setAssaySmallprocess(String assaySmallprocess) 
+    {
+        this.assaySmallprocess = assaySmallprocess;
+    }
+
+    public String getAssaySmallprocess() 
+    {
+        return assaySmallprocess;
+    }
+    public void setBeginTime(String beginTime) 
+    {
+        this.beginTime = beginTime;
+    }
+
+    public String getBeginTime() 
+    {
+        return beginTime;
+    }
+    public void setEndTime(String endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public String getEndTime() 
+    {
+        return endTime;
+    }
+    public void setAssayDate(String assayDate) 
+    {
+        this.assayDate = assayDate;
+    }
+
+    public String getAssayDate() 
+    {
+        return assayDate;
+    }
+    public void setAssayBy(String assayBy) 
+    {
+        this.assayBy = assayBy;
+    }
+
+    public String getAssayBy() 
+    {
+        return assayBy;
+    }
+    public void setVersion(String version) 
+    {
+        this.version = version;
+    }
+
+    public String getVersion() 
+    {
+        return version;
+    }
+    public void setStepName(String stepName) 
+    {
+        this.stepName = stepName;
+    }
+
+    public String getStepName() 
+    {
+        return stepName;
+    }
+    public void setStepTotal(String stepTotal) 
+    {
+        this.stepTotal = stepTotal;
+    }
+
+    public String getStepTotal() 
+    {
+        return stepTotal;
+    }
+    public void setStepNow(String stepNow) 
+    {
+        this.stepNow = stepNow;
+    }
+
+    public String getStepNow() 
+    {
+        return stepNow;
+    }
+    public void setStepInfo1(String stepInfo1) 
+    {
+        this.stepInfo1 = stepInfo1;
+    }
+
+    public String getStepInfo1() 
+    {
+        return stepInfo1;
+    }
+    public void setStepInfo2(String stepInfo2) 
+    {
+        this.stepInfo2 = stepInfo2;
+    }
+
+    public String getStepInfo2() 
+    {
+        return stepInfo2;
+    }
+    public void setStepInfo3(String stepInfo3) 
+    {
+        this.stepInfo3 = stepInfo3;
+    }
+
+    public String getStepInfo3() 
+    {
+        return stepInfo3;
+    }
+    public void setAssayStatus(String assayStatus) 
+    {
+        this.assayStatus = assayStatus;
+    }
+
+    public String getAssayStatus() 
+    {
+        return assayStatus;
+    }
+    public void setAssayMethod(String assayMethod) 
+    {
+        this.assayMethod = assayMethod;
+    }
+
+    public String getAssayMethod() 
+    {
+        return assayMethod;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("assayId", getAssayId())
+            .append("assayNo", getAssayNo())
+            .append("deviceNo", getDeviceNo())
+            .append("assayType", getAssayType())
+            .append("assayBigprocess", getAssayBigprocess())
+            .append("assaySmallprocess", getAssaySmallprocess())
+            .append("beginTime", getBeginTime())
+            .append("endTime", getEndTime())
+            .append("assayDate", getAssayDate())
+            .append("assayBy", getAssayBy())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("version", getVersion())
+            .append("stepName", getStepName())
+            .append("stepTotal", getStepTotal())
+            .append("stepNow", getStepNow())
+            .append("stepInfo1", getStepInfo1())
+            .append("stepInfo2", getStepInfo2())
+            .append("stepInfo3", getStepInfo3())
+            .append("assayStatus", getAssayStatus())
+            .append("assayMethod", getAssayMethod())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/business/domain/ZAssayResult.java

@@ -0,0 +1,491 @@
+package com.ruoyi.business.domain;
+
+import lombok.Builder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 化验结果明细对象 z_assay_result
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Builder
+public class ZAssayResult extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long resultId;
+
+    /** 化验唯一编号 */
+    @Excel(name = "化验唯一编号")
+    private String assayNo;
+
+    /** 结果编号 */
+    @Excel(name = "结果编号")
+    private String resultNo;
+
+    /** 样品编号 */
+    @Excel(name = "样品编号")
+    private String sampleNo;
+
+    /** 样品体积 */
+    @Excel(name = "样品体积")
+    private Long sampleVolume;
+
+    /** 化验设备编号 */
+    @Excel(name = "化验设备编号")
+    private String deviceNo;
+
+    /** 化验项目 */
+    @Excel(name = "化验项目")
+    private String assayItem;
+
+    /** 化验浓度值 */
+    @Excel(name = "化验浓度值")
+    private Long resultConcentration;
+
+    /** 化验ABS值（吸光度） */
+    @Excel(name = "化验ABS值", readConverterExp = "吸=光度")
+    private Long resultAbs;
+
+    /** 结果日期 */
+    @Excel(name = "结果日期")
+    private String resultDate;
+
+    /** 结果时间 */
+    @Excel(name = "结果时间")
+    private String resultTime;
+
+    /** 曲线k0 */
+    @Excel(name = "曲线k0")
+    private Long curveK0;
+
+    /** 曲线k1 */
+    @Excel(name = "曲线k1")
+    private Long curveK1;
+
+    /** 曲线唯一id */
+    @Excel(name = "曲线唯一id")
+    private Long curveId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901S01;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901D01;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901R01;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901S1;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901D1;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901R1;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901S02;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901D02;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901R02;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901S2;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901D2;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long j1901R2;
+
+    /** 化验分类 */
+    @Excel(name = "化验分类")
+    private String assayType;
+
+    /** 样品位 */
+    @Excel(name = "样品位")
+    private Long samplePost;
+
+    /** 化验温度 */
+    @Excel(name = "化验温度")
+    private Long resultWendu;
+
+    /** 化验湿度 */
+    @Excel(name = "化验湿度")
+    private Long resultShidu;
+
+    /** 原始浓度值 */
+    @Excel(name = "原始浓度值")
+    private Long originalConcentration;
+
+    /** 曲线编号 */
+    @Excel(name = "曲线编号")
+    private String curveNo;
+
+    /** (0:未读，1:已读) */
+    @Excel(name = "(0:未读，1:已读)")
+    private String readFlag;
+
+    public void setResultId(Long resultId) 
+    {
+        this.resultId = resultId;
+    }
+
+    public Long getResultId() 
+    {
+        return resultId;
+    }
+    public void setAssayNo(String assayNo) 
+    {
+        this.assayNo = assayNo;
+    }
+
+    public String getAssayNo() 
+    {
+        return assayNo;
+    }
+    public void setResultNo(String resultNo) 
+    {
+        this.resultNo = resultNo;
+    }
+
+    public String getResultNo() 
+    {
+        return resultNo;
+    }
+    public void setSampleNo(String sampleNo) 
+    {
+        this.sampleNo = sampleNo;
+    }
+
+    public String getSampleNo() 
+    {
+        return sampleNo;
+    }
+    public void setSampleVolume(Long sampleVolume) 
+    {
+        this.sampleVolume = sampleVolume;
+    }
+
+    public Long getSampleVolume() 
+    {
+        return sampleVolume;
+    }
+    public void setDeviceNo(String deviceNo) 
+    {
+        this.deviceNo = deviceNo;
+    }
+
+    public String getDeviceNo() 
+    {
+        return deviceNo;
+    }
+    public void setAssayItem(String assayItem) 
+    {
+        this.assayItem = assayItem;
+    }
+
+    public String getAssayItem() 
+    {
+        return assayItem;
+    }
+    public void setResultConcentration(Long resultConcentration) 
+    {
+        this.resultConcentration = resultConcentration;
+    }
+
+    public Long getResultConcentration() 
+    {
+        return resultConcentration;
+    }
+    public void setResultAbs(Long resultAbs) 
+    {
+        this.resultAbs = resultAbs;
+    }
+
+    public Long getResultAbs() 
+    {
+        return resultAbs;
+    }
+    public void setResultDate(String resultDate) 
+    {
+        this.resultDate = resultDate;
+    }
+
+    public String getResultDate() 
+    {
+        return resultDate;
+    }
+    public void setResultTime(String resultTime) 
+    {
+        this.resultTime = resultTime;
+    }
+
+    public String getResultTime() 
+    {
+        return resultTime;
+    }
+    public void setCurveK0(Long curveK0) 
+    {
+        this.curveK0 = curveK0;
+    }
+
+    public Long getCurveK0() 
+    {
+        return curveK0;
+    }
+    public void setCurveK1(Long curveK1) 
+    {
+        this.curveK1 = curveK1;
+    }
+
+    public Long getCurveK1() 
+    {
+        return curveK1;
+    }
+    public void setCurveId(Long curveId) 
+    {
+        this.curveId = curveId;
+    }
+
+    public Long getCurveId() 
+    {
+        return curveId;
+    }
+    public void setJ1901S01(Long j1901S01) 
+    {
+        this.j1901S01 = j1901S01;
+    }
+
+    public Long getJ1901S01() 
+    {
+        return j1901S01;
+    }
+    public void setJ1901D01(Long j1901D01) 
+    {
+        this.j1901D01 = j1901D01;
+    }
+
+    public Long getJ1901D01() 
+    {
+        return j1901D01;
+    }
+    public void setJ1901R01(Long j1901R01) 
+    {
+        this.j1901R01 = j1901R01;
+    }
+
+    public Long getJ1901R01() 
+    {
+        return j1901R01;
+    }
+    public void setJ1901S1(Long j1901S1) 
+    {
+        this.j1901S1 = j1901S1;
+    }
+
+    public Long getJ1901S1() 
+    {
+        return j1901S1;
+    }
+    public void setJ1901D1(Long j1901D1) 
+    {
+        this.j1901D1 = j1901D1;
+    }
+
+    public Long getJ1901D1() 
+    {
+        return j1901D1;
+    }
+    public void setJ1901R1(Long j1901R1) 
+    {
+        this.j1901R1 = j1901R1;
+    }
+
+    public Long getJ1901R1() 
+    {
+        return j1901R1;
+    }
+    public void setJ1901S02(Long j1901S02) 
+    {
+        this.j1901S02 = j1901S02;
+    }
+
+    public Long getJ1901S02() 
+    {
+        return j1901S02;
+    }
+    public void setJ1901D02(Long j1901D02) 
+    {
+        this.j1901D02 = j1901D02;
+    }
+
+    public Long getJ1901D02() 
+    {
+        return j1901D02;
+    }
+    public void setJ1901R02(Long j1901R02) 
+    {
+        this.j1901R02 = j1901R02;
+    }
+
+    public Long getJ1901R02() 
+    {
+        return j1901R02;
+    }
+    public void setJ1901S2(Long j1901S2) 
+    {
+        this.j1901S2 = j1901S2;
+    }
+
+    public Long getJ1901S2() 
+    {
+        return j1901S2;
+    }
+    public void setJ1901D2(Long j1901D2) 
+    {
+        this.j1901D2 = j1901D2;
+    }
+
+    public Long getJ1901D2() 
+    {
+        return j1901D2;
+    }
+    public void setJ1901R2(Long j1901R2) 
+    {
+        this.j1901R2 = j1901R2;
+    }
+
+    public Long getJ1901R2() 
+    {
+        return j1901R2;
+    }
+    public void setAssayType(String assayType) 
+    {
+        this.assayType = assayType;
+    }
+
+    public String getAssayType() 
+    {
+        return assayType;
+    }
+    public void setSamplePost(Long samplePost) 
+    {
+        this.samplePost = samplePost;
+    }
+
+    public Long getSamplePost() 
+    {
+        return samplePost;
+    }
+    public void setResultWendu(Long resultWendu) 
+    {
+        this.resultWendu = resultWendu;
+    }
+
+    public Long getResultWendu() 
+    {
+        return resultWendu;
+    }
+    public void setResultShidu(Long resultShidu) 
+    {
+        this.resultShidu = resultShidu;
+    }
+
+    public Long getResultShidu() 
+    {
+        return resultShidu;
+    }
+    public void setOriginalConcentration(Long originalConcentration) 
+    {
+        this.originalConcentration = originalConcentration;
+    }
+
+    public Long getOriginalConcentration() 
+    {
+        return originalConcentration;
+    }
+    public void setCurveNo(String curveNo) 
+    {
+        this.curveNo = curveNo;
+    }
+
+    public String getCurveNo() 
+    {
+        return curveNo;
+    }
+    public void setReadFlag(String readFlag) 
+    {
+        this.readFlag = readFlag;
+    }
+
+    public String getReadFlag() 
+    {
+        return readFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("resultId", getResultId())
+            .append("assayNo", getAssayNo())
+            .append("resultNo", getResultNo())
+            .append("sampleNo", getSampleNo())
+            .append("sampleVolume", getSampleVolume())
+            .append("deviceNo", getDeviceNo())
+            .append("assayItem", getAssayItem())
+            .append("resultConcentration", getResultConcentration())
+            .append("resultAbs", getResultAbs())
+            .append("resultDate", getResultDate())
+            .append("resultTime", getResultTime())
+            .append("curveK0", getCurveK0())
+            .append("curveK1", getCurveK1())
+            .append("curveId", getCurveId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("j1901S01", getJ1901S01())
+            .append("j1901D01", getJ1901D01())
+            .append("j1901R01", getJ1901R01())
+            .append("j1901S1", getJ1901S1())
+            .append("j1901D1", getJ1901D1())
+            .append("j1901R1", getJ1901R1())
+            .append("j1901S02", getJ1901S02())
+            .append("j1901D02", getJ1901D02())
+            .append("j1901R02", getJ1901R02())
+            .append("j1901S2", getJ1901S2())
+            .append("j1901D2", getJ1901D2())
+            .append("j1901R2", getJ1901R2())
+            .append("assayType", getAssayType())
+            .append("samplePost", getSamplePost())
+            .append("resultWendu", getResultWendu())
+            .append("resultShidu", getResultShidu())
+            .append("originalConcentration", getOriginalConcentration())
+            .append("curveNo", getCurveNo())
+            .append("readFlag", getReadFlag())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/business/domain/ZQualityValue.java

@@ -0,0 +1,143 @@
+package com.ruoyi.business.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Builder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 水厂质控值对象 z_quality_value
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Builder
+public class ZQualityValue extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 记录id */
+    private Long valueId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long deviceWorks;
+
+    /** 化验项目 */
+    @Excel(name = "化验项目")
+    private String assayItem;
+
+    /** 质控值 */
+    @Excel(name = "质控值")
+    private Long resultValue;
+
+    /** 有效结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 下限值 */
+    @Excel(name = "下限值")
+    private Long lowValue;
+
+    /** 上限值 */
+    @Excel(name = "上限值")
+    private Long highValue;
+
+    /** 有效开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date beginTime;
+
+    public void setValueId(Long valueId) 
+    {
+        this.valueId = valueId;
+    }
+
+    public Long getValueId() 
+    {
+        return valueId;
+    }
+    public void setDeviceWorks(Long deviceWorks) 
+    {
+        this.deviceWorks = deviceWorks;
+    }
+
+    public Long getDeviceWorks() 
+    {
+        return deviceWorks;
+    }
+    public void setAssayItem(String assayItem) 
+    {
+        this.assayItem = assayItem;
+    }
+
+    public String getAssayItem() 
+    {
+        return assayItem;
+    }
+    public void setResultValue(Long resultValue) 
+    {
+        this.resultValue = resultValue;
+    }
+
+    public Long getResultValue() 
+    {
+        return resultValue;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setLowValue(Long lowValue) 
+    {
+        this.lowValue = lowValue;
+    }
+
+    public Long getLowValue() 
+    {
+        return lowValue;
+    }
+    public void setHighValue(Long highValue) 
+    {
+        this.highValue = highValue;
+    }
+
+    public Long getHighValue() 
+    {
+        return highValue;
+    }
+    public void setBeginTime(Date beginTime) 
+    {
+        this.beginTime = beginTime;
+    }
+
+    public Date getBeginTime() 
+    {
+        return beginTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("valueId", getValueId())
+            .append("deviceWorks", getDeviceWorks())
+            .append("assayItem", getAssayItem())
+            .append("resultValue", getResultValue())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("endTime", getEndTime())
+            .append("lowValue", getLowValue())
+            .append("highValue", getHighValue())
+            .append("beginTime", getBeginTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/business/mapper/BizDeviceMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.mapper;
+
+import java.util.List;
+import com.ruoyi.business.domain.BizDevice;
+
+/**
+ * 设备Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface BizDeviceMapper 
+{
+    /**
+     * 查询设备
+     * 
+     * @param deviceId 设备主键
+     * @return 设备
+     */
+    public BizDevice selectBizDeviceByDeviceId(Long deviceId);
+
+    /**
+     * 查询设备列表
+     * 
+     * @param bizDevice 设备
+     * @return 设备集合
+     */
+    public List<BizDevice> selectBizDeviceList(BizDevice bizDevice);
+
+    /**
+     * 新增设备
+     * 
+     * @param bizDevice 设备
+     * @return 结果
+     */
+    public int insertBizDevice(BizDevice bizDevice);
+
+    /**
+     * 修改设备
+     * 
+     * @param bizDevice 设备
+     * @return 结果
+     */
+    public int updateBizDevice(BizDevice bizDevice);
+
+    /**
+     * 删除设备
+     * 
+     * @param deviceId 设备主键
+     * @return 结果
+     */
+    public int deleteBizDeviceByDeviceId(Long deviceId);
+
+    /**
+     * 批量删除设备
+     * 
+     * @param deviceIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBizDeviceByDeviceIds(Long[] deviceIds);
+}

ruoyi-system/src/main/java/com/ruoyi/business/mapper/BizWaterWorkMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.mapper;
+
+import java.util.List;
+import com.ruoyi.business.domain.BizWaterWork;
+
+/**
+ * 水厂Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface BizWaterWorkMapper 
+{
+    /**
+     * 查询水厂
+     * 
+     * @param worksId 水厂主键
+     * @return 水厂
+     */
+    public BizWaterWork selectBizWaterWorkByWorksId(Long worksId);
+
+    /**
+     * 查询水厂列表
+     * 
+     * @param bizWaterWork 水厂
+     * @return 水厂集合
+     */
+    public List<BizWaterWork> selectBizWaterWorkList(BizWaterWork bizWaterWork);
+
+    /**
+     * 新增水厂
+     * 
+     * @param bizWaterWork 水厂
+     * @return 结果
+     */
+    public int insertBizWaterWork(BizWaterWork bizWaterWork);
+
+    /**
+     * 修改水厂
+     * 
+     * @param bizWaterWork 水厂
+     * @return 结果
+     */
+    public int updateBizWaterWork(BizWaterWork bizWaterWork);
+
+    /**
+     * 删除水厂
+     * 
+     * @param worksId 水厂主键
+     * @return 结果
+     */
+    public int deleteBizWaterWorkByWorksId(Long worksId);
+
+    /**
+     * 批量删除水厂
+     * 
+     * @param worksIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBizWaterWorkByWorksIds(Long[] worksIds);
+}

ruoyi-system/src/main/java/com/ruoyi/business/mapper/ZAssayMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.mapper;
+
+import java.util.List;
+import com.ruoyi.business.domain.ZAssay;
+
+/**
+ * 化验项目信息Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface ZAssayMapper 
+{
+    /**
+     * 查询化验项目信息
+     * 
+     * @param assayId 化验项目信息主键
+     * @return 化验项目信息
+     */
+    public ZAssay selectZAssayByAssayId(Long assayId);
+
+    /**
+     * 查询化验项目信息列表
+     * 
+     * @param zAssay 化验项目信息
+     * @return 化验项目信息集合
+     */
+    public List<ZAssay> selectZAssayList(ZAssay zAssay);
+
+    /**
+     * 新增化验项目信息
+     * 
+     * @param zAssay 化验项目信息
+     * @return 结果
+     */
+    public int insertZAssay(ZAssay zAssay);
+
+    /**
+     * 修改化验项目信息
+     * 
+     * @param zAssay 化验项目信息
+     * @return 结果
+     */
+    public int updateZAssay(ZAssay zAssay);
+
+    /**
+     * 删除化验项目信息
+     * 
+     * @param assayId 化验项目信息主键
+     * @return 结果
+     */
+    public int deleteZAssayByAssayId(Long assayId);
+
+    /**
+     * 批量删除化验项目信息
+     * 
+     * @param assayIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZAssayByAssayIds(Long[] assayIds);
+}

ruoyi-system/src/main/java/com/ruoyi/business/mapper/ZAssayResultMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.mapper;
+
+import java.util.List;
+import com.ruoyi.business.domain.ZAssayResult;
+
+/**
+ * 化验结果明细Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface ZAssayResultMapper 
+{
+    /**
+     * 查询化验结果明细
+     * 
+     * @param resultId 化验结果明细主键
+     * @return 化验结果明细
+     */
+    public ZAssayResult selectZAssayResultByResultId(Long resultId);
+
+    /**
+     * 查询化验结果明细列表
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 化验结果明细集合
+     */
+    public List<ZAssayResult> selectZAssayResultList(ZAssayResult zAssayResult);
+
+    /**
+     * 新增化验结果明细
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 结果
+     */
+    public int insertZAssayResult(ZAssayResult zAssayResult);
+
+    /**
+     * 修改化验结果明细
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 结果
+     */
+    public int updateZAssayResult(ZAssayResult zAssayResult);
+
+    /**
+     * 删除化验结果明细
+     * 
+     * @param resultId 化验结果明细主键
+     * @return 结果
+     */
+    public int deleteZAssayResultByResultId(Long resultId);
+
+    /**
+     * 批量删除化验结果明细
+     * 
+     * @param resultIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZAssayResultByResultIds(Long[] resultIds);
+}

ruoyi-system/src/main/java/com/ruoyi/business/mapper/ZQualityValueMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.mapper;
+
+import java.util.List;
+import com.ruoyi.business.domain.ZQualityValue;
+
+/**
+ * 水厂质控值Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface ZQualityValueMapper 
+{
+    /**
+     * 查询水厂质控值
+     * 
+     * @param valueId 水厂质控值主键
+     * @return 水厂质控值
+     */
+    public ZQualityValue selectZQualityValueByValueId(Long valueId);
+
+    /**
+     * 查询水厂质控值列表
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 水厂质控值集合
+     */
+    public List<ZQualityValue> selectZQualityValueList(ZQualityValue zQualityValue);
+
+    /**
+     * 新增水厂质控值
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 结果
+     */
+    public int insertZQualityValue(ZQualityValue zQualityValue);
+
+    /**
+     * 修改水厂质控值
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 结果
+     */
+    public int updateZQualityValue(ZQualityValue zQualityValue);
+
+    /**
+     * 删除水厂质控值
+     * 
+     * @param valueId 水厂质控值主键
+     * @return 结果
+     */
+    public int deleteZQualityValueByValueId(Long valueId);
+
+    /**
+     * 批量删除水厂质控值
+     * 
+     * @param valueIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZQualityValueByValueIds(Long[] valueIds);
+}

ruoyi-system/src/main/java/com/ruoyi/business/service/IBizDeviceService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.service;
+
+import java.util.List;
+import com.ruoyi.business.domain.BizDevice;
+
+/**
+ * 设备Service接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface IBizDeviceService 
+{
+    /**
+     * 查询设备
+     * 
+     * @param deviceId 设备主键
+     * @return 设备
+     */
+    public BizDevice selectBizDeviceByDeviceId(Long deviceId);
+
+    /**
+     * 查询设备列表
+     * 
+     * @param bizDevice 设备
+     * @return 设备集合
+     */
+    public List<BizDevice> selectBizDeviceList(BizDevice bizDevice);
+
+    /**
+     * 新增设备
+     * 
+     * @param bizDevice 设备
+     * @return 结果
+     */
+    public int insertBizDevice(BizDevice bizDevice);
+
+    /**
+     * 修改设备
+     * 
+     * @param bizDevice 设备
+     * @return 结果
+     */
+    public int updateBizDevice(BizDevice bizDevice);
+
+    /**
+     * 批量删除设备
+     * 
+     * @param deviceIds 需要删除的设备主键集合
+     * @return 结果
+     */
+    public int deleteBizDeviceByDeviceIds(Long[] deviceIds);
+
+    /**
+     * 删除设备信息
+     * 
+     * @param deviceId 设备主键
+     * @return 结果
+     */
+    public int deleteBizDeviceByDeviceId(Long deviceId);
+}

ruoyi-system/src/main/java/com/ruoyi/business/service/IBizWaterWorkService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.service;
+
+import java.util.List;
+import com.ruoyi.business.domain.BizWaterWork;
+
+/**
+ * 水厂Service接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface IBizWaterWorkService 
+{
+    /**
+     * 查询水厂
+     * 
+     * @param worksId 水厂主键
+     * @return 水厂
+     */
+    public BizWaterWork selectBizWaterWorkByWorksId(Long worksId);
+
+    /**
+     * 查询水厂列表
+     * 
+     * @param bizWaterWork 水厂
+     * @return 水厂集合
+     */
+    public List<BizWaterWork> selectBizWaterWorkList(BizWaterWork bizWaterWork);
+
+    /**
+     * 新增水厂
+     * 
+     * @param bizWaterWork 水厂
+     * @return 结果
+     */
+    public int insertBizWaterWork(BizWaterWork bizWaterWork);
+
+    /**
+     * 修改水厂
+     * 
+     * @param bizWaterWork 水厂
+     * @return 结果
+     */
+    public int updateBizWaterWork(BizWaterWork bizWaterWork);
+
+    /**
+     * 批量删除水厂
+     * 
+     * @param worksIds 需要删除的水厂主键集合
+     * @return 结果
+     */
+    public int deleteBizWaterWorkByWorksIds(Long[] worksIds);
+
+    /**
+     * 删除水厂信息
+     * 
+     * @param worksId 水厂主键
+     * @return 结果
+     */
+    public int deleteBizWaterWorkByWorksId(Long worksId);
+}

ruoyi-system/src/main/java/com/ruoyi/business/service/IZAssayResultService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.service;
+
+import java.util.List;
+import com.ruoyi.business.domain.ZAssayResult;
+
+/**
+ * 化验结果明细Service接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface IZAssayResultService 
+{
+    /**
+     * 查询化验结果明细
+     * 
+     * @param resultId 化验结果明细主键
+     * @return 化验结果明细
+     */
+    public ZAssayResult selectZAssayResultByResultId(Long resultId);
+
+    /**
+     * 查询化验结果明细列表
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 化验结果明细集合
+     */
+    public List<ZAssayResult> selectZAssayResultList(ZAssayResult zAssayResult);
+
+    /**
+     * 新增化验结果明细
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 结果
+     */
+    public int insertZAssayResult(ZAssayResult zAssayResult);
+
+    /**
+     * 修改化验结果明细
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 结果
+     */
+    public int updateZAssayResult(ZAssayResult zAssayResult);
+
+    /**
+     * 批量删除化验结果明细
+     * 
+     * @param resultIds 需要删除的化验结果明细主键集合
+     * @return 结果
+     */
+    public int deleteZAssayResultByResultIds(Long[] resultIds);
+
+    /**
+     * 删除化验结果明细信息
+     * 
+     * @param resultId 化验结果明细主键
+     * @return 结果
+     */
+    public int deleteZAssayResultByResultId(Long resultId);
+}

ruoyi-system/src/main/java/com/ruoyi/business/service/IZAssayService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.service;
+
+import java.util.List;
+import com.ruoyi.business.domain.ZAssay;
+
+/**
+ * 化验项目信息Service接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface IZAssayService 
+{
+    /**
+     * 查询化验项目信息
+     * 
+     * @param assayId 化验项目信息主键
+     * @return 化验项目信息
+     */
+    public ZAssay selectZAssayByAssayId(Long assayId);
+
+    /**
+     * 查询化验项目信息列表
+     * 
+     * @param zAssay 化验项目信息
+     * @return 化验项目信息集合
+     */
+    public List<ZAssay> selectZAssayList(ZAssay zAssay);
+
+    /**
+     * 新增化验项目信息
+     * 
+     * @param zAssay 化验项目信息
+     * @return 结果
+     */
+    public int insertZAssay(ZAssay zAssay);
+
+    /**
+     * 修改化验项目信息
+     * 
+     * @param zAssay 化验项目信息
+     * @return 结果
+     */
+    public int updateZAssay(ZAssay zAssay);
+
+    /**
+     * 批量删除化验项目信息
+     * 
+     * @param assayIds 需要删除的化验项目信息主键集合
+     * @return 结果
+     */
+    public int deleteZAssayByAssayIds(Long[] assayIds);
+
+    /**
+     * 删除化验项目信息信息
+     * 
+     * @param assayId 化验项目信息主键
+     * @return 结果
+     */
+    public int deleteZAssayByAssayId(Long assayId);
+}

ruoyi-system/src/main/java/com/ruoyi/business/service/IZQualityValueService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.business.service;
+
+import java.util.List;
+import com.ruoyi.business.domain.ZQualityValue;
+
+/**
+ * 水厂质控值Service接口
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+public interface IZQualityValueService 
+{
+    /**
+     * 查询水厂质控值
+     * 
+     * @param valueId 水厂质控值主键
+     * @return 水厂质控值
+     */
+    public ZQualityValue selectZQualityValueByValueId(Long valueId);
+
+    /**
+     * 查询水厂质控值列表
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 水厂质控值集合
+     */
+    public List<ZQualityValue> selectZQualityValueList(ZQualityValue zQualityValue);
+
+    /**
+     * 新增水厂质控值
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 结果
+     */
+    public int insertZQualityValue(ZQualityValue zQualityValue);
+
+    /**
+     * 修改水厂质控值
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 结果
+     */
+    public int updateZQualityValue(ZQualityValue zQualityValue);
+
+    /**
+     * 批量删除水厂质控值
+     * 
+     * @param valueIds 需要删除的水厂质控值主键集合
+     * @return 结果
+     */
+    public int deleteZQualityValueByValueIds(Long[] valueIds);
+
+    /**
+     * 删除水厂质控值信息
+     * 
+     * @param valueId 水厂质控值主键
+     * @return 结果
+     */
+    public int deleteZQualityValueByValueId(Long valueId);
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.business.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.business.mapper.BizDeviceMapper;
+import com.ruoyi.business.domain.BizDevice;
+import com.ruoyi.business.service.IBizDeviceService;
+
+/**
+ * 设备Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Service
+public class BizDeviceServiceImpl implements IBizDeviceService 
+{
+    @Autowired
+    private BizDeviceMapper bizDeviceMapper;
+
+    /**
+     * 查询设备
+     * 
+     * @param deviceId 设备主键
+     * @return 设备
+     */
+    @Override
+    public BizDevice selectBizDeviceByDeviceId(Long deviceId)
+    {
+        return bizDeviceMapper.selectBizDeviceByDeviceId(deviceId);
+    }
+
+    /**
+     * 查询设备列表
+     * 
+     * @param bizDevice 设备
+     * @return 设备
+     */
+    @Override
+    public List<BizDevice> selectBizDeviceList(BizDevice bizDevice)
+    {
+        return bizDeviceMapper.selectBizDeviceList(bizDevice);
+    }
+
+    /**
+     * 新增设备
+     * 
+     * @param bizDevice 设备
+     * @return 结果
+     */
+    @Override
+    public int insertBizDevice(BizDevice bizDevice)
+    {
+        bizDevice.setCreateTime(DateUtils.getNowDate());
+        return bizDeviceMapper.insertBizDevice(bizDevice);
+    }
+
+    /**
+     * 修改设备
+     * 
+     * @param bizDevice 设备
+     * @return 结果
+     */
+    @Override
+    public int updateBizDevice(BizDevice bizDevice)
+    {
+        bizDevice.setUpdateTime(DateUtils.getNowDate());
+        return bizDeviceMapper.updateBizDevice(bizDevice);
+    }
+
+    /**
+     * 批量删除设备
+     * 
+     * @param deviceIds 需要删除的设备主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBizDeviceByDeviceIds(Long[] deviceIds)
+    {
+        return bizDeviceMapper.deleteBizDeviceByDeviceIds(deviceIds);
+    }
+
+    /**
+     * 删除设备信息
+     * 
+     * @param deviceId 设备主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBizDeviceByDeviceId(Long deviceId)
+    {
+        return bizDeviceMapper.deleteBizDeviceByDeviceId(deviceId);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.business.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.business.mapper.BizWaterWorkMapper;
+import com.ruoyi.business.domain.BizWaterWork;
+import com.ruoyi.business.service.IBizWaterWorkService;
+
+/**
+ * 水厂Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Service
+public class BizWaterWorkServiceImpl implements IBizWaterWorkService 
+{
+    @Autowired
+    private BizWaterWorkMapper bizWaterWorkMapper;
+
+    /**
+     * 查询水厂
+     * 
+     * @param worksId 水厂主键
+     * @return 水厂
+     */
+    @Override
+    public BizWaterWork selectBizWaterWorkByWorksId(Long worksId)
+    {
+        return bizWaterWorkMapper.selectBizWaterWorkByWorksId(worksId);
+    }
+
+    /**
+     * 查询水厂列表
+     * 
+     * @param bizWaterWork 水厂
+     * @return 水厂
+     */
+    @Override
+    public List<BizWaterWork> selectBizWaterWorkList(BizWaterWork bizWaterWork)
+    {
+        return bizWaterWorkMapper.selectBizWaterWorkList(bizWaterWork);
+    }
+
+    /**
+     * 新增水厂
+     * 
+     * @param bizWaterWork 水厂
+     * @return 结果
+     */
+    @Override
+    public int insertBizWaterWork(BizWaterWork bizWaterWork)
+    {
+        bizWaterWork.setCreateTime(DateUtils.getNowDate());
+        return bizWaterWorkMapper.insertBizWaterWork(bizWaterWork);
+    }
+
+    /**
+     * 修改水厂
+     * 
+     * @param bizWaterWork 水厂
+     * @return 结果
+     */
+    @Override
+    public int updateBizWaterWork(BizWaterWork bizWaterWork)
+    {
+        bizWaterWork.setUpdateTime(DateUtils.getNowDate());
+        return bizWaterWorkMapper.updateBizWaterWork(bizWaterWork);
+    }
+
+    /**
+     * 批量删除水厂
+     * 
+     * @param worksIds 需要删除的水厂主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBizWaterWorkByWorksIds(Long[] worksIds)
+    {
+        return bizWaterWorkMapper.deleteBizWaterWorkByWorksIds(worksIds);
+    }
+
+    /**
+     * 删除水厂信息
+     * 
+     * @param worksId 水厂主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBizWaterWorkByWorksId(Long worksId)
+    {
+        return bizWaterWorkMapper.deleteBizWaterWorkByWorksId(worksId);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.business.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.business.mapper.ZAssayResultMapper;
+import com.ruoyi.business.domain.ZAssayResult;
+import com.ruoyi.business.service.IZAssayResultService;
+
+/**
+ * 化验结果明细Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Service
+public class ZAssayResultServiceImpl implements IZAssayResultService 
+{
+    @Autowired
+    private ZAssayResultMapper zAssayResultMapper;
+
+    /**
+     * 查询化验结果明细
+     * 
+     * @param resultId 化验结果明细主键
+     * @return 化验结果明细
+     */
+    @Override
+    public ZAssayResult selectZAssayResultByResultId(Long resultId)
+    {
+        return zAssayResultMapper.selectZAssayResultByResultId(resultId);
+    }
+
+    /**
+     * 查询化验结果明细列表
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 化验结果明细
+     */
+    @Override
+    public List<ZAssayResult> selectZAssayResultList(ZAssayResult zAssayResult)
+    {
+        return zAssayResultMapper.selectZAssayResultList(zAssayResult);
+    }
+
+    /**
+     * 新增化验结果明细
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 结果
+     */
+    @Override
+    public int insertZAssayResult(ZAssayResult zAssayResult)
+    {
+        zAssayResult.setCreateTime(DateUtils.getNowDate());
+        return zAssayResultMapper.insertZAssayResult(zAssayResult);
+    }
+
+    /**
+     * 修改化验结果明细
+     * 
+     * @param zAssayResult 化验结果明细
+     * @return 结果
+     */
+    @Override
+    public int updateZAssayResult(ZAssayResult zAssayResult)
+    {
+        zAssayResult.setUpdateTime(DateUtils.getNowDate());
+        return zAssayResultMapper.updateZAssayResult(zAssayResult);
+    }
+
+    /**
+     * 批量删除化验结果明细
+     * 
+     * @param resultIds 需要删除的化验结果明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZAssayResultByResultIds(Long[] resultIds)
+    {
+        return zAssayResultMapper.deleteZAssayResultByResultIds(resultIds);
+    }
+
+    /**
+     * 删除化验结果明细信息
+     * 
+     * @param resultId 化验结果明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZAssayResultByResultId(Long resultId)
+    {
+        return zAssayResultMapper.deleteZAssayResultByResultId(resultId);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.business.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.business.mapper.ZAssayMapper;
+import com.ruoyi.business.domain.ZAssay;
+import com.ruoyi.business.service.IZAssayService;
+
+/**
+ * 化验项目信息Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Service
+public class ZAssayServiceImpl implements IZAssayService 
+{
+    @Autowired
+    private ZAssayMapper zAssayMapper;
+
+    /**
+     * 查询化验项目信息
+     * 
+     * @param assayId 化验项目信息主键
+     * @return 化验项目信息
+     */
+    @Override
+    public ZAssay selectZAssayByAssayId(Long assayId)
+    {
+        return zAssayMapper.selectZAssayByAssayId(assayId);
+    }
+
+    /**
+     * 查询化验项目信息列表
+     * 
+     * @param zAssay 化验项目信息
+     * @return 化验项目信息
+     */
+    @Override
+    public List<ZAssay> selectZAssayList(ZAssay zAssay)
+    {
+        return zAssayMapper.selectZAssayList(zAssay);
+    }
+
+    /**
+     * 新增化验项目信息
+     * 
+     * @param zAssay 化验项目信息
+     * @return 结果
+     */
+    @Override
+    public int insertZAssay(ZAssay zAssay)
+    {
+        zAssay.setCreateTime(DateUtils.getNowDate());
+        return zAssayMapper.insertZAssay(zAssay);
+    }
+
+    /**
+     * 修改化验项目信息
+     * 
+     * @param zAssay 化验项目信息
+     * @return 结果
+     */
+    @Override
+    public int updateZAssay(ZAssay zAssay)
+    {
+        zAssay.setUpdateTime(DateUtils.getNowDate());
+        return zAssayMapper.updateZAssay(zAssay);
+    }
+
+    /**
+     * 批量删除化验项目信息
+     * 
+     * @param assayIds 需要删除的化验项目信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZAssayByAssayIds(Long[] assayIds)
+    {
+        return zAssayMapper.deleteZAssayByAssayIds(assayIds);
+    }
+
+    /**
+     * 删除化验项目信息信息
+     * 
+     * @param assayId 化验项目信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZAssayByAssayId(Long assayId)
+    {
+        return zAssayMapper.deleteZAssayByAssayId(assayId);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.business.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.business.mapper.ZQualityValueMapper;
+import com.ruoyi.business.domain.ZQualityValue;
+import com.ruoyi.business.service.IZQualityValueService;
+
+/**
+ * 水厂质控值Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-09-26
+ */
+@Service
+public class ZQualityValueServiceImpl implements IZQualityValueService 
+{
+    @Autowired
+    private ZQualityValueMapper zQualityValueMapper;
+
+    /**
+     * 查询水厂质控值
+     * 
+     * @param valueId 水厂质控值主键
+     * @return 水厂质控值
+     */
+    @Override
+    public ZQualityValue selectZQualityValueByValueId(Long valueId)
+    {
+        return zQualityValueMapper.selectZQualityValueByValueId(valueId);
+    }
+
+    /**
+     * 查询水厂质控值列表
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 水厂质控值
+     */
+    @Override
+    public List<ZQualityValue> selectZQualityValueList(ZQualityValue zQualityValue)
+    {
+        return zQualityValueMapper.selectZQualityValueList(zQualityValue);
+    }
+
+    /**
+     * 新增水厂质控值
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 结果
+     */
+    @Override
+    public int insertZQualityValue(ZQualityValue zQualityValue)
+    {
+        zQualityValue.setCreateTime(DateUtils.getNowDate());
+        return zQualityValueMapper.insertZQualityValue(zQualityValue);
+    }
+
+    /**
+     * 修改水厂质控值
+     * 
+     * @param zQualityValue 水厂质控值
+     * @return 结果
+     */
+    @Override
+    public int updateZQualityValue(ZQualityValue zQualityValue)
+    {
+        zQualityValue.setUpdateTime(DateUtils.getNowDate());
+        return zQualityValueMapper.updateZQualityValue(zQualityValue);
+    }
+
+    /**
+     * 批量删除水厂质控值
+     * 
+     * @param valueIds 需要删除的水厂质控值主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZQualityValueByValueIds(Long[] valueIds)
+    {
+        return zQualityValueMapper.deleteZQualityValueByValueIds(valueIds);
+    }
+
+    /**
+     * 删除水厂质控值信息
+     * 
+     * @param valueId 水厂质控值主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZQualityValueByValueId(Long valueId)
+    {
+        return zQualityValueMapper.deleteZQualityValueByValueId(valueId);
+    }
+}

ruoyi-system/src/main/resources/mapper/business/BizDeviceMapper.xml

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.BizDeviceMapper">
+    
+    <resultMap type="BizDevice" id="BizDeviceResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="deviceNo"    column="device_no"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceSn"    column="device_sn"    />
+        <result property="deviceModel"    column="device_model"    />
+        <result property="deviceMaker"    column="device_maker"    />
+        <result property="deviceWorks"    column="device_works"    />
+        <result property="deviceMaintainer"    column="device_maintainer"    />
+        <result property="deviceTel"    column="device_tel"    />
+        <result property="deviceType"    column="device_type"    />
+        <result property="deviceStatus"    column="device_status"    />
+        <result property="assayStatus"    column="assay_status"    />
+        <result property="assayTime"    column="assay_time"    />
+        <result property="repairTime"    column="repair_time"    />
+        <result property="repairBy"    column="repair_by"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="faultCode"    column="fault_code"    />
+        <result property="deviceXujieJieguo"    column="device_xujie_jieguo"    />
+        <result property="deviceXujieBaojing"    column="device_xujie_baojing"    />
+        <result property="deviceProvince"    column="device_province"    />
+        <result property="deviceCity"    column="device_city"    />
+        <result property="deviceArea"    column="device_area"    />
+        <result property="deviceLongitude"    column="device_longitude"    />
+        <result property="deviceLatitude"    column="device_latitude"    />
+        <result property="deviceAddress"    column="device_address"    />
+        <result property="type"    column="type"    />
+    </resultMap>
+
+    <sql id="selectBizDeviceVo">
+        select device_id, device_no, device_name, device_sn, device_model, device_maker, device_works, device_maintainer, device_tel, device_type, device_status, assay_status, assay_time, repair_time, repair_by, create_by, create_time, update_by, update_time, fault_code, device_xujie_jieguo, device_xujie_baojing, device_province, device_city, device_area, device_longitude, device_latitude, device_address, type from biz_device
+    </sql>
+
+    <select id="selectBizDeviceList" parameterType="BizDevice" resultMap="BizDeviceResult">
+        <include refid="selectBizDeviceVo"/>
+        <where>
+            1 = 1
+            <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceSn != null  and deviceSn != ''"> and device_sn = #{deviceSn}</if>
+            <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
+            <if test="deviceMaker != null  and deviceMaker != ''"> and device_maker = #{deviceMaker}</if>
+            <if test="deviceWorks != null "> and device_works = #{deviceWorks}</if>
+            <if test="deviceMaintainer != null  and deviceMaintainer != ''"> and device_maintainer = #{deviceMaintainer}</if>
+            <if test="deviceTel != null  and deviceTel != ''"> and device_tel = #{deviceTel}</if>
+            <if test="deviceType != null  and deviceType != ''"> and device_type = #{deviceType}</if>
+            <if test="deviceStatus != null  and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
+            <if test="assayStatus != null  and assayStatus != ''"> and assay_status = #{assayStatus}</if>
+            <if test="assayTime != null "> and assay_time = #{assayTime}</if>
+            <if test="repairTime != null "> and repair_time = #{repairTime}</if>
+            <if test="repairBy != null  and repairBy != ''"> and repair_by = #{repairBy}</if>
+            <if test="faultCode != null  and faultCode != ''"> and fault_code = #{faultCode}</if>
+            <if test="deviceXujieJieguo != null  and deviceXujieJieguo != ''"> and device_xujie_jieguo = #{deviceXujieJieguo}</if>
+            <if test="deviceXujieBaojing != null  and deviceXujieBaojing != ''"> and device_xujie_baojing = #{deviceXujieBaojing}</if>
+            <if test="deviceProvince != null  and deviceProvince != ''"> and device_province = #{deviceProvince}</if>
+            <if test="deviceCity != null  and deviceCity != ''"> and device_city = #{deviceCity}</if>
+            <if test="deviceArea != null  and deviceArea != ''"> and device_area = #{deviceArea}</if>
+            <if test="deviceLongitude != null  and deviceLongitude != ''"> and device_longitude = #{deviceLongitude}</if>
+            <if test="deviceLatitude != null  and deviceLatitude != ''"> and device_latitude = #{deviceLatitude}</if>
+            <if test="deviceAddress != null  and deviceAddress != ''"> and device_address = #{deviceAddress}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+        </where>
+            order by device_id desc
+    </select>
+    
+    <select id="selectBizDeviceByDeviceId" parameterType="Long" resultMap="BizDeviceResult">
+        <include refid="selectBizDeviceVo"/>
+        where device_id = #{deviceId}
+    </select>
+        
+    <insert id="insertBizDevice" parameterType="BizDevice">
+        insert into biz_device
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceId != null">device_id,</if>
+            <if test="deviceNo != null">device_no,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceSn != null">device_sn,</if>
+            <if test="deviceModel != null">device_model,</if>
+            <if test="deviceMaker != null">device_maker,</if>
+            <if test="deviceWorks != null">device_works,</if>
+            <if test="deviceMaintainer != null">device_maintainer,</if>
+            <if test="deviceTel != null">device_tel,</if>
+            <if test="deviceType != null">device_type,</if>
+            <if test="deviceStatus != null">device_status,</if>
+            <if test="assayStatus != null">assay_status,</if>
+            <if test="assayTime != null">assay_time,</if>
+            <if test="repairTime != null">repair_time,</if>
+            <if test="repairBy != null">repair_by,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="faultCode != null">fault_code,</if>
+            <if test="deviceXujieJieguo != null">device_xujie_jieguo,</if>
+            <if test="deviceXujieBaojing != null">device_xujie_baojing,</if>
+            <if test="deviceProvince != null">device_province,</if>
+            <if test="deviceCity != null">device_city,</if>
+            <if test="deviceArea != null">device_area,</if>
+            <if test="deviceLongitude != null">device_longitude,</if>
+            <if test="deviceLatitude != null">device_latitude,</if>
+            <if test="deviceAddress != null">device_address,</if>
+            <if test="type != null">type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="deviceNo != null">#{deviceNo},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceSn != null">#{deviceSn},</if>
+            <if test="deviceModel != null">#{deviceModel},</if>
+            <if test="deviceMaker != null">#{deviceMaker},</if>
+            <if test="deviceWorks != null">#{deviceWorks},</if>
+            <if test="deviceMaintainer != null">#{deviceMaintainer},</if>
+            <if test="deviceTel != null">#{deviceTel},</if>
+            <if test="deviceType != null">#{deviceType},</if>
+            <if test="deviceStatus != null">#{deviceStatus},</if>
+            <if test="assayStatus != null">#{assayStatus},</if>
+            <if test="assayTime != null">#{assayTime},</if>
+            <if test="repairTime != null">#{repairTime},</if>
+            <if test="repairBy != null">#{repairBy},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="faultCode != null">#{faultCode},</if>
+            <if test="deviceXujieJieguo != null">#{deviceXujieJieguo},</if>
+            <if test="deviceXujieBaojing != null">#{deviceXujieBaojing},</if>
+            <if test="deviceProvince != null">#{deviceProvince},</if>
+            <if test="deviceCity != null">#{deviceCity},</if>
+            <if test="deviceArea != null">#{deviceArea},</if>
+            <if test="deviceLongitude != null">#{deviceLongitude},</if>
+            <if test="deviceLatitude != null">#{deviceLatitude},</if>
+            <if test="deviceAddress != null">#{deviceAddress},</if>
+            <if test="type != null">#{type},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBizDevice" parameterType="BizDevice">
+        update biz_device
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceNo != null">device_no = #{deviceNo},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceSn != null">device_sn = #{deviceSn},</if>
+            <if test="deviceModel != null">device_model = #{deviceModel},</if>
+            <if test="deviceMaker != null">device_maker = #{deviceMaker},</if>
+            <if test="deviceWorks != null">device_works = #{deviceWorks},</if>
+            <if test="deviceMaintainer != null">device_maintainer = #{deviceMaintainer},</if>
+            <if test="deviceTel != null">device_tel = #{deviceTel},</if>
+            <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
+            <if test="assayStatus != null">assay_status = #{assayStatus},</if>
+            <if test="assayTime != null">assay_time = #{assayTime},</if>
+            <if test="repairTime != null">repair_time = #{repairTime},</if>
+            <if test="repairBy != null">repair_by = #{repairBy},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="faultCode != null">fault_code = #{faultCode},</if>
+            <if test="deviceXujieJieguo != null">device_xujie_jieguo = #{deviceXujieJieguo},</if>
+            <if test="deviceXujieBaojing != null">device_xujie_baojing = #{deviceXujieBaojing},</if>
+            <if test="deviceProvince != null">device_province = #{deviceProvince},</if>
+            <if test="deviceCity != null">device_city = #{deviceCity},</if>
+            <if test="deviceArea != null">device_area = #{deviceArea},</if>
+            <if test="deviceLongitude != null">device_longitude = #{deviceLongitude},</if>
+            <if test="deviceLatitude != null">device_latitude = #{deviceLatitude},</if>
+            <if test="deviceAddress != null">device_address = #{deviceAddress},</if>
+            <if test="type != null">type = #{type},</if>
+        </trim>
+        where device_id = #{deviceId}
+    </update>
+
+    
+
+    <delete id="deleteBizDeviceByDeviceId" parameterType="Long">
+        update biz_device set del_flag = 2,revision = revision + 1 where del_flag = 0 and device_id = #{deviceId}
+    </delete>
+
+    <delete id="deleteBizDeviceByDeviceIds" parameterType="String">
+        update biz_device set del_flag = 2,revision = revision + 1 where del_flag = 0 and device_id in
+        <foreach item="deviceId" collection="array" open="(" separator="," close=")">
+            #{deviceId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/business/BizWaterWorkMapper.xml

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.BizWaterWorkMapper">
+    
+    <resultMap type="BizWaterWork" id="BizWaterWorkResult">
+        <result property="worksId"    column="works_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="ancestors"    column="ancestors"    />
+        <result property="worksName"    column="works_name"    />
+        <result property="orderNum"    column="order_num"    />
+        <result property="worksStatus"    column="works_status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="worksNo"    column="works_no"    />
+        <result property="worksProvince"    column="works_province"    />
+        <result property="worksCity"    column="works_city"    />
+        <result property="worksArea"    column="works_area"    />
+        <result property="worksLongitude"    column="works_longitude"    />
+        <result property="worksLatitude"    column="works_latitude"    />
+        <result property="worksAddress"    column="works_address"    />
+        <result property="worksCount"    column="works_count"    />
+        <result property="worksType"    column="works_type"    />
+        <result property="worksCenter"    column="works_center"    />
+        <result property="worksBelong"    column="works_belong"    />
+        <result property="worksMaintainer"    column="works_maintainer"    />
+        <result property="worksTel"    column="works_tel"    />
+    </resultMap>
+
+    <sql id="selectBizWaterWorkVo">
+        select works_id, parent_id, ancestors, works_name, order_num, works_status, del_flag, create_by, create_time, update_by, update_time, works_no, works_province, works_city, works_area, works_longitude, works_latitude, works_address, works_count, works_type, works_center, works_belong, works_maintainer, works_tel from biz_water_work
+    </sql>
+
+    <select id="selectBizWaterWorkList" parameterType="BizWaterWork" resultMap="BizWaterWorkResult">
+        <include refid="selectBizWaterWorkVo"/>
+        <where>
+            1 = 1
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
+            <if test="worksName != null  and worksName != ''"> and works_name like concat('%', #{worksName}, '%')</if>
+            <if test="orderNum != null "> and order_num = #{orderNum}</if>
+            <if test="worksStatus != null  and worksStatus != ''"> and works_status = #{worksStatus}</if>
+            <if test="worksNo != null  and worksNo != ''"> and works_no = #{worksNo}</if>
+            <if test="worksProvince != null  and worksProvince != ''"> and works_province = #{worksProvince}</if>
+            <if test="worksCity != null  and worksCity != ''"> and works_city = #{worksCity}</if>
+            <if test="worksArea != null  and worksArea != ''"> and works_area = #{worksArea}</if>
+            <if test="worksLongitude != null  and worksLongitude != ''"> and works_longitude = #{worksLongitude}</if>
+            <if test="worksLatitude != null  and worksLatitude != ''"> and works_latitude = #{worksLatitude}</if>
+            <if test="worksAddress != null  and worksAddress != ''"> and works_address = #{worksAddress}</if>
+            <if test="worksCount != null "> and works_count = #{worksCount}</if>
+            <if test="worksType != null  and worksType != ''"> and works_type = #{worksType}</if>
+            <if test="worksCenter != null  and worksCenter != ''"> and works_center = #{worksCenter}</if>
+            <if test="worksBelong != null "> and works_belong = #{worksBelong}</if>
+            <if test="worksMaintainer != null  and worksMaintainer != ''"> and works_maintainer = #{worksMaintainer}</if>
+            <if test="worksTel != null  and worksTel != ''"> and works_tel = #{worksTel}</if>
+        </where>
+        order by works_id desc
+    </select>
+    
+    <select id="selectBizWaterWorkByWorksId" parameterType="Long" resultMap="BizWaterWorkResult">
+        <include refid="selectBizWaterWorkVo"/>
+        where works_id = #{worksId}
+    </select>
+        
+    <insert id="insertBizWaterWork" parameterType="BizWaterWork">
+        insert into biz_water_work
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="worksId != null">works_id,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="ancestors != null">ancestors,</if>
+            <if test="worksName != null">works_name,</if>
+            <if test="orderNum != null">order_num,</if>
+            <if test="worksStatus != null">works_status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="worksNo != null">works_no,</if>
+            <if test="worksProvince != null">works_province,</if>
+            <if test="worksCity != null">works_city,</if>
+            <if test="worksArea != null">works_area,</if>
+            <if test="worksLongitude != null">works_longitude,</if>
+            <if test="worksLatitude != null">works_latitude,</if>
+            <if test="worksAddress != null">works_address,</if>
+            <if test="worksCount != null">works_count,</if>
+            <if test="worksType != null">works_type,</if>
+            <if test="worksCenter != null">works_center,</if>
+            <if test="worksBelong != null">works_belong,</if>
+            <if test="worksMaintainer != null">works_maintainer,</if>
+            <if test="worksTel != null">works_tel,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="worksId != null">#{worksId},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="ancestors != null">#{ancestors},</if>
+            <if test="worksName != null">#{worksName},</if>
+            <if test="orderNum != null">#{orderNum},</if>
+            <if test="worksStatus != null">#{worksStatus},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="worksNo != null">#{worksNo},</if>
+            <if test="worksProvince != null">#{worksProvince},</if>
+            <if test="worksCity != null">#{worksCity},</if>
+            <if test="worksArea != null">#{worksArea},</if>
+            <if test="worksLongitude != null">#{worksLongitude},</if>
+            <if test="worksLatitude != null">#{worksLatitude},</if>
+            <if test="worksAddress != null">#{worksAddress},</if>
+            <if test="worksCount != null">#{worksCount},</if>
+            <if test="worksType != null">#{worksType},</if>
+            <if test="worksCenter != null">#{worksCenter},</if>
+            <if test="worksBelong != null">#{worksBelong},</if>
+            <if test="worksMaintainer != null">#{worksMaintainer},</if>
+            <if test="worksTel != null">#{worksTel},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBizWaterWork" parameterType="BizWaterWork">
+        update biz_water_work
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="ancestors != null">ancestors = #{ancestors},</if>
+            <if test="worksName != null">works_name = #{worksName},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
+            <if test="worksStatus != null">works_status = #{worksStatus},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="worksNo != null">works_no = #{worksNo},</if>
+            <if test="worksProvince != null">works_province = #{worksProvince},</if>
+            <if test="worksCity != null">works_city = #{worksCity},</if>
+            <if test="worksArea != null">works_area = #{worksArea},</if>
+            <if test="worksLongitude != null">works_longitude = #{worksLongitude},</if>
+            <if test="worksLatitude != null">works_latitude = #{worksLatitude},</if>
+            <if test="worksAddress != null">works_address = #{worksAddress},</if>
+            <if test="worksCount != null">works_count = #{worksCount},</if>
+            <if test="worksType != null">works_type = #{worksType},</if>
+            <if test="worksCenter != null">works_center = #{worksCenter},</if>
+            <if test="worksBelong != null">works_belong = #{worksBelong},</if>
+            <if test="worksMaintainer != null">works_maintainer = #{worksMaintainer},</if>
+            <if test="worksTel != null">works_tel = #{worksTel},</if>
+        </trim>
+        where works_id = #{worksId}
+    </update>
+
+    
+
+    <delete id="deleteBizWaterWorkByWorksId" parameterType="Long">
+        update biz_water_work set del_flag = 2,revision = revision + 1 where del_flag = 0 and works_id = #{worksId}
+    </delete>
+
+    <delete id="deleteBizWaterWorkByWorksIds" parameterType="String">
+        update biz_water_work set del_flag = 2,revision = revision + 1 where del_flag = 0 and works_id in
+        <foreach item="worksId" collection="array" open="(" separator="," close=")">
+            #{worksId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/business/ZAssayMapper.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.ZAssayMapper">
+    
+    <resultMap type="ZAssay" id="ZAssayResult">
+        <result property="assayId"    column="assay_id"    />
+        <result property="assayNo"    column="assay_no"    />
+        <result property="deviceNo"    column="device_no"    />
+        <result property="assayType"    column="assay_type"    />
+        <result property="assayBigprocess"    column="assay_bigprocess"    />
+        <result property="assaySmallprocess"    column="assay_smallprocess"    />
+        <result property="beginTime"    column="begin_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="assayDate"    column="assay_date"    />
+        <result property="assayBy"    column="assay_by"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="version"    column="version"    />
+        <result property="stepName"    column="step_name"    />
+        <result property="stepTotal"    column="step_total"    />
+        <result property="stepNow"    column="step_now"    />
+        <result property="stepInfo1"    column="step_info1"    />
+        <result property="stepInfo2"    column="step_info2"    />
+        <result property="stepInfo3"    column="step_info3"    />
+        <result property="assayStatus"    column="assay_status"    />
+        <result property="assayMethod"    column="assay_method"    />
+    </resultMap>
+
+    <sql id="selectZAssayVo">
+        select assay_id, assay_no, device_no, assay_type, assay_bigprocess, assay_smallprocess, begin_time, end_time, assay_date, assay_by, create_by, create_time, update_by, update_time, version, step_name, step_total, step_now, step_info1, step_info2, step_info3, assay_status, assay_method from z_assay
+    </sql>
+
+    <select id="selectZAssayList" parameterType="ZAssay" resultMap="ZAssayResult">
+        <include refid="selectZAssayVo"/>
+        <where>
+            1 = 1
+            <if test="assayNo != null  and assayNo != ''"> and assay_no = #{assayNo}</if>
+            <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
+            <if test="assayType != null  and assayType != ''"> and assay_type = #{assayType}</if>
+            <if test="assayBigprocess != null  and assayBigprocess != ''"> and assay_bigprocess = #{assayBigprocess}</if>
+            <if test="assaySmallprocess != null  and assaySmallprocess != ''"> and assay_smallprocess = #{assaySmallprocess}</if>
+            <if test="beginTime != null  and beginTime != ''"> and begin_time = #{beginTime}</if>
+            <if test="endTime != null  and endTime != ''"> and end_time = #{endTime}</if>
+            <if test="assayDate != null  and assayDate != ''"> and assay_date = #{assayDate}</if>
+            <if test="assayBy != null  and assayBy != ''"> and assay_by = #{assayBy}</if>
+            <if test="version != null  and version != ''"> and version = #{version}</if>
+            <if test="stepName != null  and stepName != ''"> and step_name like concat('%', #{stepName}, '%')</if>
+            <if test="stepTotal != null  and stepTotal != ''"> and step_total = #{stepTotal}</if>
+            <if test="stepNow != null  and stepNow != ''"> and step_now = #{stepNow}</if>
+            <if test="stepInfo1 != null  and stepInfo1 != ''"> and step_info1 = #{stepInfo1}</if>
+            <if test="stepInfo2 != null  and stepInfo2 != ''"> and step_info2 = #{stepInfo2}</if>
+            <if test="stepInfo3 != null  and stepInfo3 != ''"> and step_info3 = #{stepInfo3}</if>
+            <if test="assayStatus != null  and assayStatus != ''"> and assay_status = #{assayStatus}</if>
+            <if test="assayMethod != null  and assayMethod != ''"> and assay_method = #{assayMethod}</if>
+        </where>
+        order by assay_id desc
+    </select>
+    
+    <select id="selectZAssayByAssayId" parameterType="Long" resultMap="ZAssayResult">
+        <include refid="selectZAssayVo"/>
+        where assay_id = #{assayId}
+    </select>
+        
+    <insert id="insertZAssay" parameterType="ZAssay">
+        insert into z_assay
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="assayId != null">assay_id,</if>
+            <if test="assayNo != null">assay_no,</if>
+            <if test="deviceNo != null">device_no,</if>
+            <if test="assayType != null">assay_type,</if>
+            <if test="assayBigprocess != null">assay_bigprocess,</if>
+            <if test="assaySmallprocess != null">assay_smallprocess,</if>
+            <if test="beginTime != null">begin_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="assayDate != null">assay_date,</if>
+            <if test="assayBy != null">assay_by,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="version != null">version,</if>
+            <if test="stepName != null">step_name,</if>
+            <if test="stepTotal != null">step_total,</if>
+            <if test="stepNow != null">step_now,</if>
+            <if test="stepInfo1 != null">step_info1,</if>
+            <if test="stepInfo2 != null">step_info2,</if>
+            <if test="stepInfo3 != null">step_info3,</if>
+            <if test="assayStatus != null">assay_status,</if>
+            <if test="assayMethod != null">assay_method,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="assayId != null">#{assayId},</if>
+            <if test="assayNo != null">#{assayNo},</if>
+            <if test="deviceNo != null">#{deviceNo},</if>
+            <if test="assayType != null">#{assayType},</if>
+            <if test="assayBigprocess != null">#{assayBigprocess},</if>
+            <if test="assaySmallprocess != null">#{assaySmallprocess},</if>
+            <if test="beginTime != null">#{beginTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="assayDate != null">#{assayDate},</if>
+            <if test="assayBy != null">#{assayBy},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="version != null">#{version},</if>
+            <if test="stepName != null">#{stepName},</if>
+            <if test="stepTotal != null">#{stepTotal},</if>
+            <if test="stepNow != null">#{stepNow},</if>
+            <if test="stepInfo1 != null">#{stepInfo1},</if>
+            <if test="stepInfo2 != null">#{stepInfo2},</if>
+            <if test="stepInfo3 != null">#{stepInfo3},</if>
+            <if test="assayStatus != null">#{assayStatus},</if>
+            <if test="assayMethod != null">#{assayMethod},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZAssay" parameterType="ZAssay">
+        update z_assay
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="assayNo != null">assay_no = #{assayNo},</if>
+            <if test="deviceNo != null">device_no = #{deviceNo},</if>
+            <if test="assayType != null">assay_type = #{assayType},</if>
+            <if test="assayBigprocess != null">assay_bigprocess = #{assayBigprocess},</if>
+            <if test="assaySmallprocess != null">assay_smallprocess = #{assaySmallprocess},</if>
+            <if test="beginTime != null">begin_time = #{beginTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="assayDate != null">assay_date = #{assayDate},</if>
+            <if test="assayBy != null">assay_by = #{assayBy},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="stepName != null">step_name = #{stepName},</if>
+            <if test="stepTotal != null">step_total = #{stepTotal},</if>
+            <if test="stepNow != null">step_now = #{stepNow},</if>
+            <if test="stepInfo1 != null">step_info1 = #{stepInfo1},</if>
+            <if test="stepInfo2 != null">step_info2 = #{stepInfo2},</if>
+            <if test="stepInfo3 != null">step_info3 = #{stepInfo3},</if>
+            <if test="assayStatus != null">assay_status = #{assayStatus},</if>
+            <if test="assayMethod != null">assay_method = #{assayMethod},</if>
+        </trim>
+        where assay_id = #{assayId}
+    </update>
+
+    
+
+    <delete id="deleteZAssayByAssayId" parameterType="Long">
+        update z_assay set del_flag = 2,revision = revision + 1 where del_flag = 0 and assay_id = #{assayId}
+    </delete>
+
+    <delete id="deleteZAssayByAssayIds" parameterType="String">
+        update z_assay set del_flag = 2,revision = revision + 1 where del_flag = 0 and assay_id in
+        <foreach item="assayId" collection="array" open="(" separator="," close=")">
+            #{assayId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/business/ZAssayResultMapper.xml

@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.ZAssayResultMapper">
+    
+    <resultMap type="ZAssayResult" id="ZAssayResultResult">
+        <result property="resultId"    column="result_id"    />
+        <result property="assayNo"    column="assay_no"    />
+        <result property="resultNo"    column="result_no"    />
+        <result property="sampleNo"    column="sample_no"    />
+        <result property="sampleVolume"    column="sample_volume"    />
+        <result property="deviceNo"    column="device_no"    />
+        <result property="assayItem"    column="assay_item"    />
+        <result property="resultConcentration"    column="result_concentration"    />
+        <result property="resultAbs"    column="result_abs"    />
+        <result property="resultDate"    column="result_date"    />
+        <result property="resultTime"    column="result_time"    />
+        <result property="curveK0"    column="curve_k0"    />
+        <result property="curveK1"    column="curve_k1"    />
+        <result property="curveId"    column="curve_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="j1901S01"    column="j_1901_s0_1"    />
+        <result property="j1901D01"    column="j_1901_d0_1"    />
+        <result property="j1901R01"    column="j_1901_R0_1"    />
+        <result property="j1901S1"    column="j_1901_s_1"    />
+        <result property="j1901D1"    column="j_1901_d_1"    />
+        <result property="j1901R1"    column="j_1901_r_1"    />
+        <result property="j1901S02"    column="j_1901_s0_2"    />
+        <result property="j1901D02"    column="j_1901_d0_2"    />
+        <result property="j1901R02"    column="j_1901_r0_2"    />
+        <result property="j1901S2"    column="j_1901_s_2"    />
+        <result property="j1901D2"    column="j_1901_d_2"    />
+        <result property="j1901R2"    column="j_1901_r_2"    />
+        <result property="assayType"    column="assay_type"    />
+        <result property="samplePost"    column="sample_post"    />
+        <result property="resultWendu"    column="result_wendu"    />
+        <result property="resultShidu"    column="result_shidu"    />
+        <result property="originalConcentration"    column="original_concentration"    />
+        <result property="curveNo"    column="curve_no"    />
+        <result property="readFlag"    column="read_flag"    />
+    </resultMap>
+
+    <sql id="selectZAssayResultVo">
+        select result_id, assay_no, result_no, sample_no, sample_volume, device_no, assay_item, result_concentration, result_abs, result_date, result_time, curve_k0, curve_k1, curve_id, create_by, create_time, update_by, update_time, j_1901_s0_1, j_1901_d0_1, j_1901_R0_1, j_1901_s_1, j_1901_d_1, j_1901_r_1, j_1901_s0_2, j_1901_d0_2, j_1901_r0_2, j_1901_s_2, j_1901_d_2, j_1901_r_2, assay_type, sample_post, result_wendu, result_shidu, original_concentration, curve_no, read_flag from z_assay_result
+    </sql>
+
+    <select id="selectZAssayResultList" parameterType="ZAssayResult" resultMap="ZAssayResultResult">
+        <include refid="selectZAssayResultVo"/>
+        <where>
+            1 = 1
+            <if test="assayNo != null  and assayNo != ''"> and assay_no = #{assayNo}</if>
+            <if test="resultNo != null  and resultNo != ''"> and result_no = #{resultNo}</if>
+            <if test="sampleNo != null  and sampleNo != ''"> and sample_no = #{sampleNo}</if>
+            <if test="sampleVolume != null "> and sample_volume = #{sampleVolume}</if>
+            <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
+            <if test="assayItem != null  and assayItem != ''"> and assay_item = #{assayItem}</if>
+            <if test="resultConcentration != null "> and result_concentration = #{resultConcentration}</if>
+            <if test="resultAbs != null "> and result_abs = #{resultAbs}</if>
+            <if test="resultDate != null  and resultDate != ''"> and result_date = #{resultDate}</if>
+            <if test="resultTime != null  and resultTime != ''"> and result_time = #{resultTime}</if>
+            <if test="curveK0 != null "> and curve_k0 = #{curveK0}</if>
+            <if test="curveK1 != null "> and curve_k1 = #{curveK1}</if>
+            <if test="curveId != null "> and curve_id = #{curveId}</if>
+            <if test="j1901S01 != null "> and j_1901_s0_1 = #{j1901S01}</if>
+            <if test="j1901D01 != null "> and j_1901_d0_1 = #{j1901D01}</if>
+            <if test="j1901R01 != null "> and j_1901_R0_1 = #{j1901R01}</if>
+            <if test="j1901S1 != null "> and j_1901_s_1 = #{j1901S1}</if>
+            <if test="j1901D1 != null "> and j_1901_d_1 = #{j1901D1}</if>
+            <if test="j1901R1 != null "> and j_1901_r_1 = #{j1901R1}</if>
+            <if test="j1901S02 != null "> and j_1901_s0_2 = #{j1901S02}</if>
+            <if test="j1901D02 != null "> and j_1901_d0_2 = #{j1901D02}</if>
+            <if test="j1901R02 != null "> and j_1901_r0_2 = #{j1901R02}</if>
+            <if test="j1901S2 != null "> and j_1901_s_2 = #{j1901S2}</if>
+            <if test="j1901D2 != null "> and j_1901_d_2 = #{j1901D2}</if>
+            <if test="j1901R2 != null "> and j_1901_r_2 = #{j1901R2}</if>
+            <if test="assayType != null  and assayType != ''"> and assay_type = #{assayType}</if>
+            <if test="samplePost != null "> and sample_post = #{samplePost}</if>
+            <if test="resultWendu != null "> and result_wendu = #{resultWendu}</if>
+            <if test="resultShidu != null "> and result_shidu = #{resultShidu}</if>
+            <if test="originalConcentration != null "> and original_concentration = #{originalConcentration}</if>
+            <if test="curveNo != null  and curveNo != ''"> and curve_no = #{curveNo}</if>
+            <if test="readFlag != null  and readFlag != ''"> and read_flag = #{readFlag}</if>
+        </where>
+        order by result_id desc
+    </select>
+    
+    <select id="selectZAssayResultByResultId" parameterType="Long" resultMap="ZAssayResultResult">
+        <include refid="selectZAssayResultVo"/>
+        where result_id = #{resultId}
+    </select>
+        
+    <insert id="insertZAssayResult" parameterType="ZAssayResult">
+        insert into z_assay_result
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">result_id,</if>
+            <if test="assayNo != null">assay_no,</if>
+            <if test="resultNo != null">result_no,</if>
+            <if test="sampleNo != null">sample_no,</if>
+            <if test="sampleVolume != null">sample_volume,</if>
+            <if test="deviceNo != null">device_no,</if>
+            <if test="assayItem != null">assay_item,</if>
+            <if test="resultConcentration != null">result_concentration,</if>
+            <if test="resultAbs != null">result_abs,</if>
+            <if test="resultDate != null">result_date,</if>
+            <if test="resultTime != null">result_time,</if>
+            <if test="curveK0 != null">curve_k0,</if>
+            <if test="curveK1 != null">curve_k1,</if>
+            <if test="curveId != null">curve_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="j1901S01 != null">j_1901_s0_1,</if>
+            <if test="j1901D01 != null">j_1901_d0_1,</if>
+            <if test="j1901R01 != null">j_1901_R0_1,</if>
+            <if test="j1901S1 != null">j_1901_s_1,</if>
+            <if test="j1901D1 != null">j_1901_d_1,</if>
+            <if test="j1901R1 != null">j_1901_r_1,</if>
+            <if test="j1901S02 != null">j_1901_s0_2,</if>
+            <if test="j1901D02 != null">j_1901_d0_2,</if>
+            <if test="j1901R02 != null">j_1901_r0_2,</if>
+            <if test="j1901S2 != null">j_1901_s_2,</if>
+            <if test="j1901D2 != null">j_1901_d_2,</if>
+            <if test="j1901R2 != null">j_1901_r_2,</if>
+            <if test="assayType != null">assay_type,</if>
+            <if test="samplePost != null">sample_post,</if>
+            <if test="resultWendu != null">result_wendu,</if>
+            <if test="resultShidu != null">result_shidu,</if>
+            <if test="originalConcentration != null">original_concentration,</if>
+            <if test="curveNo != null">curve_no,</if>
+            <if test="readFlag != null">read_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">#{resultId},</if>
+            <if test="assayNo != null">#{assayNo},</if>
+            <if test="resultNo != null">#{resultNo},</if>
+            <if test="sampleNo != null">#{sampleNo},</if>
+            <if test="sampleVolume != null">#{sampleVolume},</if>
+            <if test="deviceNo != null">#{deviceNo},</if>
+            <if test="assayItem != null">#{assayItem},</if>
+            <if test="resultConcentration != null">#{resultConcentration},</if>
+            <if test="resultAbs != null">#{resultAbs},</if>
+            <if test="resultDate != null">#{resultDate},</if>
+            <if test="resultTime != null">#{resultTime},</if>
+            <if test="curveK0 != null">#{curveK0},</if>
+            <if test="curveK1 != null">#{curveK1},</if>
+            <if test="curveId != null">#{curveId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="j1901S01 != null">#{j1901S01},</if>
+            <if test="j1901D01 != null">#{j1901D01},</if>
+            <if test="j1901R01 != null">#{j1901R01},</if>
+            <if test="j1901S1 != null">#{j1901S1},</if>
+            <if test="j1901D1 != null">#{j1901D1},</if>
+            <if test="j1901R1 != null">#{j1901R1},</if>
+            <if test="j1901S02 != null">#{j1901S02},</if>
+            <if test="j1901D02 != null">#{j1901D02},</if>
+            <if test="j1901R02 != null">#{j1901R02},</if>
+            <if test="j1901S2 != null">#{j1901S2},</if>
+            <if test="j1901D2 != null">#{j1901D2},</if>
+            <if test="j1901R2 != null">#{j1901R2},</if>
+            <if test="assayType != null">#{assayType},</if>
+            <if test="samplePost != null">#{samplePost},</if>
+            <if test="resultWendu != null">#{resultWendu},</if>
+            <if test="resultShidu != null">#{resultShidu},</if>
+            <if test="originalConcentration != null">#{originalConcentration},</if>
+            <if test="curveNo != null">#{curveNo},</if>
+            <if test="readFlag != null">#{readFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZAssayResult" parameterType="ZAssayResult">
+        update z_assay_result
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="assayNo != null">assay_no = #{assayNo},</if>
+            <if test="resultNo != null">result_no = #{resultNo},</if>
+            <if test="sampleNo != null">sample_no = #{sampleNo},</if>
+            <if test="sampleVolume != null">sample_volume = #{sampleVolume},</if>
+            <if test="deviceNo != null">device_no = #{deviceNo},</if>
+            <if test="assayItem != null">assay_item = #{assayItem},</if>
+            <if test="resultConcentration != null">result_concentration = #{resultConcentration},</if>
+            <if test="resultAbs != null">result_abs = #{resultAbs},</if>
+            <if test="resultDate != null">result_date = #{resultDate},</if>
+            <if test="resultTime != null">result_time = #{resultTime},</if>
+            <if test="curveK0 != null">curve_k0 = #{curveK0},</if>
+            <if test="curveK1 != null">curve_k1 = #{curveK1},</if>
+            <if test="curveId != null">curve_id = #{curveId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="j1901S01 != null">j_1901_s0_1 = #{j1901S01},</if>
+            <if test="j1901D01 != null">j_1901_d0_1 = #{j1901D01},</if>
+            <if test="j1901R01 != null">j_1901_R0_1 = #{j1901R01},</if>
+            <if test="j1901S1 != null">j_1901_s_1 = #{j1901S1},</if>
+            <if test="j1901D1 != null">j_1901_d_1 = #{j1901D1},</if>
+            <if test="j1901R1 != null">j_1901_r_1 = #{j1901R1},</if>
+            <if test="j1901S02 != null">j_1901_s0_2 = #{j1901S02},</if>
+            <if test="j1901D02 != null">j_1901_d0_2 = #{j1901D02},</if>
+            <if test="j1901R02 != null">j_1901_r0_2 = #{j1901R02},</if>
+            <if test="j1901S2 != null">j_1901_s_2 = #{j1901S2},</if>
+            <if test="j1901D2 != null">j_1901_d_2 = #{j1901D2},</if>
+            <if test="j1901R2 != null">j_1901_r_2 = #{j1901R2},</if>
+            <if test="assayType != null">assay_type = #{assayType},</if>
+            <if test="samplePost != null">sample_post = #{samplePost},</if>
+            <if test="resultWendu != null">result_wendu = #{resultWendu},</if>
+            <if test="resultShidu != null">result_shidu = #{resultShidu},</if>
+            <if test="originalConcentration != null">original_concentration = #{originalConcentration},</if>
+            <if test="curveNo != null">curve_no = #{curveNo},</if>
+            <if test="readFlag != null">read_flag = #{readFlag},</if>
+        </trim>
+        where result_id = #{resultId}
+    </update>
+
+    
+
+    <delete id="deleteZAssayResultByResultId" parameterType="Long">
+        update z_assay_result set del_flag = 2,revision = revision + 1 where del_flag = 0 and result_id = #{resultId}
+    </delete>
+
+    <delete id="deleteZAssayResultByResultIds" parameterType="String">
+        update z_assay_result set del_flag = 2,revision = revision + 1 where del_flag = 0 and result_id in
+        <foreach item="resultId" collection="array" open="(" separator="," close=")">
+            #{resultId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/business/ZQualityValueMapper.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.ZQualityValueMapper">
+    
+    <resultMap type="ZQualityValue" id="ZQualityValueResult">
+        <result property="valueId"    column="value_id"    />
+        <result property="deviceWorks"    column="device_works"    />
+        <result property="assayItem"    column="assay_item"    />
+        <result property="resultValue"    column="result_value"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="lowValue"    column="low_value"    />
+        <result property="highValue"    column="high_value"    />
+        <result property="beginTime"    column="begin_time"    />
+    </resultMap>
+
+    <sql id="selectZQualityValueVo">
+        select value_id, device_works, assay_item, result_value, create_time, update_time, end_time, low_value, high_value, begin_time from z_quality_value
+    </sql>
+
+    <select id="selectZQualityValueList" parameterType="ZQualityValue" resultMap="ZQualityValueResult">
+        <include refid="selectZQualityValueVo"/>
+        <where>
+            1 = 1
+            <if test="deviceWorks != null "> and device_works = #{deviceWorks}</if>
+            <if test="assayItem != null  and assayItem != ''"> and assay_item = #{assayItem}</if>
+            <if test="resultValue != null "> and result_value = #{resultValue}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="lowValue != null "> and low_value = #{lowValue}</if>
+            <if test="highValue != null "> and high_value = #{highValue}</if>
+            <if test="beginTime != null "> and begin_time = #{beginTime}</if>
+        </where>
+        order by value_id desc
+    </select>
+    
+    <select id="selectZQualityValueByValueId" parameterType="Long" resultMap="ZQualityValueResult">
+        <include refid="selectZQualityValueVo"/>
+        where value_id = #{valueId}
+    </select>
+        
+    <insert id="insertZQualityValue" parameterType="ZQualityValue">
+        insert into z_quality_value
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="valueId != null">value_id,</if>
+            <if test="deviceWorks != null">device_works,</if>
+            <if test="assayItem != null">assay_item,</if>
+            <if test="resultValue != null">result_value,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="lowValue != null">low_value,</if>
+            <if test="highValue != null">high_value,</if>
+            <if test="beginTime != null">begin_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="valueId != null">#{valueId},</if>
+            <if test="deviceWorks != null">#{deviceWorks},</if>
+            <if test="assayItem != null">#{assayItem},</if>
+            <if test="resultValue != null">#{resultValue},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="lowValue != null">#{lowValue},</if>
+            <if test="highValue != null">#{highValue},</if>
+            <if test="beginTime != null">#{beginTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZQualityValue" parameterType="ZQualityValue">
+        update z_quality_value
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceWorks != null">device_works = #{deviceWorks},</if>
+            <if test="assayItem != null">assay_item = #{assayItem},</if>
+            <if test="resultValue != null">result_value = #{resultValue},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="lowValue != null">low_value = #{lowValue},</if>
+            <if test="highValue != null">high_value = #{highValue},</if>
+            <if test="beginTime != null">begin_time = #{beginTime},</if>
+        </trim>
+        where value_id = #{valueId}
+    </update>
+
+    
+
+    <delete id="deleteZQualityValueByValueId" parameterType="Long">
+        update z_quality_value set del_flag = 2,revision = revision + 1 where del_flag = 0 and value_id = #{valueId}
+    </delete>
+
+    <delete id="deleteZQualityValueByValueIds" parameterType="String">
+        update z_quality_value set del_flag = 2,revision = revision + 1 where del_flag = 0 and value_id in
+        <foreach item="valueId" collection="array" open="(" separator="," close=")">
+            #{valueId}
+        </foreach>
+    </delete>
+</mapper>