Merge branch 'develop_dl' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -82,8 +82,11 @@
                                         <if test="map.positionType != null and map.positionType != ''">
                                             AND FIND_IN_SET(#{map.positionType},g.positionType)
                                         </if>
-                                        <if test="map.peopleType != null and map.peopleType != ''">
-                                            AND g.peopleType = #{map.peopleType}
+                                        <if test="map.peopleTypes != null and map.peopleTypes.size() > 0">
+                                            AND g.peopleType IN
+                                            <foreach item="item" index="index"  collection="map.peopleTypes" open="(" separator="," close=")">
+                                                #{item}
+                                            </foreach>
                                         </if>
                                         <if test="map.fireManagementPostOne != null and map.fireManagementPostOne != ''">
                                             AND locate(#{map.fireManagementPostOne}, g.fireManagementPost)
@@ -189,8 +192,11 @@
             <if test="map.positionType != null and map.positionType != ''">
             AND FIND_IN_SET(#{map.positionType},g.positionType)
             </if>
-            <if test="map.peopleType != null and map.peopleType != ''">
-                AND g.peopleType = #{map.peopleType}
+            <if test="map.peopleTypes != null and map.peopleTypes.size() > 0">
+                AND g.peopleType IN
+                <foreach item="item" index="index"  collection="map.peopleTypes" open="(" separator="," close=")">
+                    #{item}
+              </foreach>
             </if>
             <if test="map.fireManagementPostOne != null and map.fireManagementPostOne != ''">
                 AND locate(#{map.fireManagementPostOne}, g.fireManagementPost)
@@ -211,12 +217,9 @@
             ) a where a.sequenceNbr is not null
             <if test="map.fieldsValue != null">
                 <foreach collection="map.fieldsValue.keys" item="item">
-
-
                     <if test="item !=  'bizOrgName'">
                         AND a.${item} = #{map.fieldsValue[${item}]}
                     </if>
-
                 </foreach>
             </if>
             order by  CONVERT(a.companyName USING gbk) ASC, a.personStatus DESC, a.recDate DESC

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -624,7 +624,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		String peopleType = "";
 		if(req.containsKey("peopleType")) {
 			peopleType = req.get("peopleType").toString();
-			map.put("peopleType", peopleType);
+			List<String> peopleTypes = Arrays.stream(peopleType.split(",")).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
+			map.put("peopleTypes", peopleTypes);
 		}
 
 		String personStatus = "";
@@ -943,11 +944,39 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public List<Map<String, Object>> selectStatic(String bizOrgCode, String type) {
-		List<Map<String,Object>> listMap;
-		if("1601".equals(type)) {
+		List<Map<String,Object>> listMap = new ArrayList<>();
+		if ("1601".equals(type)) {
 			listMap = this.baseMapper.selectStaticFire(bizOrgCode);
-		} else {
+		} else if ("1602".equals(type)) {
 			listMap = this.baseMapper.selectStaticYw(bizOrgCode);
+		} else if ("1601,1602".equals(type)) {  // 查询“驻站消防”数据
+			Map<String, Integer> tempMap = new HashMap<>();
+			int total = 0;
+			List<Map<String, Object>> listMap1 = this.baseMapper.selectStaticFire(bizOrgCode);
+			List<Map<String, Object>> listMap2 = this.baseMapper.selectStaticYw(bizOrgCode);
+			for (Map<String, Object> map : listMap1) {
+				String postName = map.get("postName").toString();
+				int num = Integer.parseInt(map.get("num").toString());
+				tempMap.put(postName, tempMap.getOrDefault(postName, 0) + num);
+				total += num;
+			}
+			for (Map<String, Object> map : listMap2) {
+				String postName = map.get("postName").toString();
+				int num = Integer.parseInt(map.get("num").toString());
+				tempMap.put(postName, tempMap.getOrDefault(postName, 0) + num);
+				total += num;
+			}
+			// 结果转换
+			for (Map.Entry<String, Integer> entry : tempMap.entrySet()) {
+				int finalTotal = total;
+				Map<String, Object> item = new HashMap<String, Object>() {{
+					this.put("postName", entry.getKey());
+					this.put("num", entry.getValue());
+					float percent = ((float) (entry.getValue() * 100) / finalTotal);
+					this.put("percent", percent);
+				}};
+				listMap.add(item);
+			}
 		}
 		return listMap;
 	}

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

@@ -172,6 +172,14 @@ public class BigScreenController extends AbstractBaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "卡片BigSystem报警趋势统计")
+    @GetMapping("/statistic/trend/forSbpt")
+    public ResponseModel getSystemAlarmTrendForSbpt(@RequestParam(value = "systemCode", required = false)String systemCode,
+                                             @RequestParam(value = "updateTime", required = false)String updateTime) {
+        return CommonResponseUtil.success(iFireFightingSystemService.getSystemAlarmTrendForSbpt(systemCode, updateTime));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "卡片BigSystem树接口")
     @GetMapping("/system/tree")
     public List<OrgMenuDto> getSystemEquipTree(@RequestParam(value = "systemCode")String systemCode) {

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

@@ -705,7 +705,8 @@ public class EmergencyController extends AbstractBaseController {
 								   @RequestParam(required = false) Integer cleanStatus,
 								   @RequestParam(required = false) Integer handleStatus,
 								   @RequestParam(required = false) String bizOrgCode,
-								   @RequestParam(required = false) String systemCode
+								   @RequestParam(required = false) String systemCode,
+								   @RequestParam(required = false) String createDate
 								   ) {
 		Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
 		if (StringUtils.isEmpty(bizOrgCode)) {
@@ -718,7 +719,7 @@ public class EmergencyController extends AbstractBaseController {
 				}
 			}
 		}
-		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus));
+		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

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

@@ -107,7 +107,7 @@ public interface EmergencyMapper extends BaseMapper{
      * @param name 设备名称
      * @return
      */
-    Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus);
+    Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus , @Param("createDate") String createDate);
 
     IPage<EquipTypeImgAmountVO> getEmergencyEquipList(@Param("page") IPage page, @Param("equipTypeAmountPage") EquipTypeAmountPageDTO equipTypeAmountPage, @Param("list") List<String> list);
 

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

@@ -720,6 +720,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> getSystemAlarmTrend(@Param("systemCode") String systemCode, @Param("updateTime") String updateTime);
 
+    List<Map<String, Object>> getSystemAlarmTrendForSbpt(@Param("systemCode") String systemCode, @Param("updateTime") String updateTime);
+
     List<Map<String, Object>> getEquipmentAndEquipSpeTree(@Param("bizOrgCode")String bizOrgCode, @Param("systemCode") String systemCode);
 
     Page<Map<String, Object>> getEquipmentsBySystemInfo(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("equipmentCode") String equipmentCode);

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

@@ -69,7 +69,7 @@ public interface IEmergencyService {
 
     List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String bizOrgCode);
 
-    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus);
+    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate);
 
     Map<String, List<PressurePumpCountVo>> getPressurePumpDay();
 

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

@@ -342,5 +342,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     Map<String, Object> getSystemAlarmTrend(String systemCode, String updateTime);
 
+    Map<String, Object> getSystemAlarmTrendForSbpt(String systemCode, String updateTime);
+
     List<OrgMenuDto> getSystemEquipTree(String systemCode);
 }

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

@@ -627,8 +627,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
 
 
     @Override
-    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page, String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus) {
-        return emergencyMapper.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus);
+    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page, String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate) {
+        return emergencyMapper.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate);
     }
 
     //稳压泵定时向缓存中存昨日启动次数任务

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

@@ -2602,6 +2602,31 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
+    public Map<String, Object> getSystemAlarmTrendForSbpt(String systemCode, String updateTime) {
+        if(!StringUtil.isNotEmpty(updateTime)) {
+            updateTime = new SimpleDateFormat(DateUtils.DATE_PATTERN).format(new Date());
+        }
+        List<Map<String, Object>> result = fireFightingSystemMapper.getSystemAlarmTrendForSbpt(systemCode, updateTime);
+        Map<String, Object> resMap = new HashMap<>();
+        resMap.put("xAxisData", result.stream().map(x -> x.get("date")).collect(Collectors.toList()));
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> entryMap1 = new HashMap<>();
+        entryMap1.put("name", "正常");
+        entryMap1.put("data", result.stream().map(x -> x.get("normalNum")).collect(Collectors.toList()));
+        list.add(entryMap1);
+        Map<String, Object> entryMap2 = new HashMap<>();
+        entryMap2.put("name", "故障");
+        entryMap2.put("data", result.stream().map(x -> x.get("faultNum")).collect(Collectors.toList()));
+        list.add(entryMap2);
+        Map<String, Object> entryMap3 = new HashMap<>();
+        entryMap3.put("name", "告警");
+        entryMap3.put("data", result.stream().map(x -> x.get("alarmNum")).collect(Collectors.toList()));
+        list.add(entryMap3);
+        resMap.put("yAxisData", list);
+        return resMap;
+    }
+
+    @Override
     public List<OrgMenuDto> getSystemEquipTree(String systemCode) {
         // 此卡片在站端使用，由于远程调用jcs耗时，所以暂注释掉
 //        FeignClientResult<List<OrgUsrDto>> feignClientResult = jcsFeignClient.getCompanyDeptListWithAuth(authKey, "COMPANY", "dl");

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

@@ -1429,6 +1429,9 @@
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 and wlesal.biz_org_code like concat(#{bizOrgCode},'%')
             </if>
+            <if test='createDate != null and createDate == "1"'>
+                AND wlesal.create_date LIKE CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d' ), '%' )
+            </if>
             <if test="systemCode != null and systemCode != ''">
                 and fs.code = #{systemCode}
             </if>

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

@@ -6380,6 +6380,54 @@
         s1.date
     </select>
 
+    <select id="getSystemAlarmTrendForSbpt" resultType="Map">
+        SELECT
+        s1.date,
+        IFNULL( s2.normalNum, 0 ) AS normalNum,
+        IFNULL( s2.faultNum, 0 ) AS faultNum,
+        IFNULL( s2.alarmNum, 0 ) AS alarmNum
+        FROM
+        (
+        SELECT
+        @s := @s + 1  AS `index`,
+        DATE_FORMAT( DATE_ADD(( DATE( DATE_ADD(#{updateTime}, INTERVAL - 15 DAY ))), INTERVAL @s DAY ), '%Y-%m-%d' ) AS date
+        FROM
+        mysql.help_topic,
+        ( SELECT @s := - 1 ) temp
+        WHERE
+        @s &lt; 15
+        ) s1
+        LEFT JOIN (
+        SELECT
+        s.*
+        FROM
+        (
+        SELECT
+        IFNULL(SUM(IF(r.`status` = 0, 1, 0)), 0) AS normalNum,
+        IFNULL(SUM(IF((r.type = 'BREAKDOWN' AND r.`status` = 1), 1, 0)), 0) AS faultNum,
+        IFNULL(SUM(IF((r.type = 'FIREALARM' AND r.`status` = 1), 1, 0)), 0) AS alarmNum,
+        DATE_FORMAT( r.update_date, '%Y-%m-%d') AS date
+        FROM
+        wl_equipment_specific_alarm_log r
+        LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, r.system_ids )
+        <where>
+            r.update_date BETWEEN date_sub( now(), INTERVAL 15 MONTH ) AND now()
+            <if test="systemCode != null and systemCode != ''">
+                AND fs.`code` = #{systemCode}
+            </if>
+        </where>
+        GROUP BY
+        LEFT ( r.update_date, 10 )
+        ORDER BY
+        r.update_date
+        ) s
+        ) s2 ON s2.date = s1.date
+        GROUP BY
+        s1.date
+        ORDER BY
+        s1.date
+    </select>
+
     <select id="getEquipmentAndEquipSpeTree" resultType="java.util.Map">
         SELECT
             a.id,