Skip to content

A
amos-boot-biz
Commit f4ea877c authored by tianyiming's avatar tianyiming
Browse files
Options

11608

parent 24d3d23a
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 95 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @ f4ea877c
...@@ -62,10 +62,6 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -62,10 +62,6 @@ public class SupervisionConfigureController extends AbstractBaseController {
if (commonPageable.getPageNumber() == 0) { if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1); commonPageable.setPageNumber(1);
} }
if (StringUtils.isEmpty(bizOrgCode)) {
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
}
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize()); Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
return CommonResponseUtil.success(fireFightingSystemMapper.getWaterInfoBySuper(page, bizOrgCode)); return CommonResponseUtil.success(fireFightingSystemMapper.getWaterInfoBySuper(page, bizOrgCode));
} }
...@@ -94,10 +90,6 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -94,10 +90,6 @@ public class SupervisionConfigureController extends AbstractBaseController {
if (commonPageable.getPageNumber() == 0) { if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1); commonPageable.setPageNumber(1);
} }
if (StringUtils.isEmpty(bizOrgCode)) {
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
}
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize()); Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
return CommonResponseUtil.success(fireFightingSystemMapper.getPipeNetworkBySuper(page, bizOrgCode)); return CommonResponseUtil.success(fireFightingSystemMapper.getPipeNetworkBySuper(page, bizOrgCode));
} }
...@@ -196,11 +188,13 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -196,11 +188,13 @@ public class SupervisionConfigureController extends AbstractBaseController {
@RequestMapping(value = "/fireAlarmLogPage", method = RequestMethod.GET) @RequestMapping(value = "/fireAlarmLogPage", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "消防报警列表分页查询", produces = "application/json;charset=UTF-8", notes = "消防报警列表分页查询") @ApiOperation(httpMethod = "GET", value = "消防报警列表分页查询", produces = "application/json;charset=UTF-8", notes = "消防报警列表分页查询")
public ResponseModel pageQuery(@RequestParam(required = false) String code, @RequestParam(required = false) String typeCode, CommonPageable commonPageable) { public ResponseModel pageQuery(@RequestParam(required = false) String code,
@RequestParam(required = false) String typeCode,
@RequestParam(required = false) String bizOrgCode,
CommonPageable commonPageable) {
if (commonPageable.getPageNumber() == 0) { if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1); commonPageable.setPageNumber(1);
} }
ReginParams reginParams = getSelectedOrgInfo();
List<CommonRequest> queryRequests = new ArrayList<>(); List<CommonRequest> queryRequests = new ArrayList<>();
CommonRequest request7 = new CommonRequest(); CommonRequest request7 = new CommonRequest();
request7.setName("system"); request7.setName("system");
...@@ -210,12 +204,10 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -210,12 +204,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
request8.setName("specificIndexKey"); request8.setName("specificIndexKey");
request8.setValue(StringUtil.isNotEmpty(typeCode) ? StringUtils.trimToNull(typeCode) : null); request8.setValue(StringUtil.isNotEmpty(typeCode) ? StringUtils.trimToNull(typeCode) : null);
queryRequests.add(request8); queryRequests.add(request8);
if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
CommonRequest request13 = new CommonRequest(); CommonRequest request13 = new CommonRequest();
request13.setName("bizOrgCode"); request13.setName("bizOrgCode");
request13.setValue(StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null); request13.setValue(StringUtil.isNotEmpty(bizOrgCode) ? StringUtils.trimToNull(typeCode) : null);
queryRequests.add(request13); queryRequests.add(request13);
}
CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable); CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
return CommonResponseUtil.success(equipmentSpecificAlarmService.fireAlarmLogPage(param)); return CommonResponseUtil.success(equipmentSpecificAlarmService.fireAlarmLogPage(param));
} }
...@@ -225,16 +217,7 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -225,16 +217,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
@RequestMapping(value = "/alarmTrend", method = RequestMethod.GET) @RequestMapping(value = "/alarmTrend", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "报警类型趋势", produces = "application/json;charset=UTF-8", notes = "报警类型趋势") @ApiOperation(httpMethod = "GET", value = "报警类型趋势", produces = "application/json;charset=UTF-8", notes = "报警类型趋势")
public ResponseModel alarmTrend() { public ResponseModel alarmTrend(@RequestParam(required = false) String bizOrgCode) {
String bizOrgCode = null;
ReginParams reginParams = getSelectedOrgInfo();
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
if (!ValidationUtil.isEmpty(personIdentity)) {
bizOrgCode = personIdentity.getBizOrgCode();
if (bizOrgCode == null) {
return CommonResponseUtil.success(null);
}
}
return CommonResponseUtil.success(equipmentSpecificAlarmService.alarmTrend(bizOrgCode)); return CommonResponseUtil.success(equipmentSpecificAlarmService.alarmTrend(bizOrgCode));
} }
...@@ -242,12 +225,10 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -242,12 +225,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "概览稳压泵信息") @ApiOperation(value = "概览稳压泵信息")
@GetMapping("/getPressurePumpInfo") @GetMapping("/getPressurePumpInfo")
public ResponseModel getPressurePumpInfo(CommonPageable commonPageable) { public ResponseModel getPressurePumpInfo(CommonPageable commonPageable,@RequestParam(required = false) String bizOrgCode) {
if (commonPageable.getPageNumber() == 0) { if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1); commonPageable.setPageNumber(1);
} }
ReginParams reginParams = getSelectedOrgInfo();
String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize()); Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
if (StringUtils.isEmpty(bizOrgCode)) { if (StringUtils.isEmpty(bizOrgCode)) {
return CommonResponseUtil.success(null); return CommonResponseUtil.success(null);
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ f4ea877c
...@@ -1394,129 +1394,84 @@ ...@@ -1394,129 +1394,84 @@
<select id="alarmTrend" resultType="java.util.Map"> <select id="alarmTrend" resultType="java.util.Map">
SELECT SELECT
`result`.`click_date` AS `click_date`, `result`.`click_date` AS `click_date`,
`a`.`fireAlarmNum` AS `fireAlarmNum`, IFNULL( `a`.`fireAlarmNum`, 0 ) AS `fireAlarmNum`,
`b`.`breakdownNum` AS `breakdownNum`, IFNULL( `b`.`breakdownNum`, 0 ) AS `breakdownNum`,
`c`.`shieldNum` AS `shieldNum`, IFNULL( `c`.`shieldNum`, 0 ) AS `shieldNum`,
`d`.`otherNum` AS `otherNum` IFNULL( `d`.`otherNum`, 0 ) AS `otherNum`
FROM FROM
(((( ((((
`v_monitor_event_utils_week` `result` `v_monitor_event_utils_week` `result`
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
`weekUtil`.`click_date` AS `click_date`, SUBSTRING_INDEX( log.create_date, " ", 1 ) date,
ifnull( count( `fireAlarm`.`id` ), 0 ) AS `fireAlarmNum` count( SUBSTRING_INDEX( log.create_date, " ", 1 )) AS `fireAlarmNum`
FROM
(
`v_monitor_event_utils_week` `weekUtil`
LEFT JOIN (
SELECT
log.*
FROM FROM
`wl_equipment_specific_alarm_log` `log` `wl_equipment_specific_alarm_log` `log`
LEFT JOIN wl_equipment_specific wes ON `log`.equipment_specific_id = wes.id LEFT JOIN wl_equipment_specific wes ON `log`.equipment_specific_id = wes.id
AND log.`type` = 'FIREALARM'
<where> <where>
<if test="bizOrgCode != null and bizOrgCode != ''"> <if test="bizOrgCode != null and bizOrgCode != ''">
wes.biz_org_code like concat (#{bizOrgCode},'%') wes.biz_org_code like concat (#{bizOrgCode},'%')
</if> </if>
</where> </where>
) fireAlarm ON (((
date_format( `fireAlarm`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
)
AND ( `fireAlarm`.`type` = 'FIREALARM' )
)))
GROUP BY GROUP BY
`weekUtil`.`click_date` SUBSTRING_INDEX(log.create_date," ",1)
ORDER BY
`weekUtil`.`click_date`
) `a` ON (( ) `a` ON ((
`a`.`click_date` = `result`.`click_date` `a`.`date` = `result`.`click_date`
))) )))
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
`weekUtil`.`click_date` AS `click_date`, SUBSTRING_INDEX( log.create_date, " ", 1 ) date,
ifnull( count( `breakdown`.`id` ), 0 ) AS `breakdownNum` count( SUBSTRING_INDEX( log.create_date, " ", 1 )) AS `breakdownNum`
FROM
(
`v_monitor_event_utils_week` `weekUtil`
LEFT JOIN (
SELECT
log.*
FROM FROM
`wl_equipment_specific_alarm_log` `log` `wl_equipment_specific_alarm_log` `log`
LEFT JOIN wl_equipment_specific wes ON `log`.equipment_specific_id = wes.id LEFT JOIN wl_equipment_specific wes ON `log`.equipment_specific_id = wes.id
AND log.`type` = 'BREAKDOWN'
<where> <where>
<if test="bizOrgCode != null and bizOrgCode != ''"> <if test="bizOrgCode != null and bizOrgCode != ''">
wes.biz_org_code like concat (#{bizOrgCode},'%') wes.biz_org_code like concat (#{bizOrgCode},'%')
</if> </if>
</where> </where>
) `breakdown` ON (((
`weekUtil`.`click_date` = date_format( `breakdown`.`create_date`, '%Y-%m-%d' ))
AND ( `breakdown`.`type` = 'BREAKDOWN' ))))
GROUP BY GROUP BY
`weekUtil`.`click_date` SUBSTRING_INDEX(log.create_date," ",1)
ORDER BY
`weekUtil`.`click_date`
) `b` ON (( ) `b` ON ((
`b`.`click_date` = `result`.`click_date` `b`.`date` = `result`.`click_date`
))) )))
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
`weekUtil`.`click_date` AS `click_date`, SUBSTRING_INDEX( log.create_date, " ", 1 ) date,
ifnull( count( `shield`.`id` ), 0 ) AS `shieldNum` count( SUBSTRING_INDEX( log.create_date, " ", 1 )) AS `shieldNum`
FROM
(
`v_monitor_event_utils_week` `weekUtil`
LEFT JOIN (
SELECT
log.*
FROM FROM
`wl_equipment_specific_alarm_log` `log` `wl_equipment_specific_alarm_log` `log`
LEFT JOIN wl_equipment_specific wes ON `log`.equipment_specific_id = wes.id LEFT JOIN wl_equipment_specific wes ON `log`.equipment_specific_id = wes.id
AND log.`type` = 'SHIELD'
<where> <where>
<if test="bizOrgCode != null and bizOrgCode != ''"> <if test="bizOrgCode != null and bizOrgCode != ''">
wes.biz_org_code like concat (#{bizOrgCode},'%') wes.biz_org_code like concat (#{bizOrgCode},'%')
</if> </if>
</where> </where>
) `shield` ON (((
date_format( `shield`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
)
AND ( `shield`.`type` = 'SHIELD' ))))
GROUP BY GROUP BY
`weekUtil`.`click_date` SUBSTRING_INDEX(log.create_date," ",1)
ORDER BY
`weekUtil`.`click_date`
) `c` ON (( ) `c` ON ((
`c`.`click_date` = `result`.`click_date` `c`.`date` = `result`.`click_date`
))) )))
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
`weekUtil`.`click_date` AS `click_date`, SUBSTRING_INDEX( log.create_date, " ", 1 ) date,
ifnull( count( `other`.`id` ), 0 ) AS `otherNum` count( SUBSTRING_INDEX( log.create_date, " ", 1 )) AS `otherNum`
FROM
(
`v_monitor_event_utils_week` `weekUtil`
LEFT JOIN (
SELECT
log.*
FROM FROM
`wl_equipment_specific_alarm_log` `log` `wl_equipment_specific_alarm_log` `log`
LEFT JOIN wl_equipment_specific wes ON `log`.equipment_specific_id = wes.id LEFT JOIN wl_equipment_specific wes ON `log`.equipment_specific_id = wes.id
AND log.`type` NOT IN ( 'SHIELD', 'BREAKDOWN', 'FIREALARM' )
<where> <where>
<if test="bizOrgCode != null and bizOrgCode != ''"> <if test="bizOrgCode != null and bizOrgCode != ''">
wes.biz_org_code like concat (#{bizOrgCode},'%') wes.biz_org_code like concat (#{bizOrgCode},'%')
</if> </if>
</where> </where>
) `other` ON (((
date_format( `other`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
)
AND (
`other`.`type` NOT IN ( 'SHIELD', 'BREAKDOWN', 'FIREALARM' )))))
GROUP BY GROUP BY
`weekUtil`.`click_date` SUBSTRING_INDEX(log.create_date," ",1)
ORDER BY
`weekUtil`.`click_date`
) `d` ON (( ) `d` ON ((
`d`.`click_date` = `result`.`click_date` `d`.`date` = `result`.`click_date`
))) )))
ORDER BY ORDER BY
`result`.`click_date` `result`.`click_date`
......
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