Pārlūkot izejas kodu

大同新增受累管理

xieshengjie 2 gadi atpakaļ
vecāks
revīzija
1843f78933
20 mainītis faili ar 562 papildinājumiem un 2 dzēšanām
  1. 20 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/InvolvedController.java
  2. 20 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/InvolvedstatusController.java
  3. 20 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/LineController.java
  4. 95 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/ghost/GhostController.java
  5. 11 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/init/CacheContext.java
  6. 16 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/mapper/auto/InvolvedMapper.java
  7. 16 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/mapper/auto/InvolvedstatusMapper.java
  8. 17 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/mapper/auto/LineMapper.java
  9. 51 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Involved.java
  10. 26 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Involvedstatus.java
  11. 53 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Line.java
  12. 83 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/GhostService.java
  13. 16 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/IInvolvedService.java
  14. 16 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/IInvolvedstatusService.java
  15. 17 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/ILineService.java
  16. 20 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/impl/InvolvedServiceImpl.java
  17. 20 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/impl/InvolvedstatusServiceImpl.java
  18. 21 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/impl/LineServiceImpl.java
  19. 2 2
      web/gdsx-ghost/src/main/java/com/gyee/ghost/task/SaticScheduleTask.java
  20. 22 0
      web/gdsx-ghost/src/main/java/com/gyee/ghost/vo/InvolvedVo.java

+ 20 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/InvolvedController.java

@@ -0,0 +1,20 @@
+package com.gyee.ghost.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+@RestController
+@RequestMapping("//involved")
+public class InvolvedController {
+
+}

+ 20 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/InvolvedstatusController.java

@@ -0,0 +1,20 @@
+package com.gyee.ghost.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+@RestController
+@RequestMapping("//involvedstatus")
+public class InvolvedstatusController {
+
+}

+ 20 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/LineController.java

@@ -0,0 +1,20 @@
+package com.gyee.ghost.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-28
+ */
+@RestController
+@RequestMapping("//line")
+public class LineController {
+
+}

+ 95 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/ghost/GhostController.java

@@ -9,6 +9,7 @@ import com.gyee.ghost.init.CacheContext;
 import com.gyee.ghost.model.auto.*;
 import com.gyee.ghost.service.auto.GhostService;
 import com.gyee.ghost.vo.FaultinputVo;
+import com.gyee.ghost.vo.InvolvedVo;
 import com.gyee.ghost.vo.NatureVo;
 import com.gyee.ghost.vo.WindturbineVo;
 import org.springframework.web.bind.annotation.*;
@@ -380,6 +381,100 @@ public class GhostController {
     }
 
 
+    @GetMapping("/involved")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R involvedlist(@RequestParam(value = "wpid",required = true)String wpid,
+                            @RequestParam(value = "begin",required = true)Long begin,
+                            @RequestParam(value = "end",required = true)Long end) throws Exception {
+        List<Involved> resultList = ghostService.involvedlist(wpid,begin,end);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok((long) resultList.size()).data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    @DeleteMapping("/involved/{id}")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R involvedremove(@PathVariable("id") String id) throws Exception {
+        boolean b = ghostService.involvedremove(id);
+        if (StringUtils.isNotNull(b)) {
+            return R.ok().data(b);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    @PostMapping("/involved")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R involvedadd(@RequestBody InvolvedVo involvedVo) throws Exception {
+        boolean b = ghostService.involvedadd(involvedVo);
+        if (StringUtils.isNotNull(b)) {
+            return R.ok().data(b);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    @PutMapping("/involved")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R involvedupdate(@RequestBody Involved involved) throws Exception {
+        boolean b = ghostService.involvedupdate(involved);
+        if (StringUtils.isNotNull(b)) {
+            return R.ok().data(b);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    @GetMapping("/involved/{id}")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R involvedget(@PathVariable("id") String id) throws Exception {
+        Involved involved = ghostService.involvedget(id);
+        if (StringUtils.isNotNull(involved)) {
+            return R.ok().data(involved);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+
+    @GetMapping("/getLines")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R getLines(@RequestParam(value = "wpid",required = true)String wpid) throws Exception {
+        List<Line> lines = ghostService.getLines(wpid);
+        if (StringUtils.isNotNull(lines)) {
+            return R.ok().data(lines);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    @GetMapping("/getslStatus")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R getslStatus() throws Exception {
+        List<Involvedstatus> status = ghostService.getslStatus();
+        if (StringUtils.isNotNull(status)) {
+            return R.ok().data(status);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+
+
+
+
+
+
+
 
 
 

+ 11 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/init/CacheContext.java

@@ -47,8 +47,11 @@ public class CacheContext implements CommandLineRunner {
     private IEquipmentmodelService equipmentmodelService;
     @Resource
     private IProEconStatusmxService proEconStatusmxService;
+    @Resource
+    private ILineService lineService;
 
     public static List<Windturbine> wtls = new ArrayList<>();
+    public static List<Line> lines = new ArrayList<>();
     public static Map<String,Windturbine> wtmap = new HashMap<>();
     public static Map<String,Project> promap = new HashMap<>();
     public static Map<String,Windpowerstation> wpmap = new HashMap<>();
@@ -60,6 +63,8 @@ public class CacheContext implements CommandLineRunner {
 
     public static Map<Integer,String> statusmxMap = new HashMap<>();
 
+    public static Map<String,Line> lineMap = new HashMap<>();
+
 //    public static Map<String,String> freedomMap = new HashMap<>();
 
     @Override
@@ -111,6 +116,12 @@ public class CacheContext implements CommandLineRunner {
             statusmxMap.put(mx.getId(),mx.getName());
         });
 
+        lines = lineService.list();
+        lines.stream().forEach(line->{
+            lineMap.put(line.getId(),line);
+
+        });
+
 //        List<Freedom> freedoms = freedomService.list();
 //        freedoms.stream().forEach(f->{
 //            freedomMap.put(f.getId(),f.getName());

+ 16 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/mapper/auto/InvolvedMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.ghost.mapper.auto;
+
+import com.gyee.ghost.model.auto.Involved;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+public interface InvolvedMapper extends BaseMapper<Involved> {
+
+}

+ 16 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/mapper/auto/InvolvedstatusMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.ghost.mapper.auto;
+
+import com.gyee.ghost.model.auto.Involvedstatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+public interface InvolvedstatusMapper extends BaseMapper<Involvedstatus> {
+
+}

+ 17 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/mapper/auto/LineMapper.java

@@ -0,0 +1,17 @@
+package com.gyee.ghost.mapper.auto;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.ghost.model.auto.Line;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-28
+ */
+public interface LineMapper extends BaseMapper<Line> {
+
+}

+ 51 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Involved.java

@@ -0,0 +1,51 @@
+package com.gyee.ghost.model.auto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Involved extends Model {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "ID",type = IdType.INPUT)
+    private String id;
+
+    private String projectid;
+
+    private String projectname;
+
+    private String wpid;
+
+    private String wpname;
+
+    private String lineid;
+
+    private String linename;
+
+    private Date begindate;
+
+    private Date enddate;
+
+    private String faulttype;
+
+    private Double powerloss;
+
+    private Double faultduration;
+
+
+}

+ 26 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Involvedstatus.java

@@ -0,0 +1,26 @@
+package com.gyee.ghost.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Involvedstatus extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String name;
+
+
+}

+ 53 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Line.java

@@ -0,0 +1,53 @@
+package com.gyee.ghost.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("LINE")
+public class Line extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("ANAME")
+    private String aname;
+
+    @TableField("PROJECTID")
+    private String projectid;
+
+    @TableField("ORDERNUM")
+    private Integer ordernum;
+
+    @TableField("CAPACITY")
+    private Integer capacity;
+
+    @TableField("CAPACITYUNIT")
+    private String capacityunit;
+
+    @TableField("QUANTITY")
+    private Integer quantity;
+
+
+}

+ 83 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/GhostService.java

@@ -2,6 +2,7 @@ package com.gyee.ghost.service.auto;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import com.google.common.collect.Lists;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.CommonUtils;
@@ -9,6 +10,7 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.analysis.DeskObject;
+import com.gyee.ghost.config.ResultCode;
 import com.gyee.ghost.contant.Contant;
 import com.gyee.ghost.init.CacheContext;
 import com.gyee.ghost.model.auto.*;
@@ -16,8 +18,10 @@ import com.gyee.ghost.util.realtimesource.ClassUtil;
 import com.gyee.ghost.util.realtimesource.IEdosUtil;
 import com.gyee.ghost.util.realtimesource.StringUtil;
 import com.gyee.ghost.vo.InitVo;
+import com.gyee.ghost.vo.InvolvedVo;
 import com.gyee.ghost.vo.NatureVo;
 import com.gyee.ghost.vo.WindturbineVo;
+import io.swagger.models.auth.In;
 import javafx.beans.binding.BooleanBinding;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -51,6 +55,10 @@ public class GhostService {
     private IFaultrecordService faultrecordService;
     @Resource
     private IMainrecordService mainrecordService;
+    @Resource
+    private IInvolvedService involvedService;
+    @Resource
+    private IInvolvedstatusService involvedstatusService;
     /**
      * 存储fanoperation运行分析表
      */
@@ -528,6 +536,81 @@ public class GhostService {
         return mainrecord;
     }
 
+    public List<Involved> involvedlist(String wpid, Long begin, Long end) {
+        QueryWrapper<Involved> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(wpid)){
+            queryWrapper.eq("wpid",wpid);
+        }
+        queryWrapper.ge("begindate",DateUtils.parseLongToDate(begin)).le("enddate",DateUtils.parseLongToDate(end));
+        List<Involved> involvedList = involvedService.list(queryWrapper);
+        return involvedList;
+    }
+
+    public boolean involvedremove(String id) {
+        boolean b = involvedService.removeById(id);
+        return b;
+    }
+
+    public boolean involvedadd(InvolvedVo involvedVo) {
+        Map<String, Windpowerstation> wpmap = CacheContext.wpmap;
+        Map<String, Project> promap = CacheContext.promap;
+        Map<String, Line> lineMap = CacheContext.lineMap;
+
+        Long begin = involvedVo.getBegin();
+        Long end = involvedVo.getEnd();
+        List<Line> lines = involvedVo.getLines();
+        Double ssdl = involvedVo.getSsdl();
+        String type = involvedVo.getType();
+        List<Involved> resultList = new ArrayList<>();
+        double zcapacity = lines.stream().mapToDouble(line -> lineMap.get(line.getId()).getCapacity()).sum();
+        lines.stream().forEach(line->{
+            Involved involved = new Involved();
+            involved.setId(CommonUtils.getUUID());
+            involved.setLinename(lineMap.get(line.getId()).getName());
+            involved.setLineid(line.getId());
+            involved.setProjectid(lineMap.get(line.getId()).getProjectid());
+            involved.setProjectname(promap.get(lineMap.get(line.getId()).getProjectid()).getName());
+            involved.setWpid(promap.get(lineMap.get(line.getId()).getProjectid()).getWindpowerstationid());
+            involved.setWpname(wpmap.get(promap.get(lineMap.get(line.getId()).getProjectid()).getWindpowerstationid()).getCode());
+            involved.setBegindate(DateUtils.parseLongToDate(begin));
+            involved.setEnddate(DateUtils.parseLongToDate(end));
+            involved.setFaulttype(type);
+            involved.setPowerloss(ssdl*(lineMap.get(line.getId()).getCapacity()/zcapacity));
+            double hours = DateUtils.hoursDiff2(DateUtils.parseLongToDate(begin), DateUtils.parseLongToDate(end));
+            involved.setFaultduration(hours);
+            resultList.add(involved);
+        });
+        boolean b = involvedService.saveBatch(resultList);
+        return b;
+    }
+
+    public boolean involvedupdate(Involved involved) {
+        involved.setBegindate(involved.getBegindate());
+        involved.setEnddate(involved.getEnddate());
+        involved.setFaulttype(involved.getFaulttype());
+        involved.setPowerloss(involved.getPowerloss());
+        double hours = DateUtils.hoursDiff2(involved.getBegindate(), involved.getEnddate());
+        involved.setFaultduration(hours);
+        boolean b = involvedService.saveOrUpdate(involved);
+        return b;
+    }
+
+    public Involved involvedget(String id) {
+        Involved involved = involvedService.getById(id);
+        return involved;
+    }
+
+    public List<Line> getLines(String wpid) {
+        List<Line> lines = CacheContext.lines;
+        Map<String, Project> promap = CacheContext.promap;
+        return lines.stream().filter(line->promap.get(line.getProjectid()).getWindpowerstationid().equals(wpid)).collect(Collectors.toList());
+    }
+
+    public List<Involvedstatus> getslStatus() {
+        List<Involvedstatus> list = involvedstatusService.list();
+        return list;
+    }
+
 
 //    public List<Shutdownevent> stoplist(String wpid, String wtid, String stoptypeid, Long begin, Long end, Integer type) {
 //        Date begindate = DateUtils.parseLongToDate(begin);

+ 16 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/IInvolvedService.java

@@ -0,0 +1,16 @@
+package com.gyee.ghost.service.auto;
+
+import com.gyee.ghost.model.auto.Involved;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+public interface IInvolvedService extends IService<Involved> {
+
+}

+ 16 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/IInvolvedstatusService.java

@@ -0,0 +1,16 @@
+package com.gyee.ghost.service.auto;
+
+import com.gyee.ghost.model.auto.Involvedstatus;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+public interface IInvolvedstatusService extends IService<Involvedstatus> {
+
+}

+ 17 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/ILineService.java

@@ -0,0 +1,17 @@
+package com.gyee.ghost.service.auto;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.ghost.model.auto.Line;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-28
+ */
+public interface ILineService extends IService<Line> {
+
+}

+ 20 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/impl/InvolvedServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.ghost.service.auto.impl;
+
+import com.gyee.ghost.model.auto.Involved;
+import com.gyee.ghost.mapper.auto.InvolvedMapper;
+import com.gyee.ghost.service.auto.IInvolvedService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+@Service
+public class InvolvedServiceImpl extends ServiceImpl<InvolvedMapper, Involved> implements IInvolvedService {
+
+}

+ 20 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/impl/InvolvedstatusServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.ghost.service.auto.impl;
+
+import com.gyee.ghost.model.auto.Involvedstatus;
+import com.gyee.ghost.mapper.auto.InvolvedstatusMapper;
+import com.gyee.ghost.service.auto.IInvolvedstatusService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-11-20
+ */
+@Service
+public class InvolvedstatusServiceImpl extends ServiceImpl<InvolvedstatusMapper, Involvedstatus> implements IInvolvedstatusService {
+
+}

+ 21 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/impl/LineServiceImpl.java

@@ -0,0 +1,21 @@
+package com.gyee.ghost.service.auto.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.ghost.mapper.auto.LineMapper;
+import com.gyee.ghost.model.auto.Line;
+import com.gyee.ghost.service.auto.ILineService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-28
+ */
+@Service
+public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements ILineService {
+
+}

+ 2 - 2
web/gdsx-ghost/src/main/java/com/gyee/ghost/task/SaticScheduleTask.java

@@ -55,7 +55,7 @@ public class SaticScheduleTask {
 
     //或直接指定时间间隔,例如:5秒
 //    @Scheduled(fixedRate=300000)
-    @Scheduled(cron = "0 0/5 * * * ?")
+//    @Scheduled(cron = "0 0/5 * * * ?")
     private void status() {
         try {
             realtimeService.saveWindturbineStatus2();
@@ -64,7 +64,7 @@ public class SaticScheduleTask {
         }
     }
 
-    @Scheduled(cron = "1 0 0 * * ?")
+    @Scheduled(cron = "0 30 0 * * ?")
     //或直接指定时间间隔,例如:5秒
     //@Scheduled(fixedRate=5000)
     private void statustj() {

+ 22 - 0
web/gdsx-ghost/src/main/java/com/gyee/ghost/vo/InvolvedVo.java

@@ -0,0 +1,22 @@
+package com.gyee.ghost.vo;/*
+@author   谢生杰
+@date   2022/11/20-17:53
+*/
+
+import com.gyee.ghost.model.auto.Line;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InvolvedVo {
+
+    public String wpid; //风场id,显示名称
+    public Long begin; //开始时间
+    public Long end;  //结束时间
+    public Double ssdl;  //损失电量
+    public List<Line> lines;   //勾选线路
+    public String type;  //类型
+
+
+}