1.earlyreport 添加字段relatedParts

2.调度参数添加windturbineParts

schedule-job/alarm-schedule/build.gradle

@@ -19,6 +19,7 @@ apply plugin: "io.spring.dependency-management"
 
 
 dependencies {
+    implementation fileTree(dir: "src/main/lib", include: "*.jar")
     implementation project(":common:utils")
     implementation("$bootGroup:spring-boot-starter-web")
     implementation("$bootGroup:spring-boot-starter-undertow")
@@ -27,7 +28,7 @@ dependencies {
     implementation("org.apache.logging.log4j:log4j-jul:$log4jVersion")
     implementation("org.apache.logging.log4j:log4j-api:$log4jVersion")
     implementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion")
-    implementation ("mysql:mysql-connector-java:$mysqlConnectorVersion")
+  //  implementation ("mysql:mysql-connector-java:$mysqlConnectorVersion")
     implementation ("com.alibaba:druid:$alibabaDruidVersion")
     implementation ("com.alibaba:fastjson:$fastjsonVersion")
 

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/biz/EarlyReportTask.java

@@ -59,6 +59,7 @@ public class EarlyReportTask implements Callable<TaskResult> {
                 .setReportDate(new Date())
                 .setStationId(stationId)
                 .setStationName(StationCache.getStationName(stationId))
+                .setRelatedParts(reportParam.getWindturbineParts())
                 .setReportName(StationCache.getStationName(stationId)+"风机"+reportParam.getAnalysisName()+"诊断报告")
                 .setStatStartDate(statStartTime)
                 .setStatEndDate(statEndTime)

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/job/EarlyReportHandler.java

@@ -46,7 +46,25 @@ public class EarlyReportHandler {
      * @author Wanghs
      * @description 生成风机诊断报告方法
      * xxl-job参数为json格式
-     * {"customRuleId":["qwe","123"],"interval":14,"resultLimit":3,"windturbineRuleId":["daf","456"]}
+     *
+     * {
+     *     "reportName":"主轴隐患感知",
+     *     "windturbineParts":"CLX",
+     *     "interval": 7,
+     *     "customRuleId":
+     *     [
+     *         "ZX051NSSUP82",
+     *         "ZX534NSSUP82",
+     *         "ZX085NSSUP82"
+     *     ],
+     *     "windturbineRuleId":
+     *     [],
+     *     "resultLimit": 3,
+     *     "stationId": "NSS_FDC",
+     *     "model": "UP82"
+     * }
+     *
+     *
      * customRuleId为自定义报警规则id 对应alertrule2
      * windturbineRuleId风机报警id 对应warning2
      * interval 为分析时间区间，执行时以当天0点，前推相应天数

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/model/EarlyReportParam.java

@@ -13,6 +13,8 @@ import java.util.List;
 @Data
 public class EarlyReportParam implements Serializable {
 
+    //部件编码  CLX,FDJ等
+    private String windturbineParts;
     //分析名称（部件名称）
     private String analysisName;
     //时间间隔（天），即从当日0点，向前间隔天数，为计算区间