按照新的需求接口做对应的调整

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

@@ -95,7 +95,9 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+#  expireTime: 30
+  #2024年10月21日10:53:49改成一天
+  expireTime: 1440
 
 # MyBatis配置
 mybatis:

ruoyi-system/src/main/java/com/ruoyi/business/res/AssayDetailRes.java

@@ -34,48 +34,64 @@ public class AssayDetailRes {
 
     private String highCodDeviationRate;//高COD偏差度
 
+    private Double highCodDeviationRateNumber;//高COD偏差度-数字
+
     private Double lowCodStandardVal = 50.0D;//低COD标称值
 
     private Double lowCodResultConcentration;//低COD化验值
 
     private String lowCodDeviationRate;//低COD偏差度
 
+    private Double lowCodDeviationRateNumber;//低COD偏差度-数字
+
     private Double anDanStandardVal = 20.0D;//氨氮标称值
 
     private Double anDanResultConcentration;//氨氮化验值
 
     private String anDanDeviationRate;//氨氮偏差度
 
+    private Double anDanDeviationRateNumber;//氨氮偏差度-数字
+
     private Double tnStandardVal = 20.0D;//总氮标称值
 
     private Double tnResultConcentration;//总氮化验值
 
     private String tnDeviationRate;//总氮偏差度
 
+    private Double tnDeviationRateNumber;//总氮偏差度-数字
+
     private Double tpStandardVal = 2.0D;//总磷标称值
 
     private Double tpResultConcentration;//总磷化验值
 
     private String tpDeviationRate;//总磷偏差度
 
+    private Double tpDeviationRateNumber;//总磷偏差度-数字
+
     private Double xsydStandardVal = 20.0D;//硝酸盐氮标称值
 
     private Double xsydResultConcentration;//硝酸盐氮化验值
 
     private String xsydDeviationRate;//硝酸盐氮偏差度
 
+    private Double xsydDeviationRateNumber;//硝酸盐氮偏差度-数字
+
     private Double yxsyStandardVal = 1.0D;//亚硝酸盐标称值
 
     private Double yxsyResultConcentration;//亚硝酸盐化验值
 
     private String yxsyDeviationRate;//亚硝酸盐偏差度
 
+    private Double yxsyDeviationRateNumber;//亚硝酸盐偏差度-数字
+
     private Double zlsyStandardVal = 2.0D;//正磷酸标称值
 
     private Double zlsyResultConcentration;//正磷酸盐化验值
 
     private String zlsyDeviationRate;//正磷酸偏差度
 
+    private Double zlsyDeviationRateNumber;//正磷酸偏差度-数字
+
 
 
 

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

@@ -109,7 +109,8 @@ public class BusinessServiceImpl implements IBusinessService {
 
     @Override
     public List<AssayQualityDetailRes> assayCountListByDates(AssayReq assayReq) {
-        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().deviceNo(assayReq.getDeviceNo()).timeBegin(assayReq.getTimeBegin()).timeEnd(assayReq.getTimeEnd()).assayType("3").build());
+        //2024年10月21日10:56:31 只获取质控样的数据
+        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().assayType("3").deviceNo(assayReq.getDeviceNo()).timeBegin(assayReq.getTimeBegin()).timeEnd(assayReq.getTimeEnd()).assayType("3").build());
         if(CollectionUtils.isEmpty(zAssayResults)){
             return Collections.emptyList();
         }
@@ -356,72 +357,105 @@ public class BusinessServiceImpl implements IBusinessService {
             if(highCodOptional.isPresent()){
                 ZAssayResult zAssayResult = highCodOptional.get();
                 Double resultConcentration = NumberUtils.getDoubleNLength(INT_2, NumberUtils.getDoubleNLength(INT_2, zAssayResult.getResultConcentration()));
-                assayDetailRes.setHighCodResultConcentration(resultConcentration);
-                Double highCodStandardVal = assayDetailRes.getHighCodStandardVal();
-                assayDetailRes.setHighCodDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4,(resultConcentration - highCodStandardVal) / highCodStandardVal, INT_2));
+                if(!Objects.isNull(resultConcentration)){
+                    assayDetailRes.setHighCodResultConcentration(resultConcentration);
+                    Double highCodStandardVal = assayDetailRes.getHighCodStandardVal();
+                    Double val = (resultConcentration - highCodStandardVal) / highCodStandardVal;
+                    assayDetailRes.setHighCodDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
+                    assayDetailRes.setHighCodDeviationRateNumber(NumberUtils.getDoubleNLength(INT_2, val));
+                }
             }
             //低COD
             Optional<ZAssayResult> lowCodOptional = zAssayResults.stream().filter(zAssayResult -> "2".equals(zAssayResult.getAssayItem())).findFirst();
             if(lowCodOptional.isPresent()){
                 ZAssayResult zAssayResult = lowCodOptional.get();
                 Double resultConcentration = NumberUtils.getDoubleNLength(INT_2, zAssayResult.getResultConcentration());
-                assayDetailRes.setLowCodResultConcentration(resultConcentration);
-                Double lowCodStandardVal = assayDetailRes.getLowCodStandardVal();
-                assayDetailRes.setLowCodDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4,(resultConcentration - lowCodStandardVal) / lowCodStandardVal, INT_2));
+                if(!Objects.isNull(resultConcentration)){
+                    assayDetailRes.setLowCodResultConcentration(resultConcentration);
+                    Double lowCodStandardVal = assayDetailRes.getLowCodStandardVal();
+                    Double val = (resultConcentration - lowCodStandardVal) / lowCodStandardVal;
+                    assayDetailRes.setLowCodDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
+                    assayDetailRes.setLowCodDeviationRateNumber(NumberUtils.getDoubleNLength(INT_2, val));
+                }
+
             }
             //氨氮
             Optional<ZAssayResult> andanOptional = zAssayResults.stream().filter(zAssayResult -> "3".equals(zAssayResult.getAssayItem())).findFirst();
             if(andanOptional.isPresent()){
                 ZAssayResult zAssayResult = andanOptional.get();
                 Double resultConcentration = NumberUtils.getDoubleNLength(INT_2, zAssayResult.getResultConcentration());
-                assayDetailRes.setAnDanResultConcentration(resultConcentration);
-                Double anDanStandardVal = assayDetailRes.getAnDanStandardVal();
-                assayDetailRes.setAnDanDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4,(resultConcentration - anDanStandardVal) / anDanStandardVal, INT_2));
+                if(!Objects.isNull(resultConcentration)){
+                    assayDetailRes.setAnDanResultConcentration(resultConcentration);
+                    Double anDanStandardVal = assayDetailRes.getAnDanStandardVal();
+                    Double val = (resultConcentration - anDanStandardVal) / anDanStandardVal;
+                    assayDetailRes.setAnDanDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
+                    assayDetailRes.setAnDanDeviationRateNumber(NumberUtils.getDoubleNLength(INT_2, val));
+                }
             }
             //总氮
             Optional<ZAssayResult> tnOptional = zAssayResults.stream().filter(zAssayResult -> "4".equals(zAssayResult.getAssayItem())).findFirst();
             if(tnOptional.isPresent()){
                 ZAssayResult zAssayResult = tnOptional.get();
                 Double resultConcentration = NumberUtils.getDoubleNLength(INT_2, zAssayResult.getResultConcentration());
-                assayDetailRes.setTnResultConcentration(resultConcentration);
-                Double tnStandardVal = assayDetailRes.getTnStandardVal();
-                assayDetailRes.setTnDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4,(resultConcentration - tnStandardVal) / tnStandardVal, INT_2));
+                if(!Objects.isNull(resultConcentration)){
+                    assayDetailRes.setTnResultConcentration(resultConcentration);
+                    Double tnStandardVal = assayDetailRes.getTnStandardVal();
+                    Double val = (resultConcentration - tnStandardVal) / tnStandardVal;
+                    assayDetailRes.setTnDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
+                    assayDetailRes.setTnDeviationRateNumber(NumberUtils.getDoubleNLength(INT_2, val));
+                }
             }
             //总磷
             Optional<ZAssayResult> tpOptional = zAssayResults.stream().filter(zAssayResult -> "5".equals(zAssayResult.getAssayItem())).findFirst();
             if(tpOptional.isPresent()){
                 ZAssayResult zAssayResult = tpOptional.get();
                 Double resultConcentration = NumberUtils.getDoubleNLength(INT_2, zAssayResult.getResultConcentration());
-                assayDetailRes.setTpResultConcentration(resultConcentration);
-                Double tpStandardVal = assayDetailRes.getTpStandardVal();
-                assayDetailRes.setTpDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4,(resultConcentration - tpStandardVal) / tpStandardVal, INT_2));
+                if(!Objects.isNull(resultConcentration)){
+                    assayDetailRes.setTpResultConcentration(resultConcentration);
+                    Double tpStandardVal = assayDetailRes.getTpStandardVal();
+                    Double val = (resultConcentration - tpStandardVal) / tpStandardVal;
+                    assayDetailRes.setTpDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
+                    assayDetailRes.setTpDeviationRateNumber(NumberUtils.getDoubleNLength(INT_2, val));
+                }
             }
             //正磷酸盐
             Optional<ZAssayResult> zlsyOptional = zAssayResults.stream().filter(zAssayResult -> "6".equals(zAssayResult.getAssayItem())).findFirst();
             if(zlsyOptional.isPresent()){
                 ZAssayResult zAssayResult = zlsyOptional.get();
                 Double resultConcentration = NumberUtils.getDoubleNLength(INT_2, zAssayResult.getResultConcentration());
-                assayDetailRes.setZlsyResultConcentration(resultConcentration);
-                Double zlsyStandardVal = assayDetailRes.getZlsyStandardVal();
-                assayDetailRes.setZlsyDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4,(resultConcentration - zlsyStandardVal) / zlsyStandardVal, INT_2));
+                if(!Objects.isNull(resultConcentration)){
+                    assayDetailRes.setZlsyResultConcentration(resultConcentration);
+                    Double zlsyStandardVal = assayDetailRes.getZlsyStandardVal();
+                    Double val = (resultConcentration - zlsyStandardVal) / zlsyStandardVal;
+                    assayDetailRes.setZlsyDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
+                    assayDetailRes.setZlsyDeviationRateNumber(NumberUtils.getDoubleNLength(INT_2, val));
+                }
             }
             //亚硝酸盐氮
             Optional<ZAssayResult> yxsydOptional = zAssayResults.stream().filter(zAssayResult -> "7".equals(zAssayResult.getAssayItem())).findFirst();
             if(yxsydOptional.isPresent()){
                 ZAssayResult zAssayResult = yxsydOptional.get();
                 Double resultConcentration = NumberUtils.getDoubleNLength(INT_2, zAssayResult.getResultConcentration());
-                assayDetailRes.setYxsyResultConcentration(resultConcentration);
-                Double yxsyStandardVal = assayDetailRes.getYxsyStandardVal();
-                assayDetailRes.setYxsyDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4,(resultConcentration - yxsyStandardVal) / yxsyStandardVal, INT_2));
+                if(!Objects.isNull(resultConcentration)){
+                    assayDetailRes.setYxsyResultConcentration(resultConcentration);
+                    Double yxsyStandardVal = assayDetailRes.getYxsyStandardVal();
+                    Double val = (resultConcentration - yxsyStandardVal) / yxsyStandardVal;
+                    assayDetailRes.setYxsyDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
+                    assayDetailRes.setYxsyDeviationRateNumber(NumberUtils.getDoubleNLength(INT_2, val));
+                }
             }
             //硝酸盐氮
             Optional<ZAssayResult> xsydOptional = zAssayResults.stream().filter(zAssayResult -> "8".equals(zAssayResult.getAssayItem())).findFirst();
             if(xsydOptional.isPresent()){
                 ZAssayResult zAssayResult = xsydOptional.get();
                 Double resultConcentration = NumberUtils.getDoubleNLength(INT_2, zAssayResult.getResultConcentration());
-                assayDetailRes.setXsydResultConcentration(resultConcentration);
-                Double xsydStandardVal = assayDetailRes.getXsydStandardVal();
-                assayDetailRes.setXsydDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4,(resultConcentration - xsydStandardVal) / xsydStandardVal, INT_2));
+                if(!Objects.isNull(resultConcentration)){
+                    assayDetailRes.setXsydResultConcentration(resultConcentration);
+                    Double xsydStandardVal = assayDetailRes.getXsydStandardVal();
+                    Double val = (resultConcentration - xsydStandardVal) / xsydStandardVal;
+                    assayDetailRes.setXsydDeviationRate(NumberUtils.getDoublePercentAndNLength(INT_4, val, INT_2));
+                    assayDetailRes.setXsydDeviationRateNumber(NumberUtils.getDoubleNLength(INT_2, val));
+                }
             }
         }
     }