瀏覽代碼

超标准停电时长查询新增标准

zx 3 月之前
父節點
當前提交
9f45880a63

+ 4 - 3
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmStopRecordsController.java

@@ -3,6 +3,7 @@ package com.ruoyi.powerdistribution.controller;
 import java.util.List;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.ruoyi.powerdistribution.domain.vo.PdmStopRecordsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -45,7 +46,7 @@ public class PdmStopRecordsController extends BaseController
     {
     {
         startPage();
         startPage();
         pdmStopRecords.setTimeFlag("1");//超长停电
         pdmStopRecords.setTimeFlag("1");//超长停电
-        List<PdmStopRecords> list = pdmStopRecordsService.selectPdmStopRecordsList(pdmStopRecords);
+        List<PdmStopRecordsVo> list = pdmStopRecordsService.selectPdmStopRecordsList(pdmStopRecords);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
@@ -56,8 +57,8 @@ public class PdmStopRecordsController extends BaseController
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, PdmStopRecords pdmStopRecords)
     public void export(HttpServletResponse response, PdmStopRecords pdmStopRecords)
     {
     {
-        List<PdmStopRecords> list = pdmStopRecordsService.selectPdmStopRecordsList(pdmStopRecords);
-        ExcelUtil<PdmStopRecords> util = new ExcelUtil<PdmStopRecords>(PdmStopRecords.class);
+        List<PdmStopRecordsVo> list = pdmStopRecordsService.selectPdmStopRecordsList(pdmStopRecords);
+        ExcelUtil<PdmStopRecordsVo> util = new ExcelUtil<PdmStopRecordsVo>(PdmStopRecordsVo.class);
         util.exportExcel(response, list, "可靠性停电记录数据");
         util.exportExcel(response, list, "可靠性停电记录数据");
     }
     }
 
 

+ 1 - 9
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmStopRecords.java

@@ -164,23 +164,15 @@ public class PdmStopRecords extends BaseEntity
     private String operaFlgDsc;
     private String operaFlgDsc;
 
 
     /** 生成时间 */
     /** 生成时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "生成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createTm;
     private Date createTm;
 
 
     /** 确认时间 */
     /** 确认时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date affirmTm;
     private Date affirmTm;
 
 
     /** 入库时间 */
     /** 入库时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date enterTm;
     private Date enterTm;
 
 
     /** 修改时间 */
     /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updateTm;
     private Date updateTm;
 
 
     /** 推送标志代码 */
     /** 推送标志代码 */
@@ -535,7 +527,7 @@ public class PdmStopRecords extends BaseEntity
     private String stopReason;
     private String stopReason;
 
 
     /**
     /**
-     * 是否超时长
+     * 是否超时长 查询条件
      */
      */
     private String timeFlag;
     private String timeFlag;
 
 

+ 26 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/vo/PdmStopRecordsVo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.powerdistribution.domain.vo;
+
+import com.ruoyi.powerdistribution.domain.PdmStopRecords;
+
+/**
+ * 可靠性停电记录对象 VO
+ *
+ * @author ruoyi
+ * @date 2024-12-18
+ */
+public class PdmStopRecordsVo extends PdmStopRecords
+{
+
+    /**
+     * 标准时长
+     */
+    private String standardTime;
+
+    public String getStandardTime() {
+        return standardTime;
+    }
+
+    public void setStandardTime(String standardTime) {
+        this.standardTime = standardTime;
+    }
+}

+ 2 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmStopRecordsMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.mapper;
 
 
 import java.util.List;
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmStopRecords;
 import com.ruoyi.powerdistribution.domain.PdmStopRecords;
+import com.ruoyi.powerdistribution.domain.vo.PdmStopRecordsVo;
 
 
 /**
 /**
  * 可靠性停电记录Mapper接口
  * 可靠性停电记录Mapper接口
@@ -25,7 +26,7 @@ public interface PdmStopRecordsMapper
      * @param pdmStopRecords 可靠性停电记录
      * @param pdmStopRecords 可靠性停电记录
      * @return 可靠性停电记录集合
      * @return 可靠性停电记录集合
      */
      */
-    public List<PdmStopRecords> selectPdmStopRecordsList(PdmStopRecords pdmStopRecords);
+    public List<PdmStopRecordsVo> selectPdmStopRecordsList(PdmStopRecords pdmStopRecords);
 
 
     /**
     /**
      * 新增可靠性停电记录
      * 新增可靠性停电记录

+ 2 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmStopRecordsService.java

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.service;
 
 
 import java.util.List;
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmStopRecords;
 import com.ruoyi.powerdistribution.domain.PdmStopRecords;
+import com.ruoyi.powerdistribution.domain.vo.PdmStopRecordsVo;
 
 
 /**
 /**
  * 可靠性停电记录Service接口
  * 可靠性停电记录Service接口
@@ -25,7 +26,7 @@ public interface IPdmStopRecordsService
      * @param pdmStopRecords 可靠性停电记录
      * @param pdmStopRecords 可靠性停电记录
      * @return 可靠性停电记录集合
      * @return 可靠性停电记录集合
      */
      */
-    public List<PdmStopRecords> selectPdmStopRecordsList(PdmStopRecords pdmStopRecords);
+    public List<PdmStopRecordsVo> selectPdmStopRecordsList(PdmStopRecords pdmStopRecords);
 
 
     /**
     /**
      * 新增可靠性停电记录
      * 新增可靠性停电记录

+ 2 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmStopRecordsServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.service.impl;
 
 
 import java.util.List;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.powerdistribution.domain.vo.PdmStopRecordsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.ruoyi.powerdistribution.mapper.PdmStopRecordsMapper;
 import com.ruoyi.powerdistribution.mapper.PdmStopRecordsMapper;
@@ -39,7 +40,7 @@ public class PdmStopRecordsServiceImpl implements IPdmStopRecordsService
      * @return 可靠性停电记录
      * @return 可靠性停电记录
      */
      */
     @Override
     @Override
-    public List<PdmStopRecords> selectPdmStopRecordsList(PdmStopRecords pdmStopRecords)
+    public List<PdmStopRecordsVo> selectPdmStopRecordsList(PdmStopRecords pdmStopRecords)
     {
     {
         return pdmStopRecordsMapper.selectPdmStopRecordsList(pdmStopRecords);
         return pdmStopRecordsMapper.selectPdmStopRecordsList(pdmStopRecords);
     }
     }

文件差異過大導致無法顯示
+ 0 - 0
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmStopRecordsMapper.xml


部分文件因文件數量過多而無法顯示