mis数据导入新增功率和故障次数

src/main/java/com/gyee/frame/controller/report/MisReportController.java

@@ -2,6 +2,7 @@ package com.gyee.frame.controller.report;
 
 
 import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.Misdailydata;
 import com.gyee.frame.service.report.MisDailyDateService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.excel.MisDailyData;
@@ -11,11 +12,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * mis日报数据导入
@@ -47,6 +46,7 @@ public class MisReportController {
         return AjaxResult.success();
     }
 
+
     /**
      * 计算数据
      * @return
@@ -60,4 +60,35 @@ public class MisReportController {
         return AjaxResult.successData(200, list);
     }
 
+
+    /**
+     * 根据时间查询当前日期数据
+     * @param time
+     * @return
+     */
+    @GetMapping("/glyc/data")
+    public AjaxResult getGLYCData(String time){
+        Date date = DateUtils.parseStrtoDate(time, DateUtils.YYYY_MM_DD);
+
+        Misdailydata data = misDailyDateService.selectItemByDate(date);
+        return AjaxResult.successData(200, data);
+    }
+
+
+    /**
+     * 保存对象数据
+     * @return
+     */
+    @PostMapping("/save/glyc")
+    public AjaxResult saveGLYCData(@RequestBody Misdailydata data){
+        String str = DateUtils.format(data.getImportdate(), DateUtils.YYYY_MM_DD_HH_MM_SS);
+        data.setImportdate(DateUtils.parseStrtoDate(str, DateUtils.YYYY_MM_DD));
+        boolean flag = misDailyDateService.insertOrUpdate(data);
+
+        if (flag)
+            return AjaxResult.success();
+
+        return AjaxResult.error("保存失败");
+    }
+
 }

src/main/java/com/gyee/frame/mapper/auto/MisdailydataMapper.java

@@ -1,96 +0,0 @@
-package com.gyee.frame.mapper.auto;
-
-import com.gyee.frame.model.auto.Misdailydata;
-import com.gyee.frame.model.auto.MisdailydataExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface MisdailydataMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    long countByExample(MisdailydataExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(MisdailydataExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    int insert(Misdailydata record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    int insertSelective(Misdailydata record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    List<Misdailydata> selectByExample(MisdailydataExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    Misdailydata selectByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") Misdailydata record, @Param("example") MisdailydataExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") Misdailydata record, @Param("example") MisdailydataExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(Misdailydata record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table MISDAILYDATA
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(Misdailydata record);
-}

src/main/java/com/gyee/frame/service/report/MisDailyDateService.java

@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.gyee.frame.mapper.auto.MisdailydataMapper;
 import com.gyee.frame.model.auto.Misdailydata;
 import com.gyee.frame.model.auto.MisdailydataExample;
-import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
 import com.gyee.frame.util.excel.MisDailyData;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,7 +50,7 @@ public class MisDailyDateService {
     public boolean selectItem(Misdailydata data){
         MisdailydataExample example = new MisdailydataExample();
         example.createCriteria().andImportdateEqualTo(data.getImportdate())
-                .andUnitNoEqualTo((short) data.getUnitNo());
+                .andUnitNoEqualTo(data.getUnitNo());
 
         List<Misdailydata> list = misdailydataMapper.selectByExample(example);
         if (list.size() > 0)
@@ -59,6 +59,41 @@ public class MisDailyDateService {
             return false;
     }
 
+    /**
+     * 更新或删除短期功率预测数据和故障次数
+     * @param data
+     * @return
+     */
+    public boolean insertOrUpdate(Misdailydata data){
+        int i = 0;
+
+        if (StringUtils.isEmpty(data.getId())){
+            data.setId(SnowflakeIdWorker.getUUID());
+            i = misdailydataMapper.insert(data);
+        } else {
+            i = misdailydataMapper.updateByPrimaryKey(data);
+        }
+
+        return i > 0 ? true : false;
+    }
+
+    /**
+     * 查询短期功率数据及故障次数
+     * @param date
+     * @return
+     */
+    public Misdailydata selectItemByDate(Date date){
+        MisdailydataExample example = new MisdailydataExample();
+        example.createCriteria().andImportdateEqualTo(date)
+                .andUnitNoIsNull();
+
+        List<Misdailydata> list = misdailydataMapper.selectByExample(example);
+
+        Misdailydata obj = list.size() > 0 ? list.get(0) : new Misdailydata();
+
+        return obj;
+    }
+
 
     /**
      * 计算数据   风速、同期电量等
@@ -68,7 +103,8 @@ public class MisDailyDateService {
     public List<Object> getCalData(Date st, Date et){
         //当前数据
         MisdailydataExample example = new MisdailydataExample();
-        example.createCriteria().andImportdateBetween(st, et);
+        example.createCriteria().andImportdateBetween(st, et)
+                .andProjectidIsNotNull();
         example.setOrderByClause(" IMPORTDATE ASC");
         List<Misdailydata> listC = misdailydataMapper.selectByExample(example);
 

src/main/java/com/gyee/frame/util/excel/MisDailyData.java

@@ -1,6 +1,5 @@
 package com.gyee.frame.util.excel;
 
-import com.gyee.frame.util.SnowflakeIdWorker;
 import org.apache.poi.ss.usermodel.Row;
 
 import java.util.Date;

src/main/java/com/gyee/frame/util/excel/MisDailyUtil.java

@@ -1,19 +1,15 @@
 package com.gyee.frame.util.excel;
 
-
-import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.exception.QiNiuException;
 import com.gyee.frame.common.exception.enums.QiNiuErrorEnum;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
-import com.qiniu.common.QiniuException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
@@ -23,7 +19,6 @@ import java.util.*;
  * mis日报数据导入
  */
 @Slf4j
-@Component
 public class MisDailyUtil {
 
     static String name = "C:\\Users\\HP\\Desktop\\2022年数据\\2022年8月国电电力MIS每日数据.xlsx";