计划停电接口调整1

fiveep-model/src/main/java/com/bizmatics/model/WcBlackoutPlan.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -69,7 +71,7 @@ public class WcBlackoutPlan implements Serializable {
     /**
      * 添加时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
 
 }

fiveep-model/src/main/java/com/bizmatics/model/vo/WcBlackoutPlanVo.java

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -40,12 +41,12 @@ public class WcBlackoutPlanVo implements Serializable {
     /**
      * 开始时间
      */
-    private LocalDateTime startTime;
+    private Date startTime;
 
     /**
      * 结束时间
      */
-    private LocalDateTime endTime;
+    private Date endTime;
 
     /**
      * 联系人 
@@ -70,9 +71,16 @@ public class WcBlackoutPlanVo implements Serializable {
     /**
      * 添加时间
      */
-    private LocalDateTime createTime;
-
+    private Date createTime;
 
+    /**
+     * 站点名称
+     */
     private String siteName;
 
+    /**
+     * 状态 1 未执行 2执行中 3 已执行
+     */
+    private Integer type;
+
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/WcBlackoutPlanServiceImpl.java

@@ -13,6 +13,8 @@ import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,7 +31,7 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
         SysUser user = SecurityUtils.getLoginUser().getUser();
         wcBlackoutPlan.setEnable(1);
         wcBlackoutPlan.setCreator(user.getUserName());
-        wcBlackoutPlan.setCreateTime(LocalDateTime.now());
+        wcBlackoutPlan.setCreateTime(new Date());
         this.save(wcBlackoutPlan);
     }
 
@@ -56,6 +58,31 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
         int startCurrent = (plannedOutageVo.getCurrent() - 1) * plannedOutageVo.getSize();
 
         List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(),plannedOutageVo.getSize(),startCurrent);
-        return new CommonPage<>(plannedOutageList, total, plannedOutageVo.getSize(), plannedOutageVo.getCurrent());
+        List<WcBlackoutPlanVo> plannedOutageListOne = new ArrayList<>();
+        if (plannedOutageList.size()>0){
+            for (int i = 0; i < plannedOutageList.size(); i++) {
+                WcBlackoutPlanVo wcBlackoutPlanVo = new WcBlackoutPlanVo();
+                wcBlackoutPlanVo.setSiteId(plannedOutageList.get(i).getSiteId());
+                wcBlackoutPlanVo.setPlanType(plannedOutageList.get(i).getPlanType());
+                wcBlackoutPlanVo.setStartTime(plannedOutageList.get(i).getStartTime());
+                wcBlackoutPlanVo.setEndTime(plannedOutageList.get(i).getEndTime());
+                wcBlackoutPlanVo.setContacts(plannedOutageList.get(i).getContacts());
+                wcBlackoutPlanVo.setPhone(plannedOutageList.get(i).getPhone());
+                wcBlackoutPlanVo.setEnable(plannedOutageList.get(i).getEnable());
+                wcBlackoutPlanVo.setCreator(plannedOutageList.get(i).getCreator());
+                wcBlackoutPlanVo.setCreateTime(plannedOutageList.get(i).getCreateTime());
+                wcBlackoutPlanVo.setSiteName(plannedOutageList.get(i).getSiteName());
+                wcBlackoutPlanVo.setId(plannedOutageList.get(i).getId());
+                if (plannedOutageList.get(i).getStartTime().getTime()>new Date().getTime()){
+                    wcBlackoutPlanVo.setType(1);
+                }else if(plannedOutageList.get(i).getStartTime().getTime()<new Date().getTime()&&plannedOutageList.get(i).getEndTime().getTime()>new Date().getTime()){
+                    wcBlackoutPlanVo.setType(2);
+                }else if (plannedOutageList.get(i).getEndTime().getTime()<new Date().getTime()){
+                    wcBlackoutPlanVo.setType(3);
+                }
+                plannedOutageListOne.add(wcBlackoutPlanVo);
+            }
+        }
+        return new CommonPage<>(plannedOutageListOne, total, plannedOutageVo.getSize(), plannedOutageVo.getCurrent());
     }
 }