Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/DateUtils.java

@@ -883,11 +883,17 @@ public class DateUtils {
                 endDay = i;
             }
             if(startDay != 0 && endDay != 0){
-                String s = year + "第" + getWeekOfYear(date2) + "周" + "（" + date.substring(5) + "月" + startDay +
-                        "日至" + date.substring(5) + "月" + endDay + "日" +"）";
-
+                String s = "";
                 String weekStart = year + "-"+ date.substring(5) +"-" +startDay +" 00:00:00";
                 String weekEnd = year + "-"+ date.substring(5) +"-" +endDay +" 23:59:59";
+                if("12".equals(date.substring(5)) && weekOfYear(date2) == 1 ){
+                    long week =  Long.valueOf(dates.get(dates.size()-1).get("name").substring(5,7)) + 1;
+                    s = year + "第" + week + "周" + "（" + date.substring(5) + "月" + startDay +
+                            "日至" + date.substring(5) + "月" + endDay + "日" +"）";
+                } else {
+                    s = year + "第" + getWeekOfYear(date2) + "周" + "（" + date.substring(5) + "月" + startDay +
+                            "日至" + date.substring(5) + "月" + endDay + "日" +"）";
+                }
                 HashMap<String, String> map = new HashMap<>();
                 map.put("name",s);
                 map.put("weekStart",weekStart);
@@ -912,6 +918,14 @@ public class DateUtils {
         return week_of_year;
     }
 
+    public static int weekOfYear(Date date) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        c.setFirstDayOfWeek(Calendar.MONDAY);
+        int week_of_year = c.get(Calendar.WEEK_OF_YEAR);
+        return week_of_year;
+    }
+
     /**
      * 获得本月的开始时间，即2012-01-01 00:00:00
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java

@@ -61,9 +61,9 @@ public interface EmergencyMapper extends BaseMapper{
 
     List<Map<String, Object>> getCAFSWaterTankInfo(@Param("bizOrgCode") String bizOrgCode);
 
-    List<Map<String, Object>> selectAlarmAnalysis(@Param("bizOrgCode") String bizOrgCode, @Param("startDate")String startDate, @Param("endDate")String endDate);
+    List<Map<String, Object>> selectAlarmAnalysis(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("dataType")String dataType, @Param("date")String date, @Param("list") List<String> codes);
 
-    List<Map<String, Object>> selectAlarmAnalysisCount(@Param("bizOrgCode") String bizOrgCode, @Param("startDate")String startDate, @Param("endDate")String endDate);
+    List<Map<String, Object>> selectAlarmAnalysisCount( @Param("startDate")String startDate, @Param("endDate")String endDate,@Param("list") List<String> codes);
 
     Map<String, Object> getSystemAndCarCount();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java

@@ -34,9 +34,9 @@ public interface IEmergencyService {
 
     Page<Map<String, Object>> selectPressureFlow(Page<Map<String, Object>> page, String bizOrgCode);
 
-    List<Map<String, Object>> selectAlarmAnalysis(String bizOrgCode, String startDate, String endDate);
+    List<Map<String, Object>> selectAlarmAnalysis(String startDate, String endDate, String dataType, String date, String systemType);
 
-    List<Map<String, Object>> selectAlarmAnalysisCount(String bizOrgCode, String startDate, String endDate);
+    List<Map<String, Object>> selectAlarmAnalysisCount(String systemType, String startDate, String endDate);
 
     Map<String, Object> systemAndCar();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.mapper.EmergencyMapper;
 import com.yeejoin.equipmanage.service.IEmergencyService;
 import org.apache.commons.compress.utils.Lists;
@@ -8,8 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static com.yeejoin.equipmanage.common.utils.DateUtils.getFirstDayOfMonth;
+
 /**
  *
  * 四横八纵应急模块接口服务类
@@ -90,13 +96,23 @@ public class EmergencyServiceImpl implements IEmergencyService {
     }
 
     @Override
-    public List<Map<String, Object>> selectAlarmAnalysis(String bizOrgCode, String startDate, String endDate) {
-        return emergencyMapper.selectAlarmAnalysis(bizOrgCode, startDate, endDate);
+    public List<Map<String, Object>> selectAlarmAnalysis(String startDate, String endDate, String dataType, String date, String systemType) {
+        List<String> strings = emergencyMapper.selectSystemCodes(systemType);
+        if (!CollectionUtils.isEmpty(strings)) {
+            return emergencyMapper.selectAlarmAnalysis(startDate, endDate, dataType, date, strings);
+        }
+        return null;
+
     }
 
     @Override
-    public List<Map<String, Object>> selectAlarmAnalysisCount(String bizOrgCode, String startDate, String endDate) {
-        return emergencyMapper.selectAlarmAnalysisCount(bizOrgCode, startDate, endDate);
+    public List<Map<String, Object>> selectAlarmAnalysisCount(String systemType, String startDate, String endDate) {
+        List<String> strings = emergencyMapper.selectSystemCodes(systemType);
+        if (!CollectionUtils.isEmpty(strings)) {
+            return emergencyMapper.selectAlarmAnalysisCount( startDate, endDate,strings);
+        }
+        return null;
+
     }
 
     @Override

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -412,7 +412,9 @@
                     wespa.equipment_specific_index_key LIKE concat('%', 'Fault')
                   AND wespa.create_date LIKE concat(temp.date, '%')
                   AND wespa.equipment_specific_index_value = 'true'
-                  AND wespa.biz_org_code like concat(#{bizOrgCode}, '%')
+                    <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
+                        wespa.system_codes  like concat('%',#{code},'%')
+                    </foreach>
             ) AS faultNum,
             (
                 SELECT
@@ -427,7 +429,9 @@
                     wespa.equipment_specific_index_key LIKE concat('%', 'FireAlarm')
                   AND wespa.create_date LIKE concat(temp.date, '%')
                   AND wespa.equipment_specific_index_value = 'true'
-                  AND wespa.biz_org_code like concat(#{bizOrgCode}, '%')
+                    <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
+                        wespa.system_codes  like concat('%',#{code},'%')
+                    </foreach>
             ) AS alarmNum,
             (
                 SELECT
@@ -442,22 +446,95 @@
                     wespa.equipment_specific_index_key LIKE concat('%', 'Shield')
                   AND wespa.create_date LIKE concat(temp.date, '%')
                   AND wespa.equipment_specific_index_value = 'true'
-                  AND wespa.biz_org_code like concat(#{bizOrgCode}, '%')
+                    <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
+                        wespa.system_codes  like concat('%',#{code},'%')
+                    </foreach>
             ) AS shieldNum
         FROM
+        <if test="dataType == 1">
+            (
+
+            SELECT
+            date_format(
+            (#{date} - INTERVAL 0 MONTH),
+            '%Y-%m'
+            ) AS `date`
+            UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -1 MONTH),
+            '%Y-%m'
+            ) AS `date`)
+            UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -2 MONTH),
+            '%Y-%m'
+            ) AS `date`)
+            UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -3 MONTH),
+            '%Y-%m'
+            ) AS `date`)
+            UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -4 MONTH),
+            '%Y-%m'
+            ) AS `date`)
+            UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -5 MONTH),
+            '%Y-%m'
+            ) AS `date`)UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -6 MONTH),
+            '%Y-%m'
+            ) AS `date`)UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -7 MONTH),
+            '%Y-%m'
+            ) AS `date`)UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -8 MONTH),
+            '%Y-%m'
+            ) AS `date`)UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -9 MONTH),
+            '%Y-%m'
+            ) AS `date`)UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -10 MONTH),
+            '%Y-%m'
+            ) AS `date`)UNION
+            (SELECT
+            date_format(
+            (#{date} - INTERVAL -11 MONTH),
+            '%Y-%m'
+            ) AS `date`))temp
+        </if>
+        <if test="dataType != 1">
             (
-                SELECT temp.selected_date as date FROM
-                    (SELECT ADDDATE('1970-01-01',t4.i*10000 + t3.i*1000 + t2.i*100 + t1.i*10 + t0.i) selected_date FROM
-                    (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t0,
-                    (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t1,
-                    (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t2,
-                    (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t3,
-                    (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t4)
-                    temp
-                WHERE selected_date BETWEEN #{startDate} AND #{endDate}
+            SELECT temp.selected_date as date FROM
+            (SELECT ADDDATE('1970-01-01',t4.i*10000 + t3.i*1000 + t2.i*100 + t1.i*10 + t0.i) selected_date FROM
+            (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t0,
+            (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t1,
+            (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t2,
+            (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t3,
+            (SELECT 0 i UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t4)
+            temp
+            WHERE selected_date BETWEEN #{startDate} AND #{endDate}
             ) temp
-        ORDER BY
+            ORDER BY
             temp.date
+        </if>
     </select>
     <select id="selectAlarmAnalysisCount" resultType="java.util.Map">
         SELECT
@@ -473,9 +550,11 @@
                 WHERE
                     wespa.equipment_specific_index_key LIKE concat('%', 'Fault')
                   AND wespa.equipment_specific_index_value = 'true'
-                  AND wespa.biz_org_code LIKE concat(#{bizOrgCode}, '%')
                   AND wespa.create_date BETWEEN #{startDate}
                     AND #{endDate}
+                <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
+                    wespa.system_codes  like concat('%',#{code},'%')
+                </foreach>
             ) AS faultNum,
             (
                 SELECT
@@ -489,9 +568,11 @@
                 WHERE
                     wespa.equipment_specific_index_key LIKE concat('%', 'FireAlarm')
                   AND wespa.equipment_specific_index_value = 'true'
-                  AND wespa.biz_org_code LIKE concat(#{bizOrgCode}, '%')
                   AND wespa.create_date BETWEEN #{startDate}
                     AND #{endDate}
+                    <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
+                        wespa.system_codes  like concat('%',#{code},'%')
+                    </foreach>
             ) AS fireAlarmNum,
             (
                 SELECT
@@ -505,9 +586,11 @@
                 WHERE
                     wespa.equipment_specific_index_key LIKE concat('%', 'Shield')
                   AND wespa.equipment_specific_index_value = 'true'
-                  AND wespa.biz_org_code LIKE concat(#{bizOrgCode}, '%')
                   AND wespa.create_date BETWEEN #{startDate}
                     AND #{endDate}
+                <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
+                    wespa.system_codes  like concat('%',#{code},'%')
+                </foreach>
             ) AS shieldNum
 
     </select>