漏洞文件bug修改

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/request/DateUtil.java

 package com.yeejoin.amos.fas.core.common.request;
 
+import java.security.SecureRandom;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
@@ -1071,8 +1072,10 @@ public class DateUtil {
         {
             ;
         }
-        long day = (date.getTime() - mydate.getTime()) / (24 * 60 * 60 * 1000);
-        return day;
+        if (null != date && null != mydate) {
+            return (date.getTime() - mydate.getTime()) / (24 * 60 * 60 * 1000);
+        }
+        return 0;
     }
 
     /**
@@ -1115,7 +1118,7 @@ public class DateUtil {
      */
     private static String getRandom(int i)
     {
-        Random jjj = new Random();
+        SecureRandom jjj = new SecureRandom();
         // int suiJiShu = jjj.nextInt(9);
         if (i == 0) return "";
         String jj = "";

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FileController.java

@@ -117,9 +117,17 @@ public class FileController extends BaseController {
             ResponseUtils.renderText(response, "File not exists!");
             return;
         }
-        FileInputStream fis = new FileInputStream(file);
+        FileInputStream fis = null;
+        try {
+            fis = new FileInputStream(file);
             ResponseUtils.downFileByInputStream(file.getName(), fis, response, open);
-        IOUtils.closeQuietly(fis);
+        } catch (IOException e) {
+
+        } finally {
+            if (null != fis) {
+                fis.close();
+            }
+        }
     }
 
     @Permission

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

@@ -69,6 +69,8 @@ public class PlanVisual3dController extends BaseController {
         if (testPlan != null) {
             String path = testPlan.getFilePath();
             if (path != null && !"".equals(path)) {
+                FileInputStream inputStream = null;
+                InputStream fis = null;
                 try {
                     // path是指欲下载的文件的路径。
                     File file = new File(fileUploadDir + path);
@@ -79,10 +81,12 @@ public class PlanVisual3dController extends BaseController {
                         String ext = filename.substring(filename.lastIndexOf(".") + 1).toUpperCase();
 
                         // 以流的形式下载文件。
-                        InputStream fis = new BufferedInputStream(new FileInputStream(fileUploadDir + path));
+                        inputStream = new FileInputStream(fileUploadDir + path);
+                        if (null != inputStream) {
+                            fis = new BufferedInputStream(inputStream);
+
                             byte[] buffer = new byte[fis.available()];
                             fis.read(buffer);
-                        fis.close();
                             // 清空response
 //    				response.reset();
                             // 设置response的Header
@@ -94,11 +98,23 @@ public class PlanVisual3dController extends BaseController {
                             toClient.write(buffer);
                             toClient.flush();
                             toClient.close();
+                        }
                     } else {
                         response.setStatus(404);
                     }
                 } catch (IOException ex) {
                     ex.printStackTrace();
+                } finally {
+                    try {
+                        if (null != inputStream) {
+                            inputStream.close();
+                        }
+                        if (null != fis) {
+                            fis.close();
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         } else {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/WeatherController.java

@@ -35,6 +35,8 @@ public class WeatherController extends BaseController {
 
 		String result = "";
         BufferedReader in = null;
+        BufferedReader responseReader = null;
+        InputStreamReader res = null;
         try {
             String urlNameString = weatherUrl + address;
             URL realUrl = new URL(urlNameString);
@@ -55,12 +57,13 @@ public class WeatherController extends BaseController {
             StringBuffer sb = new StringBuffer();
             String readLine = new String();
             GZIPInputStream gZipS=new GZIPInputStream(connection.getInputStream());
-            InputStreamReader res = new InputStreamReader(gZipS,"UTF-8");
-            BufferedReader responseReader = new BufferedReader(res);
+            res = new InputStreamReader(gZipS,"UTF-8");
+            responseReader = new BufferedReader(res);
+
             while ((readLine = responseReader.readLine()) != null) {
                 sb.append(readLine);
             }
-            responseReader.close();
+
             result = sb.toString();
             System.out.println(result);
    
@@ -75,6 +78,12 @@ public class WeatherController extends BaseController {
                 if (in != null) {
                     in.close();
                 }
+                if (null != responseReader) {
+                    responseReader.close();
+                }
+                if (null != res) {
+                    res.close();
+                }
             } catch (Exception e2) {
                 e2.printStackTrace();
             }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentFireEquipmentServiceImpl.java

@@ -161,9 +161,9 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
                 }
             }
         }
-        if (!CollectionUtils.isEmpty(map)) {
-            Integer total = Integer.parseInt(map.get("total").toString());
-            Integer count = Integer.parseInt(map.get("count").toString());
+        if (null != map &&!CollectionUtils.isEmpty(map)) {
+            Integer total = Integer.parseInt(map.getOrDefault("total", 0).toString());
+            Integer count = Integer.parseInt(map.getOrDefault("count", 0).toString());
             if (SqlKeyWordEnum.AND.getKey().equalsIgnoreCase(type)) {
                 return total.equals(count);
             } else if (SqlKeyWordEnum.OR.getKey().equalsIgnoreCase(type)) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentServiceImpl.java

@@ -325,7 +325,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
     		if(date.isPresent()){
     			equipment2=date.get();
     		}
-           equipment.setCreateDate(equipment2.getCreateDate());
+           equipment.setCreateDate(null != equipment2 ? equipment2.getCreateDate() : new Date());
         }
 
         preplanPictureDao.saveAndFlush(pp);
@@ -369,8 +369,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
         		if(date.isPresent()){
         			equipment2=date.get();
         		}
-
-                equipment.setCreateDate(equipment2.getCreateDate() == null ? new Date() : equipment2.getCreateDate());
+                equipment.setCreateDate(null != equipment2 && null != equipment2.getCreateDate() ? equipment2.getCreateDate() : new Date());
             }
         } else {
             equipment = save(equipment);
@@ -382,7 +381,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
         			equipment2=date.get();
         		}
 
-                equipment.setCreateDate(equipment2.getCreateDate() == null ? new Date() : equipment2.getCreateDate());
+                equipment.setCreateDate(null != equipment2 && null != equipment2.getCreateDate() ? equipment2.getCreateDate() : new Date());
             }
             Long equipmentId = Long.valueOf(equipment.getId());
             for (int i = 0; i < imgs.length; i++) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -210,6 +210,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             riskSource.setStatus(FasConstant.RISK_SOURCE_STATUS_NORMAL);
             riskSource.setCreateDate(new Date());
         } else {// 更新
+            if (null != oldRiskSource) {
                 riskSource.setCreateDate(oldRiskSource.getCreateDate());
                 riskSource.setFmeaList(oldRiskSource.getFmeaList());
                 riskSource.setIncrement(oldRiskSource.getIncrement());
@@ -218,6 +219,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 riskSource.setRpni(oldRiskSource.getRpni());
                 riskSource.setStatus(oldRiskSource.getStatus());
             }
+        }
         iRiskSourceDao.saveAndFlush(riskSource);
         return riskSource;
     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/DesUtil.java

@@ -97,36 +97,48 @@ public class DesUtil {
                         int[] tempBt;
                         int x, y, z;
                         tempBt = bt;
+                        if (null != firstKeyBt) {
                             for (x = 0; x < firstLength; x++) {
                                 tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                             }
+                        }
+                        if (null != secondKeyBt) {
                             for (y = 0; y < secondLength; y++) {
                                 tempBt = enc(tempBt, (int[]) secondKeyBt.get(y));
                             }
+                        }
+                        if (null != thirdKeyBt) {
                             for (z = 0; z < thirdLength; z++) {
                                 tempBt = enc(tempBt, (int[]) thirdKeyBt.get(z));
                             }
+                        }
                         encByte = tempBt;
                     } else {
                         if (firstKey != null && firstKey != "" && secondKey != null && secondKey != "") {
                             int[] tempBt;
                             int x, y;
                             tempBt = bt;
+                            if (null != firstKeyBt) {
                                 for (x = 0; x < firstLength; x++) {
                                     tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                                 }
+                            }
+                            if (null != secondKeyBt) {
                                 for (y = 0; y < secondLength; y++) {
                                     tempBt = enc(tempBt, (int[]) secondKeyBt.get(y));
                                 }
+                            }
                             encByte = tempBt;
                         } else {
                             if (firstKey != null && firstKey != "") {
                                 int[] tempBt;
                                 int x = 0;
                                 tempBt = bt;
+                                if (null != firstKeyBt) {
                                     for (x = 0; x < firstLength; x++) {
                                         tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                                     }
+                                }
                                 encByte = tempBt;
                             }
                         }
@@ -144,36 +156,48 @@ public class DesUtil {
                             int[] tempBt;
                             int x, y, z;
                             tempBt = tempByte;
+                            if (null != firstKeyBt) {
                                 for (x = 0; x < firstLength; x++) {
                                     tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                                 }
+                            }
+                            if (null != secondKeyBt) {
                                 for (y = 0; y < secondLength; y++) {
                                     tempBt = enc(tempBt, (int[]) secondKeyBt.get(y));
                                 }
+                            }
+                            if (null != thirdKeyBt) {
                                 for (z = 0; z < thirdLength; z++) {
                                     tempBt = enc(tempBt, (int[]) thirdKeyBt.get(z));
                                 }
+                            }
                             encByte = tempBt;
                         } else {
                             if (firstKey != null && firstKey != "" && secondKey != null && secondKey != "") {
                                 int[] tempBt;
                                 int x, y;
                                 tempBt = tempByte;
+                                if (null != firstKeyBt) {
                                     for (x = 0; x < firstLength; x++) {
                                         tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                                     }
+                                }
+                                if (null != secondKeyBt) {
                                     for (y = 0; y < secondLength; y++) {
                                         tempBt = enc(tempBt, (int[]) secondKeyBt.get(y));
                                     }
+                                }
                                 encByte = tempBt;
                             } else {
                                 if (firstKey != null && firstKey != "") {
                                     int[] tempBt;
                                     int x;
                                     tempBt = tempByte;
+                                    if (null != firstKeyBt) {
                                         for (x = 0; x < firstLength; x++) {
                                             tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                                         }
+                                    }
                                     encByte = tempBt;
                                 }
                             }
@@ -188,36 +212,48 @@ public class DesUtil {
                             int[] tempBt;
                             int x, y, z;
                             tempBt = tempByte;
+                            if (null != firstKeyBt) {
                                 for (x = 0; x < firstLength; x++) {
                                     tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                                 }
+                            }
+                            if (null != secondKeyBt) {
                                 for (y = 0; y < secondLength; y++) {
                                     tempBt = enc(tempBt, (int[]) secondKeyBt.get(y));
                                 }
+                            }
+                            if (null != thirdKeyBt) {
                                 for (z = 0; z < thirdLength; z++) {
                                     tempBt = enc(tempBt, (int[]) thirdKeyBt.get(z));
                                 }
+                            }
                             encByte = tempBt;
                         } else {
                             if (firstKey != null && firstKey != "" && secondKey != null && secondKey != "") {
                                 int[] tempBt;
                                 int x, y;
                                 tempBt = tempByte;
+                                if (null != firstKeyBt) {
                                     for (x = 0; x < firstLength; x++) {
                                         tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                                     }
+                                }
+                                if (null != secondKeyBt) {
                                     for (y = 0; y < secondLength; y++) {
                                         tempBt = enc(tempBt, (int[]) secondKeyBt.get(y));
                                     }
+                                }
                                 encByte = tempBt;
                             } else {
                                 if (firstKey != null && firstKey != "") {
                                     int[] tempBt;
                                     int x;
                                     tempBt = tempByte;
+                                    if (null != firstKeyBt) {
                                         for (x = 0; x < firstLength; x++) {
                                             tempBt = enc(tempBt, (int[]) firstKeyBt.get(x));
                                         }
+                                    }
                                     encByte = tempBt;
                                 }
                             }
@@ -267,36 +303,48 @@ public class DesUtil {
                     int[] tempBt;
                     int x, y, z;
                     tempBt = intByte;
+                    if (null != thirdKeyBt) {
                         for (x = thirdLength - 1; x >= 0; x--) {
                             tempBt = dec(tempBt, (int[]) thirdKeyBt.get(x));
                         }
+                    }
+                    if (null != secondKeyBt) {
                         for (y = secondLength - 1; y >= 0; y--) {
                             tempBt = dec(tempBt, (int[]) secondKeyBt.get(y));
                         }
+                    }
+                    if (null != firstKeyBt) {
                         for (z = firstLength - 1; z >= 0; z--) {
                             tempBt = dec(tempBt, (int[]) firstKeyBt.get(z));
                         }
+                    }
                     decByte = tempBt;
                 } else {
                     if (firstKey != null && firstKey != "" && secondKey != null && secondKey != "") {
                         int[] tempBt;
                         int x, y, z;
                         tempBt = intByte;
+                        if (null != secondKeyBt) {
                             for (x = secondLength - 1; x >= 0; x--) {
                                 tempBt = dec(tempBt, (int[]) secondKeyBt.get(x));
                             }
+                        }
+                        if (null != firstKeyBt) {
                             for (y = firstLength - 1; y >= 0; y--) {
                                 tempBt = dec(tempBt, (int[]) firstKeyBt.get(y));
                             }
+                        }
                         decByte = tempBt;
                     } else {
                         if (firstKey != null && firstKey != "") {
                             int[] tempBt;
                             int x, y, z;
                             tempBt = intByte;
+                            if (null != firstKeyBt) {
                                 for (x = firstLength - 1; x >= 0; x--) {
                                     tempBt = dec(tempBt, (int[]) firstKeyBt.get(x));
                                 }
+                            }
                             decByte = tempBt;
                         }
                     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/FileUtils.java

@@ -62,10 +62,14 @@ public class FileUtils {
         } catch (Exception ex) {
             ex.printStackTrace();
         } finally {
+            if (null != br) {
                 br.close();
+            }
+            if (null != out) {
                 out.close();
             }
         }
+    }
 
     /**
      * 通过文件服务器——>获取流——>输出——>压缩

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/RandomUtil.java

 package com.yeejoin.amos.fas.business.util;
 
+import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Random;
@@ -12,7 +13,7 @@ public class RandomUtil {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         String newDate = sdf.format(new Date());
         String result = "";
-        Random random = new Random();
+        SecureRandom random = new SecureRandom();
         for (int i = 0; i < 3; i++) {
             result += random.nextInt(10);
         }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/util/DateUtil.java

@@ -402,8 +402,10 @@ public static Time formatStrToTime(String strDate){
 	} catch (Exception e) { 
 	 e.printStackTrace(); 
 	}
-	Time date = new Time(d.getTime()); 
-	return date;
+	if (null != d) {
+		return new Time(d.getTime());
+	}
+	return null;
 }
 
 /**