fix：1.公式2.tableInfo

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/DatabaseDto.java

@@ -13,16 +13,14 @@ public class DatabaseDto implements Serializable {
 
     private String name;
 
+    private String url;
+
     private String type;
 
     private String dataBaseType;
 
     private boolean online;
 
-    private String ipAddress;
-
-    private String port;
-
     private String slowQuery;
 
     private Integer alarms;

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml

@@ -36,16 +36,15 @@
         SELECT
             d.ID,
             d.NAME,
-            d.port,
+            d.db_url AS url,
-            d.type,
+            d.db_type AS type,
-            d.ip_address,
             COUNT (l.id) AS alarms
         FROM
             sys_database d
         LEFT JOIN alarm_rule r ON d.ID = r.source_id
         LEFT JOIN alarm_log l ON r.ID = l.rule_id
         AND l.alarm_start_date BETWEEN #{startDate} AND #{endDate}
-        GROUP BY d.ID, d.NAME, d.port, d.ip_address
+        GROUP BY d.ID, d.NAME, d.db_url, d.db_type
         <if test="pageFlag == null">
             LIMIT #{pageSize} OFFSET #{pageStart}
         </if>

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java

@@ -149,19 +149,33 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
         if (ObjectUtil.isNull(database))
             return Result.error(Prompt.DATA_NOT_EXITS);
         String name = sysDatabase.getName();
-        // String ipAddress = sysDatabase.getIpAddress();
         LambdaQueryWrapper<SysDatabase> wrapper = new LambdaQueryWrapper<>();
         if (!StrUtil.equals(name,database.getName())){
             wrapper.eq(SysDatabase::getName,name);
             if (CollUtil.isNotEmpty(list(wrapper)))
                 return Result.error("Name" + Prompt.NOT_REPEAT);
-            wrapper.clear();
         }
-        /*if (!StrUtil.equals(ipAddress,database.getIpAddress())){
+        // 截取dbName并保存
-            wrapper.eq(SysDatabase::getIpAddress,ipAddress);
+        String dbType = sysDatabase.getDbType();
-            if (CollUtil.isNotEmpty(list(wrapper)))
+        String dbUrl = sysDatabase.getDbUrl();
-                return Result.error("IP Address" + Prompt.NOT_REPEAT);
+        DbType dbTypeE = typeOf(dbType);
-        }*/
+        switch (dbTypeE){
+            case POSTGRESQL:
+                sysDatabase.setDbName(bias(dbUrl));
+                break;
+            case ORACLE:
+                sysDatabase.setDbName(colon(dbUrl));
+                break;
+            case MYSQL55:
+                sysDatabase.setDbName(bias(dbUrl));
+                break;
+            case MYSQL57:
+                sysDatabase.setDbName(bias(dbUrl));
+                break;
+            default:
+                break;
+        }
+
         int count = baseMapper.updateById(sysDatabase);
         if (count == 1)
             return Result.OK(Prompt.UPDATE_SUCC);

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/TestMail.java

@@ -0,0 +1,118 @@
+package org.jeecg.modules.demo.test;
+
+import cn.hutool.core.lang.Console;
+import cn.hutool.http.Header;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+
+public class TestMail {
+
+
+    public static void main(String[] args) {
+        String headerURL = "https://api.qiye.163.com";
+        String token = headerURL + "/api/pub/token/acquireToken";
+        String getMailAccountInfo = headerURL + "/api/gw/qiye/mailaccount/getMailAccountInfo";
+        String appId = "qy20231114144636B85B";
+        String orgOpenId = "9c96b0ec1e6be89a";
+        String authCode = "O1eSXJwU";
+
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("appId", appId);
+        paramMap.put("authCode", authCode);
+        paramMap.put("orgOpenId", orgOpenId);
+
+       String tokenResult = reqHttpRequest(token, paramMap);
+       JSONObject jsonObject = JSONUtil.parseObj(tokenResult);
+       String code = jsonObject.get("code").toString();
+       String accessTokenNew = jsonObject.get("accessToken").toString();
+        System.out.println(tokenResult);
+
+        String accessToken = "a62a3904e56b49ec9fc3d310386880ae";
+        // refreshToken = 57d0ddd2fc24499490717e48a1a786f7
+        paramMap = new HashMap<>();
+        paramMap.put("domain", "ndc.org.cn");
+        paramMap.put("account_name", "cnndc.rn.ng");
+        String result = reqHttpRequest(getMailAccountInfo, accessToken, appId, orgOpenId, paramMap);
+    }
+
+    public static void reqHuTool(String reqURL, String appId, String orgOpenId, String authCode){
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("appId", appId);
+        paramMap.put("authCode", authCode);
+        paramMap.put("orgOpenId", orgOpenId);
+        String reqToken = HttpUtil.post(reqURL, paramMap);
+        System.out.println(reqToken);
+    }
+
+    /**
+     * 获取token
+     * @param reqURL
+     * @param paramMap
+     * @return
+     */
+    public static String reqHttpRequest(String reqURL, HashMap<String, Object> paramMap){
+
+        JSON parse = JSONUtil.parse(paramMap);
+
+        try {
+//            String postData = buildPostDataString(paramMap);
+            //链式构建请求
+            String result2 = HttpRequest.post(reqURL)
+                    .header(Header.CONTENT_TYPE, "application/json")//头信息，多个头信息多次调用此方法即可
+//                    .form(paramMap)//表单内容
+                    .body(parse.toString())
+                    .timeout(20000)//超时，毫秒
+                    .execute().body();
+
+            Console.log(result2);
+            return result2;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * 请求接口，需要配置ip
+     * @param reqURL
+     * @param token
+     * @param appId
+     * @param orgOpenId
+     * @param paramMap
+     * @return
+     */
+    public static String reqHttpRequest(String reqURL, String token, String appId, String orgOpenId, HashMap<String, Object> paramMap){
+
+        JSON parse = JSONUtil.parse(paramMap);
+
+        try {
+//            String postData = buildPostDataString(paramMap);
+            //链式构建请求
+            String result2 = HttpRequest.post(reqURL)
+                    .header(Header.CONTENT_TYPE, "application/json")//头信息，多个头信息多次调用此方法即可
+                    .header("qiye-access-token", token)
+                    .header("qiye-app-id", appId)
+                    .header("qiye-org-open-id", orgOpenId)
+                    .header("qiye-timestamp", Long.toString(System.currentTimeMillis()))
+//                    .header("qiye-nonce", CodecUtils.hexEncode(CodecUtils.generateRandom(6)))
+//                    .form(paramMap)//表单内容
+                    .body(parse.toString())
+                    .timeout(20000)//超时，毫秒
+                    .execute().body();
+
+            Console.log(result2);
+            return result2;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java

@@ -3996,7 +3996,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 List<Calibration> samplOldCalibrations = new ArrayList<>();
                 Calibration samplOldCalibrationCH = new Calibration();
                 Calibration samplOldCalibrationE = new Calibration();
-                if (betaDataFile.isBBetaEnergyValidSample() || betaDataFile.isBGammaEnergyValidSample()){
+                // if (betaDataFile.isBBetaEnergyValidSample() || betaDataFile.isBGammaEnergyValidSample()){
                     if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
                         samplOldCalibrationCH.setBeta(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
                     } else {
@@ -4017,12 +4017,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                     }else {
                         samplOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
                     }
-                } else {
+                /*} else {
                     samplOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
                     samplOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
                     samplOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
                     samplOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
+                }*/
                 samplOldCalibrations.add(samplOldCalibrationCH);
                 samplOldCalibrations.add(samplOldCalibrationE);
                 result.put("samplOldCalibrations",samplOldCalibrations);
@@ -4031,22 +4031,22 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 List<Calibration> samplNewCalibrations = new ArrayList<>();
                 Calibration samplNewCalibrationCH = new Calibration();
                 Calibration samplNewCalibrationE = new Calibration();
-                    samplNewCalibrationCH.setBeta("CH(x) = ("+ (Objects.isNull(betaCalibrationParamS.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1())))
+                samplNewCalibrationCH.setBeta("CH(x) =  ("+ (Objects.isNull(betaCalibrationParamES.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1())))
-                            +")+("+ (Objects.isNull(betaCalibrationParamS.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2())))
-                            +")*x+("+ (Objects.isNull(betaCalibrationParamS.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3())))
-                            +")x*x");
-                samplNewCalibrationCH.setGamma("CH(x) = ("+ (Objects.isNull(gammaCalibrationParamS.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1())))
-                        +")+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2())))
-                        +")*x+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3())))
-                        +")x*x");
-                samplNewCalibrationE.setBeta("E(x) =  ("+ (Objects.isNull(betaCalibrationParamES.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1())))
                         +")+("+ (Objects.isNull(betaCalibrationParamES.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff2())))
                         +")*x+("+ (Objects.isNull(betaCalibrationParamES.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff3())))
                         +")x*x");
-                samplNewCalibrationE.setGamma("E(x) =  ("+ (Objects.isNull(gammaCalibrationParamES.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1())))
+                samplNewCalibrationCH.setGamma("CH(x) =  ("+ (Objects.isNull(gammaCalibrationParamES.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1())))
                         +")+("+ (Objects.isNull(gammaCalibrationParamES.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff2())))
                         +")*x+("+ (Objects.isNull(gammaCalibrationParamES.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff3())))
                         +")x*x");
+                samplNewCalibrationE.setBeta("E(x) = ("+ (Objects.isNull(betaCalibrationParamS.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1())))
+                        +")+("+ (Objects.isNull(betaCalibrationParamS.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2())))
+                        +")*x+("+ (Objects.isNull(betaCalibrationParamS.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3())))
+                        +")x*x");
+                samplNewCalibrationE.setGamma("E(x) = ("+ (Objects.isNull(gammaCalibrationParamS.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1())))
+                        +")+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2())))
+                        +")*x+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3())))
+                        +")x*x");
                 samplNewCalibrations.add(samplNewCalibrationCH);
                 samplNewCalibrations.add(samplNewCalibrationE);
                 result.put("samplNewCalibrations",samplNewCalibrations);
@@ -4068,7 +4068,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 List<Calibration> detOldCalibrations = new ArrayList<>();
                 Calibration detOldCalibrationCH = new Calibration();
                 Calibration detOldCalibrationE = new Calibration();
-                if (betaDataFile.isBBetaEnergyValidDet() || betaDataFile.isBGammaEnergyValidDet()){
+                // if (betaDataFile.isBBetaEnergyValidDet() || betaDataFile.isBGammaEnergyValidDet()){
                     if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
                         detOldCalibrationCH.setBeta(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
                     } else {
@@ -4089,12 +4089,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                     } else {
                         detOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
                     }
-                } else {
+                /*} else {
                     detOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
                     detOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
                     detOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
                     detOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
+                }*/
                 detOldCalibrations.add(detOldCalibrationCH);
                 detOldCalibrations.add(detOldCalibrationE);
                 result.put("detOldCalibrations", detOldCalibrations);
@@ -4103,22 +4103,22 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 List<Calibration> detNewCalibrations = new ArrayList<>();
                 Calibration detNewCalibrationCH = new Calibration();
                 Calibration detNewCalibrationE = new Calibration();
-                detNewCalibrationCH.setBeta("CH(x) = ("+ (Objects.isNull(betaCalibrationParamD.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff1())))
+                detNewCalibrationCH.setBeta("CH(x) =  ("+ (Objects.isNull(betaCalibrationParamED.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff1())))
-                        +")+("+ (Objects.isNull(betaCalibrationParamD.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff2())))
-                        +")*x+("+ (Objects.isNull(betaCalibrationParamD.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff3())))
-                        +")x*x");
-                detNewCalibrationCH.setGamma("CH(x) = ("+ (Objects.isNull(gammaCalibrationParamD.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff1())))
-                        +")+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff2())))
-                        +")*x+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff3())))
-                        +")x*x");
-                detNewCalibrationE.setBeta("E(x) =  ("+ (Objects.isNull(betaCalibrationParamED.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff1())))
                         +")+("+ (Objects.isNull(betaCalibrationParamED.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff2())))
                         +")*x+("+ (Objects.isNull(betaCalibrationParamED.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff3())))
                         +")x*x");
-                detNewCalibrationE.setGamma("E(x) =  ("+ (Objects.isNull(gammaCalibrationParamED.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff1())))
+                detNewCalibrationCH.setGamma("CH(x) =  ("+ (Objects.isNull(gammaCalibrationParamED.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff1())))
                         +")+("+ (Objects.isNull(gammaCalibrationParamED.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff2())))
                         +")*x+("+ (Objects.isNull(gammaCalibrationParamED.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff3())))
                         +")x*x");
+                detNewCalibrationE.setBeta("E(x) = ("+ (Objects.isNull(betaCalibrationParamD.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff1())))
+                        +")+("+ (Objects.isNull(betaCalibrationParamD.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff2())))
+                        +")*x+("+ (Objects.isNull(betaCalibrationParamD.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff3())))
+                        +")x*x");
+                detNewCalibrationE.setGamma("E(x) = ("+ (Objects.isNull(gammaCalibrationParamD.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff1())))
+                        +")+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff2())))
+                        +")*x+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff3())))
+                        +")x*x");
                 detNewCalibrations.add(detNewCalibrationCH);
                 detNewCalibrations.add(detNewCalibrationE);
                 result.put("detNewCalibrations", detNewCalibrations);
@@ -4140,7 +4140,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 List<Calibration> gasOldCalibrations = new ArrayList<>();
                 Calibration gasOldCalibrationCH = new Calibration();
                 Calibration gasOldCalibrationE = new Calibration();
-                if (betaDataFile.isBBetaEnergyValidGas() || betaDataFile.isBGammaEnergyValidGas()){
+                // if (betaDataFile.isBBetaEnergyValidGas() || betaDataFile.isBGammaEnergyValidGas()){
                     if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
                         gasOldCalibrationCH.setBeta(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))));
                     } else {
@@ -4161,12 +4161,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                     } else {
                         gasOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
                     }
-                } else {
+                /*} else {
                     gasOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
                     gasOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
                     gasOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
                     gasOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
+                }*/
                 gasOldCalibrations.add(gasOldCalibrationCH);
                 gasOldCalibrations.add(gasOldCalibrationE);
                 result.put("gasOldCalibrations",gasOldCalibrations);
@@ -4175,22 +4175,22 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 List<Calibration> gasNewCalibrations = new ArrayList<>();
                 Calibration gasNewCalibrationCH = new Calibration();
                 Calibration gasNewCalibrationE = new Calibration();
-                gasNewCalibrationCH.setBeta("CH(x) = ("+ (Objects.isNull(betaCalibrationParamG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff1())))
+                gasNewCalibrationCH.setBeta("CH(x) =  ("+ (Objects.isNull(betaCalibrationParamEG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff1())))
-                        +")+("+ (Objects.isNull(betaCalibrationParamG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff2())))
-                        +")*x+("+ (Objects.isNull(betaCalibrationParamG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff3())))
-                        +")x*x");
-                gasNewCalibrationCH.setGamma("CH(x) = ("+ (Objects.isNull(gammaCalibrationParamG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff1())))
-                        +")+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff2())))
-                        +")*x+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff3())))
-                        +")x*x");
-                gasNewCalibrationE.setBeta("E(x) =  ("+ (Objects.isNull(betaCalibrationParamEG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff1())))
                         +")+("+ (Objects.isNull(betaCalibrationParamEG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff2())))
                         +")*x+("+ (Objects.isNull(betaCalibrationParamEG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff3())))
                         +")x*x");
-                gasNewCalibrationE.setGamma("E(x) =  ("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff1())))
+                gasNewCalibrationCH.setGamma("CH(x) =  ("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff1())))
                         +")+("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff2())))
                         +")*x+("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff3())))
                         +")x*x");
+                gasNewCalibrationE.setBeta("E(x) = ("+ (Objects.isNull(betaCalibrationParamG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff1())))
+                        +")+("+ (Objects.isNull(betaCalibrationParamG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff2())))
+                        +")*x+("+ (Objects.isNull(betaCalibrationParamG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff3())))
+                        +")x*x");
+                gasNewCalibrationE.setGamma("E(x) = ("+ (Objects.isNull(gammaCalibrationParamG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff1())))
+                        +")+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff2())))
+                        +")*x+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff3())))
+                        +")x*x");
                 gasNewCalibrations.add(gasNewCalibrationCH);
                 gasNewCalibrations.add(gasNewCalibrationE);
                 result.put("gasNewCalibrations",gasNewCalibrations);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -11,7 +11,6 @@ import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictModelMany;
 import org.jeecg.common.system.vo.DictQuery;
 import org.jeecg.modules.base.entity.postgre.SysDict;
-import org.jeecg.modules.base.dto.DatabaseDto;
 import org.jeecg.modules.system.dto.DatabaseTypeDto;
 import org.jeecg.modules.system.model.DuplicateCheckVo;
 import org.jeecg.modules.system.model.TreeSelectModel;