线路，分支线代码提交

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmBranchLineController.java

@@ -2,6 +2,10 @@ package com.ruoyi.powerdistribution.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.powerdistribution.domain.vo.PdmBranchLineComplete;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-12-24
  */
+@Api(value = "PdmBranchLineController", tags = "分支线查询")
 @RestController
 @RequestMapping("/power/branchLine")
 public class PdmBranchLineController extends BaseController
@@ -101,4 +106,17 @@ public class PdmBranchLineController extends BaseController
     {
         return toAjax(pdmBranchLineService.deletePdmBranchLineByIds(ids));
     }
+
+    /**
+     * 查询可靠性分支线完成情况
+     */
+    @ApiOperation(value = "查询可靠性分支线完成情况")
+    @GetMapping("/selectBranchLineCompleteList")
+    public TableDataInfo selectBranchLineCompleteList(PdmBranchLineComplete pdmBranchLine)
+    {
+        startPage();
+        List<PdmBranchLineComplete> list = pdmBranchLineService.selectBranchLineCompleteList(pdmBranchLine);
+        return getDataTable(list);
+    }
+
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmLineController.java

@@ -2,12 +2,14 @@ package com.ruoyi.powerdistribution.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.powerdistribution.domain.vo.PdmLineComplete;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-12-24
  */
+@Api(value = "PdmLineController", tags = "线路查询")
 @RestController
 @RequestMapping("/power/line")
 public class PdmLineController extends BaseController
@@ -74,7 +77,7 @@ public class PdmLineController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:line:add')")
     @Log(title = "可靠性馈线", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody PdmLine pdmLine)
     {
         return toAjax(pdmLineService.insertPdmLine(pdmLine));
@@ -85,7 +88,7 @@ public class PdmLineController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:line:edit')")
     @Log(title = "可靠性馈线", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/update")
     public AjaxResult edit(@RequestBody PdmLine pdmLine)
     {
         return toAjax(pdmLineService.updatePdmLine(pdmLine));
@@ -96,9 +99,22 @@ public class PdmLineController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:line:remove')")
     @Log(title = "可靠性馈线", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(pdmLineService.deletePdmLineByIds(ids));
     }
+
+    /**
+     * 查询线路完成情况列表
+     */
+    @ApiOperation(value = "查询线路完成情况列表")
+    @GetMapping("/selectCompleteList")
+    public TableDataInfo selectCompleteList(PdmLineComplete complete)
+    {
+        startPage();
+        List<PdmLineComplete> list = pdmLineService.selectCompleteList(complete);
+        return getDataTable(list);
+    }
+
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/vo/PdmBranchLineComplete.java

@@ -0,0 +1,25 @@
+package com.ruoyi.powerdistribution.domain.vo;
+
+import com.ruoyi.powerdistribution.domain.PdmBranchLine;
+
+import java.math.BigDecimal;
+
+/**
+ * 线路完成情况
+ */
+public class PdmBranchLineComplete extends PdmBranchLine {
+
+    /** 计划检修后无故障持续时间 */
+    private String faultFreeDuration;
+
+    /** 奖励金额 */
+    private BigDecimal rewardAmount;
+
+    public String getFaultFreeDuration() {
+        return faultFreeDuration;
+    }
+
+    public BigDecimal getRewardAmount() {
+        return rewardAmount;
+    }
+}

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/vo/PdmLineComplete.java

@@ -0,0 +1,26 @@
+package com.ruoyi.powerdistribution.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.powerdistribution.domain.PdmLine;
+
+import java.math.BigDecimal;
+
+/**
+ * 线路完成情况统计
+ */
+public class PdmLineComplete extends PdmLine {
+
+    /** 计划检修后无故障持续时间 */
+    private String faultFreeDuration;
+
+    /** 奖励金额 */
+    private BigDecimal rewardAmount;
+
+    public String getFaultFreeDuration() {
+        return faultFreeDuration;
+    }
+
+    public BigDecimal getRewardAmount() {
+        return rewardAmount;
+    }
+}

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmBranchLineMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.mapper;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmBranchLine;
+import com.ruoyi.powerdistribution.domain.vo.PdmBranchLineComplete;
 
 /**
  * 可靠性分支线Mapper接口
@@ -58,4 +59,11 @@ public interface PdmBranchLineMapper
      * @return 结果
      */
     public int deletePdmBranchLineByIds(Long[] ids);
+
+    /**
+     * 查询分支线完成情况
+     * @param complete
+     * @return
+     */
+    List<PdmBranchLineComplete> selectBranchLineCompleteList(PdmBranchLineComplete complete);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmLineMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.mapper;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmLine;
+import com.ruoyi.powerdistribution.domain.vo.PdmLineComplete;
 
 /**
  * 可靠性馈线Mapper接口
@@ -58,4 +59,11 @@ public interface PdmLineMapper
      * @return 结果
      */
     public int deletePdmLineByIds(Long[] ids);
+
+    /**
+     * 统计完成情况
+     * @param complete
+     * @return
+     */
+    List<PdmLineComplete> selectCompleteList(PdmLineComplete complete);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmBranchLineService.java

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.service;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmBranchLine;
+import com.ruoyi.powerdistribution.domain.vo.PdmBranchLineComplete;
 
 /**
  * 可靠性分支线Service接口
@@ -58,4 +59,11 @@ public interface IPdmBranchLineService
      * @return 结果
      */
     public int deletePdmBranchLineById(Long id);
+
+    /**
+     * 查询分支线完成情况
+     * @param complete
+     * @return
+     */
+    List<PdmBranchLineComplete> selectBranchLineCompleteList(PdmBranchLineComplete complete);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmLineService.java

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.service;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmLine;
+import com.ruoyi.powerdistribution.domain.vo.PdmLineComplete;
 
 /**
  * 可靠性馈线Service接口
@@ -58,4 +59,11 @@ public interface IPdmLineService
      * @return 结果
      */
     public int deletePdmLineById(Long id);
+
+    /**
+     * 统计完成情况
+     * @param complete
+     * @return
+     */
+    List<PdmLineComplete> selectCompleteList(PdmLineComplete complete);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmBranchLineServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.powerdistribution.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.powerdistribution.domain.vo.PdmBranchLineComplete;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.powerdistribution.mapper.PdmBranchLineMapper;
@@ -90,4 +92,9 @@ public class PdmBranchLineServiceImpl implements IPdmBranchLineService
     {
         return pdmBranchLineMapper.deletePdmBranchLineById(id);
     }
+
+    @Override
+    public List<PdmBranchLineComplete> selectBranchLineCompleteList(PdmBranchLineComplete complete) {
+        return pdmBranchLineMapper.selectBranchLineCompleteList(complete);
+    }
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmLineServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.powerdistribution.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.powerdistribution.domain.vo.PdmLineComplete;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.powerdistribution.mapper.PdmLineMapper;
@@ -90,4 +92,9 @@ public class PdmLineServiceImpl implements IPdmLineService
     {
         return pdmLineMapper.deletePdmLineById(id);
     }
+
+    @Override
+    public List<PdmLineComplete> selectCompleteList(PdmLineComplete complete) {
+        return pdmLineMapper.selectCompleteList(complete);
+    }
 }

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmBranchLineMapper.xml

@@ -303,4 +303,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectBranchLineCompleteList" parameterType="com.ruoyi.powerdistribution.domain.vo.PdmBranchLineComplete" resultType="com.ruoyi.powerdistribution.domain.vo.PdmBranchLineComplete">
+        <include refid="selectPdmBranchLineVo"/>
+        <where>
+            <if test="lineNm != null  and lineNm != ''"> and line_nm = #{lineNm}</if>
+            <if test="eqpNo != null  and eqpNo != ''"> and eqp_no = #{eqpNo}</if>
+            <if test="runNo != null  and runNo != ''"> and run_no = #{runNo}</if>
+            <if test="blgBigFeederId != null  and blgBigFeederId != ''"> and blg_big_feeder_id = #{blgBigFeederId}</if>
+            <if test="blgBigFeederNm != null  and blgBigFeederNm != ''"> and blg_big_feeder_nm = #{blgBigFeederNm}</if>
+        </where>
+    </select>
 </mapper>

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmLineMapper.xml

@@ -183,4 +183,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectCompleteList" parameterType="com.ruoyi.powerdistribution.domain.vo.PdmLineComplete" resultType="com.ruoyi.powerdistribution.domain.vo.PdmLineComplete">
+        select *,TIMESTAMPDIFF(DAY,poweroff_term_tm,NOW()) fault_free_duration from(
+            SELECT
+            t1.id, t1.rec_id, t1.line_nm, t1.line_run_no, t1.volt_lvl_cd, t1.volt_lvl_dsc,
+            t1.subs_id, t1.subs_nm, t1.feeder_id, t1.feeder_nm, t1.op_maint_org_id, t1.op_maint_org_nm,
+            t1.maint_team_id, t1.maint_team_nm, t1.org_no, t1.org_nm, t1.std_creator_no, t1.std_creator_nm,
+            t1.std_updator_no, t1.std_updator_nm, t1.std_org_no, t1.std_org_nm, t1.std_city_org_no,
+            t1.std_city_org_nm, t1.std_county_org_no, t1.std_county_org_nm, t1.data_dt, t1.etl_tm,
+            (select max(poweroff_term_tm) poweroff_term_tm from pdm_stop_records where line_id = t1.rec_id  ) poweroff_term_tm
+        from pdm_line t1
+        <where>
+            <if test="recId != null  and recId != ''"> and t1.rec_id = #{recId}</if>
+            <if test="lineNm != null  and lineNm != ''"> and t1.line_nm like concat('%', #{lineNm}, '%')</if>
+        </where>
+        ) a
+    </select>
 </mapper>