数据导出修改

pom.xml

@@ -31,6 +31,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+<!--			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>-->
 		</dependency>
 		<!-- SpringBoot集成mybatis框架 -->
 		<dependency>
@@ -385,6 +391,12 @@
 			<version>4.4</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-nop</artifactId>
+			<version>2.0.0-alpha5</version>
+		</dependency>
+
 	</dependencies>
 
 

src/main/java/com/gyee/SpringbootStart.java

@@ -24,12 +24,12 @@ public class SpringbootStart {
 
 
         InitialRedis initialRedis=new InitialRedis();
-//        System.out.println("初始化开始！");
-//        initialRedis.intialWindturbinepowercurvefitting();
-//        initialRedis.intialWpScatter();
-//        initialRedis.intialPjScatter();
-//        initialRedis.intialLnScatter();
-//        initialRedis.intialWtScatter();
+        System.out.println("初始化开始！");
+        initialRedis.intialWindturbinepowercurvefitting();
+        initialRedis.intialWpScatter();
+        initialRedis.intialPjScatter();
+        initialRedis.intialLnScatter();
+        initialRedis.intialWtScatter();
 //        System.out.println("初始化完成！");
     }
 }

src/main/java/com/gyee/frame/service/export/GoldenService.java

@@ -170,7 +170,7 @@ public class GoldenService {
                 for (Map.Entry<String, Map<String, List<Object>>> entry : wtMap.entrySet()) {
                     map.put(entry.getKey(), entry.getValue());
                     List<String> title = exportConfig.getTemplate1title();
-                    ExcelExportUtils.exelcExportTem(entry.getValue(), entry.getKey(), title, exportConfig.getExportpath() + "\\" + startTss.substring(0, 7) + "\\" + val + "分钟\\" + address + "单机\\", entry.getKey());
+                    ExcelExportUtils.exelcExportTem(entry.getValue(), entry.getKey(), title, exportConfig.getExportpath() + "\\" + startTss.substring(0, 7) + "\\" + val + "分钟\\" + address + "单机\\", entry.getKey().replace("01_",""));
                 }
             }
         } catch (Exception e) {

src/main/java/com/gyee/frame/util/task/TaskTemplateCallable.java

@@ -6,6 +6,7 @@ import com.gyee.frame.common.exception.enums.QiNiuErrorEnum;
 import com.gyee.frame.common.feign.IAdapterService;
 import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
 import com.gyee.frame.model.custom.export.TsPointData;
+import com.gyee.frame.model.custom.weather.Sys;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -65,12 +66,14 @@ public class TaskTemplateCallable implements Callable {
                 List<Object> collect = new ArrayList<>();
                 // 故障状态或限电状态都是整型0或1
                 if (code.equals("GZZT") || code.equals("XDZT")) {
-                    if (data.size() == 0) {
-                        for (int i = 0; i < intervals.size(); i++)
+//                    if (data.size() == 0) {
+                        for (int i = 0; i < intervals.size(); i++){
                             collect.add(0);
-                    } else {
-                        collect = data.stream().map(point -> (int) point.getDoubleValue()).collect(Collectors.toList());
-                    }
+                        }
+
+//                    } else {
+//                        collect = data.stream().map(point -> (int) point.getDoubleValue()).collect(Collectors.toList());
+//                    }
                     //list.add(collect);
                     list.put("F"+num,collect);
                 } else {
@@ -78,7 +81,10 @@ public class TaskTemplateCallable implements Callable {
                         for (int i = 0; i < intervals.size(); i++)
                             collect.add(0.0);
                     } else {
-                        collect = data.stream().map(TsPointData::getDoubleValue).collect(Collectors.toList());
+//                        collect = data.stream().map(TsPointData::getDoubleValue).collect(Collectors.toList());
+                        collect = data.stream().map(s -> {
+                            return s.getDoubleValue() < 0 ? 0 : s.getDoubleValue();
+                        }).collect(Collectors.toList());
                     }
                     //list.add(collect);
                     list.put("F"+num,collect);

src/main/resources/application.yml

@@ -200,7 +200,7 @@ exportcode:
   #测风塔数据
   template2cft:
     MHS_FDC: MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLS30,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLD70,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLTEM,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLPRE,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLHUM
-    NSS_FDC: NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLS30,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLD70,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLTEM,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLPRE,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLHUM
+    NSS_FDC: NSSFJ.NX_GD_NSSF_FJ_P1_L1_001_AI0007,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLD70,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLTEM,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLD70,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLHUM
     QS_FDC: QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT003,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT018,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT019,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT020,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT021
     SBQ_FDC: SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0106,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLD70,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLTEM,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLPRE,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLHUM
     XS_FDC: XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLS30,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLD70,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLTEM,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLPRE,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLHUM