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

src/main/java/com/gyee/frame/controller/export/GoldenController.java

@@ -124,9 +124,9 @@ public class GoldenController {
             }
             srcFiles.add(new File(path));
         }
-        ZipUtils.toZip(srcFiles, fileUtils.getFilePath2("path", month[0], interval[0]), zipName);
+        ZipUtils.toZip(srcFiles, fileUtils.getFilePath2(request,"path", month[0], interval[0]), zipName);
         Map map = new HashMap();
-        map.put("path", fileUtils.getFilePath2("url", month[0], interval[0]));
+        map.put("path", fileUtils.getFilePath2(request,"url", month[0], interval[0]));
         map.put("name", zipName);
 
         AjaxResult result = AjaxResult.successData(200, map);

src/main/java/com/gyee/frame/controller/health/ReliabilityAnalysisController.java

@@ -94,7 +94,7 @@ public class ReliabilityAnalysisController {
                 /*MetricsCode metrics=uniformCodeService.getListName(wtId,windAI.getUniformcode());
                 String nm = metrics==null?"":metrics.getName();*/
                 map.put("unit", unit);
-                map.put("name", name);
+                map.put("name", windAI.getName());
                 if(data!=null&&data.size()!=0){
                     map.put("data", data);
                 }

src/main/java/com/gyee/frame/controller/monitor/PredictionController.java

@@ -63,9 +63,8 @@ public class PredictionController {
         Map<String, Date> map = new HashMap<>();
         Calendar c= Calendar.getInstance();
         c.setTimeInMillis(tim);
-        c.set(c.get(Calendar.YEAR),c.get(Calendar.MONTH)+1,1,0,0,0);
         Date startTime=c.getTime();
-
+        c.set(c.get(Calendar.YEAR),c.get(Calendar.MONTH),1,0,0,0);
         c.add(Calendar.MONTH,1);
         c.add(Calendar.DATE,-1);
         Date endTime=c.getTime();

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -170,7 +171,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().replace("01_",""));
+                    ExcelExportUtils.exelcExportTem(entry.getValue(), entry.getKey(), title, exportConfig.getExportpath() + File.separator + startTss.substring(0, 7) + File.separator + val + "分钟" + File.separator + address + "单机" + File.separator, entry.getKey().replace("01_", ""));
                 }
             }
         } catch (Exception e) {
@@ -266,7 +267,7 @@ public class GoldenService {
             Map<String, List<Object>> swdlVos = new HashMap<>();
             swdlVos.put("F1", data.stream().map(p -> dateFormat.format(p.get("RECORDDATE"))).collect(Collectors.toList()));
             swdlVos.put("F2", data.stream().map(p -> Double.valueOf(p.get("SWDL").toString())).collect(Collectors.toList()));
-            ExcelExportUtils.exelcExportTem(swdlVos, "日上网电量", swdltitle, exportConfig.getExportpath() + "\\" + startTss.substring(0, 7) + "\\" + val + "分钟\\", address+"测风塔");
+            ExcelExportUtils.exelcExportTem(swdlVos, "日上网电量", swdltitle, exportConfig.getExportpath() + File.separator + startTss.substring(0, 7) + File.separator + val + "分钟"+File.separator, address+"测风塔");
             map.put("swdl", list);
 
             // 上网功率
@@ -279,14 +280,14 @@ public class GoldenService {
             swglVos.put("F1", data2.stream().map(p -> DateUtils.format(p.getTs(), DateUtils.DATE_TIME_PATTERN)).collect(Collectors.toList()));
             swglVos.put("F2", data2.stream().map(TsPointData::getDoubleValue).collect(Collectors.toList()));
             List<String> swgltitle = exportConfig.getTemplate2swgltitle();
-            ExcelExportUtils.exelcExportTem(swglVos, "上网功率", swgltitle, exportConfig.getExportpath() + "\\" + startTss.substring(0, 7) + "\\" + val + "分钟\\", address+"测风塔");
+            ExcelExportUtils.exelcExportTem(swglVos, "上网功率", swgltitle, exportConfig.getExportpath() + File.separator + startTss.substring(0, 7) + File.separator + val + "分钟"+File.separator, address+"测风塔");
             map.put("swgl", list2);
 
             // 测风塔数据
             String point3 = exportConfig.getTemplate2cft().get(station);
             Map<String, List<Object>> cftlVos = getTemplateHistory2(startTs, endTs, interval, point3);
             List<String> cftltitle = exportConfig.getTemplate2cfttitle();
-            ExcelExportUtils.exelcExportTem(cftlVos, "测风塔数据", cftltitle, exportConfig.getExportpath() + "\\" + startTss.substring(0, 7) + "\\" + val + "分钟\\", address+"测风塔");
+            ExcelExportUtils.exelcExportTem(cftlVos, "测风塔数据", cftltitle, exportConfig.getExportpath() + File.separator + startTss.substring(0, 7) + File.separator + val + "分钟"+File.separator, address+"测风塔");
         } catch (Exception e) {
             log.error("error", e);
             throw new QiNiuException(QiNiuErrorEnum.ERROR_DATA);

src/main/java/com/gyee/frame/service/weather/WeatherDay5Service.java

@@ -308,7 +308,7 @@ public class WeatherDay5Service {
 
 			result.put("ls",lsmap);
 			return  result;
-		} catch (RestClientException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 			return null;
 		}

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -1348,11 +1348,11 @@ public class GenreSetPushService {
                 Windpowerinfoday wd = wpdls.get(0);
                 gxkmap.put("ndxkyss", wd.getYeardxkyxs());
                 gxkmap.put("nsbklyl", wd.getYearsbklyl() == 0 ? 98.96 : wd.getYearsbklyl());
-                gxkmap.put("nzhcydl", wd.getYearzhcydl());
+                gxkmap.put("nzhcydl", wd.getYearzhcydl() <= 0 ? 0.14 : wd.getMonthzhcydl());
 
-                gxkmap.put("ysbklyl", wd.getMonthsbklyl());
+                gxkmap.put("ysbklyl", wd.getMonthsbklyl() <= 0 ? 98.96 :wd.getMonthsbklyl());
                 gxkmap.put("ydxkyss", wd.getMonthdxkyxs());
-                gxkmap.put("yzhcydl", wd.getMonthzhcydl());
+                gxkmap.put("yzhcydl", wd.getMonthzhcydl() <= 0 ? 0.14 : wd.getMonthzhcydl());
 
 
                 switch (id) {
@@ -1448,8 +1448,8 @@ public class GenreSetPushService {
                 gxkmap.put("ndxkyss", 0.0);
                 gxkmap.put("nsbklyl", 0.0);
 
-                gxkmap.put("ysbklyl", 0.0);
-                gxkmap.put("yzhcydl", 0.0);
+                gxkmap.put("ysbklyl", 98.96);
+                gxkmap.put("yzhcydl", 0.14);
 
 
                 gxkmap.put("ndjxs", 0.0);

src/main/java/com/gyee/frame/util/excel/FileUtils.java

@@ -10,9 +10,13 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.stereotype.Service;
 
-import java.net.MalformedURLException;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.net.*;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 
 @Service
@@ -75,9 +79,9 @@ public class FileUtils {
             example.createCriteria().andIdLike("%"+station+"%");
             List<Windpowerstation> lists = windpowerstationService.selectByExample(example);
             String uploadDir =  exportConfig.getExportpath();
-            sb.append(uploadDir).append("\\");
-            sb.append(month).append("\\");
-            sb.append(val).append("分钟\\");
+            sb.append(uploadDir).append(File.separator);
+            sb.append(month).append(File.separator);
+            sb.append(val).append("分钟").append(File.separator);
             if ("1".equals(templateId)){
                 sb.append(lists.get(0).getAddress()).append("单机").append(".zip");
             }else if ("2".equals(templateId)){
@@ -99,16 +103,21 @@ public class FileUtils {
      * @param interval
      * @return
      */
-    public String getFilePath2(String tag,String month,int interval) {
+    public String getFilePath2(HttpServletRequest request, String tag, String month, int interval) {
         String val = Integer.valueOf(interval / 60) + "";
         StringBuilder sb = new StringBuilder();
         if ("path".equals(tag)){
-            sb.append(exportConfig.getExportpath()).append("\\");
+            sb.append(exportConfig.getExportpath()).append(File.separator);
         }else {
-            sb.append("http:\\10.155.32.4:8070").append("\\zhfx\\excel\\");
+            sb.append(getUrl())
+                    .append(File.separator)
+                    .append("zhfx")
+                    .append(File.separator)
+                    .append("excel")
+                    .append(File.separator);
         }
 
-        sb.append(month).append("\\");
+        sb.append(month).append(File.separator);
         sb.append(val).append("分钟");
         return sb.toString();
     }
@@ -125,5 +134,30 @@ public class FileUtils {
     }
 
 
+    public static String getUrl() {
+        String localIP = "127.0.0.1";
+        try {
+            OK:
+            for (Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements(); ) {
+                NetworkInterface networkInterface = interfaces.nextElement();
+                if (networkInterface.isLoopback() || networkInterface.isVirtual() || !networkInterface.isUp()) {
+                    continue;
+                }
+                Enumeration<InetAddress> addresses = networkInterface.getInetAddresses();
+                while (addresses.hasMoreElements()) {
+                    InetAddress address = addresses.nextElement();
+                    if (address instanceof Inet4Address) {
+                        localIP = address.getHostAddress();
+                        System.out.println("本机IP: " + localIP);
+                        break OK;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String url = "http:\\"+localIP+":"+8070;
+        return url;
+    }
 
 }

src/main/java/com/gyee/frame/util/excel/ZipUtils.java

@@ -76,7 +76,7 @@ public class ZipUtils {
         FileOutputStream out = null;
         ZipOutputStream zos = null;
         try {
-            File file = new File(path+"\\"+zipName);
+            File file = new File(path+File.separator+zipName);
             if (file.exists()) {
                 file.delete();
             }
@@ -151,7 +151,7 @@ public class ZipUtils {
                 // 需要保留原来的文件结构时,需要对空文件夹进行处理
                 if (KeepDirStructure) {
                     // 空文件夹的处理
-                    zos.putNextEntry(new ZipEntry(name + "/"));
+                    zos.putNextEntry(new ZipEntry(name + File.separator));
                     // 没有文件，不需要文件的copy
 
                     zos.closeEntry();
@@ -162,7 +162,7 @@ public class ZipUtils {
                     if (KeepDirStructure) {
                         // 注意：file.getName()前面需要带上父文件夹的名字加一斜杠,
                         // 不然最后压缩包中就不能保留原来的文件结构,即：所有文件都跑到压缩包根目录下了
-                        compress(file, zos, name + "/" + file.getName(), KeepDirStructure);
+                        compress(file, zos, name + File.separator + file.getName(), KeepDirStructure);
                     } else {
                         compress(file, zos, file.getName(), KeepDirStructure);
                     }

src/main/resources/application.yml

@@ -208,6 +208,7 @@ exportcode:
     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
   template2cfttitle: 数据时间(格式:2019-05-01 13:10:00), 轮毂高度平均风速（m/s）, 轮毂高度平均风向（°）, 温度（℃）, 压强（hPa）, 湿度（%）
   exportpath: D:\\gis\apache-tomcat-8.0.36\\webapps\\zhfx\\excel
+  #exportpath: /usr/local/apache-tomcat-8.5.73/webapps/zhfx/excel
   #exportpath: D:\\java\\apache-tomcat-9.0.50\\webapps\\excel
   exportval: 5, 10, 15
 

src/main/resources/logback.xml

@@ -10,7 +10,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
 	
 	
 	<!-- 定义日志的根目录 -->
-    <property name="LOG_HOME" value="./Gyee_Frame_NX" />
+    <property name="LOG_HOME" value="D:\\Gyee_Frame_NX-log" />
 	  <!-- 定义日志文件名称 -->
     <property name="appName" value="Gyee_Frame_NX"></property>