Skip to content

A
amos-boot-biz
Commit eff9924d authored by KeYong's avatar KeYong
Browse files
Options

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

parents cff3c7d1 a983c80f
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 45 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SystemStatisticController.java
View file @ eff9924d
......@@ -59,24 +59,37 @@ public class SystemStatisticController extends AbstractBaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/alarm/panel", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取系统告警统计信息", notes = "获取系统告警统计信息")
public ResponseModel getAbnormalSystemInfo(@RequestParam(required = false) String bizOrgCode) {
List<Map<String, Object>> list = fireFightingSystemMapper.getAbnormalSystemInfo(bizOrgCode);
@RequestMapping(value = "/system-types-num-stats", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取系统类型数据统计", notes = "获取系统类型数据统计")
public ResponseModel getSystemTypesNumStats(@RequestParam(required = false) String bizOrgCode) {
List<Map<String, Object>> list = fireFightingSystemMapper.getSystemTypesNumStats(bizOrgCode);
return CommonResponseUtil.success(list);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/system-types", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取系统类型列表", notes = "获取系统类型列表")
public ResponseModel getSystemTypes(@RequestParam(required = false) String bizOrgCode) {
List<Map<String, Object>> list = fireFightingSystemMapper.getSystemTypes(bizOrgCode);
return CommonResponseUtil.success(list);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/page", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取水池信息", notes = "获取水池信息")
public ResponseModel getSystemPage(CommonPageable commonPageable, @RequestParam(required = false) String bizOrgCode,
@RequestParam(required = false) String systemType, @RequestParam(required = false) String systemState,
@RequestParam(required = false) String stateOrder, @RequestParam(required = false) String alarmEquips) {
if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1);
@ApiOperation(httpMethod = "GET", value = "获取系统信息", notes = "获取系统信息")
public ResponseModel getSystemPage(CommonPageable commonPageable,
@RequestParam(required = false) String bizOrgCode,
@RequestParam(required = false) String systemType,
@RequestParam(required = false) String systemState,
@RequestParam(required = false) String sorter
) {
String sortField = "", sortOrder = "";
if (org.springframework.util.StringUtils.hasText(sorter)) {
sortField = sorter.split("@")[0];
sortOrder = sorter.split("@")[1];
}
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
Page<Map<String, Object>> page1 = fireFightingSystemMapper.getSystemInfoPage(page, bizOrgCode, systemType, systemState, stateOrder, alarmEquips);
Page<Map<String, Object>> page1 = fireFightingSystemMapper.getSystemInfoPage(page, bizOrgCode, systemType, systemState, sortField, sortOrder);
return CommonResponseUtil.success(page1);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
View file @ eff9924d
......@@ -754,13 +754,15 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
Map<String, Object> getCenterEquipState(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> getAbnormalSystemInfo(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> getSystemTypesNumStats(@Param("bizOrgCode") String bizOrgCode);
Page<Map<String, Object>> getSystemInfoPage(Page page, @Param("bizOrgCode") String bizOrgCode,
Page<Map<String, Object>> getSystemInfoPage(Page page,
@Param("bizOrgCode") String bizOrgCode,
@Param("systemType") String systemType,
@Param("systemState") String systemState,
@Param("stateOrder") String stateOrder,
@Param("alarmEquips") String alarmEquips);
@Param("sortField") String sortField,
@Param("sortOrder") String sortOrder
);
Map<String, Object> getIotInfo(@Param("bizOrgCode") String bizOrgCode);
......@@ -768,4 +770,5 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
List<Map<String, Object>> getSystemAlarmNum(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> getSystemTypes(String bizOrgCode);
}
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ eff9924d
......@@ -6911,30 +6911,32 @@
) d
</select>
<select id="getAbnormalSystemInfo" resultType="Map">
<select id="getSystemTypesNumStats" resultType="Map">
SELECT
d.id,
d.`name`,
SUM(IF( d.VALUE > 0, 1, 0 )) AS sysNum
FROM
(
d.system_type_code AS code,
d.name,
SUM(IF( d.VALUE > 0, 1, 0 )) AS num
FROM (
SELECT
`fs`.`id` AS `id`,
`fs`.`name` AS `name`,
fs.system_type_code,
( SELECT count( 1 ) FROM `wl_equipment_specific_alarm_log` WHERE 0 <![CDATA[<>]]> find_in_set( `fs`.`id`, `wl_equipment_specific_alarm_log`.`system_ids` ) ) AS `value`
t1.id AS id,
t2.name AS name,
t1.system_type_code,
(SELECT count(1) FROM wl_equipment_specific_alarm_log t WHERE 0 <![CDATA[<>]]> find_in_set( t1.id, t.system_ids ) ) AS value
FROM
`f_fire_fighting_system` `fs`
f_fire_fighting_system t1
LEFT JOIN wl_equipment_category t2 on t1.system_type = t2.id
WHERE
fs.system_type_code IS NOT NULL
AND LENGTH(
trim( fs.system_type_code )) != 0
<if test="bizOrgCode!=null and bizOrgCode!=''">
AND fs.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
t1.system_type_code IS NOT NULL AND LENGTH(TRIM(t1.system_type_code)) != 0
AND t2.name IS NOT NULL AND LENGTH(TRIM(t2.name)) != 0
<if test="bizOrgCode != null and bizOrgCode != ''">
AND t1.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
</if>
) d
WHERE d.value != 0
GROUP BY d.system_type_code
WHERE
d.value != 0
GROUP BY
d.system_type_code
</select>
<select id="getSystemInfoPage" resultType="Map">
......@@ -6968,25 +6970,27 @@
</if>
) d
<where>
<if test="systemState!=null and systemState!='' and systemState =='1'">
d.value <![CDATA[>]]> 0
<if test="systemState == 'normal'">
AND d.value = 0
</if>
<if test="systemState!=null and systemState!='' and systemState =='0'">
d.value <![CDATA[<]]> 0
<if test="systemState == 'abnormal'">
AND d.value <![CDATA[>]]> 0
</if>
</where>
<if test="stateOrder!=null and stateOrder!='' and stateOrder==1">
ORDER BY d.value DESC,
</if>
<if test="stateOrder!=null and stateOrder!='' and stateOrder==0">
ORDER BY d.value ASC,
ORDER BY
<if test="sortField != null and sortField != ''">
<choose>
<when test="sortOrder == 'ascend'">
${sortField} ASC
</when>
<otherwise>
${sortField} DESC
</otherwise>
</choose>
</if>
<if test="alarmEquips!=null and alarmEquips!='' and alarmEquips==1">
<if test="sortField == null or sortField == ''">
d.equips DESC
</if>
<if test="alarmEquips!=null and alarmEquips!='' and alarmEquips==0">
d.equips ASC
</if>
</select>
<select id="getIotInfo" resultType="Map">
......@@ -7044,4 +7048,22 @@
GROUP BY fs.system_type_code
</select>
<select id="getSystemTypes" resultType="Map">
SELECT
t1.system_type_code AS systemTypeCode,
t2.name AS name
FROM
f_fire_fighting_system t1
left join wl_equipment_category t2 on t1.system_type = t2.id
<where>
t1.system_type_code IS NOT NULL AND LENGTH(TRIM(t1.system_type_code)) != 0
AND t2.name IS NOT NULL AND LENGTH(TRIM(t2.name)) != 0
<if test="bizOrgCode != null and bizOrgCode != ''">
AND t1.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
</if>
</where>
GROUP BY
t1.system_type_code
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment