Jelajahi Sumber

1.修改client代码bug,修改打包为jar+lib

wangtao 3 tahun lalu
induk
melakukan
b9e279613f

+ 0 - 13
focus-client.yml

@@ -1,13 +0,0 @@
-#青海client小程序使用jar包外配置文件
-remote:
-  ip: 192.168.1.208
-  port: 22
-  user: root
-  pwd: Syjy*3377
-  path: /home/syjy/ipfcstV3/downLoadFile/
-  dcUrl: http://cloud.jiayuepowertech.com:9001/qinghaiComeBackApi/datas
-v3cloud:
-  filelogUrl: https://117.78.19.70:9010/client/getDownLoadFileAll/
-  fileDownUrl: https://117.78.19.70:9010/client/getFileById?id=
-local:
-  downFilePath: /Users/wangtao/Documents/temp/client/

+ 1 - 1
ipfcst-client/src/main/java/com/jiayue/client/job/DownloadFileJob.java

@@ -49,7 +49,7 @@ public class DownloadFileJob {
     /**
      * 每天凌晨2点执行
      */
-    @Scheduled(cron = "0 0/2 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void download() {
         log.info("上午文件下载定时任务开始");
         List<Map<String, Object>> stations = queryDataService.getStations();

+ 6 - 6
ipfcst-client/src/main/java/com/jiayue/client/service/QueryDataService.java

@@ -101,8 +101,8 @@ public class QueryDataService {
      * @return
      */
     public List<Map<String, Object>> getWeatherds(String startTime, String endTime, String equirpmentNo) {
-        String wedSql = "SELECT C_TIME,C_EQUIPMENT_NO,C_GLOBALR,C_AIRT " +
-                "from t_weather_station_status_data where C_EQUIPMENT_NO='" + equirpmentNo + "' and C_TIME between '" + startTime + "'and '" + endTime + "'";
+        String wedSql = "SELECT C_TIME,C_EQUIPMENT_ID,C_GLOBALR,C_AIRT " +
+                "from t_weather_station_status_data where C_EQUIPMENT_ID='" + equirpmentNo + "' and C_TIME between '" + startTime + "'and '" + endTime + "'";
         log.info("超短期回传数据查询sql:{}", wedSql);
         return jdbcTemplate.queryForList(wedSql);
     }
@@ -116,8 +116,8 @@ public class QueryDataService {
      * @return
      */
     public List<Map<String, Object>> getCfts(String startTime, String endTime, String equirpmentNo) {
-        String cftsSql = "SELECT C_TIME,C_EQUIPMENT_NO,C_WS_INST_HUB_HEIGHT,C_WD_INST_HUB_HEIGHT " +
-                "from t_wind_tower_status_data where C_EQUIPMENT_NO='" + equirpmentNo + "' and C_TIME between '" + startTime + "'and '" + endTime + "'";
+        String cftsSql = "SELECT C_TIME,C_EQUIPMENT_ID,C_WS_INST_HUB_HEIGHT,C_WD_INST_HUB_HEIGHT " +
+                "from t_wind_tower_status_data where C_EQUIPMENT_ID='" + equirpmentNo + "' and C_TIME between '" + startTime + "'and '" + endTime + "'";
         log.info("测风塔回传数据查询sql:{}", cftsSql);
 
         return jdbcTemplate.queryForList(cftsSql);
@@ -132,8 +132,8 @@ public class QueryDataService {
      * @return
      */
     public List<Map<String, Object>> getFjs(String startTime, String endTime, String equirpmentNo) {
-        String fjsSql = "SELECT C_TIME,C_EQUIPMENT_NO,C_WS,C_WD " +
-                "from t_wind_turbine_status_data where C_EQUIPMENT_NO='" + equirpmentNo + "' and C_TIME between '" + startTime + "'and '" + endTime + "'";
+        String fjsSql = "SELECT C_TIME,C_EQUIPMENT_ID,C_WS,C_WD " +
+                "from t_wind_turbine_status_data where C_EQUIPMENT_ID='" + equirpmentNo + "' and C_TIME between '" + startTime + "'and '" + endTime + "'";
         log.info("风机回传数据查询sql:{}", fjsSql);
         return jdbcTemplate.queryForList(fjsSql);
     }

+ 2 - 2
ipfcst-client/src/main/resources/logback-spring.xml

@@ -22,7 +22,7 @@
 
     <!-- Log file debug output -->
     <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/client.log</file>
+        <file>${log.path}/client-debug.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
@@ -35,7 +35,7 @@
 
     <!-- Log file error output -->
     <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
+        <file>${log.path}/client-error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>

+ 1 - 1
pom.xml

@@ -158,7 +158,7 @@
                         <!--<verbose />-->
                         <!-- 解决maven命令编译报错,因为rt.jar 和jce.jar在jre的lib下面,不在jdk的lib下面,
                         导致maven找不到(java7以后会出现这个问题),将这2个jar包拷贝到jdk的lib下面估计也好使-->
-                        <bootclasspath>${java.home}\lib\rt.jar;${java.home}\lib\jce.jar</bootclasspath>
+                        <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>
             </plugin>