From 9199a7c7632b01ac7c5f2ed20dc56c288f80344b Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Mon, 10 Apr 2023 20:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=9C=88=E6=B5=81=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pq/pojo/param/PqsParam.java    |  2 ++
 .../controller/OperationContrController.java   | 15 +++++++++++----
 .../com/njcn/device/pq/mapper/LineMapper.java  |  6 ++++--
 .../device/pq/mapper/mapping/DeviceMapper.xml  |  4 ++--
 .../device/pq/mapper/mapping/LineMapper.xml    | 18 ++++++++++++++++++
 .../njcn/device/pq/service/LineService.java    |  2 ++
 .../pq/service/impl/LineServiceImpl.java       |  6 ++++++
 7 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsParam.java
index 59180de88..0e397d9a6 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsParam.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsParam.java
@@ -12,6 +12,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 public class PqsParam extends DeviceInfoParam.BusinessParam {
+    @ApiModelProperty("装置id")
+    private String devId;
     @ApiModelProperty("当前页码")
     private Integer pageNum;
     @ApiModelProperty("当前页条数")
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java
index 292e198cb..d15c77864 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java
@@ -22,10 +22,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -118,6 +115,16 @@ public class OperationContrController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getMonthFlow")
+    @ApiOperation("获取每月流量")
+    @ApiImplicitParam(name = "deviceInfoParam", value = "实体", required = true)
+    public HttpResult<List<LineFlowMealDetailVO>> getMonthFlow (@RequestBody PqsParam deviceInfoParam){
+        String methodDescribe = getMethodDescribe("getMonthFlow");
+        LogUtil.njcnDebug(log, "{}，参数集合：{}", methodDescribe, deviceInfoParam);
+        List<LineFlowMealDetailVO> result = lineService.getMonthFlow(deviceInfoParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
 
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
index 649f45d25..981eb08c0 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
@@ -420,6 +420,8 @@ public interface LineMapper extends BaseMapper<Line> {
 
     List<LineFlowMealDetailVO> getDeviceRunStatistics(@Param("list") List<String> list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
 
-    Page<LineFlowMealDetailVO> getNewDeviceRunStatistics(Page<LineFlowMealDetailVO> page,@Param("devs") List<String> list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
-    Page<LineFlowMealDetailVO> getNewDeviceFlowStatistics(Page<LineFlowMealDetailVO> page,@Param("devs") List<String> list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
+    Page<LineFlowMealDetailVO> getNewDeviceRunStatistics (Page<LineFlowMealDetailVO> page,@Param("devs") List<String> list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
+    Page<LineFlowMealDetailVO> getNewDeviceFlowStatistics (Page<LineFlowMealDetailVO> page,@Param("devs") List<String> list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
+
+    List<LineFlowMealDetailVO> getMonthFlow (@Param("devId") String devId,@Param("startTime") DateTime beginOfDay, @Param("endTime") DateTime endOfDay);
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
index c2bfe7fcc..043a32d6c 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
@@ -118,7 +118,7 @@
 
     <select id="getRunManageDevList" resultType="com.njcn.device.pq.pojo.vo.RunTimeVO">
         SELECT
-        dev.Id as id,
+        dev.Id AS id,
         area.NAME AS areaName,
         gd.NAME AS gdName,
         sub.NAME AS bdName,
@@ -170,7 +170,7 @@
                 #{item2}
             </foreach>
         </if>
-        <if test="manufacturers.size()!=0">
+        <if test="manufacturers.size() != 0">
             and device.Manufacturer in
             <foreach collection="manufacturers" item="item3" separator="," open="("  close=")">
                 #{item3}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index fc3b8cbca..fdedbc27c 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -1053,5 +1053,23 @@
         and d.com_flag = #{comFlag}
         and a.state = 1
     </select>
+    <select id="getMonthFlow" resultType="com.njcn.device.pq.pojo.vo.LineFlowMealDetailVO">
+        select t.*,
+        (t.statisValue)/(t.flowMeal) flowProportion
+        from (
+            SELECT
+            m.Dev_Id,
+            ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal,
+            ifnull(m.Actual_Value,0)/1024/1024 statisValue
+            FROM    cld_month_flow  m
+            LEFT JOIN cld_dev_meal c ON m.Dev_Id = c.line_id
+            LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
+            LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
+            where m.Dev_Id = #{devId}
+            and
+            m.Time_Id between #{startTime} and #{endTime}
+        ) t
+        ORDER BY flowProportion DESC
+    </select>
 
 </mapper>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
index 6453fa6de..53ba61443 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
@@ -208,4 +208,6 @@ public interface LineService {
     Page<TopMsgPO> dailyDeviceAbnormalStatistics(PqsParam param);
 
     List<TopMsgPO> dailyDeviceAbnormal(DeviceInfoParam.BusinessParam conditionBusinessParam);
+
+    List<LineFlowMealDetailVO> getMonthFlow (PqsParam deviceInfoParam);
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
index aee95534a..ca87f9a39 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -403,6 +403,12 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         return topMsgDetails;
     }
 
+    @Override
+    public List<LineFlowMealDetailVO> getMonthFlow(PqsParam deviceInfoParam) {
+        List<LineFlowMealDetailVO> list = lineMapper.getMonthFlow(deviceInfoParam.getDevId(),DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())));
+        return list;
+    }
+
     @Override
     public List<LineFlowMealDetailVO> getDeviceRunStatistics(DeviceInfoParam.BusinessParam deviceInfoParam) {
         ArrayList<LineFlowMealDetailVO> lineFlowMealDetailList = new ArrayList<>();