104模块

platform-dao/src/main/java/com/platform/dao/dto/remote/RemoteDegreeLogDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Transient;
 import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -119,5 +120,6 @@ public class RemoteDegreeLogDTO extends BaseDTO implements Serializable {
     /**
      * 对应设备所属线路，用于分组统计
      */
-    private String zjm;
+    @Transient
+    private Integer baoyangTimes;
 }

platform-dao/src/main/java/com/platform/dao/vo/query/remote/RemoteDegreeLogVO.java

@@ -2,15 +2,11 @@ package com.platform.dao.vo.query.remote;
 
 import lombok.Data;
 import com.platform.common.bean.BaseVO;
-import com.platform.common.bean.BaseDTO;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.time.LocalDate;
 import java.math.BigDecimal;
 
 /**
@@ -36,12 +32,16 @@ public class RemoteDegreeLogVO extends BaseVO implements Serializable {
      * 设备名称
      */
     private String sbName;
+    /**
+     * 设备名称
+     */
+    private String sbNo;
     /**
      * 点位
      */
     private Integer positionNum;
     /**
-     * 类型
+     * 类型：1正向有功,2正向无功
      */
     private Integer type;
     /**
@@ -99,6 +99,6 @@ public class RemoteDegreeLogVO extends BaseVO implements Serializable {
     /**
      * 对应设备所属线路，用于分组统计
      */
-    private String zjm;
+    private Integer baoyangTimes;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -424,11 +424,11 @@ public class SbInfoVO extends BaseVO implements Serializable {
     private LocalDate lastBaoyangTime;//最近保养时间
     private double lastBaoyangMiles;//最近保养里程
     private double lastBaoyangHours;//最近保养台时
-    private Integer baoyangTimes;//保养次数
+    private Integer baoyangTimes;//保养次数 （改成宁德的：线路，电力设备的线路问题，在数据字典SB_LINE）
 
-    private String zjm;//助记码，（改成宁德的：线路，电力设备的线路问题，在数据字典SB_LINE）
+    private String zjm;//助记码，页面位置水平轴，
     private LocalDate spDate;//上牌日期
-    private String jbdh;//交保单号
+    private String jbdh;//交保单号,页面位置垂直轴
     private LocalDate jbdDate;//交保到期日
     private LocalDate sbdDate;//商报到期日
     private String bxgs;//保险公司

platform-dao/src/main/resources/mapper/remote/RemoteDegreeLogMapper.xml

@@ -112,13 +112,13 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.remote.RemoteDegreeLogDTO"
             resultType="com.platform.dao.vo.query.remote.RemoteDegreeLogVO">
-        select degree_log.*, sbInfo.zjm, sbInfo.no sbNo
+        select degree_log.*, sbInfo.baoyang_times baoyangTimes, sbInfo.no sbNo
         from t_remote_degree_log as degree_log
         left join t_sb_info sbInfo on degree_log.sb_id = sbInfo.id
         <where>
             <include refid="List_Condition"/>
-            <if test="zjm != null">
-                and sbInfo.zjm = #{zjm}
+            <if test="baoyangTimes != null">
+                and sbInfo.baoyang_times = #{baoyangTimes}
             </if>
         </where>
     </select>

platform-rest/src/main/java/com/platform/rest/controller/remote/RemoteDegreeLogController.java

@@ -131,7 +131,7 @@ public class RemoteDegreeLogController {
      * @return R
      */
     @GetMapping("/report/{isDay}")
-    public R queryMonthOrDay(RemoteDegreeLogDTO remoteDegreeLogDTO, @PathVariable("id") Integer isDay) {
+    public R queryMonthOrDay(RemoteDegreeLogDTO remoteDegreeLogDTO, @PathVariable("isDay") Integer isDay) {
         return new R<>(remoteDegreeLogService.getMonthOrDayReport(remoteDegreeLogDTO, isDay == 1 ? true : false));
     }
 

platform-service/src/main/java/com/platform/service/remote/impl/RemoteDegreeLogServiceImpl.java

@@ -131,7 +131,7 @@ public class RemoteDegreeLogServiceImpl extends BaseServiceImpl<RemoteDegreeLogM
         sysDictList.sort(Comparator.comparing(SysDict::getSort));
         List<RemoteDegreeLogVO> list = mapper.selectList(record);
         JSONArray jSONArray = new JSONArray();
-        if (isDay) {
+        if (isDay) {//
             for (int i = 0; i < 24; i++) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("time", i + ":00");
@@ -142,11 +142,13 @@ public class RemoteDegreeLogServiceImpl extends BaseServiceImpl<RemoteDegreeLogM
                     BigDecimal positiveTotal = new BigDecimal(0.00);// 正向有功
                     BigDecimal negativeTotal = new BigDecimal(0.00);// 正向无功
                     for (RemoteDegreeLogVO log : list) {
-                        if (log.getHour().equals(i)) {
-                            if(log.getType().equals(YesNoEnum.YES.getValue())){
-                                positiveTotal.add(new BigDecimal(log.getResult()));
-                            }else{
-                                negativeTotal.add(new BigDecimal(log.getResult()));
+                        if (log.getBaoyangTimes().toString().equals(dict.getValue())) {
+                            if (log.getHour().equals(i)) {
+                                if (log.getType().equals(1)) {
+                                    positiveTotal = positiveTotal.add(new BigDecimal(log.getResult()));
+                                } else {
+                                    negativeTotal = negativeTotal.add(new BigDecimal(log.getResult()));
+                                }
                             }
                         }
                     }
@@ -159,10 +161,10 @@ public class RemoteDegreeLogServiceImpl extends BaseServiceImpl<RemoteDegreeLogM
             }
         } else {
             LocalDate localDate = LocalDate.of(record.getYear(), record.getMonth(), 1);
-            int days = localDate.getDayOfMonth();
-            for (int i = 0; i < days; i++) {
+            int days = localDate.lengthOfMonth();
+            for (int i = 1; i <= days; i++) {
                 JSONObject jsonObject = new JSONObject();
-                jsonObject.put("time", i + ":00");
+                jsonObject.put("time", i);
                 JSONArray lineArray = new JSONArray();
                 for (SysDict dict : sysDictList) {
                     JSONObject dictJsonObject = new JSONObject();
@@ -170,11 +172,16 @@ public class RemoteDegreeLogServiceImpl extends BaseServiceImpl<RemoteDegreeLogM
                     BigDecimal positiveTotal = new BigDecimal(0.00);// 正向有功
                     BigDecimal negativeTotal = new BigDecimal(0.00);// 正向无功,不需要吗，后面可以删除，先保存
                     for (RemoteDegreeLogVO log : list) {
-                        if (log.getDay().equals(i)) {
-                            if(log.getType().equals(YesNoEnum.YES.getValue())){
-                                positiveTotal.add(new BigDecimal(log.getResult()));
-                            }else{
-                                negativeTotal.add(new BigDecimal(log.getResult()));
+                        if(log.getBaoyangTimes() == null){
+                            throw new BusinessException("设备未设置电力线路, 设备名称：" + log.getSbName() + ", 设备编号：" + log.getSbNo());
+                        }
+                        if (log.getBaoyangTimes().toString().equals(dict.getValue())) {
+                            if (log.getDay().equals(i)) {
+                                if (log.getType().equals(1)) {
+                                    positiveTotal = positiveTotal.add(new BigDecimal(log.getResult()));
+                                } else {
+                                    negativeTotal = negativeTotal.add(new BigDecimal(log.getResult()));
+                                }
                             }
                         }
                     }
@@ -186,8 +193,13 @@ public class RemoteDegreeLogServiceImpl extends BaseServiceImpl<RemoteDegreeLogM
                 jSONArray.add(jsonObject);
             }
         }
+        return jSONArray;
+    }
 
-        return null;
+    public static void main(String[] args) {
+        LocalDate localDate = LocalDate.of(2022, 10, 1);
+        int days = localDate.lengthOfMonth();
+        System.out.println(days);
     }
 
     @Override