From 719fb5c4812bf9825686529c1ea36f46e0383703 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Fri, 29 Jul 2022 11:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/domain/BaseDtNeng.java   |  13 +-
 .../mapper/system/BaseDtNengMapper.xml        |   7 +-
 .../mapper/system/BroadDataMapper.xml         | 148 ++++++++++++++++++
 3 files changed, 164 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseDtNeng.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseDtNeng.java
index 754b7a0..4f5a26d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseDtNeng.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseDtNeng.java
@@ -21,11 +21,12 @@ public class BaseDtNeng extends BaseEntity
     /** 年份 */
     @Excel(name = "年份")
     private Long yearName;
-
+    private String target;
     /** 1月 */
     @Excel(name = "1月")
     private String month1;
 
+
     /** 2月 */
     @Excel(name = "2月")
     private String month2;
@@ -70,7 +71,15 @@ public class BaseDtNeng extends BaseEntity
     @Excel(name = "12月")
     private String month12;
 
-    public void setId(Long id) 
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseDtNengMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseDtNengMapper.xml
index 8dada2c..eb523f7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseDtNengMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseDtNengMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="BaseDtNeng" id="BaseDtNengResult">
         <result property="id"    column="id"    />
         <result property="yearName"    column="year_name"    />
+        <result property="target"    column="target"    />
         <result property="month1"    column="month1"    />
         <result property="month2"    column="month2"    />
         <result property="month3"    column="month3"    />
@@ -22,11 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBaseDtNengVo">
-        select id, year_name, month1, month2, month3, month4, month5, month6, month7, month8, month9, month10, month11, month12 from base_dt_neng
+        select id, year_name, month1, month2, month3, month4, month5,
+        month6, month7, month8, month9, month10, month11, month12,target from base_dt_neng
     </sql>
 
     <select id="selectBaseDtNengList1" parameterType="BaseDtNeng" resultMap="BaseDtNengResult">
- select id, year_name, month1, month2, month3, month4, month5, month6, month7, month8, month9, month10, month11, month12 from base_dt_neng
+    select  target,year_name, month1, month2, month3, month4, month5, month6,
+    month7, month8, month9, month10, month11, month12 from base_dt_neng
     where year_name=to_number(to_char(sysdate,'yyyy'))
     </select>
     <select id="selectBaseDtNengList" parameterType="BaseDtNeng" resultMap="BaseDtNengResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 3cbca41..01c40ea 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -110,6 +110,154 @@
         group by TO_CHAR(CREATION_DATE, 'hh24')
     </select>
 
+    <select id="selectOutputByTime1" resultType="com.ruoyi.system.domain.BoxOutput">
+        select name, qty
+        from (
+                 select '19:30' as name, sum(QTY3) as qty,1 as ord
+                 from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                          left join (
+                     select W_END as day1, W_END + interval '1' HOUR as day2
+                     from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+                     where qt = 1
+                 ) t1 on 1 = 1
+                 where ippb.CREATE_TIME &gt;= day1 and ippb.CREATE_TIME &lt; day2
+                union
+        select '20:30' as name, sum(QTY3) as qty, 2 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            -- 2022-07-28 20:30:00
+            select W_END + interval '1' HOUR as day1, W_END + interval '2' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+                union
+        select '21:30' as name, sum(QTY3) as qty, 3 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            -- 2022-07-28 21:30:00
+            select W_END + interval '2' HOUR as day1, W_END + interval '3' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+                union
+        select '22:30' as name, sum(QTY3) as qty, 4 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            -- 2022-07-28 22:30:00
+            select W_END + interval '3' HOUR as day1, W_END + interval '4' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+                union
+        select '23:30' as name, sum(QTY3) as qty, 5 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            -- 2022-07-28 23:30:00
+            select W_END + interval '4' HOUR as day1, W_END + interval '5' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+
+                union
+        select '00:30' as name, sum(QTY3) as qty, 6 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            -- 2022-07-29 00:30:00
+            select W_END + interval '5' HOUR as day1, W_END + interval '6' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+
+                union
+        select '01:30' as name, sum(QTY3) as qty, 7 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            -- 2022-07-29 01:30:00
+            select W_END + interval '6' HOUR as day1, W_END + interval '7' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+
+                union
+        select '02:30' as name, sum(QTY3) as qty, 8 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            select W_END + interval '7' HOUR as day1, W_END + interval '8' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+
+                union
+        select '03:30' as name, sum(QTY3) as qty, 9 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            select W_END + interval '8' HOUR as day1, W_END + interval '9' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+
+                union
+        select '04:30' as name, sum(QTY3) as qty, 10 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            select W_END + interval '9' HOUR as day1, W_END + interval '10' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+
+                union
+        select '05:30' as name, sum(QTY3) as qty, 11 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            select W_END + interval '10' HOUR as day1, W_END + interval '11' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+
+                union
+        select '06:30' as name, sum(QTY3) as qty, 12 as ord
+        from IMOS.BASE_BOX_OUTPUT_RECORD ippb
+                 left join (
+            select W_END + interval '11' HOUR as day1, W_END + interval '12' HOUR as day2
+            from (select W_END, row_number() over (order by CREATE_TIME desc) as qt from haiwei.BASE_DAY_WBTIME)
+            where qt = 1
+        ) t1 on 1 = 1
+        where ippb.CREATE_TIME &gt;
+        = day1 and ippb.CREATE_TIME &lt;
+        day2
+                    )
+                order by ord
+    </select>
     <select id="selectOutputByTime" resultType="com.ruoyi.system.domain.BoxOutput">
         select '07:30' as name, nvl(sum(QTY3),0) as qty
         from IMOS.BASE_BOX_OUTPUT_RECORD