item：添加未消除告警设备日月环比信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificAlarmLogController.java

@@ -13,8 +13,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.Date;
-
 /**
  * @author ZeHua Li
  * @date 2020/10/29 14:26
@@ -29,11 +27,17 @@ public class EquipmentSpecificAlarmLogController extends AbstractBaseController
     IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService;
 
 
+    /**
+     * 获取告警设备日月环比信息
+     *
+     * @param date
+     * @return
+     */
     @RequestMapping(value = "/equipAlarmLink", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "获取告警日志信息", notes = "获取告警日志信息")
-    public ResponseModel equipAlarmLink(@RequestParam(required = false) Date date, @RequestParam(required = false) String pattern) {
-        return CommonResponseUtil.success(equipmentSpecificAlarmLogService.equipAlarmLink(date, pattern));
+    @ApiOperation(httpMethod = "GET", value = "获取告警设备日月环比信息", notes = "获取告警设备日月环比信息")
+    public ResponseModel equipAlarmLink(@RequestParam(required = false) String date) {
+        return CommonResponseUtil.success(equipmentSpecificAlarmLogService.equipAlarmLink(date));
     }
 
 

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

@@ -39,5 +39,7 @@ public interface EquipmentSpecificAlarmLogMapper extends BaseMapper<EquipmentSpe
 
     List<Map<String, Object>> getOtherEquipInfo(@Param("date") String date, @Param("equipmentId") Long equipmentId);
 
-    List<Map<String, Object>> equipAlarmLink(String date, String pattern);
+    Map<String, Object> alarmEquipLink(String date, String pattern, String cleanFlag);
+
+    Map<String, Object> unCleanAlarmEquipLink(String date, String pattern, String cleanFlag);
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -25,15 +24,17 @@ public interface IEquipmentSpecificAlarmLogService extends IService<EquipmentSpe
 
     /**
      * 通过告警ID，获取告警Log数据
+     *
      * @param equipmentSpecificAlarmId
-     * @param isConfirm '' 为全部数据 0 为未确认 1为已确认
+     * @param isConfirm                '' 为全部数据 0 为未确认 1为已确认
      * @return
      */
-    List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(Long equipmentSpecificId,String equipmentSpecificIndexKey, String isConfirm);
+    List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(Long equipmentSpecificId, String equipmentSpecificIndexKey, String isConfirm);
 
     /**
      * 获取设备告警环比
+     *
      * @return
      */
-    Map<String, Object> equipAlarmLink(Date date, String pattern);
+    Map<String, Object> equipAlarmLink(String date);
 }

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

@@ -46,40 +46,24 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
     }
 
     @Override
-    public Map<String, Object> equipAlarmLink(Date date, String pattern) {
+    public Map<String, Object> equipAlarmLink(String date) {
         Map<String, Object> map = new HashMap<>();
-        String dateStr = null;
-        if (date != null && StringUtils.isNotBlank(pattern)) {
-            dateStr = DateUtils.convertDateToString(date, pattern);
-            int length = dateStr.length();
-            switch (length) {
-                case 10 :
-                    pattern = "%Y-%m-%d";
-                    break;
-                case 7 :
-                    pattern = "%Y-%m";
-                    break;
-                case 4 :
-                    pattern = "%Y";
-                    break;
-                default:
-                    break;
-            }
-        } else {
-            dateStr = DateUtils.convertDateToString(new Date(), "yyyy-MM-dd");
+        if (StringUtils.isBlank(date)) {
+            date = DateUtils.convertDateToString(new Date(), "yyyy-MM-dd");
         }
+        String monthDate = date.substring(0, 7);
         //  获取今日告警设备、日环比
-        List<Map<String, Object>> alarmEquipDayLinkList = equipmentSpecificAlarmLogMapper.equipAlarmLink(dateStr, pattern);
+        Map<String, Object> alarmEquipDayLink = equipmentSpecificAlarmLogMapper.alarmEquipLink(date, "%Y-%m-%d", null);
         //  获取今日告警设备、月环比
-        List<Map<String, Object>> alarmEquipMonthLinkList = equipmentSpecificAlarmLogMapper.equipAlarmLink(dateStr, pattern);
+        Map<String, Object> alarmEquipMonthLink = equipmentSpecificAlarmLogMapper.alarmEquipLink(monthDate, "%Y-%m", null);
         //  获取未消除告警设备，日环比
-        List<Map<String, Object>> unCleanAlarmEquipDayLinkList = equipmentSpecificAlarmLogMapper.equipAlarmLink(dateStr, pattern);
+        Map<String, Object> unCleanAlarmEquipDayLink = equipmentSpecificAlarmLogMapper.unCleanAlarmEquipLink(date, "%Y-%m-%d", "unClean");
         //  获取未消除告警设备，月环比
-        List<Map<String, Object>> unCleanAlarmEquipMonthLinkList = equipmentSpecificAlarmLogMapper.equipAlarmLink(dateStr, pattern);
-        map.put("alarmEquipDayLink", alarmEquipDayLinkList);
-        map.put("alarmEquipMonthLink", alarmEquipMonthLinkList);
-        map.put("unCleanAlarmEquipDayLink", unCleanAlarmEquipDayLinkList);
-        map.put("unCleanAlarmEquipMonthLink", unCleanAlarmEquipMonthLinkList);
+        Map<String, Object> unCleanAlarmEquipMonthLink = equipmentSpecificAlarmLogMapper.unCleanAlarmEquipLink(monthDate, "%Y-%m", "unClean");
+        map.put("alarmEquipDayLink", alarmEquipDayLink);
+        map.put("alarmEquipMonthLink", alarmEquipMonthLink);
+        map.put("unCleanAlarmEquipDayLink", unCleanAlarmEquipDayLink);
+        map.put("unCleanAlarmEquipMonthLink", unCleanAlarmEquipMonthLink);
         return map;
     }
 }

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

@@ -183,34 +183,64 @@
         </where>
         ORDER BY weal.create_date DESC
     </select>
-    <select id="equipAlarmLink" resultType="java.util.Map">
+    <select id="alarmEquipLink" resultType="java.util.Map">
         SELECT
-            ta.ymd,
+            ta.`date`,
             IFNULL( ta.sumNum, 0 ) AS sumNum,
-            IFNULL( tc.sumNum, 0 ) AS rhbSumNum,
+            IFNULL( tc.sumNum, 0 ) AS hbSumNum,
             concat(
                     ifnull( round( ( ta.sumNum - tc.sumNum ) / tc.sumNum * 100, 0 ), 0 ),
                     '%'
-                ) AS rhbRate
+                ) AS hbRate
         FROM
             <choose>
                 <when test="pattern != null and pattern != ''">
-                    ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) ymd, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY ymd ) ta
-                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) ymd, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY ymd ) tc
-                    ON ta.ymd = date_add( tc.ymd, INTERVAL 1 DAY )
+                    ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) ta
+                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) tc
+                    ON ta.`date` = date_add( tc.`date`, INTERVAL 1 DAY )
                 </when>
                 <otherwise>
-                    ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) ymd, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY ymd ) ta
-                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) ymd, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY ymd ) tc
-                    ON ta.ymd = date_add( tc.ymd, INTERVAL 1 DAY )
+                    ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) ta
+                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) tc
+                    ON ta.`date` = date_add( tc.`date`, INTERVAL 1 DAY )
                 </otherwise>
             </choose>
         <where>
             <if test="date != null and date != ''">
-                ta.ymd = #{date}
+                ta.`date` = #{date}
             </if>
         </where>
         ORDER BY
-            ta.ymd
+            ta.`date`
+    </select>
+    <select id="unCleanAlarmEquipLink" resultType="java.util.Map">
+        SELECT
+            ta.`date`,
+            IFNULL( ta.sumNum, 0 ) AS sumNum,
+            IFNULL( tc.sumNum, 0 ) AS hbSumNum,
+            concat(
+                    ifnull( round( ( ta.sumNum - tc.sumNum ) / tc.sumNum * 100, 0 ), 0 ),
+                    '%'
+                ) AS hbRate
+        FROM
+            <choose>
+                <when test="pattern != null and pattern != ''">
+                    ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL GROUP BY `date` ) ta
+                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) tc
+                    ON ta.`date` = date_add( tc.`date`, INTERVAL 1 DAY )
+                </when>
+                <otherwise>
+                    ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL GROUP BY `date` ) ta
+                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) tc
+                    ON ta.`date` = date_add( tc.`date`, INTERVAL 1 DAY )
+                </otherwise>
+            </choose>
+        <where>
+            <if test="date != null and date != ''">
+                ta.`date` = #{date}
+            </if>
+        </where>
+        ORDER BY
+            ta.`date`
     </select>
 </mapper>
\ No newline at end of file