湖北准确率修改，所有场站， 都增加 实际功率<额定容量3%的数据，忽略不计

src/main/java/com/syjy/calculate/service/AccuracyPassRateCalculateService.java

@@ -34,7 +34,6 @@ public class AccuracyPassRateCalculateService {
      * @return
      */
     public CalculateResult calculate(CalculateRequest calculateRequest) {
-        log.info("--------------------准确率计算开始--------------------");
         // 根据类型从数据库中查出公式列表
         CalculationFormula calculationFormula = calculationFormulaRepository.findByTypeAndProvince(CalculateResult.FORMULA, calculateRequest.getFormulaType(), calculateRequest.getProvince(), calculateRequest.getElectricType(), calculateRequest.getStationCode());
         if (calculationFormula == null || calculationFormula.getFormula() == null) {
@@ -93,11 +92,9 @@ public class AccuracyPassRateCalculateService {
             if (calculationFormula.getIsRate().equals(CalculateResult.STR_TRUE)) {
                 result = filterResult(executeResult);
             }
-            log.info("--------------------准确率计算结束--------------------");
             return CalculateResult.success(CalculateResult.MSG_CALCULATE_SUCCESS, result);
         } catch (Exception e) {
             e.printStackTrace();
-            log.info("--------------------准确率计算结束--------------------");
             return CalculateResult.error(CalculateResult.MSG_CALCULATE_FAIL + e.toString());
         }
     }

src/main/java/com/syjy/calculate/service/AssessmentCalculateService.java

@@ -33,7 +33,6 @@ public class AssessmentCalculateService {
      * @return
      */
     public CalculateResult calculateAssessment(AssessmentRequest assessmentRequest) {
-        log.info("--------------------考核计算开始--------------------");
         AssessmentInfo assessmentInfo = new AssessmentInfo();
         CalculateResult checkResult = checkRequestInfo(assessmentRequest);
         // 如果校验失败
@@ -94,7 +93,6 @@ public class AssessmentCalculateService {
         assessmentInfo.setAnemometerTowerAccuracyRate(anemometerTowerAccuracyRate);
         assessmentInfo.setInstalledCapacityAccuracyRate(installedCapacityAccuracyRate);
         assessmentInfo.setAvailableCapacityAccuracyRate(availableCapacityAccuracyRate);
-        log.info("--------------------考核计算结束--------------------");
         return CalculateResult.success(CalculateResult.MSG_CALCULATE_SUCCESS, assessmentInfo);
 
     }

src/main/resources/sql/t_calculation_formula.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80029
  File Encoding         : 65001
 
- Date: 17/02/2023 10:38:39
+ Date: 22/02/2023 10:20:07
 */
 
 SET NAMES utf8mb4;
@@ -178,10 +178,10 @@ INSERT INTO `t_calculation_formula` VALUES (131, 'RULES', 1, '    ## 设定返
 INSERT INTO `t_calculation_formula` VALUES (132, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E37', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (133, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    ## 如果开机容量为负数，忽略不计\r\n    if (openCapacity <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"开机容量为负数忽忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E41', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (134, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    ## 如果开机容量为负数，忽略不计\r\n    if (openCapacity <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"开机容量为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E41', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (135, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (136, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (137, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (138, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (135, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (136, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (137, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (138, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (139, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E43', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (140, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E43', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (141, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E44Old', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
@@ -320,12 +320,12 @@ INSERT INTO `t_calculation_formula` VALUES (317, 'RULES', 1, '	let m = seq.map(\
 INSERT INTO `t_calculation_formula` VALUES (318, 'RULES', 1, '	let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n	if (ultraShortReportRate == nil) {\r\n      m.code = \"500\";\r\n      m.msg = \"超短期上报率为空\";\r\n      return m;\r\n    }\r\n	if (ratedCapacity == nil) {\r\n      m.code = \"500\";\r\n      m.msg = \"额定容量为空\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E44new', 'E1;E2', 'ALL', 'ASSESSMENT_ULTRA_SHORT_REPORT_RATE', '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (319, 'RULES', 1, '	let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n	if (shortAccuracyRate == nil) {\r\n      m.code = \"500\";\r\n      m.msg = \"短期准确率为空\";\r\n      return m;\r\n    }\r\n	if (ratedCapacity == nil) {\r\n      m.code = \"500\";\r\n      m.msg = \"额定容量量为空\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E44new', 'E1;E2', 'ALL', 'ASSESSMENT_SHORT_ACCURACY_RATE', '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (320, 'RULES', 1, '	let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n	if (ultraShortAccuracyRate == nil) {\r\n      m.code = \"500\";\r\n      m.msg = \"超短期准确率为空\";\r\n      return m;\r\n    }\r\n	if (ratedCapacity == nil) {\r\n      m.code = \"500\";\r\n      m.msg = \"额定容量为空\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E44new', 'E1;E2', 'ALL', 'ASSESSMENT_ULTRA_SHORT_ACCURACY_RATE', '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (321, 'DAY_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00313', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (322, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00313', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (323, 'DAY_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00313', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (324, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00313', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (327, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00313', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (328, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00313', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (321, 'DAY_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00313', NULL, '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (322, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00313', NULL, '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (323, 'DAY_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00313', NULL, '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (324, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00313', NULL, '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (327, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00313', 'DAY_SHORT_ACCURACY', '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (328, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00313', 'DAY_ULTRA_SHORT_ACCURACY', '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (329, 'ASSESSMENT_SHORT_REPORT_RATE', 1, 'if(shortReportRate>=1){\r\n  return 0;\r\n}\r\n\r\nreturn (1-shortReportRate)*ratedCapacity*0.1*0.2;', 'E45old', 'E1;E2', 'ALL', NULL, '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (330, 'ASSESSMENT_ULTRA_SHORT_REPORT_RATE', 1, 'if(shortReportRate>=1){\r\n  return 0;\r\n}\r\n\r\nreturn (1-shortReportRate)*ratedCapacity*0.1*0.2;', 'E45old', 'E1;E2', 'ALL', NULL, '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (331, 'ASSESSMENT_SHORT_ACCURACY_RATE', 1, 'if(shortAccuracyRate>=0.8){\r\n  return 0;\r\n}\r\nreturn (0.8-shortAccuracyRate)*ratedCapacity*0.1*1;\r\n', 'E45old', 'E1', 'ALL', NULL, '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
@@ -542,12 +542,12 @@ INSERT INTO `t_calculation_formula` VALUES (541, 'RULES', 1, '    ## 设定返
 INSERT INTO `t_calculation_formula` VALUES (542, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率、可用功率、预测功率均小于装机容量*10%时，忽略不计\r\n    if (ableValue <electricCapacity*0.1 && realValue <electricCapacity*0.1 && forecastAbleValue <electricCapacity*0.1 ) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率、可用功率、预测功率均小于装机容量*10%时，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E53', 'E1;E2', 'ALL', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (543, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率、可用功率、预测功率均小于装机容量*10%时，忽略不计\r\n    if (ableValue <electricCapacity*0.1 && realValue <electricCapacity*0.1 && forecastAbleValue <electricCapacity*0.1 ) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率、可用功率、预测功率均小于装机容量*10%时，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E53', 'E1;E2', 'ALL', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (544, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorC(list,ableValue,forecastAbleValue,openCapacity)', 'E21', 'E1;E2', 'ALL', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (545, 'DAY_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00352', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (546, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00352', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (547, 'DAY_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00352', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (548, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00352', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (549, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00352', 'DAY_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `t_calculation_formula` VALUES (550, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00352', 'DAY_ULTRA_SHORT_ACCURACY', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (545, 'DAY_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00352', NULL, '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (546, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'meanAbsoluteError(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E1', 'J00352', NULL, '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (547, 'DAY_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00352', NULL, '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (548, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,ableValue,forecastAbleValue,electricCapacity)', 'E42', 'E2', 'J00352', NULL, '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (549, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00352', 'DAY_SHORT_ACCURACY', '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (550, 'RULES', 1, '    ## 设定返回map\r\n    let m = seq.map(\"code\", \"500\", \"msg\", \"校验不通过\", \"data\", \"0.00%\");\r\n    ## 如果实际功率为负数，忽略不计\r\n    if (ableValue <0) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率为负数，忽略不计\";\r\n      return m;\r\n    }\r\n\r\n    ## 如果实际功率小于额定容量的3%，忽略不计\r\n    if (ableValue<0.03*electricCapacity) {\r\n      m.code = \"666\";\r\n      m.msg = \"实际功率小于额定容量的3%，忽略不计\";\r\n      return m;\r\n    }\r\n    m.code = \"200\";\r\n    m.msg = \"校验通过\";\r\n    return m;', 'E42', 'E1;E2', 'J00352', 'DAY_ULTRA_SHORT_ACCURACY', '1', '0', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (551, 'DAY_MID_ACCURACY', 1, '    let sum = 0;\r\n    let count = 0;\r\n    for x in list{\r\n        let insideResult = rootMeanSquaredErrorC(x,ableValue,forecastAbleValue,electricCapacity);\r\n        sum = sum + insideResult;\r\n        count = count + 1;\r\n    }\r\n    let data = sum/count;\r\n    return data;', 'E33', 'E1;E2', 'ALL', NULL, '1', '1', 'E278,E279', '10', NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (552, 'DAY_SHORT_ACCURACY', 1, '    let sum = 0;\r\n    let count = 0;\r\n    for x in list{\r\n        let insideResult = rootMeanSquaredErrorC(x,ableValue,forecastAbleValue,electricCapacity);\r\n        sum = sum + insideResult;\r\n        count = count + 1;\r\n    }\r\n    let data = sum/count;\r\n    return data;', 'E33', 'E1;E2', 'ALL', NULL, '1', '1', 'E278,E279', '3', NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (553, 'DAY_ULTRA_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorC(list,ableValue,forecastAbleValue,electricCapacity)', 'E33', 'E1;E2', 'ALL', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);