Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/Gyee_Frame_NX

pom.xml

@@ -27,6 +27,11 @@
 	
 	<!-- https://mvnrepository.com/ 查找jar网站 -->
 	<dependencies>
+		<dependency>
+			<groupId>javax.xml</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.1</version>
+		</dependency>
 		<!-- SpringBoot Web容器 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/gyee/frame/controller/file/ShapeInfo.java

@@ -1,6 +1,6 @@
 package com.gyee.frame.controller.file;
 
-import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
+import com.sun.xml.bind.v2.model.core.PropertyInfo;
 
 import javax.servlet.jsp.tagext.TagInfo;
 import java.util.List;

src/main/java/com/gyee/frame/schdule/windturbinestatetime/TaskLoadrateHourlyStatistics.java

@@ -124,7 +124,7 @@ public class TaskLoadrateHourlyStatistics {
     /**
      * 18点半
      */
-    @Scheduled(cron = "0 30 18 * * ?")
+    @Scheduled(cron = "0 0 16 * * ?")
     public void getLoadrateHourly1830(){
         creatExcel("1830");
     }