将之前方案生成1个镜像文件，更改为每个信息1个文件。修改console启动和controller切面内容。封装获取镜像文件公共方法。

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/util/CommonDataUtil.java

@@ -2,6 +2,9 @@ package com.jiayue.ipfcst.common.data.util;
 
 import cn.hutool.core.util.CharsetUtil;
 import com.alibaba.fastjson.JSON;
+import com.jiayue.ipfcst.common.core.util.JsonBeanUtil;
+import com.jiayue.ipfcst.common.data.entity.PvModuleModel;
+import com.jiayue.ipfcst.common.data.entity.UploadFileCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ResourceUtils;
 
@@ -13,6 +16,7 @@ import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,17 +31,24 @@ public class CommonDataUtil {
    * 读取基础镜像文件公共方法
    * @throws Exception
    */
-  public static Map<String,String> readBaseInfoImage() throws Exception {
+  public static List<? extends Object> readBaseInfoImage(String imageName) throws Exception {
     String imageFilePath = getImageFilePath();
-    Map<String,String> map = new HashMap();
-    try (BufferedReader reader = new BufferedReader(new FileReader(imageFilePath+File.separator+"BaseInfoImage.txt"))) {
+    String path = "com.jiayue.ipfcst.common.data.entity.";
+    if (imageName.startsWith("FileParse")|| imageName.startsWith("Gather")){
+      path = path+"gathertunnelinfo.";
+    }
+    else if (imageName.startsWith("Sender")){
+      path = path+"sendertunnelinfo.";
+    }
+    Class clazz = Class.forName(path+imageName);
+    try (BufferedReader reader = new BufferedReader(new FileReader(imageFilePath+File.separator+imageName+".txt"))) {
       String line;
       while ((line = reader.readLine()) != null) {
         String[] spval = line.split(":::");
-        map.put(spval[0],spval[1]);
+        return JsonBeanUtil.jsonToBean(spval[1], clazz.newInstance().getClass());
       }
     }
-    return map;
+    return null;
   }
 
   /**
@@ -229,14 +240,15 @@ public class CommonDataUtil {
   }
 
   public static void main(String[] args) throws Exception{
-    String json="{\"area\":123,\"stationCode\":\"T00001\",\"stationStatusEnum\":\"E1\",\"altitude\":123,\"electricFieldTypeEnum\":\"E1\",\"creator\":\"admin\",\"latitude\":44.15,\"sign\":\"T00001\",\"provinceEnum\":\"E16\",\"capacity\":30,\"gridCE\":30,\"createTime\":1711343781634,\"name\":\"沈阳嘉越光伏场站\",\"netSubstationName\":\"T00001\",\"interval\":60,\"company\":\"测试\",\"location\":\"测试\",\"longitude\":118.55}";
-    String keyss = "ElectricField";
-
-    String resumeName = keyss.getClass().getCanonicalName();
-    Class newClass = Class.forName(resumeName);
-    Object obj = JSON.parseObject(json, newClass);
+//    String json="{\"area\":123,\"stationCode\":\"T00001\",\"stationStatusEnum\":\"E1\",\"altitude\":123,\"electricFieldTypeEnum\":\"E1\",\"creator\":\"admin\",\"latitude\":44.15,\"sign\":\"T00001\",\"provinceEnum\":\"E16\",\"capacity\":30,\"gridCE\":30,\"createTime\":1711343781634,\"name\":\"沈阳嘉越光伏场站\",\"netSubstationName\":\"T00001\",\"interval\":60,\"company\":\"测试\",\"location\":\"测试\",\"longitude\":118.55}";
+//    String keyss = "ElectricField";
+//
+//    String resumeName = keyss.getClass().getCanonicalName();
+//    Class newClass = Class.forName(resumeName);
+//    Object obj = JSON.parseObject(json, newClass);
+//
+//    System.out.println(obj.toString());
 
-    System.out.println(obj.toString());
 
   }
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/aop/BaseInfoImage.java

@@ -9,4 +9,8 @@ import java.lang.annotation.*;
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface BaseInfoImage {
+  /**
+   * 模块
+   */
+  public String title() default "";
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/aop/BaseInfoImageAspect.java

@@ -1,32 +1,13 @@
 package com.jiayue.ipfcst.aop;
 
 import com.alibaba.fastjson.JSONObject;
-import com.jiayue.ipfcst.common.core.util.SpringContextHolder;
-import com.jiayue.ipfcst.common.data.constant.enums.ElectricFieldStatrsEnum;
-import com.jiayue.ipfcst.common.data.entity.ElectricField;
 import com.jiayue.ipfcst.console.service.BaseInfoImageService;
-import com.jiayue.ipfcst.console.service.ElectricFieldService;
-import com.jiayue.ipfcst.fileupload.util.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileWriter;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * service层aop，根据注解确定哪些方法需要执行某些操作
@@ -41,21 +22,16 @@ public class BaseInfoImageAspect {
   @Autowired
   BaseInfoImageService baseInfoImageService;
 
-    @Pointcut("@annotation(com.jiayue.ipfcst.aop.BaseInfoImage)")
-    public void aroundPoinCut() {
-    }
-
-    @AfterReturning(value = "aroundPoinCut()",returning = "methodResult")
-    public Object afterReturningPublish(JoinPoint joinPoint, Object methodResult) throws Throwable {
-        log.info("----------------------------------进入BaseInfoImage拦截器-----------------------------------------------");
+    @AfterReturning(pointcut = "@annotation(baseInfoImage)",returning = "methodResult")
+    public Object afterReturningPublish(JoinPoint joinPoint, BaseInfoImage baseInfoImage, Object methodResult) throws Throwable {
+      log.info("----------------------------------进入BaseInfoImage拦截器-----------------------------------------------");
       String returnJson = JSONObject.toJSONString(methodResult);
-//      Object[] args = joinPoint.getArgs();
-
       try {
-          baseInfoImageService.generateBaseInfoImage();
-        } catch (Exception e) {
-            log.error("拦截器生成基础镜像信息异常", e);
-        }
-        return returnJson;
+        String title = baseInfoImage.title();
+        baseInfoImageService.generateBaseInfoImageByTitle(title);
+      } catch (Exception e) {
+          log.error("拦截器生成基础镜像信息异常", e);
+      }
+      return returnJson;
     }
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/AGC_AVCInfoController.java

@@ -38,7 +38,7 @@ public class AGC_AVCInfoController {
   * 保存
   * */
   @PostMapping
-  @BaseInfoImage
+  @BaseInfoImage(title = "AgcAvcInfo")
   public ResponseVO save(@RequestBody AGC_AVCInfo agc_avcInfo){
     agcAvcInfoService.save(agc_avcInfo);
     return ResponseVO.success(1);
@@ -48,7 +48,7 @@ public class AGC_AVCInfoController {
   * 更新
   * */
   @PutMapping
-  @BaseInfoImage
+  @BaseInfoImage(title = "AgcAvcInfo")
   public ResponseVO update(@RequestBody AGC_AVCInfo agc_avcInfo){
     agcAvcInfoService.save(agc_avcInfo);
     return ResponseVO.success(1);
@@ -58,7 +58,7 @@ public class AGC_AVCInfoController {
   * 删除
   * */
   @DeleteMapping("/{id}")
-  @BaseInfoImage
+  @BaseInfoImage(title = "AgcAvcInfo")
   public ResponseVO delete(@PathVariable String id) throws BusinessException {
     agcAvcInfoService.delete(Integer.parseInt(id));
     return ResponseVO.success(1);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/BoosterStationInfoController.java

@@ -38,7 +38,7 @@ public class BoosterStationInfoController {
   * 保存
   * */
   @PostMapping
-  @BaseInfoImage
+  @BaseInfoImage(title = "BoosterStationInfo")
   public ResponseVO save(@RequestBody BoosterStationInfo boosterStationInfo){
     boosterStationInfoService.save(boosterStationInfo);
     return ResponseVO.success(1);
@@ -48,7 +48,7 @@ public class BoosterStationInfoController {
   * 更新
   * */
   @PutMapping
-  @BaseInfoImage
+  @BaseInfoImage(title = "BoosterStationInfo")
   public ResponseVO update(@RequestBody BoosterStationInfo boosterStationInfo){
     boosterStationInfoService.save(boosterStationInfo);
     return ResponseVO.success(1);
@@ -58,7 +58,7 @@ public class BoosterStationInfoController {
   * 删除
   * */
   @DeleteMapping("/{id}")
-  @BaseInfoImage
+  @BaseInfoImage(title = "BoosterStationInfo")
   public ResponseVO delete(@PathVariable String id) throws BusinessException {
     boosterStationInfoService.delete(Integer.parseInt(id));
     return ResponseVO.success(1);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ElectricFieldController.java

@@ -122,7 +122,7 @@ public class ElectricFieldController {
      */
     @PostMapping(value = "/")
     @SaveValidate
-    @BaseInfoImage
+    @BaseInfoImage(title = "ElectricField")
     public ResponseVO saveElectricField(@RequestBody ElectricField electricField) {
         try {
             electricFieldService.update(electricField);
@@ -144,7 +144,7 @@ public class ElectricFieldController {
      */
     @PutMapping(value = "/")
     @SaveValidate
-    @BaseInfoImage
+    @BaseInfoImage(title = "ElectricField")
     public ResponseVO updateElectricField(@RequestBody ElectricField electricField) {
         try {
             this.electricFieldService.update(electricField);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/InverterInfoController.java

@@ -64,7 +64,7 @@ public class InverterInfoController {
      */
     @SaveValidate
     @PostMapping(value = "inverterInfo/")
-    @BaseInfoImage
+    @BaseInfoImage(title = "InverterInfo")
     public ResponseVO saveInverter(@RequestBody InverterInfo inverterInfo) {
         try {
             inverterInfoService.save(inverterInfo);
@@ -85,7 +85,7 @@ public class InverterInfoController {
      */
     @SaveValidate
     @PostMapping(value = "inverterInfo/saveAll/{startValue}/{endValue}")
-    @BaseInfoImage
+    @BaseInfoImage(title = "InverterInfo")
     public ResponseVO allSaveInverter(@RequestBody InverterInfo inverterInfo,@PathVariable("startValue") Integer startValue,@PathVariable("endValue") Integer endValue) {
         try {
           inverterInfoService.addALL(inverterInfo,startValue,endValue);
@@ -106,7 +106,7 @@ public class InverterInfoController {
      */
     @SaveValidate
     @PutMapping(value = "inverterInfo/")
-    @BaseInfoImage
+    @BaseInfoImage(title = "InverterInfo")
     public ResponseVO updateInverter(@RequestBody InverterInfo inverterInfo) {
         try {
             inverterInfoService.save(inverterInfo);
@@ -128,7 +128,7 @@ public class InverterInfoController {
      */
     @SaveValidate
     @DeleteMapping(value = "inverterInfo/{ids}")
-    @BaseInfoImage
+    @BaseInfoImage(title = "InverterInfo")
     public ResponseVO deleteInverter(@PathVariable("ids") String ids) {
         try {
             inverterInfoService.delete(ids);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/OverHaulOlanController.java

@@ -1,5 +1,6 @@
 package com.jiayue.ipfcst.console.controller;
 
+import com.jiayue.ipfcst.aop.BaseInfoImage;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
@@ -37,6 +38,7 @@ public class OverHaulOlanController {
    */
 
   @PostMapping
+  @BaseInfoImage(title = "OverhaulPlan")
   public ResponseVO insert(@RequestBody OverhaulPlan overhaulPlan){
     this.overHaulPlanService.add(overhaulPlan);
     return ResponseVO.success(1);
@@ -46,6 +48,7 @@ public class OverHaulOlanController {
    * 修改 检修计划接口
    */
   @PutMapping
+  @BaseInfoImage(title = "OverhaulPlan")
   public ResponseVO update(@RequestBody OverhaulPlan overhaulPlan) throws BusinessException {
     this.overHaulPlanService.save(overhaulPlan);
     return ResponseVO.success(1);
@@ -57,6 +60,7 @@ public class OverHaulOlanController {
    * @return 操作结果
    */
   @DeleteMapping
+  @BaseInfoImage(title = "OverhaulPlan")
   public ResponseVO delete(@RequestBody OverhaulPlan overhaulPlan){
     this.overHaulPlanService.delete(overhaulPlan.getId());
     return ResponseVO.success(1);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/PvModuleModelController.java

@@ -86,7 +86,7 @@ public class PvModuleModelController {
      */
     @SaveValidate
     @PostMapping(value = "pvModuleModel/")
-    @BaseInfoImage
+    @BaseInfoImage(title = "PvModuleModel")
     public ResponseVO savePvModuleModel(@RequestBody PvModuleModel pvModuleModel) {
         try {
             pvModuleModelService.save(pvModuleModel);
@@ -107,7 +107,7 @@ public class PvModuleModelController {
      */
     @SaveValidate
     @PutMapping(value = "pvModuleModel/")
-    @BaseInfoImage
+    @BaseInfoImage(title = "PvModuleModel")
     public ResponseVO updatePvModuleModel(@RequestBody PvModuleModel pvModuleModel) {
         try {
             pvModuleModelService.save(pvModuleModel);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/QuartzController.java

@@ -1,5 +1,6 @@
 package com.jiayue.ipfcst.console.controller;
 
+import com.jiayue.ipfcst.aop.BaseInfoImage;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.entity.Quartz;
@@ -43,6 +44,7 @@ public class QuartzController {
     @SaveValidate
     @SneakyThrows
     @PostMapping(value = "quartzs")
+    @BaseInfoImage(title = "Quartz")
     public ResponseVO addQuartz(@RequestBody final Quartz qt) {
         final Quartz quartz = quartzService.findByClass(qt.getExecuteClass());
         if (null != quartz) {
@@ -67,6 +69,7 @@ public class QuartzController {
     @SaveValidate
     @SneakyThrows
     @PutMapping(value = "quartzs")
+    @BaseInfoImage(title = "Quartz")
     public ResponseVO stateQuartz(@RequestBody final Quartz qt) {
         final boolean flag = quartzService.save(qt);
         if (flag) {
@@ -84,6 +87,7 @@ public class QuartzController {
      */
     @SneakyThrows
     @RequestMapping(value = "quartzs/delete/{ids}", method = RequestMethod.DELETE)
+    @BaseInfoImage(title = "Quartz")
     public ResponseVO deleteQuartzById(@PathVariable final String ids) {
         if (quartzService.deleteById(ids)) {
             return ResponseVO.success("删除成功!");

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SubsidiaryEquipmentInfoController.java

@@ -39,7 +39,7 @@ public class SubsidiaryEquipmentInfoController {
   * 保存
   * */
   @PostMapping
-  @BaseInfoImage
+  @BaseInfoImage(title = "SubsidiaryEquipmentInfo")
   public ResponseVO save(@RequestBody SubsidiaryEquipmentInfo subsidiaryEquipmentInfo){
     subsidiaryEquipmentInfoService.save(subsidiaryEquipmentInfo);
     return ResponseVO.success(1);
@@ -49,7 +49,7 @@ public class SubsidiaryEquipmentInfoController {
   * 更新
   * */
   @PutMapping
-  @BaseInfoImage
+  @BaseInfoImage(title = "SubsidiaryEquipmentInfo")
   public ResponseVO update(@RequestBody SubsidiaryEquipmentInfo subsidiaryEquipmentInfo){
     subsidiaryEquipmentInfoService.save(subsidiaryEquipmentInfo);
     return ResponseVO.success(1);
@@ -59,7 +59,7 @@ public class SubsidiaryEquipmentInfoController {
   * 删除
   * */
   @DeleteMapping("/{id}")
-  @BaseInfoImage
+  @BaseInfoImage(title = "SubsidiaryEquipmentInfo")
   public ResponseVO delete(@PathVariable String id) throws BusinessException {
     subsidiaryEquipmentInfoService.delete(Integer.parseInt(id));
     return ResponseVO.success(1);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/SysParameterController.java

@@ -1,5 +1,6 @@
 package com.jiayue.ipfcst.console.controller;
 
+import com.jiayue.ipfcst.aop.BaseInfoImage;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.RequestVO;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
@@ -42,6 +43,7 @@ public class SysParameterController {
     @SneakyThrows
     @PostMapping()
     @SaveValidate
+    @BaseInfoImage(title = "SysParameter")
     public ResponseVO add(@RequestBody SysParameter sysParameter) {
       try {
         this.sysParameterService.add(sysParameter);
@@ -62,6 +64,7 @@ public class SysParameterController {
     @SneakyThrows
     @SaveValidate
     @PutMapping()
+    @BaseInfoImage(title = "SysParameter")
     public ResponseVO update(@RequestBody SysParameter sysParameter) {
       this.sysParameterService.update(sysParameter);
       return ResponseVO.success(1);
@@ -76,6 +79,7 @@ public class SysParameterController {
     @SneakyThrows
     @SaveValidate
     @DeleteMapping()
+    @BaseInfoImage(title = "SysParameter")
     public ResponseVO delete(@RequestBody SysParameter sysParameter) {
       this.sysParameterService.delete(sysParameter.getId());
       return ResponseVO.success(1);
@@ -159,6 +163,7 @@ public class SysParameterController {
    */
   @SneakyThrows
   @PostMapping("/noSaveValidate")
+  @BaseInfoImage(title = "SysParameter")
   public ResponseVO save(@RequestBody SysParameter sysParameter) {
     try {
       this.sysParameterService.update(sysParameter);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/WeatherStationInfoController.java

@@ -42,7 +42,7 @@ public class WeatherStationInfoController {
     @SneakyThrows
     @SaveValidate
     @PostMapping()
-    @BaseInfoImage
+    @BaseInfoImage(title = "WeatherStationInfo")
     public ResponseVO add(@RequestBody WeatherStationInfo weatherStationInfo) {
       try {
         this.weatherStationInfoService.add(weatherStationInfo);
@@ -64,7 +64,7 @@ public class WeatherStationInfoController {
     @SneakyThrows
     @SaveValidate
     @PutMapping()
-    @BaseInfoImage
+    @BaseInfoImage(title = "WeatherStationInfo")
     public ResponseVO update(@RequestBody WeatherStationInfo weatherStationInfo) {
       try {
         this.weatherStationInfoService.update(weatherStationInfo);
@@ -104,7 +104,7 @@ public class WeatherStationInfoController {
     @SneakyThrows
     @SaveValidate
     @DeleteMapping("/{id}")
-    @BaseInfoImage
+    @BaseInfoImage(title = "WeatherStationInfo")
     public ResponseVO delete(@PathVariable Integer id) {
       try {
         this.weatherStationInfoService.delete(id);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/WindTowerInfoController.java

@@ -40,7 +40,7 @@ import java.util.List;
     @SneakyThrows
     @SaveValidate
     @PostMapping()
-    @BaseInfoImage
+    @BaseInfoImage(title = "WindTowerInfo")
     public ResponseVO add(@RequestBody WindTowerInfo windTowerInfo) {
         try {
             this.windTowerInfoService.add(windTowerInfo);
@@ -61,7 +61,7 @@ import java.util.List;
     @SneakyThrows
     @SaveValidate
     @PutMapping()
-    @BaseInfoImage
+    @BaseInfoImage(title = "WindTowerInfo")
     public ResponseVO update(@RequestBody WindTowerInfo windTowerInfo) {
         this.windTowerInfoService.update(windTowerInfo);
         return ResponseVO.success(1);
@@ -76,7 +76,7 @@ import java.util.List;
     @SneakyThrows
     @SaveValidate
     @DeleteMapping("/{id}")
-    @BaseInfoImage
+    @BaseInfoImage(title = "WindTowerInfo")
     public ResponseVO delete(@PathVariable Integer id) {
         this.windTowerInfoService.delete(id);
         return ResponseVO.success(1);

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/WindTurbineInfoController.java

@@ -44,7 +44,7 @@ public class WindTurbineInfoController {
     @SneakyThrows
     @SaveValidate
     @PostMapping()
-    @BaseInfoImage
+    @BaseInfoImage(title = "WindTurbineInfo")
     public ResponseVO add(@RequestBody WindTurbineInfo windTurbineInfo) {
         this.windTurbineInfoService.add(windTurbineInfo);
         return ResponseVO.success(1);
@@ -59,7 +59,7 @@ public class WindTurbineInfoController {
     @SneakyThrows
     @SaveValidate
     @PutMapping()
-    @BaseInfoImage
+    @BaseInfoImage(title = "WindTurbineInfo")
     public ResponseVO update(@RequestBody WindTurbineInfo windTurbineInfo) {
         this.windTurbineInfoService.update(windTurbineInfo);
         return ResponseVO.success(1);
@@ -87,7 +87,7 @@ public class WindTurbineInfoController {
     @SneakyThrows
     @SaveValidate
     @DeleteMapping("/{id}")
-    @BaseInfoImage
+    @BaseInfoImage(title = "WindTurbineInfo")
     public ResponseVO delete(@PathVariable Integer id) {
         this.windTurbineInfoService.delete(id);
         return ResponseVO.success(1);
@@ -130,7 +130,7 @@ public class WindTurbineInfoController {
    */
   @SaveValidate
   @PostMapping(value = "/saveAll/{startValue}/{endValue}")
-  @BaseInfoImage
+  @BaseInfoImage(title = "WindTurbineInfo")
   public ResponseVO allSaveWindTurbineInfo(@RequestBody WindTurbineInfo windTurbineInfo, @PathVariable("startValue") Integer startValue, @PathVariable("endValue") Integer endValue) {
     try {
       windTurbineInfoService.addALL(windTurbineInfo,startValue,endValue);
@@ -150,7 +150,7 @@ public class WindTurbineInfoController {
    */
   @SaveValidate
   @DeleteMapping(value = "/deleteIds/{ids}")
-  @BaseInfoImage
+  @BaseInfoImage(title = "WindTurbineInfo")
   public ResponseVO deleteWindTurbineInfo(@PathVariable("ids") String ids) {
     try {
       windTurbineInfoService.delete(ids);

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

@@ -7,7 +7,6 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.FileWriter;
-import java.util.List;
 
 /**
  * 生成镜像文件服务类
@@ -19,9 +18,130 @@ import java.util.List;
 public class BaseInfoImageService {
   @Autowired
   ElectricFieldService electricFieldService;
+
   public void generateBaseInfoImage() throws Exception{
-    ElectricField electricField = electricFieldService.get();
-    List<String> list = electricFieldService.queryAllParamsFromDb(electricField);
+    String[] titleList = {"ElectricField","PvModuleModel","OverhaulPlan","InverterInfo","WeatherStationInfo","WindTowerInfo","WindTurbineInfo",
+      "Quartz","SysParameter","UploadObject","UploadFileChannel","UploadFileCode","UploadURL","EquipmentAttribute","TunnelInfo","DataPoint","AgcAvcInfo",
+      "BoosterStationInfo","SubsidiaryEquipmentInfo"};
+
+    for (String title:titleList){
+      generateBaseInfoImageByTitle(title);
+    }
+  }
+
+  /**
+   * 根据title名字生成镜像文件
+   * @param title
+   * @throws Exception
+   */
+  public void generateBaseInfoImageByTitle(String title) throws Exception{
+    // 根据title获取数据
+    ElectricField electricField = electricFieldService.getElectricField();
+    String header = electricField.getStationCode();
+    String fileContent = "";
+    if ("ElectricField".equals(title)){
+      fileContent = electricFieldService.getElectricField(electricField);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("PvModuleModel".equals(title)){
+      fileContent = electricFieldService.getPvModuleModel(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("OverhaulPlan".equals(title)){
+      fileContent = electricFieldService.getOverhaulPlan(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("InverterInfo".equals(title)){
+      fileContent = electricFieldService.getInverterInfo(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("WeatherStationInfo".equals(title)){
+      fileContent = electricFieldService.getWeatherStationInfo(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("WindTowerInfo".equals(title)){
+      fileContent = electricFieldService.getWindTowerInfo(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("WindTurbineInfo".equals(title)){
+      fileContent = electricFieldService.getWindTurbineInfo(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("Quartz".equals(title)){
+      fileContent = electricFieldService.getQuartz(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("SysParameter".equals(title)){
+      fileContent = electricFieldService.getSysParameter(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("UploadObject".equals(title)){
+      fileContent = electricFieldService.getUploadObject(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("UploadFileChannel".equals(title)){
+      fileContent = electricFieldService.getUploadFileChannel(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("UploadFileCode".equals(title)){
+      fileContent = electricFieldService.getUploadFileCode(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("UploadURL".equals(title)){
+      fileContent = electricFieldService.getUploadURL(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("EquipmentAttribute".equals(title)){
+      fileContent = electricFieldService.getEquipmentAttribute(header);
+      generateBaseInfoImageByTitle(title,fileContent);
+    }
+    else if ("TunnelInfo".equals(title)){
+      fileContent = electricFieldService.getFileParseTunnelInfo(header);
+      generateBaseInfoImageByTitle("FileParseTunnelInfo",fileContent);
+      fileContent = electricFieldService.getGather104TcpTunnelInfo(header);
+      generateBaseInfoImageByTitle("Gather104TcpTunnelInfo",fileContent);
+      fileContent = electricFieldService.getGatherCdtRtuTunnelInfo(header);
+      generateBaseInfoImageByTitle("GatherCdtRtuTunnelInfo",fileContent);
+      fileContent = electricFieldService.getGatherModbusRtuTunnelInfo(header);
+      generateBaseInfoImageByTitle("GatherModbusRtuTunnelInfo",fileContent);
+      fileContent = electricFieldService.getGatherModbusTcpTunnelInfo(header);
+      generateBaseInfoImageByTitle("GatherModbusTcpTunnelInfo",fileContent);
+      fileContent = electricFieldService.getGatherModbusRtuWithTcpServerTunnelInfo(header);
+      generateBaseInfoImageByTitle("GatherModbusRtuWithTcpServerTunnelInfo",fileContent);
+      fileContent = electricFieldService.getSender104TcpTunnelInfo(header);
+      generateBaseInfoImageByTitle("Sender104TcpTunnelInfo",fileContent);
+      fileContent = electricFieldService.getSenderCdtRtuTunnelInfo(header);
+      generateBaseInfoImageByTitle("SenderCdtRtuTunnelInfo",fileContent);
+      fileContent = electricFieldService.getSenderModbusRtuTunnelInfo(header);
+      generateBaseInfoImageByTitle("SenderModbusRtuTunnelInfo",fileContent);
+      fileContent = electricFieldService.getSenderModbusTcpTunnelInfo(header);
+      generateBaseInfoImageByTitle("SenderModbusTcpTunnelInfo",fileContent);
+      fileContent = electricFieldService.getWeatherStationInfo(header);
+      generateBaseInfoImageByTitle("WeatherStationInfo",fileContent);
+      fileContent = electricFieldService.getWindTowerInfo(header);
+      generateBaseInfoImageByTitle("WindTowerInfo",fileContent);
+    }
+    else if ("DataPoint".equals(title)){
+      fileContent = electricFieldService.getProtocolSenderDataPoint(header);
+      generateBaseInfoImageByTitle("ProtocolSenderDataPoint",fileContent);
+      fileContent = electricFieldService.getProtocolGatherDataPoint(header);
+      generateBaseInfoImageByTitle("ProtocolGatherDataPoint",fileContent);
+    }
+    else if ("AgcAvcInfo".equals(title)){
+      fileContent = electricFieldService.getAGC_AVCInfo(header);
+      generateBaseInfoImageByTitle("AgcAvcInfo",fileContent);
+    }
+    else if ("BoosterStationInfo".equals(title)){
+      fileContent = electricFieldService.getBoosterStationInfo(header);
+      generateBaseInfoImageByTitle("BoosterStationInfo",fileContent);
+    }
+    else if ("SubsidiaryEquipmentInfo".equals(title)){
+      fileContent = electricFieldService.getSubsidiaryEquipmentInfo(header);
+      generateBaseInfoImageByTitle("SubsidiaryEquipmentInfo",fileContent);
+    }
+  }
+
+  public void generateBaseInfoImageByTitle(String title, String fileContent) throws Exception{
     String destFileDir = FileUtil.getImageFilePath();
     File destDir = new File(destFileDir);
     if (!destDir.exists()) {// 如果目录不存在则创建uploadFileEndTime目录
@@ -32,14 +152,13 @@ public class BaseInfoImageService {
     }
 
     // 先删除本地镜像文件
-    File BaseInfoImageFile = new File(destFileDir+File.separator + "BaseInfoImage.txt");
+    File BaseInfoImageFile = new File(destFileDir+File.separator + title+".txt");
     BaseInfoImageFile.delete();
-    // 生成新的镜像文件
-    try(FileWriter writer = new FileWriter(BaseInfoImageFile)){
-      // 增加文件
-      for (String str:list){
-        writer.write(str);
-        writer.write(System.getProperty("line.separator"));
+    if (!"".equals(fileContent)){
+      // 生成新的镜像文件
+      try(FileWriter writer = new FileWriter(BaseInfoImageFile)){
+        // 增加文件
+        writer.write(fileContent);
       }
     }
   }

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

@@ -203,297 +203,502 @@ public class ElectricFieldService extends BaseService {
     return electricField;
   }
 
-  public List<String> queryAllParamsFromDb(ElectricField electricField) throws Exception{
-    String header = electricField.getStationCode();
-    List<String> valList = new ArrayList<>();
+  public String getElectricField(ElectricField electricField){
     //场站信息
     List<ElectricField> electricFields = new ArrayList<>();
     electricFields.add(electricField);
     String val = "ElectricField:::" + JsonBeanUtil.beanToJson(electricFields);
-    valList.add(val);
+    return val;
+  }
 
+  public String getPvModuleModel(String header){
     //光伏组件信息
     List<PvModuleModel> pvModuleModelList = pvModuleModelService.getAll();
+    String val = "";
     if (null != pvModuleModelList && pvModuleModelList.size() > 0) {
       for (PvModuleModel bean : pvModuleModelList) {
         bean.setStationCode(header);
       }
       val = "PvModuleModel:::" + JsonBeanUtil.beanToJson(pvModuleModelList);
-      valList.add(val);
     }
+    return val;
+  }
+
+  public String getOverhaulPlan(String header){
     //检修计划
     List<OverhaulPlan> overhaulPlanList = overHaulPlanService.getAll();
+    String val = "";
     if (null != overhaulPlanList && overhaulPlanList.size() > 0) {
       for (OverhaulPlan bean : overhaulPlanList) {
         bean.setStationCode(header);
       }
       val = "OverhaulPlan:::" + JsonBeanUtil.beanToJson(overhaulPlanList);
-      valList.add(val);
     }
+    return val;
+  }
+
+  public String getInverterInfo(String header){
     //逆变器信息
     List<InverterInfo> inverterInfoList = inverterInfoService.getAll();
+    String val = "";
     if (null != inverterInfoList && inverterInfoList.size() > 0) {
       for (InverterInfo bean : inverterInfoList) {
         bean.setStationCode(header);
       }
       val = "InverterInfo:::" + JsonBeanUtil.beanToJson(inverterInfoList);
-      valList.add(val);
     }
+    return val;
+  }
+
+  public String getWeatherStationInfo(String header){
     //气象站数据
     List<WeatherStationInfo> weatherStationInfoList = weatherStationInfoService.getAll();
+    String val = "";
     if (null != weatherStationInfoList && weatherStationInfoList.size() > 0) {
       for (WeatherStationInfo bean : weatherStationInfoList) {
         bean.setStationCode(header);
       }
       val = "WeatherStationInfo:::" + JsonBeanUtil.beanToJson(weatherStationInfoList);
-      valList.add(val);
     }
+    return val;
+  }
+
+  public String getWindTowerInfo(String header){
     //测风塔
     List<WindTowerInfo> windTowerInfoList = windTowerInfoService.getAll();
+    String val = "";
     if (null != windTowerInfoList && windTowerInfoList.size() > 0) {
       for (WindTowerInfo bean : windTowerInfoList) {
         bean.setStationCode(header);
       }
       val = "WindTowerInfo:::" + JsonBeanUtil.beanToJson(windTowerInfoList);
-      valList.add(val);
     }
+    return val;
+  }
+
+  public String getWindTurbineInfo(String header){
     //风机
     List<WindTurbineInfo> windTurbineInfoList = windTurbineInfoService.getAll();
+    String val = "";
     if (null != windTurbineInfoList && windTurbineInfoList.size() > 0) {
       for (WindTurbineInfo bean : windTurbineInfoList) {
         bean.setStationCode(header);
       }
       val = "WindTurbineInfo:::" + JsonBeanUtil.beanToJson(windTurbineInfoList);
-      valList.add(val);
     }
+    return val;
+  }
+
+  public String getInitJobClass(String header){
     //初始化定时任务
     List<InitJobClass> initJobClassList = initJobClassService.findAll();
+    String val = "";
     if (null != initJobClassList && initJobClassList.size() > 0) {
       for (InitJobClass bean : initJobClassList) {
         bean.setStationCode(header);
       }
       val = "InitJobClass:::" + JsonBeanUtil.beanToJson(initJobClassList);
-      valList.add(val);
     }
+    return val;
+  }
+
+  public String getQuartz(String header) throws Exception{
     //定时任务
     List<Quartz> quartzList = quartzService.getAll();
+    String val = "";
     if (null != quartzList && quartzList.size() > 0) {
       for (Quartz bean : quartzList) {
         bean.setStationCode(header);
       }
       val = "Quartz:::" + JsonBeanUtil.beanToJson(quartzList);
-      valList.add(val);
     }
+    return val;
+  }
+  public String getSysParameter(String header){
     //系统参数
     List<SysParameter> sysParameterList = sysParameterService.getAll();
+    String val = "";
     if (null != sysParameterList && sysParameterList.size() > 0) {
       for (SysParameter bean : sysParameterList) {
         bean.setStationCode(header);
       }
       val = "SysParameter:::" + JsonBeanUtil.beanToJson(sysParameterList);
-      valList.add(val);
     }
-
-    //文件上报部分
+    return val;
+  }
+  public String getUploadObject(String header){
+    //文件上报对象
     List<UploadObject> uploadObjectList = uploadObjectService.get();
+    String val = "";
     if (null != uploadObjectList && uploadObjectList.size() > 0) {
       for (UploadObject bean : uploadObjectList) {
         bean.setStationCode(header);
       }
       val = "UploadObject:::" + JsonBeanUtil.beanToJson(uploadObjectList);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getUploadFileChannel(String header){
     //上报通道
     List<UploadFileChannel> uploadFileChannels = uploadFileChannelService.get();
+    String val = "";
     if (null != uploadFileChannels && uploadFileChannels.size() > 0) {
       for (UploadFileChannel bean : uploadFileChannels) {
         bean.setStationCode(header);
       }
       val = "UploadFileChannel:::" + JsonBeanUtil.beanToJson(uploadFileChannels);
-      valList.add(val);
     }
+    return val;
+  }
+  public String getUploadFileCode(String header){
     //上报文件编码
     List<UploadFileCode> uploadFileCodes = uploadFileCodeService.get();
+    String val = "";
     if (null != uploadFileCodes && uploadFileCodes.size() > 0) {
       for (UploadFileCode bean : uploadFileCodes) {
         bean.setStationCode(header);
       }
       val = "UploadFileCode:::" + JsonBeanUtil.beanToJson(uploadFileCodes);
-      valList.add(val);
     }
+    return val;
+  }
+  public String getUploadURL(String header){
     //上报文件路径
     List<UploadURL> uploadURLS = uploadURLService.findAll();
+    String val = "";
     if (null != uploadURLS && uploadURLS.size() > 0) {
       for (UploadURL bean : uploadURLS) {
         bean.setStationCode(header);
       }
       val = "UploadURL:::" + JsonBeanUtil.beanToJson(uploadURLS);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getEquipmentAttribute(String header){
     //数据接入部分
     List<EquipmentAttribute> equipmentAttributes = equipmentAttributeService.getAll();
+    String val = "";
     if (null != equipmentAttributes && equipmentAttributes.size() > 0) {
       for (EquipmentAttribute bean : equipmentAttributes) {
         bean.setStationCode(header);
       }
       val = "EquipmentAttribute:::" + JsonBeanUtil.beanToJson(equipmentAttributes);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getFileParseTunnelInfo(String header){
     //文件解析通道信息
     List<FileParseTunnelInfo> fileParseTunnelInfos = tunnelInfoService.getAllFileParseTunnel();
+    String val = "";
     if (null != fileParseTunnelInfos && fileParseTunnelInfos.size() > 0) {
       for (FileParseTunnelInfo bean : fileParseTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "FileParseTunnelInfo:::" + JsonBeanUtil.beanToJson(fileParseTunnelInfos);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getGather104TcpTunnelInfo(String header){
     //104tcp 接入通道
     List<Gather104TcpTunnelInfo> gather104TcpTunnelInfos = tunnelInfoService.getAllGather104TcpTunnel();
+    String val = "";
     if (null != gather104TcpTunnelInfos && gather104TcpTunnelInfos.size() > 0) {
       for (Gather104TcpTunnelInfo bean : gather104TcpTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "Gather104TcpTunnelInfo:::" + JsonBeanUtil.beanToJson(gather104TcpTunnelInfos);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getGatherCdtRtuTunnelInfo(String header){
     //cdtRtu接入通道
     List<GatherCdtRtuTunnelInfo> gatherCdtRtuTunnelInfos = tunnelInfoService.getAllGatherCdtRtuTunnel();
+    String val = "";
     if (null != gatherCdtRtuTunnelInfos && gatherCdtRtuTunnelInfos.size() > 0) {
       for (GatherCdtRtuTunnelInfo bean : gatherCdtRtuTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "GatherCdtRtuTunnelInfo:::" + JsonBeanUtil.beanToJson(gatherCdtRtuTunnelInfos);
-      valList.add(val);
     }
+    return val;
+  }
+  public String getGatherModbusRtuTunnelInfo(String header){
     //modbusRtu接入通道
     List<GatherModbusRtuTunnelInfo> gatherModbusRtuTunnelInfos =
       tunnelInfoService.getAllGatherModbusRtuTunnel();
+    String val = "";
     if (null != gatherModbusRtuTunnelInfos && gatherModbusRtuTunnelInfos.size() > 0) {
       for (GatherModbusRtuTunnelInfo bean : gatherModbusRtuTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "GatherModbusRtuTunnelInfo:::" + JsonBeanUtil.beanToJson(gatherModbusRtuTunnelInfos);
-      valList.add(val);
     }
+    return val;
+  }
 
+  public String getGatherModbusTcpTunnelInfo(String header){
     //modbusTcp接入通道
     List<GatherModbusTcpTunnelInfo> gatherModbusTcpTunnelInfos =
       tunnelInfoService.getAllGatherModbusTcpTunnel();
+    String val = "";
     if (null != gatherModbusTcpTunnelInfos && gatherModbusTcpTunnelInfos.size() > 0) {
       for (GatherModbusTcpTunnelInfo bean : gatherModbusTcpTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "GatherModbusTcpTunnelInfo:::" + JsonBeanUtil.beanToJson(gatherModbusTcpTunnelInfos);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getGatherModbusRtuWithTcpServerTunnelInfo(String header){
     //ModbusRtuWithTcp 接入通道
     List<GatherModbusRtuWithTcpServerTunnelInfo> gatherModbusRtuWithTcpServerTunnelInfos =
       tunnelInfoService.getAllGatherModbusRtuWithTcpServerTunnel();
+    String val = "";
     if (null != gatherModbusRtuWithTcpServerTunnelInfos && gatherModbusRtuWithTcpServerTunnelInfos.size() > 0) {
       for (GatherModbusRtuWithTcpServerTunnelInfo bean : gatherModbusRtuWithTcpServerTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "GatherModbusRtuWithTcpServerTunnelInfo:::" + JsonBeanUtil.beanToJson(gatherModbusRtuWithTcpServerTunnelInfos);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getSender104TcpTunnelInfo(String header){
     //104tcp转发通道
     List<Sender104TcpTunnelInfo> sender104TcpTunnelInfos = tunnelInfoService.getAllSender104TcpTunnel();
+    String val = "";
     if (null != sender104TcpTunnelInfos && sender104TcpTunnelInfos.size() > 0) {
       for (Sender104TcpTunnelInfo bean : sender104TcpTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "Sender104TcpTunnelInfo:::" + JsonBeanUtil.beanToJson(sender104TcpTunnelInfos);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getSenderCdtRtuTunnelInfo(String header){
     //CdtRtu转发通道
     List<SenderCdtRtuTunnelInfo> senderCdtRtuTunnelInfos = tunnelInfoService.getAllSenderCdtRtuTunnel();
+    String val = "";
     if (null != senderCdtRtuTunnelInfos && senderCdtRtuTunnelInfos.size() > 0) {
       for (SenderCdtRtuTunnelInfo bean : senderCdtRtuTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "SenderCdtRtuTunnelInfo:::" + JsonBeanUtil.beanToJson(senderCdtRtuTunnelInfos);
-      valList.add(val);
     }
+    return val;
+  }
+  public String getSenderModbusRtuTunnelInfo(String header){
     //ModbusRtu 转发通道
     List<SenderModbusRtuTunnelInfo> senderModbusRtuTunnelInfos =
       tunnelInfoService.getAllSenderModbusRtuTunnel();
+    String val = "";
     if (null != senderModbusRtuTunnelInfos && senderModbusRtuTunnelInfos.size() > 0) {
       for (SenderModbusRtuTunnelInfo bean : senderModbusRtuTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "SenderModbusRtuTunnelInfo:::" + JsonBeanUtil.beanToJson(senderModbusRtuTunnelInfos);
-      valList.add(val);
     }
+    return val;
+  }
+  public String getSenderModbusTcpTunnelInfo(String header){
     //ModbusTcp 转发通道
     List<SenderModbusTcpTunnelInfo> senderModbusTcpTunnelInfos =
       tunnelInfoService.getAllSenderModbusTcpTunnel();
+    String val = "";
     if (null != senderModbusTcpTunnelInfos && senderModbusTcpTunnelInfos.size() > 0) {
       for (SenderModbusTcpTunnelInfo bean : senderModbusTcpTunnelInfos) {
         bean.setStationCode(header);
       }
       val = "SenderModbusTcpTunnelInfo:::" + JsonBeanUtil.beanToJson(senderModbusTcpTunnelInfos);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getProtocolSenderDataPoint(String header){
     //转发点表
     List<ProtocolSenderDataPoint> protocolSenderDataPoints = protocolSenderDataPointService.getAll();
+    String val = "";
     if (null != protocolSenderDataPoints && protocolSenderDataPoints.size() > 0) {
       for (ProtocolSenderDataPoint bean : protocolSenderDataPoints) {
         bean.setStationCode(header);
       }
       val = "ProtocolSenderDataPoint:::" + JsonBeanUtil.beanToJson(protocolSenderDataPoints);
-      valList.add(val);
     }
+    return val;
+  }
+  public String getProtocolGatherDataPoint(String header){
     //接入点表
     List<ProtocolGatherDataPoint> protocolGatherDataPoints = protocolGatherDataPointService.getAll();
+    String val = "";
     if (null != protocolGatherDataPoints && protocolGatherDataPoints.size() > 0) {
       for (ProtocolGatherDataPoint bean : protocolGatherDataPoints) {
         bean.setStationCode(header);
       }
       val = "ProtocolGatherDataPoint:::" + JsonBeanUtil.beanToJson(protocolGatherDataPoints);
-      valList.add(val);
     }
-
-    // -------------------------20220615 新增agc/avc 升压站 南方电网设备-----------------------------------
+    return val;
+  }
+  public String getAGC_AVCInfo(String header){
     //gac/avc
     List<AGC_AVCInfo> agcAvcInfoList = agcAvcInfoService.getAll();
+    String val = "";
     if (null != agcAvcInfoList && agcAvcInfoList.size() > 0) {
       for (AGC_AVCInfo bean : agcAvcInfoList) {
         bean.setStationCode(header);
       }
       val = "AgcAvcInfo:::" + JsonBeanUtil.beanToJson(agcAvcInfoList);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getBoosterStationInfo(String header){
     //升压站
     List<BoosterStationInfo> boosterStationInfoList = boosterStationInfoService.getAll();
+    String val = "";
     if (null != boosterStationInfoList && boosterStationInfoList.size() > 0) {
       for (BoosterStationInfo bean : boosterStationInfoList) {
         bean.setStationCode(header);
       }
       val = "BoosterStationInfo:::" + JsonBeanUtil.beanToJson(boosterStationInfoList);
-      valList.add(val);
     }
-
+    return val;
+  }
+  public String getSubsidiaryEquipmentInfo(String header){
     //南方电网设备
     List<SubsidiaryEquipmentInfo> subsidiaryEquipmentInfoList = subsidiaryEquipmentInfoService.getAll();
+    String val = "";
     if (null != subsidiaryEquipmentInfoList && subsidiaryEquipmentInfoList.size() > 0) {
       for (SubsidiaryEquipmentInfo bean : subsidiaryEquipmentInfoList) {
         bean.setStationCode(header);
       }
       val = "SubsidiaryEquipmentInfo:::" + JsonBeanUtil.beanToJson(subsidiaryEquipmentInfoList);
-      valList.add(val);
     }
+    return val;
+  }
 
+
+  public List<String> queryAllParamsFromDb(ElectricField electricField) throws Exception{
+    String header = electricField.getStationCode();
+
+    List<String> valList = new ArrayList<>();
+    String electricFieldVal = getElectricField(electricField);
+    if (!"".equals(electricFieldVal)){
+      valList.add(electricFieldVal);
+    }
+    String pvModuleModelVal = getPvModuleModel(header);
+    if (!"".equals(pvModuleModelVal)){
+      valList.add(pvModuleModelVal);
+    }
+    String overhaulPlanVal = getOverhaulPlan(header);
+    if (!"".equals(overhaulPlanVal)){
+      valList.add(overhaulPlanVal);
+    }
+    String inverterInfoVal = getInverterInfo(header);
+    if (!"".equals(inverterInfoVal)){
+      valList.add(inverterInfoVal);
+    }
+    String weatherStationInfoVal = getWeatherStationInfo(header);
+    if (!"".equals(weatherStationInfoVal)){
+      valList.add(weatherStationInfoVal);
+    }
+    String windTowerInfoVal = getWindTowerInfo(header);
+    if (!"".equals(windTowerInfoVal)){
+      valList.add(windTowerInfoVal);
+    }
+    String windTurbineInfoVal = getWindTurbineInfo(header);
+    if (!"".equals(windTurbineInfoVal)){
+      valList.add(windTurbineInfoVal);
+    }
+    String initJobClassVal = getInitJobClass(header);
+    if (!"".equals(initJobClassVal)){
+      valList.add(initJobClassVal);
+    }
+    String quartzVal = getQuartz(header);
+    if (!"".equals(quartzVal)){
+      valList.add(quartzVal);
+    }
+    String sysParameterVal = getSysParameter(header);
+    if (!"".equals(sysParameterVal)){
+      valList.add(sysParameterVal);
+    }
+    String uploadObjectVal = getUploadObject(header);
+    if (!"".equals(uploadObjectVal)){
+      valList.add(uploadObjectVal);
+    }
+    String uploadFileChannelVal = getUploadFileChannel(header);
+    if (!"".equals(uploadFileChannelVal)){
+      valList.add(uploadFileChannelVal);
+    }
+    String uploadFileCodeVal = getUploadFileCode(header);
+    if (!"".equals(uploadFileCodeVal)){
+      valList.add(uploadFileCodeVal);
+    }
+    String uploadURLVal = getUploadURL(header);
+    if (!"".equals(uploadURLVal)){
+      valList.add(uploadURLVal);
+    }
+    String equipmentAttributeVal = getEquipmentAttribute(header);
+    if (!"".equals(equipmentAttributeVal)){
+      valList.add(equipmentAttributeVal);
+    }
+    String fileParseTunnelInfoVal = getFileParseTunnelInfo(header);
+    if (!"".equals(fileParseTunnelInfoVal)){
+      valList.add(fileParseTunnelInfoVal);
+    }
+    String gather104TcpTunnelInfoVal = getGather104TcpTunnelInfo(header);
+    if (!"".equals(gather104TcpTunnelInfoVal)){
+      valList.add(gather104TcpTunnelInfoVal);
+    }
+    String gatherCdtRtuTunnelInfoVal = getGatherCdtRtuTunnelInfo(header);
+    if (!"".equals(gatherCdtRtuTunnelInfoVal)){
+      valList.add(gatherCdtRtuTunnelInfoVal);
+    }
+    String gatherModbusRtuTunnelInfoVal = getGatherModbusRtuTunnelInfo(header);
+    if (!"".equals(gatherModbusRtuTunnelInfoVal)){
+      valList.add(gatherModbusRtuTunnelInfoVal);
+    }
+    String gatherModbusTcpTunnelInfoVal = getGatherModbusTcpTunnelInfo(header);
+    if (!"".equals(gatherModbusTcpTunnelInfoVal)){
+      valList.add(gatherModbusTcpTunnelInfoVal);
+    }
+    String gatherModbusRtuWithTcpServerTunnelInfoVal = getGatherModbusRtuWithTcpServerTunnelInfo(header);
+    if (!"".equals(gatherModbusRtuWithTcpServerTunnelInfoVal)){
+      valList.add(gatherModbusRtuWithTcpServerTunnelInfoVal);
+    }
+    String sender104TscpTunnelInfoVal = getSender104TcpTunnelInfo(header);
+    if (!"".equals(sender104TscpTunnelInfoVal)){
+      valList.add(sender104TscpTunnelInfoVal);
+    }
+    String senderCdtRtuTunnelInfoVal = getSenderCdtRtuTunnelInfo(header);
+    if (!"".equals(senderCdtRtuTunnelInfoVal)){
+      valList.add(senderCdtRtuTunnelInfoVal);
+    }
+    String senderModbusRtuTunnelInfoVal = getSenderModbusRtuTunnelInfo(header);
+    if (!"".equals(senderModbusRtuTunnelInfoVal)){
+      valList.add(senderModbusRtuTunnelInfoVal);
+    }
+    String senderModbusTcpTunnelInfoVal = getSenderModbusTcpTunnelInfo(header);
+    if (!"".equals(senderModbusTcpTunnelInfoVal)){
+      valList.add(senderModbusTcpTunnelInfoVal);
+    }
+    String protocolSenderDataPointVal = getProtocolSenderDataPoint(header);
+    if (!"".equals(protocolSenderDataPointVal)){
+      valList.add(protocolSenderDataPointVal);
+    }
+    String protocolGatherDataPointVal = getProtocolGatherDataPoint(header);
+    if (!"".equals(protocolGatherDataPointVal)){
+      valList.add(protocolGatherDataPointVal);
+    }
+    // -------------------------20220615 新增agc/avc 升压站 南方电网设备-----------------------------------
+    String agc_avcInfoVal = getAGC_AVCInfo(header);
+    if (!"".equals(agc_avcInfoVal)){
+      valList.add(agc_avcInfoVal);
+    }
+    String boosterStationInfoVal = getBoosterStationInfo(header);
+    if (!"".equals(boosterStationInfoVal)){
+      valList.add(boosterStationInfoVal);
+    }
+    String subsidiaryEquipmentInfoVal = getSubsidiaryEquipmentInfo(header);
+    if (!"".equals(subsidiaryEquipmentInfoVal)){
+      valList.add(subsidiaryEquipmentInfoVal);
+    }
     return valList;
   }
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/EquipmentAttributeController.java

@@ -1,5 +1,6 @@
 package com.jiayue.ipfcst.dataexchange.controller;
 
+import com.jiayue.ipfcst.aop.BaseInfoImage;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.abst.equipmentinfo.AbstractEquipmentInfo;
@@ -222,11 +223,13 @@ public class EquipmentAttributeController {
   }
 
   @PostMapping
+  @BaseInfoImage(title = "EquipmentAttribute")
   public ResponseVO saveEquipmentAttribute(@RequestBody EquipmentAttribute equipmentAttribute){
     equipmentAttributeService.saveOrUpdateEquipmentAttribute(equipmentAttribute);
     return ResponseVO.success(1);
   }
   @PutMapping
+  @BaseInfoImage(title = "EquipmentAttribute")
   public ResponseVO UpdateEquipmentAttribute(@RequestBody EquipmentAttribute equipmentAttribute){
     equipmentAttributeService.saveOrUpdateEquipmentAttribute(equipmentAttribute);
     return ResponseVO.success(1);
@@ -235,6 +238,7 @@ public class EquipmentAttributeController {
    * 删除
    * */
   @DeleteMapping("/{id}")
+  @BaseInfoImage(title = "EquipmentAttribute")
   public ResponseVO delete(@PathVariable String id) throws BusinessException {
     equipmentAttributeService.delete(Integer.parseInt(id));
     return ResponseVO.success(1);

ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/ProtocolGatherDataPointController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.googlecode.aviator.AviatorEvaluator;
+import com.jiayue.ipfcst.aop.BaseInfoImage;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.abst.equipmentinfo.AbstractEquipmentInfo;
@@ -158,6 +159,7 @@ public class ProtocolGatherDataPointController {
    */
   @PostMapping("/saveDataPoint")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO saveGatherDataPoint(@RequestBody ProtocolGatherDataPoint protocolDataPoint) {
     return ResponseVO.success(protocolGatherDataPointService.save(protocolDataPoint));
   }
@@ -207,6 +209,7 @@ public class ProtocolGatherDataPointController {
    */
   @PutMapping("/updateDataPoint")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO updateGatherDataPoint(@RequestBody ProtocolGatherDataPoint protocolDataPoint) {
     return ResponseVO.success(protocolGatherDataPointService.save(protocolDataPoint));
   }
@@ -218,6 +221,7 @@ public class ProtocolGatherDataPointController {
    */
   @DeleteMapping("/deleteById/{id}")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO deleteById(@PathVariable("id") Integer id) {
     try {
       protocolGatherDataPointService.deleteById(id);
@@ -231,6 +235,7 @@ public class ProtocolGatherDataPointController {
 
   @DeleteMapping("/batchDeleteGatherDataPoint/{pointIds}")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO batchDeleteGatherDataPoint(@PathVariable Integer[] pointIds) {
     try {
       for (int i = 0; i < pointIds.length; i++) {
@@ -364,6 +369,7 @@ public class ProtocolGatherDataPointController {
    * @throws Exception
    */
   @PostMapping("/upload")
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO upload(@RequestParam MultipartFile file) {
     String errorMessage = protocolGatherDataPointService.analysisUploadExcel(file);
     return ResponseVO.success(errorMessage);

ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/ProtocolSenderDataPointController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.alibaba.fastjson.JSONObject;
+import com.jiayue.ipfcst.aop.BaseInfoImage;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
@@ -161,6 +162,7 @@ public class ProtocolSenderDataPointController {
    */
   @PostMapping("/saveDataPoint")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO saveSenderDataPoint(@RequestBody ProtocolSenderDataPoint protocolSenderDataPoint) {
     try {
       return ResponseVO.success(protocolSenderDataPointService.save(protocolSenderDataPoint));
@@ -179,6 +181,7 @@ public class ProtocolSenderDataPointController {
    */
   @PostMapping("/batchSaveForecastPoint")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO batchSaveSenderDataPoint(@RequestBody JSONObject param) throws BusinessException {
     String tunnelId = param.getString("tunnelId");
     String protocolPointType = param.getString("protocolPointType");
@@ -228,6 +231,7 @@ public class ProtocolSenderDataPointController {
    */
   @PutMapping("/updateDataPoint")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO updateSenderDataPoint(@RequestBody ProtocolSenderDataPoint protocolSenderDataPoint) {
     try {
       return ResponseVO.success(protocolSenderDataPointService.save(protocolSenderDataPoint));
@@ -246,6 +250,7 @@ public class ProtocolSenderDataPointController {
    */
   @DeleteMapping("/deleteDataPoint/{id}")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO deleteById(@PathVariable("id") Integer id) {
     try {
       protocolSenderDataPointService.deleteById(id);
@@ -259,6 +264,7 @@ public class ProtocolSenderDataPointController {
 
   @DeleteMapping("/batchDeleteSenderDataPoint/{pointIds}")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO batchDeleteGatherDataPoint(@PathVariable Integer[] pointIds) {
     try {
       for (int i = 0; i < pointIds.length; i++) {

ipfcst-console/src/main/java/com/jiayue/ipfcst/dataexchange/controller/TunnelInfoController.java

@@ -1,6 +1,7 @@
 package com.jiayue.ipfcst.dataexchange.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.jiayue.ipfcst.aop.BaseInfoImage;
 import com.jiayue.ipfcst.aop.SaveValidate;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
@@ -73,6 +74,7 @@ public class TunnelInfoController {
    */
   @PostMapping
   @SaveValidate
+  @BaseInfoImage(title="TunnelInfo")
   public ResponseVO saveTunnelInfo(@RequestBody JSONObject baseTunnelInfo)
     throws DataExchangeException {
     String type = baseTunnelInfo.getString("tunnelType");
@@ -88,6 +90,7 @@ public class TunnelInfoController {
   /*修改*/
   @PutMapping
   @SaveValidate
+  @BaseInfoImage(title="TunnelInfo")
   public ResponseVO updateTunnelInfo(@RequestBody JSONObject baseTunnelInfo)
     throws BusinessException {
     String type = baseTunnelInfo.getString("tunnelType");
@@ -104,6 +107,7 @@ public class TunnelInfoController {
   @SneakyThrows
   @DeleteMapping(value = "/{id}/{tunnelType}")
   @SaveValidate
+  @BaseInfoImage(title="TunnelInfo")
   public ResponseVO delete(@PathVariable("id") String id, @PathVariable("tunnelType") String tunnelType) {
     try {
       this.tunnelInfoService.delete(id, tunnelType);
@@ -123,6 +127,7 @@ public class TunnelInfoController {
   @SneakyThrows
   @DeleteMapping(value = "/deleteDataPointById/{id}/{tunnelType}")
   @SaveValidate
+  @BaseInfoImage(title="DataPoint")
   public ResponseVO deleteDataPointById(@PathVariable("id") String id, @PathVariable("tunnelType") String tunnelType) {
     try {
       this.tunnelInfoService.deleteDataPointById(id, tunnelType);

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileChannelController.java

@@ -48,7 +48,7 @@ public class UploadFileChannelController {
   @SneakyThrows
   @PostMapping
   @SaveValidate
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadFileChannel")
   public ResponseVO add(@RequestBody UploadFileChannel uploadFileChannel) {
     UploadFileChannel save = uploadFileChannelService.save(uploadFileChannel);
     return ResponseVO.success(save);
@@ -64,7 +64,7 @@ public class UploadFileChannelController {
   @PutMapping
   @SaveValidate
   @Transactional
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadFileChannel")
   public ResponseVO update(@RequestBody UploadFileChannel uploadFileChannel) {
 
     uploadFileChannelService.save(uploadFileChannel);
@@ -87,7 +87,7 @@ public class UploadFileChannelController {
   @SneakyThrows
   @DeleteMapping("/{id}")
   @SaveValidate
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadFileChannel")
   public ResponseVO delete(@PathVariable Integer id) {
     UploadFileChannel uploadFileChannel = uploadFileChannelService.getById(id);
     uploadFileChannelService.delete(uploadFileChannel);
@@ -312,6 +312,7 @@ public class UploadFileChannelController {
   @SneakyThrows
   @DeleteMapping("/deleteByObjId/{id}")
   @SaveValidate
+  @BaseInfoImage(title = "UploadFileChannel")
   public ResponseVO deleteByObjId(@PathVariable Integer id) {
     try {
       uploadFileChannelService.deleteByObjId(id);

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileCodeController.java

@@ -40,7 +40,7 @@ public class UploadFileCodeController {
    */
   @PostMapping
   @SaveValidate
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadFileCode")
   public ResponseVO update(@RequestBody UploadFileCode uploadFileCode){
     return ResponseVO.success(uploadFileCodeService.save(uploadFileCode));
   }
@@ -53,7 +53,7 @@ public class UploadFileCodeController {
    */
   @PutMapping
   @SaveValidate
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadFileCode")
   public ResponseVO add(@RequestBody UploadFileCode uploadFileCode){
     return ResponseVO.success(uploadFileCodeService.save(uploadFileCode));
   }
@@ -66,7 +66,7 @@ public class UploadFileCodeController {
    */
   @DeleteMapping("/{id}")
   @SaveValidate
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadFileCode")
   public ResponseVO delete(@PathVariable Integer id){
     UploadFileCode uploadFileCode = new UploadFileCode();
     uploadFileCode.setId(id);

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadObjectController.java

@@ -52,7 +52,7 @@ public class UploadObjectController {
    */
   @PostMapping
   @SaveValidate
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadObject")
   public ResponseVO add(@RequestBody UploadObject uploadObject) {
     try {
       uploadObjectService.save(uploadObject);
@@ -71,7 +71,7 @@ public class UploadObjectController {
    */
   @PutMapping
   @SaveValidate
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadObject")
   public ResponseVO update(@RequestBody UploadObject uploadObject) {
     try {
       uploadObjectService.save(uploadObject);
@@ -91,7 +91,7 @@ public class UploadObjectController {
    */
   @DeleteMapping("/{id}")
   @SaveValidate
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadObject")
   public ResponseVO delete(@PathVariable Integer id) {
     try {
       uploadFileChannelService.deleteByObjId(id);

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadURLController.java

@@ -25,7 +25,7 @@ public class UploadURLController {
 
   @PostMapping("/uploadURL")
   @Transactional
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadURL")
   public ResponseVO save(@RequestBody UploadURL uploadURL){
 
     uploadURLService.save(uploadURL);
@@ -35,7 +35,7 @@ public class UploadURLController {
 
   @DeleteMapping("/uploadURL/{id}")
   @Transactional
-  @BaseInfoImage
+  @BaseInfoImage(title = "UploadURL")
   public ResponseVO delete(@PathVariable Integer id){
 
     uploadURLService.deleteByChannelId(id);