山东新增第十天准确率

pom.xml

@@ -10,8 +10,8 @@
     </parent>
     <groupId>com.syjy</groupId>
     <artifactId>calculation-spring-boot-starter</artifactId>
-    <version>0.0.19</version>
-    <!--<version>0.0.19-SNAPSHOT</version>-->
+    <version>0.0.20</version>
+    <!--<version>0.0.20-SNAPSHOT</version>-->
     <name>calculation</name>
     <description>Demo project for Spring Boot</description>
     <properties>
@@ -42,19 +42,19 @@
         </dependency>
 
         <!--本地使用时候放开-->
-        <!--<dependency>-->
-            <!--<groupId>kingbasejdbc4</groupId>-->
-            <!--<artifactId>kingbasejdbc4</artifactId>-->
-            <!--<version>1</version>-->
-        <!--</dependency>-->
-
-        <!--发布时候放开-->
         <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <version>2.2.0.RELEASE</version>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <groupId>kingbasejdbc4</groupId>
+            <artifactId>kingbasejdbc4</artifactId>
+            <version>1</version>
         </dependency>
 
+        <!--发布时候放开-->
+        <!--<dependency>-->
+            <!--<groupId>com.alibaba.cloud</groupId>-->
+            <!--<version>2.2.0.RELEASE</version>-->
+            <!--<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+        <!--</dependency>-->
+
         <!-- druid 连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -119,7 +119,7 @@
     <distributionManagement>
 
         <repository>
-            <id>jiayue-releases</id>
+            <id>jiayue-rzeleases</id>
             <name>Nexus Release Repository</name>
             <url>http://49.4.68.219:8888/repository/jiayue-releases/</url>
         </repository>

src/main/java/com/syjy/calculate/entity/CalculationFormula.java

@@ -55,6 +55,11 @@ public class CalculationFormula extends PageReq {
     private String electricType;
 
     /**
+     * 场站编码
+     */
+    private String stationCode;
+
+    /**
      * 细则对应的公式
      */
     private String ruleFormula;

src/main/resources/sql/t_calculation_formula.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80029
  File Encoding         : 65001
 
- Date: 11/05/2023 11:10:57
+ Date: 24/07/2023 09:48:32
 */
 
 SET NAMES utf8mb4;
@@ -34,12 +34,12 @@ CREATE TABLE `t_calculation_formula`  (
   `STATE` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '状态： 0 失效    1 有效',
   `DATA_SOURCE_TYPE` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生成文件的类型\r\nE278：浙江上午短期(新)\r\nE279：浙江下午短期(新)\r\nE280：浙江超短期(新)\r\n',
   `HOW_MANY_DAYS` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '获取提前几天生成的数据',
-  `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `CREATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `CREATOR` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `LAST_MODIFIER` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改时间',
-  `LAST_MODIFY_TIME` datetime NULL DEFAULT NULL COMMENT '修改人',
+  `LAST_MODIFY_TIME` datetime(0) NULL DEFAULT NULL COMMENT '修改人',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 681 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 685 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of t_calculation_formula
@@ -677,5 +677,7 @@ INSERT INTO `t_calculation_formula` VALUES (680, 'RULES', 1, '	let m = seq.map(\
 INSERT INTO `t_calculation_formula` VALUES (681, '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;', 'E36', 'E1;E2', 'ALL', 'ASSESSMENT_ULTRA_SHORT_ACCURACY_RATE', '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (682, 'ASSESSMENT_ULTRA_SHORT_ACCURACY_RATE', 1, 'if(ultraShortReportRate>=0.9){\r\n  return 0;\r\n}\r\nreturn (0.9-ultraShortReportRate)*ratedCapacity*0.1*1;', 'E36', 'E2', 'ALL', NULL, '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (683, 'USER', 1, 'user:123456', 'E99', 'E1;E2', NULL, NULL, '0', '1', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (684, 'POINT_SHORT_ACCURACY', 1, 'manyDayThreeDayDeviationElectricity(list,\'if(forecastAbleValue == 0 && ableValue !=0){ return 1;}elsif(forecastAbleValue==ableValue){return 0;} else{return math.abs(forecastAbleValue-ableValue)/forecastAbleValue; } \',0.15,\'##如果预测 = 0\r\n        deviationElectricity = 0;\r\n        if (forecastAbleValue == 0) {\r\n            return ableValue * 0.25;\r\n        }\r\n        ##如果预测大于实际\r\n        if (forecastAbleValue > ableValue) {\r\n            deviationElectricity = (forecastAbleValue * (1 - 0.2) - ableValue) * 0.25;\r\n        ##如果预测小于实际\r\n        } else {\r\n            deviationElectricity = (ableValue - (forecastAbleValue * (1 + 0.2))) * 0.25;\r\n        }\r\n        return deviationElectricity;\',day)', 'E996', 'E1', 'ALL', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (685, 'TEN_DAY_SHORT_ACCURACY', 1, 'rootMeanSquaredErrorS(list,realValue,forecastAbleValue,electricCapacity)', 'E37', 'E1;E2', 'ALL', NULL, '1', '1', NULL, NULL, NULL, NULL, NULL, NULL);
 
 SET FOREIGN_KEY_CHECKS = 1;