计划停电导出2

fiveep-service/src/main/java/com/bizmatics/service/WcBlackoutPlanService.java

@@ -4,6 +4,7 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.WcBlackoutPlan;
 import com.bizmatics.model.vo.PlannedOutageVo;
+import com.bizmatics.model.vo.WcBlackoutPlanOneVo;
 import com.bizmatics.model.vo.WcBlackoutPlanVo;
 
 import java.util.List;
@@ -25,4 +26,6 @@ public interface WcBlackoutPlanService extends CrudService<WcBlackoutPlan> {
     CommonPage<WcBlackoutPlanVo> plannedOutageList(PlannedOutageVo plannedOutageVo);
 
     String outagePlanListExport(String startTime, String endTime, Integer type);
+
+    List<WcBlackoutPlanOneVo> wcBlackoutPlanOneVolist(String startTime, String endTime, Integer type, Integer startCurrent);
 }

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

@@ -10,14 +10,12 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.common.spring.util.GlobalUtils;
 import com.bizmatics.model.WcBlackoutPlan;
 import com.bizmatics.model.system.SysUser;
-import com.bizmatics.model.vo.CorrespondDeviceVO;
 import com.bizmatics.model.vo.PlannedOutageVo;
 import com.bizmatics.model.vo.WcBlackoutPlanOneVo;
 import com.bizmatics.model.vo.WcBlackoutPlanVo;
 import com.bizmatics.persistence.mapper.WcBlackoutPlanMapper;
 import com.bizmatics.service.WcBlackoutPlanService;
 import com.bizmatics.service.util.SecurityUtils;
-import com.bizmatics.service.vo.CorrespondDeviceExportVO;
 import com.bizmatics.service.vo.WcBlackoutPlanOneExportVo;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
@@ -25,7 +23,6 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -63,16 +60,16 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
 
     @Override
     public CommonPage<WcBlackoutPlanVo> plannedOutageList(PlannedOutageVo plannedOutageVo) {
-        List<WcBlackoutPlanVo> wcBlackoutPlanVoListOne = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(),0,null);
+        List<WcBlackoutPlanVo> wcBlackoutPlanVoListOne = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(), 0, null);
         int total = 0;
         if (wcBlackoutPlanVoListOne.size() > 0) {
             total = wcBlackoutPlanVoListOne.size();
         }
         int startCurrent = (plannedOutageVo.getCurrent() - 1) * plannedOutageVo.getSize();
 
-        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(),plannedOutageVo.getSize(),startCurrent);
+        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(plannedOutageVo.getStartTime(), plannedOutageVo.getEndTime(), plannedOutageVo.getType(), plannedOutageVo.getId(), plannedOutageVo.getSize(), startCurrent);
         List<WcBlackoutPlanVo> plannedOutageListOne = new ArrayList<>();
-        if (plannedOutageList.size()>0){
+        if (plannedOutageList.size() > 0) {
             for (int i = 0; i < plannedOutageList.size(); i++) {
                 WcBlackoutPlanVo wcBlackoutPlanVo = new WcBlackoutPlanVo();
                 wcBlackoutPlanVo.setSiteId(plannedOutageList.get(i).getSiteId());
@@ -86,11 +83,11 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
                 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()){
+                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()){
+                } 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()){
+                } else if (plannedOutageList.get(i).getEndTime().getTime() < new Date().getTime()) {
                     wcBlackoutPlanVo.setType(3);
                 }
                 plannedOutageListOne.add(wcBlackoutPlanVo);
@@ -100,7 +97,7 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
     }
 
     @Override
-    public String outagePlanListExport(String startTime,String endTime,Integer type) {
+    public String outagePlanListExport(String startTime, String endTime, Integer type) {
         Workbook workbook = null;
         File file = null;
         try {
@@ -109,32 +106,8 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
             workbook = ExcelExportUtil.exportBigExcel(params, WcBlackoutPlanOneExportVo.class,
                     (o, i) -> {
                         int startCurrent = (i - 1) * 30;
-                        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(startTime, endTime, type, 0,30,startCurrent);
-//                        if (plannedOutageList.size()>0){
-//                            for (int j = 0; j< plannedOutageList.size(); j++) {
-//                                WcBlackoutPlanOneVo wcBlackoutPlanVo = new WcBlackoutPlanOneVo();
-//                                wcBlackoutPlanVo.setEndTime(plannedOutageList.get(j).getEndTime());
-//                                wcBlackoutPlanVo.setContacts(plannedOutageList.get(j).getContacts());
-//                                wcBlackoutPlanVo.setStartTime(plannedOutageList.get(j).getStartTime());
-//                                wcBlackoutPlanVo.setEnable(plannedOutageList.get(j).getEnable());
-//                                wcBlackoutPlanVo.setCreator(plannedOutageList.get(j).getCreator());
-//                                wcBlackoutPlanVo.setCreateTime(plannedOutageList.get(j).getCreateTime());
-//                                wcBlackoutPlanVo.setPhone(plannedOutageList.get(j).getPhone());
-//                                wcBlackoutPlanVo.setSiteName(plannedOutageList.get(j).getSiteName());
-//                                wcBlackoutPlanVo.setId(plannedOutageList.get(j).getId());
-//                                wcBlackoutPlanVo.setPlanType(plannedOutageList.get(j).getPlanType());
-//                                wcBlackoutPlanVo.setSiteId(plannedOutageList.get(j).getSiteId());
-//                                if (plannedOutageList.get(j).getStartTime().getTime()>new Date().getTime()){
-//                                    wcBlackoutPlanVo.setType("未执行");
-//                                }else if(plannedOutageList.get(j).getStartTime().getTime()<new Date().getTime()&&plannedOutageList.get(j).getEndTime().getTime()>new Date().getTime()){
-//                                    wcBlackoutPlanVo.setType("执行中");
-//                                }else if (plannedOutageList.get(j).getEndTime().getTime()<new Date().getTime()){
-//                                    wcBlackoutPlanVo.setType("已执行");
-//                                }
-//                                plannedOutageListOne.add(wcBlackoutPlanVo);
-//                            }
-//                        }
-                        return new ArrayList<>(BeanMapperUtils.mapList(plannedOutageList, WcBlackoutPlanVo.class, WcBlackoutPlanOneExportVo.class));
+                        List<WcBlackoutPlanOneVo> plannedOutageList = this.wcBlackoutPlanOneVolist(startTime, endTime, type, startCurrent);
+                        return new ArrayList<>(BeanMapperUtils.mapList(plannedOutageList, WcBlackoutPlanOneVo.class, WcBlackoutPlanOneExportVo.class));
                     }, null);
             if (null != workbook) {
                 file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "停电计划列表", System.currentTimeMillis() + ""));
@@ -158,4 +131,39 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
         }
         return file.getName();
     }
+
+
+    @Override
+    public List<WcBlackoutPlanOneVo> wcBlackoutPlanOneVolist(String startTime, String endTime, Integer type, Integer startCurrent) {
+        List<WcBlackoutPlanOneVo> plannedOutageListOne = new ArrayList<>();
+
+
+        List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(startTime, endTime, type, 0, 30, startCurrent);
+        if (plannedOutageList.size() > 0) {
+            for (int j = 0; j < plannedOutageList.size(); j++) {
+                WcBlackoutPlanOneVo wcBlackoutPlanVo = new WcBlackoutPlanOneVo();
+                wcBlackoutPlanVo.setEndTime(plannedOutageList.get(j).getEndTime());
+                wcBlackoutPlanVo.setContacts(plannedOutageList.get(j).getContacts());
+                wcBlackoutPlanVo.setStartTime(plannedOutageList.get(j).getStartTime());
+                wcBlackoutPlanVo.setEnable(plannedOutageList.get(j).getEnable());
+                wcBlackoutPlanVo.setCreator(plannedOutageList.get(j).getCreator());
+                wcBlackoutPlanVo.setCreateTime(plannedOutageList.get(j).getCreateTime());
+                wcBlackoutPlanVo.setPhone(plannedOutageList.get(j).getPhone());
+                wcBlackoutPlanVo.setSiteName(plannedOutageList.get(j).getSiteName());
+                wcBlackoutPlanVo.setId(plannedOutageList.get(j).getId());
+                wcBlackoutPlanVo.setPlanType(plannedOutageList.get(j).getPlanType());
+                wcBlackoutPlanVo.setSiteId(plannedOutageList.get(j).getSiteId());
+                if (plannedOutageList.get(j).getStartTime().getTime() > new Date().getTime()) {
+                    wcBlackoutPlanVo.setType("未执行");
+                } else if (plannedOutageList.get(j).getStartTime().getTime() < new Date().getTime() && plannedOutageList.get(j).getEndTime().getTime() > new Date().getTime()) {
+                    wcBlackoutPlanVo.setType("执行中");
+                } else if (plannedOutageList.get(j).getEndTime().getTime() < new Date().getTime()) {
+                    wcBlackoutPlanVo.setType("已执行");
+                }
+                plannedOutageListOne.add(wcBlackoutPlanVo);
+            }
+
+        }
+        return plannedOutageListOne;
+    }
 }