微调

system/src/main/java/com/njcn/gather/system/config/service/ISysTestConfigService.java

@@ -29,4 +29,10 @@ public interface ISysTestConfigService extends IService<SysTestConfig> {
      * @return 是否更新成功
      */
     boolean updateTestConfig(SysTestConfigParam.UpdateParam param);
+
+    /**
+     * 获取检测配置
+     * @return
+     */
+    SysTestConfig getOneConfig();
 }

system/src/main/java/com/njcn/gather/system/config/service/impl/SysTestConfigServiceImpl.java

@@ -2,11 +2,13 @@ package com.njcn.gather.system.config.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.gather.system.config.mapper.SysTestConfigMapper;
 import com.njcn.gather.system.config.pojo.param.SysTestConfigParam;
 import com.njcn.gather.system.config.pojo.po.SysTestConfig;
 import com.njcn.gather.system.config.service.ISysTestConfigService;
+import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -43,4 +45,14 @@ public class SysTestConfigServiceImpl extends ServiceImpl<SysTestConfigMapper, S
         BeanUtils.copyProperties(param, sysTestConfig);
         return this.updateById(sysTestConfig);
     }
+
+    @Override
+    public SysTestConfig getOneConfig() {
+        MPJLambdaWrapper<SysTestConfig> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(SysTestConfig.class)
+                .selectAs(DictData::getCode, SysTestConfig::getDataRule)
+                .leftJoin(DictData.class, DictData::getId, SysTestConfig::getDataRule)
+                .eq(SysTestConfig::getState, DataStateEnum.ENABLE.getCode());
+        return this.getBaseMapper().selectJoinOne(SysTestConfig.class, queryWrapper);
+    }
 }

system/src/main/java/com/njcn/gather/system/dictionary/pojo/enums/DictDataEnum.java

@@ -16,7 +16,22 @@ public enum DictDataEnum {
      */
     DIGITAL("数字式", "Digital"),
     SIMULATE("模拟式", "Simulate"),
-    CONTRAST("比对式", "Contrast"),;
+    CONTRAST("比对式", "Contrast"),
+
+
+    /**
+     * 数据处理原则
+     */
+    AT_WILL_VALUE("任意值", "At_Will_Value"),
+    SECTION_VALUE("部分值", "Section_Value"),
+    CP95_VALUE("cp95值", "Cp95_Value"),
+    AVG_VALUE("平均值", "Avg_value"),
+    Own_value("所有值", "Own_value"),
+
+
+
+
+    ;
 
 
     private final String name;