修复代码4

ipfcst-common/ipfcst-common-security/src/main/java/com/jiayue/ipfcst/common/security/util/JwtTokenUtil.java

@@ -75,12 +75,14 @@ public class JwtTokenUtil {
      * @return 用户名
      */
     public String getUsernameFromToken(String token) {
-        String username;
+        String username = null;
         try {
             Claims claims = getClaimsFromToken(token);
-            username = claims.getSubject();
+            if (claims!=null){
+                username = claims.getSubject();
+            }
         } catch (Exception e) {
-            username = null;
+            return null;
         }
         return username;
     }
@@ -94,8 +96,11 @@ public class JwtTokenUtil {
     public Boolean isTokenExpired(String token) {
         try {
             Claims claims = getClaimsFromToken(token);
-            Date expiration = claims.getExpiration();
-            return expiration.before(new Date());
+            if (claims!=null){
+                Date expirationDate = claims.getExpiration();
+                return expirationDate.before(new Date());
+            }
+            return true;
         } catch (Exception e) {
             return true;
         }

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/QuartzService.java

@@ -1,5 +1,7 @@
 package com.jiayue.ipfcst.console.service;
 
+import com.jiayue.ipfcst.common.core.exception.BusinessException;
+import com.jiayue.ipfcst.common.data.entity.InverterInfo;
 import com.jiayue.ipfcst.common.data.entity.Quartz;
 import com.jiayue.ipfcst.common.data.repository.QuartzRepository;
 import com.jiayue.ipfcst.common.data.service.BaseService;
@@ -22,10 +24,7 @@ import javax.persistence.criteria.Predicate;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 定时逻辑
@@ -80,9 +79,8 @@ public class QuartzService extends BaseService {
       flag = updateState(qt);
     } catch (Exception e) {
       log.error("系统错误", e);
-    } finally {
-      return flag;
     }
+    return flag;
   }
 
   /**
@@ -99,23 +97,31 @@ public class QuartzService extends BaseService {
         String[] id = ids.split(",");
         if (null != id && id.length > 0) {
           for (String did : id) {
-            Quartz quartz = quartzRepository.findById(Integer.parseInt(did)).get();
+            Optional<Quartz> optional = quartzRepository.findById(Integer.parseInt(did));
+            if (optional.isPresent()) {
+              Quartz quartz = optional.get();
+              deleteJob(quartz.getJobName());
+              quartzRepository.delete(quartz);
+            } else {
+              throw new BusinessException("定时任务不存在!");
+            }
+          }
+        } else {
+          Optional<Quartz> optional = quartzRepository.findById(Integer.parseInt(ids));
+          if (optional.isPresent()) {
+            Quartz quartz = optional.get();
             deleteJob(quartz.getJobName());
             quartzRepository.delete(quartz);
+          } else {
+            throw new BusinessException("定时任务不存在!");
           }
-        } else {
-          Quartz quartz = quartzRepository.findById(Integer.parseInt(ids)).get();
-          deleteJob(quartz.getJobName());
-          quartzRepository.delete(quartz);
-
         }
         flag = true;
       }
     } catch (Exception e) {
       log.error("系统错误", e);
-    } finally {
-      return flag;
     }
+    return flag;
   }
 
   /**
@@ -189,7 +195,7 @@ public class QuartzService extends BaseService {
         scheduleJob(c, quartz.getJobName(), quartz.getStartTime(), quartz.getCronExpression(), null);
       } else {
         scheduleJob(c, quartz.getJobName(), quartz.getStartTime(),
-          Long.valueOf(Integer.parseInt(quartz.getCronExpression()) * 1000), null);
+          Long.valueOf(Integer.parseInt(quartz.getCronExpression()) * 1000L), null);
       }
 
       if (quartz.getJobState().equals("暂停")) {
@@ -206,9 +212,8 @@ public class QuartzService extends BaseService {
 
     } catch (Exception e) {
       log.error("系统错误" + e);
-    } finally {
-      return flag;
     }
+    return flag;
   }
 
   /**

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/IEC102/ServerFor102StandardService.java

@@ -88,7 +88,9 @@ public class ServerFor102StandardService extends Base102Service {
           for (Map.Entry<String, FileMutableInteger> entry : filterMap.entrySet()) {
             fileNameKey = entry.getKey();
             log.info(ctx.channel().remoteAddress() + " - " + "上传文件===>" + entry.getKey());
-            break;
+            if (!fileNameKey.isEmpty()){
+              break;
+            }
           }
         } else {
           // 从待上报的缓存中取一个文件放入次数变量中
@@ -99,7 +101,9 @@ public class ServerFor102StandardService extends Base102Service {
             FileConstant.uploadCountMap.put(entry.getKey(), fileMutableInteger);
             log.info(ctx.channel().remoteAddress() + " - " + "找到文件===>" + entry.getKey());
             fileNameKey = entry.getKey();
-            break;
+            if (!fileNameKey.isEmpty()){
+              break;
+            }
           }
         }
         if ("".equals(fileNameKey)) {

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/E63UploadFileService.java

@@ -106,7 +106,7 @@ public class E63UploadFileService extends BaseUploadFileService {
       try {
         Template template;
         // 获取短期模板
-        if (electricFieldInfo.getElectricFieldTypeEnum().equals("E1")) {
+        if (electricFieldInfo.getElectricFieldTypeEnum().toString().equals("E1")) {
           template = this.velocityEngine.getTemplate(this.vmsPath + "/DQ.vm");
         } else {
           template = this.velocityEngine.getTemplate(this.vmsPath + "/DQ_F.vm");
@@ -147,7 +147,7 @@ public class E63UploadFileService extends BaseUploadFileService {
             //场站装机容量
             velocityContext.put("capacity", electricFieldInfo.getCapacity());
             //系统当前日期
-            if (electricFieldInfo.getElectricFieldTypeEnum().equals("E1")) {
+            if (electricFieldInfo.getElectricFieldTypeEnum().toString().equals("E1")) {
               velocityContext.put("currentTime", DateFormatUtils.format(systemDate, "yyyy-MM-dd_" + "00:00:00"));
             } else {
               velocityContext.put("currentTime", DateFormatUtils.format(systemDate, "yyyy-MM-dd " + "00:00"));
@@ -186,7 +186,7 @@ public class E63UploadFileService extends BaseUploadFileService {
       try {
         Template template;
         // 获取短期模板
-        if (electricFieldInfo.getElectricFieldTypeEnum().equals("E1")) {
+        if (electricFieldInfo.getElectricFieldTypeEnum().toString().equals("E1")) {
           template = this.velocityEngine.getTemplate(this.vmsPath + "/DQ_USE.vm");
         } else {
           template = this.velocityEngine.getTemplate(this.vmsPath + "/DQ_USE_F.vm");
@@ -259,7 +259,7 @@ public class E63UploadFileService extends BaseUploadFileService {
       try {
         Template template;
         // 获取短期模板
-        if (electricFieldInfo.getElectricFieldTypeEnum().equals("E1")) {
+        if (electricFieldInfo.getElectricFieldTypeEnum().toString().equals("E1")) {
           template = this.velocityEngine.getTemplate(this.vmsPath + "/CDQ.vm");
         } else {
           template = this.velocityEngine.getTemplate(this.vmsPath + "/CDQ_F.vm");
@@ -301,7 +301,7 @@ public class E63UploadFileService extends BaseUploadFileService {
             // 场站装机容量
             velocityContext.put("capacity", electricFieldInfo.getCapacity());
             // 系统当前日期
-            if (electricFieldInfo.getElectricFieldTypeEnum().equals("E1")) {
+            if (electricFieldInfo.getElectricFieldTypeEnum().toString().equals("E1")) {
               velocityContext.put("currentTime", DateFormatUtils.format(systemDate, "yyyy-MM-dd_HH:mm" + ":00"));
             } else {
               velocityContext.put("currentTime", DateFormatUtils.format(systemDate, "yyyy-MM-dd HH:mm" + ":00"));
@@ -339,7 +339,7 @@ public class E63UploadFileService extends BaseUploadFileService {
       try {
         Template template;
         // 获取短期模板
-        if (electricFieldInfo.getElectricFieldTypeEnum().equals("E1")) {
+        if (electricFieldInfo.getElectricFieldTypeEnum().toString().equals("E1")) {
           template = this.velocityEngine.getTemplate(this.vmsPath + "/CDQ_USE.vm");
         } else {
           template = this.velocityEngine.getTemplate(this.vmsPath + "/CDQ_USE_F.vm");
@@ -384,7 +384,7 @@ public class E63UploadFileService extends BaseUploadFileService {
             // 场站装机容量
             velocityContext.put("capacity", electricFieldInfo.getCapacity());
             // 系统当前日期
-            if (electricFieldInfo.getElectricFieldTypeEnum().equals("E1")) {
+            if (electricFieldInfo.getElectricFieldTypeEnum().toString().equals("E1")) {
               velocityContext.put("currentTime", DateFormatUtils.format(systemDate, "yyyy-MM-dd_HH:mm" + ":00"));
             } else {
               velocityContext.put("currentTime", DateFormatUtils.format(systemDate, "yyyy-MM-dd HH:mm" + ":00"));
@@ -429,7 +429,7 @@ public class E63UploadFileService extends BaseUploadFileService {
         Long startTime = endTime - 4 * 60 * 1000;
         // 生成上报文件名格式
         Template template;
-        if (electricFieldInfo.getElectricFieldTypeEnum().toString().equals("E1")) {
+        if (electricFieldInfo.getElectricFieldTypeEnum().toString().toString().equals("E1")) {
           // 获取气象站模板
           template = this.velocityEngine.getTemplate(this.vmsPath + "/QXZ.vm");
           fileName = e63UploadFileRuleService.getFileNameRule(electricFieldInfo, "E6", endTime);

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/UploadFileChannelService.java

@@ -2,7 +2,9 @@ package com.jiayue.ipfcst.fileupload.service;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.data.constant.enums.ChannelStatusEnum;
+import com.jiayue.ipfcst.common.data.entity.InverterInfo;
 import com.jiayue.ipfcst.common.data.entity.UploadFileChannel;
 import com.jiayue.ipfcst.common.data.entity.UploadObject;
 import com.jiayue.ipfcst.common.data.repository.UploadFileChannelRepository;
@@ -155,8 +157,11 @@ public class UploadFileChannelService {
   }
 
   public UploadFileChannel getById(Integer id) {
-    Optional<UploadFileChannel> channel = uploadFileChannelRepository.findById(id);
-    return channel.get();
+    Optional<UploadFileChannel> optional = uploadFileChannelRepository.findById(id);
+    if (optional.isPresent()) {
+      return optional.get();
+    }
+    return null;
   }
 
   /**

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/UploadFileLogService.java

@@ -81,7 +81,11 @@ public class UploadFileLogService {
       }
 
       if (uploadObjectId > 0) {
-        UploadObject uploadObject = uploadObjectRepository.findById(uploadObjectId).get();
+        UploadObject uploadObject = null;
+        Optional<UploadObject> optional = uploadObjectRepository.findById(uploadObjectId);
+        if (optional.isPresent()) {
+          uploadObject = optional.get();
+        }
         uploadObjectList.add(uploadObject);
       } else {
         uploadObjectList = uploadObjectRepository.findAll();
@@ -217,65 +221,71 @@ public class UploadFileLogService {
     long et = DateTimeUtil.getMillisecondsSubDay() + 1000 * 60 * 60 * 24 - 1;
     UploadFileLog uploadFileLog = uploadFileLogRepository.findByUploadObjectIdAndFileNameAndCreateTimeBetween(objectId, file.getOriginalFilename(), new Date(st), new Date(et));
     try {
-      UploadObject uploadObject = uploadObjectRepository.findById(objectId).get();
-
-      // 上报文件目录
-      String destFileDir = FileUtil.getFileUploadPath() + File.separator + "process" + File.separator + uploadObject.getObjectNo() + File.separator + fileType;
-      File destDir = new File(destFileDir);
-      if (!destDir.exists()) {// 如果目录不存在则创建目录
-        boolean b = destDir.mkdirs();
-        if (!b) // 如果创建失败则抛出异常
-          throw new RuntimeException(destFileDir + " 目录创建失败");
-      }
+      UploadObject uploadObject;
+      Optional<UploadObject> optional = uploadObjectRepository.findById(objectId);
+      if (optional.isPresent()) {
+        uploadObject = optional.get();
+        // 上报文件目录
+        String destFileDir = FileUtil.getFileUploadPath() + File.separator + "process" + File.separator + uploadObject.getObjectNo() + File.separator + fileType;
+        File destDir = new File(destFileDir);
+        if (!destDir.exists()) {// 如果目录不存在则创建目录
+          boolean b = destDir.mkdirs();
+          if (!b) // 如果创建失败则抛出异常
+            throw new RuntimeException(destFileDir + " 目录创建失败");
+        }
 
-      File destFirFile = new File(destFileDir + File.separator + file.getOriginalFilename());
-      if (destFirFile.exists()) {
-        File reNameFile = new File(destFileDir + File.separator + file.getOriginalFilename() + "（被替换文件）");
-        if (reNameFile.exists()) {
-          reNameFile.delete();
+        File destFirFile = new File(destFileDir + File.separator + file.getOriginalFilename());
+        if (destFirFile.exists()) {
+          File reNameFile = new File(destFileDir + File.separator + file.getOriginalFilename() + "（被替换文件）");
+          if (reNameFile.exists()) {
+            reNameFile.delete();
+          }
+          boolean b = destFirFile.renameTo(reNameFile);
+          if (!b) {
+            return false;
+          }
         }
-        boolean b = destFirFile.renameTo(reNameFile);
-        if (!b) {
-          return false;
+        file.transferTo(destFirFile);
+        if (uploadFileLog == null) {
+          UploadFileLog newUploadFileLog = new UploadFileLog();
+          newUploadFileLog.setUploadObjectId(uploadObject.getId());
+          newUploadFileLog.setUploadObjectName(uploadObject.getUploadObjectName());
+          newUploadFileLog.setUploadObjectNo(uploadObject.getObjectNo());
+          newUploadFileLog.setFileName(file.getOriginalFilename());
+          newUploadFileLog.setFileTypeEnum(FileTypeEnum.valueOf(fileType));
+          newUploadFileLog.setFileStatusEnum(FileStatusEnum.E1);
+          newUploadFileLog.setUploadProtocolEnum(uploadObject.getUploadProtocolEnum());
+          newUploadFileLog.setUploadCounter(0);
+          newUploadFileLog.setUploadFileEndTime(null);
+          newUploadFileLog.setStationCode(uploadObject.getStationCode());
+          newUploadFileLog.setFileRemarks("手动上传文件");
+          uploadFileLog = this.uploadFileLogRepository.save(newUploadFileLog);
+          String readyFileKey = uploadObject.getObjectNo() + "@" + fileType + "@" + file.getOriginalFilename();
+          FileConstant.readyUploadFileMap.put(readyFileKey, newUploadFileLog);
+          FileConstant.fileShouldMomentMap.put(readyFileKey, uploadFileLog.getId());
+          log.info("上报对象编号：" + uploadObject.getObjectNo() + ",上传文件" + file.getOriginalFilename() + "成功");
+        } else {
+          uploadFileLog.setUploadCounter(0);
+          String readyFileKey = uploadObject.getObjectNo() + "@" + fileType + "@" + file.getOriginalFilename();
+          FileConstant.readyUploadFileMap.put(readyFileKey, uploadFileLog);
+          FileConstant.fileShouldMomentMap.put(readyFileKey, uploadFileLog.getId());
+          log.info("上报对象编号：" + uploadObject.getObjectNo() + ",覆盖上传文件" + file.getOriginalFilename() + "成功");
         }
+        ManualUploadLog manualUploadLog = new ManualUploadLog();
+        manualUploadLog.setFileName(uploadFileLog.getFileName());
+        manualUploadLog.setFileTypeEnum(uploadFileLog.getFileTypeEnum());
+        manualUploadLog.setUploadEquipmentID(uploadFileLog.getUploadEquipmentID());
+        manualUploadLog.setUploadObjectId(uploadFileLog.getUploadObjectId());
+        manualUploadLog.setUploadObjectName(uploadFileLog.getUploadObjectName());
+        manualUploadLog.setUploadObjectNo(uploadFileLog.getUploadObjectNo());
+        manualUploadLog.setUploadCatalog(destFileDir);
+        manualUploadLog.setUploadDate(new Date());
+        manualUploadLogRepository.save(manualUploadLog);
+        return true;
       }
-      file.transferTo(destFirFile);
-      if (uploadFileLog == null) {
-        UploadFileLog newUploadFileLog = new UploadFileLog();
-        newUploadFileLog.setUploadObjectId(uploadObject.getId());
-        newUploadFileLog.setUploadObjectName(uploadObject.getUploadObjectName());
-        newUploadFileLog.setUploadObjectNo(uploadObject.getObjectNo());
-        newUploadFileLog.setFileName(file.getOriginalFilename());
-        newUploadFileLog.setFileTypeEnum(FileTypeEnum.valueOf(fileType));
-        newUploadFileLog.setFileStatusEnum(FileStatusEnum.E1);
-        newUploadFileLog.setUploadProtocolEnum(uploadObject.getUploadProtocolEnum());
-        newUploadFileLog.setUploadCounter(0);
-        newUploadFileLog.setUploadFileEndTime(null);
-        newUploadFileLog.setStationCode(uploadObject.getStationCode());
-        newUploadFileLog.setFileRemarks("手动上传文件");
-        uploadFileLog = this.uploadFileLogRepository.save(newUploadFileLog);
-        String readyFileKey = uploadObject.getObjectNo() + "@" + fileType + "@" + file.getOriginalFilename();
-        FileConstant.readyUploadFileMap.put(readyFileKey, newUploadFileLog);
-        FileConstant.fileShouldMomentMap.put(readyFileKey, uploadFileLog.getId());
-        log.info("上报对象编号：" + uploadObject.getObjectNo() + ",上传文件" + file.getOriginalFilename() + "成功");
-      } else {
-        uploadFileLog.setUploadCounter(0);
-        String readyFileKey = uploadObject.getObjectNo() + "@" + fileType + "@" + file.getOriginalFilename();
-        FileConstant.readyUploadFileMap.put(readyFileKey, uploadFileLog);
-        FileConstant.fileShouldMomentMap.put(readyFileKey, uploadFileLog.getId());
-        log.info("上报对象编号：" + uploadObject.getObjectNo() + ",覆盖上传文件" + file.getOriginalFilename() + "成功");
+      else{
+        return false;
       }
-      ManualUploadLog manualUploadLog = new ManualUploadLog();
-      manualUploadLog.setFileName(uploadFileLog.getFileName());
-      manualUploadLog.setFileTypeEnum(uploadFileLog.getFileTypeEnum());
-      manualUploadLog.setUploadEquipmentID(uploadFileLog.getUploadEquipmentID());
-      manualUploadLog.setUploadObjectId(uploadFileLog.getUploadObjectId());
-      manualUploadLog.setUploadObjectName(uploadFileLog.getUploadObjectName());
-      manualUploadLog.setUploadObjectNo(uploadFileLog.getUploadObjectNo());
-      manualUploadLog.setUploadCatalog(destFileDir);
-      manualUploadLog.setUploadDate(new Date());
-      manualUploadLogRepository.save(manualUploadLog);
-      return true;
     } catch (IOException e) {
       log.info("手动上传上报文件发生错误！");
       e.printStackTrace();
@@ -291,8 +301,11 @@ public class UploadFileLogService {
       Optional<UploadFileLog> uploadFileLogOptional = uploadFileLogRepository.findById(id);
       if (uploadFileLogOptional.isPresent()) {
         UploadFileLog uploadFileLog = uploadFileLogOptional.get();
-        UploadObject uploadObject = uploadObjectRepository.findById(uploadFileLog.getUploadObjectId()).get();
-
+        UploadObject uploadObject = null;
+        Optional<UploadObject> optional = uploadObjectRepository.findById(uploadFileLog.getUploadObjectId());
+        if (optional.isPresent()) {
+          uploadObject = optional.get();
+        }
         // 上报文件目录
         String destFileDir = FileUtil.getFileUploadPath() + File.separator + "process" + File.separator + uploadObject.getObjectNo() + File.separator + uploadFileLog.getFileTypeEnum().name();
         File destDir = new File(destFileDir);