feat: 增加覆冰导出

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java

@@ -6,6 +6,7 @@ import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.entity.LeadPulls;
 import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals;
 import com.shxy.xymanager_common.page.TableDataInfo;
+import com.shxy.xymanager_common.util.EasyExcelUtil;
 import com.shxy.xymanager_common.vo.TerminalSelectVo;
 import com.shxy.xymanager_service.service.LeadPullsService;
 import com.shxy.xymanager_service.service.TerminalService;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 
 @RestController
 @Api(tags = {"拉力相关接口"})
@@ -34,12 +36,23 @@ public class LeadPullsController extends BaseController {
     @ApiOperation("查询列表")
     public ResponseReult<PageInfo<LeadPulls>> list(Integer lineId, Integer towerId, Integer termId,
                                                    Long start, Long end,
-                                                   int pageNum, int pageSize) {
+                                                   Integer pageNum, Integer pageSize) {
         PageInfo<LeadPulls> result = service.list(lineId, towerId, termId,
                 start, end, pageNum, pageSize);
         return ResponseReult.success(result);
     }
 
+    @GetMapping("export")
+    @ApiOperation("导出")
+    public void export(Integer lineId, Integer towerId, Integer termId,
+                       Long start, Long end,
+                       Integer pageNum, Integer pageSize,
+                       HttpServletResponse response) throws Exception {
+        PageInfo<LeadPulls> result = service.list(lineId, towerId, termId,
+                start, end, pageNum, pageSize);
+        EasyExcelUtil.createExcel(response, "覆冰数据", result.getList(), LeadPulls.class);
+    }
+
     @GetMapping("latest")
     @ApiOperation("查询最新的")
     public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> latest(Integer dyId, Integer lineId, Integer towerId,

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java

@@ -32,7 +32,7 @@ public class WeatherController extends BaseController {
     @ApiOperation("查询列表")
     public ResponseReult<PageInfo<Weathers>> list(Integer lineId, Integer towerId, Integer termId,
                                                   Long start, Long end,
-                                                  int pageNum, int pageSize) {
+                                                  Integer pageNum, Integer pageSize) {
         PageInfo<Weathers> result = service.list(lineId, towerId, termId,
                 start, end, pageNum, pageSize);
         return ResponseReult.success(result);

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LeadPulls.java

@@ -1,5 +1,9 @@
 package com.shxy.xymanager_common.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
 import java.util.Date;
 
 public class LeadPulls {
@@ -10,6 +14,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ExcelIgnore
     private Long id;
 
     /**
@@ -19,6 +24,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ExcelIgnore
     private Integer termId;
 
     /**
@@ -28,7 +34,12 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ExcelIgnore
     private Long updateTime;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "时间", order = 2)
+
+    private Date updateDate;
 
     /**
      *
@@ -37,6 +48,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(16)
+    @ExcelProperty(value = "功能单元识别码", order = 3)
     private Integer funcCode;
 
     /**
@@ -46,6 +59,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(14)
+    @ExcelProperty(value = "最大拉力(Kg)", order = 4)
     private Integer maxpullPull;
 
     /**
@@ -55,6 +70,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "最大拉力时风偏角(°)", order = 5)
     private Float maxpullWind;
 
     /**
@@ -64,6 +81,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "最大拉力时倾斜角(°)", order = 6)
     private Float maxpullTilt;
 
     /**
@@ -73,6 +92,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(14)
+    @ExcelProperty(value = "最小拉力(Kg)", order = 7)
     private Integer minpullPull;
 
     /**
@@ -82,6 +103,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "最小拉力时风偏角(°)", order = 8)
     private Float minpullWind;
 
     /**
@@ -91,6 +114,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "最小拉力时倾斜角(°)", order = 9)
     private Float minpullTilt;
 
     /**
@@ -100,6 +125,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(21)
+    @ExcelProperty(value = "最大风偏角时拉力(Kg)", order = 10)
     private Integer maxwindPull;
 
     /**
@@ -109,6 +136,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(14)
+    @ExcelProperty(value = "最大风偏角(°)", order = 11)
     private Float maxwindWind;
 
     /**
@@ -118,6 +147,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(22)
+    @ExcelProperty(value = "最大风偏角时倾斜角(°)", order = 12)
     private Float maxwindTilt;
 
     /**
@@ -127,6 +158,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(21)
+    @ExcelProperty(value = "最小风偏角时拉力(Kg)", order = 13)
     private Integer minwindPull;
 
     /**
@@ -136,6 +169,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(14)
+    @ExcelProperty(value = "最小风偏角(°)", order = 14)
     private Float minwindWind;
 
     /**
@@ -145,6 +180,8 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ColumnWidth(22)
+    @ExcelProperty(value = "最小风偏角时倾斜角(°)", order = 15)
     private Float minwindTilt;
 
     /**
@@ -154,6 +191,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ExcelIgnore
     private Long wid;
 
     /**
@@ -163,6 +201,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ExcelIgnore
     private Float windSpeed;
 
     /**
@@ -172,6 +211,7 @@ public class LeadPulls {
      *
      * @mbg.generated
      */
+    @ExcelIgnore
     private Date createTime;
 
     /**
@@ -244,6 +284,7 @@ public class LeadPulls {
      */
     public void setUpdateTime(Long updateTime) {
         this.updateTime = updateTime;
+        this.updateDate = new Date(updateTime*1000);
     }
 
     /**
@@ -630,7 +671,11 @@ public class LeadPulls {
         this.createTime = createTime;
     }
 
+    @ColumnWidth(15)
+    @ExcelProperty(value = "监测终端编号", order = 1)
     private String cmdid;
+
+    @ExcelIgnore
     private String phase;
 
     public String getCmdid() {
@@ -648,4 +693,12 @@ public class LeadPulls {
     public void setPhase(String phase) {
         this.phase = phase;
     }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java

@@ -28,7 +28,7 @@ public class LeadPullsServiceImpl implements LeadPullsService {
 
     @Override
     public PageInfo<LeadPulls> list(Integer lineId, Integer towerId, Integer termId,
-                                    Long start, Long end, int pageNum, int pageSize) {
+                                    Long start, Long end, Integer pageNum, Integer pageSize) {
         List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
         List<Integer> idList = new ArrayList<>();
         for (Terminals terminals : terminalsList) {
@@ -49,7 +49,9 @@ public class LeadPullsServiceImpl implements LeadPullsService {
         criteria.andTermIdIn(idList);
         example.setOrderByClause("update_time desc");
 
-        PageHelper.startPage(pageNum, pageSize);
+        if (pageNum != null && pageSize != null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
         List<LeadPulls> list = mapper.selectByExample(example);
         for (LeadPulls leadPull : list) {
             for (Terminals terminals : terminalsList) {

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java

@@ -26,7 +26,7 @@ public class WeatherServiceImpl implements WeatherService {
 
     @Override
     public PageInfo<Weathers> list(Integer lineId, Integer towerId, Integer termId,
-                                   Long start, Long end, int pageNum, int pageSize) {
+                                   Long start, Long end, Integer pageNum, Integer pageSize) {
         List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
         List<Integer> idList = new ArrayList<>();
         for (Terminals terminals : terminalsList) {
@@ -47,7 +47,9 @@ public class WeatherServiceImpl implements WeatherService {
         criteria.andTermIdIn(idList);
         example.setOrderByClause("update_time desc");
 
-        PageHelper.startPage(pageNum, pageSize);
+        if (pageNum != null && pageSize != null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
         List<Weathers> list = mapper.selectByExample(example);
         for (Weathers weather : list) {
             for (Terminals terminals : terminalsList) {

xymanager_service/src/main/java/com/shxy/xymanager_service/service/LeadPullsService.java

@@ -8,7 +8,7 @@ public interface LeadPullsService {
 
     PageInfo<LeadPulls> list(Integer lineId, Integer towerId, Integer termId,
                              Long start, Long end,
-                             int pageNum, int pageSize);
+                             Integer pageNum, Integer pageSize);
 
     LeadPulls getLast(Integer termId);
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/WeatherService.java

@@ -8,7 +8,7 @@ public interface WeatherService {
 
     PageInfo<Weathers> list(Integer lineId, Integer towerId, Integer termId,
                             Long start, Long end,
-                            int pageNum, int pageSize);
+                            Integer pageNum, Integer pageSize);
 
     Weathers getLast(Integer termId);
 }