修改表底计算逻辑

src/main/java/cn/gyee/tamplate/config/R.java

@@ -0,0 +1,71 @@
+package cn.gyee.tamplate.config;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName : R
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 16:59
+ * @Description : 结果集
+ */
+@Data
+public class R {
+    @ApiModelProperty(value = "是否成功")
+    private Boolean success;
+    @ApiModelProperty(value = "返回码")
+    private Integer code;
+    @ApiModelProperty(value = "返回消息")
+    private String message;
+    @ApiModelProperty(value = "总数量")
+    private Integer count;
+    @ApiModelProperty(value = "返回数据")
+    private Object data = new Object();
+    private R(){}
+    public static R ok(){
+        R r = new R();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        return r;
+    }
+    public static R ok(Integer count){
+        R r = new R();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        r.setCount(count);
+        return r;
+    }
+    public static R error(){
+        R r = new R();
+        r.setSuccess(false);
+        r.setCode(ResultCode.ERROR);
+        r.setMessage("失败");
+        return r;
+    }
+    public R success(Boolean success){
+        this.setSuccess(success);
+        return this;
+    }
+    public R message(String message){
+        this.setMessage(message);
+        return this;
+    }
+    public R code(Integer code){
+        this.setCode(code);
+        return this;
+    }
+//    public R data(String key, Object value){
+//        this.data.put(key, value);
+//        return this;
+//    }
+//    public R data(Map<String, Object> map){
+//        this.setData(map);
+//        return this;
+//    }
+    public R data(Object value){
+        this.setData(value);
+        return this;
+    }
+}

src/main/java/cn/gyee/tamplate/config/ResultCode.java

@@ -0,0 +1,12 @@
+package cn.gyee.tamplate.config;
+
+/**
+ * @ClassName : ResultCode
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 17:01
+ * @Description : 结果状态
+ */
+public class ResultCode {
+    public static Integer SUCCESS = 200;
+    public static Integer ERROR = 500;
+}

src/main/java/cn/gyee/tamplate/controller/DutyscheduleController.java

@@ -27,6 +27,37 @@ public class DutyscheduleController {
     @Resource
     private IDutyscheduleService dutyscheduleService;
 
+
+    @PostMapping("/saveplus")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public void saveplus(@RequestBody List<DutyVo> dutys){
+        String begin = null;
+        String end = null;
+        for (DutyVo duty : dutys) {
+
+            if (duty.getBc().equals("上午")){
+                begin = "8:00";
+                end = "13:59";
+            }else if (duty.getBc().equals("下午")){
+                begin = "14:00";
+                end = "19:59";
+            }else{
+                begin = "0:00,20:00";
+                end = "7:59,23:59";
+            }
+            Date theday = DateUtils.parseDate(duty.getRq());
+            Dutyschedule dutyschedule = new Dutyschedule();
+            dutyschedule.setBegin(begin);
+            dutyschedule.setEnd(end);
+            dutyschedule.setCreatedate(theday);
+            dutyschedule.setName(duty.getZj());
+            dutyscheduleService.save(dutyschedule);
+        }
+
+    }
+
+
     @GetMapping("/save")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
@@ -69,8 +100,8 @@ public class DutyscheduleController {
         List<Dutyschedule> dutyschedulesList=dutyscheduleService.list(wrapper);
         dutyschedulesList.stream().forEach(i -> {
             DutyVo vo = new DutyVo();
-            vo.setName(i.getName());
-            vo.setDate(DateUtils.toDate(i.getCreatedate()));
+            vo.setZj(i.getName());
+            vo.setRq(DateUtils.toDate(i.getCreatedate()));
             if (i.getBegin().equals("8:00")){
                 vo.setBc("上午");
             }else if(i.getBegin().equals("14:00")){

src/main/java/cn/gyee/tamplate/controller/analysis/AnalysisNewController.java

@@ -1,13 +1,16 @@
 package cn.gyee.tamplate.controller.analysis;
 
+import cn.gyee.tamplate.config.R;
 import cn.gyee.tamplate.model.vo.AnalysisMainVo;
 import cn.gyee.tamplate.service.analysis.AnalysisNewService;
+import cn.gyee.tamplate.util.DateUtils;
 import cn.gyee.tamplate.util.common.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.beans.IntrospectionException;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -23,6 +26,7 @@ public class AnalysisNewController {
     @Resource
     private AnalysisNewService analysisNewService;
 
+
     /**
      * 首页list
      * @param beginDate

src/main/java/cn/gyee/tamplate/model/vo/DutyVo.java

@@ -10,7 +10,7 @@ import lombok.Data;
  */
 @Data
 public class DutyVo {
-    private String Date;
-    private String name;
+    private String zj;
     private String bc;
+    private String rq;
 }

src/main/java/cn/gyee/tamplate/task/SaticScheduleTask.java

@@ -33,29 +33,38 @@ public class SaticScheduleTask {
     @Resource
     private AnalysisNewService analysisNewService;
 
-    //3.添加定时任务
-    @Scheduled(cron = "0 0 1 * * ?")
-    //或直接指定时间间隔，例如：5秒
-    //@Scheduled(fixedRate=5000)
-    private void configureTasks1() {
-        try {
-            operationService.opeMapTask();
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Scheduled(cron = "0 0 2 * * ?")
-    //或直接指定时间间隔，例如：5秒
-    //@Scheduled(fixedRate=5000)
-    private void configureTasks2() {
-        try {
-            benchmarkService.createBeanchmarkList();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+//    //3.添加定时任务
+//    /**
+//     * 控制指令调度
+//     */
+//    @Scheduled(cron = "0 0 1 * * ?")
+//    //或直接指定时间间隔，例如：5秒
+//    //@Scheduled(fixedRate=5000)
+//    private void configureTasks1() {
+//        try {
+//            operationService.opeMapTask();
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    /**
+//     * 值际五损调度
+//     */
+//    @Scheduled(cron = "0 0 2 * * ?")
+//    //或直接指定时间间隔，例如：5秒
+//    //@Scheduled(fixedRate=5000)
+//    private void configureTasks2() {
+//        try {
+//            benchmarkService.createBeanchmarkList();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
 
+    /**
+     * 风电统计分析
+     */
     @Scheduled(cron = "0 15 0 * * ?")
     //或直接指定时间间隔，例如：5秒
     //@Scheduled(fixedRate=5000)
@@ -80,6 +89,9 @@ public class SaticScheduleTask {
         }
     }
 
+    /**
+     * 光伏统计分析
+     */
     @Scheduled(cron = "0 0 20 * * ?")
     //或直接指定时间间隔，例如：5秒
     //@Scheduled(fixedRate=5000)

src/test/java/cn/gyee/tamplate/AnalysisTest.java

@@ -28,13 +28,13 @@ public class AnalysisTest {
 
 
 //       analysisNewService.savaAnalysisGfmain("2021-04-01", "2021-04-22");
-//        analysisNewService.saveAnalysisGfTableBottom("2021-04-01", "2021-04-22");
+        analysisNewService.saveAnalysisGfTableBottom("2021-07-10", "2021-08-02");
 //        analysisNewService.savePvProject("2021-04-01", "2021-04-22");
 //        analysisNewService.savePvStation("2021-04-01", "2021-04-22");
 
 
               //  analysisNewService.savaAnalysismain("2021-04-25", "2021-04-25");
-//        analysisNewService.saveAnalysisTableBottom("2021-04-26", "2021-04-26");
+        analysisNewService.saveAnalysisTableBottom("2021-07-10", "2021-08-02");
 //        analysisNewService.saveWindProject("2021-04-26", "2021-04-26");
 //        analysisNewService.saveWindStation("2021-04-26", "2021-04-26");
 //        analysisNewService.saveCompany("2021-04-26", "2021-04-26");