Skip to content

A
amos-boot-biz
Commit ed504d97 authored by zhangsen's avatar zhangsen
Browse files
Options

水池等信息提交

parent 3c448dcd
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java
View file @ ed504d97
...@@ -382,7 +382,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -382,7 +382,7 @@ public class WaterResourceDto extends BaseDto {
@ExcelIgnore @ExcelIgnore
@ApiModelProperty("水池液位显示装置id") @ApiModelProperty("水池液位显示装置id")
private Long levelDeviceId; private String levelDeviceId;
@ApiModelProperty("水池液位显示装置名称") @ApiModelProperty("水池液位显示装置名称")
@ExcelProperty(value = "水池液位显示装置", index = 45) @ExcelProperty(value = "水池液位显示装置", index = 45)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
View file @ ed504d97
...@@ -466,12 +466,12 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE ...@@ -466,12 +466,12 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
*/ */
List<Map<String, Object>> getWaterPoolInfoNum(@Param("bizOrgCode") String bizOrgCode); List<Map<String, Object>> getWaterPoolInfoNum(@Param("bizOrgCode") String bizOrgCode);
/** // /**
* 消防水源总量统计 // * 消防水源总量统计
* @param companyCode // * @param companyCode
* @return // * @return
*/ // */
Map<String, Object> getWaterPoolVolumeInfo(@Param("companyCode") String companyCode); // Map<String, Object> getWaterPoolVolumeInfo(@Param("companyCode") String companyCode);
/** /**
* 获取车辆总数 * 获取车辆总数
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @ ed504d97
...@@ -1340,7 +1340,7 @@ public class ExcelServiceImpl { ...@@ -1340,7 +1340,7 @@ public class ExcelServiceImpl {
if (item.getLevelDeviceName() != null) { if (item.getLevelDeviceName() != null) {
String[] type = item.getLevelDeviceName().split("@"); String[] type = item.getLevelDeviceName().split("@");
item.setLevelDeviceName(type[0]); item.setLevelDeviceName(type[0]);
item.setLevelDeviceId(Long.valueOf(type[1])); item.setLevelDeviceId(type[1]);
} }
// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17 // BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
if (item.getEquipCategoryName() != null) { if (item.getEquipCategoryName() != null) {
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ ed504d97
...@@ -2970,7 +2970,7 @@ ...@@ -2970,7 +2970,7 @@
SELECT SELECT
ifnull( `rp`.`min_water_level`, 0 ) AS `minLevel`, ifnull( `rp`.`min_water_level`, 0 ) AS `minLevel`,
ifnull( `rp`.`max_water_level`, 0 ) AS `maxLevel`, ifnull( `rp`.`max_water_level`, 0 ) AS `maxLevel`,
avg( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' THEN IFNULL( ei.`value`, 0 ) END ) AS nowLevel IFNULL(avg( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' THEN IFNULL( ei.`value`, 0 ) END ),0) AS nowLevel
FROM FROM
`cb_water_resource` `r` `cb_water_resource` `r`
LEFT JOIN `cb_water_resource_pool` `rp` ON `rp`.`resource_id` = `r`.`sequence_nbr` LEFT JOIN `cb_water_resource_pool` `rp` ON `rp`.`resource_id` = `r`.`sequence_nbr`
...@@ -3006,7 +3006,7 @@ ...@@ -3006,7 +3006,7 @@
SELECT SELECT
ifnull( `rp`.`min_water_level`, 0 ) AS `minLevel`, ifnull( `rp`.`min_water_level`, 0 ) AS `minLevel`,
ifnull( `rp`.`max_water_level`, 0 ) AS `maxLevel`, ifnull( `rp`.`max_water_level`, 0 ) AS `maxLevel`,
MAX( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' THEN IFNULL( ei.`value`, 0 ) END ) AS nowLevel ifnull(MAX( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' THEN IFNULL( ei.`value`, 0 ) END ), 0) AS nowLevel
FROM FROM
`cb_water_resource` `r` `cb_water_resource` `r`
LEFT JOIN `cb_water_resource_pool` `rp` ON `rp`.`resource_id` = `r`.`sequence_nbr` LEFT JOIN `cb_water_resource_pool` `rp` ON `rp`.`resource_id` = `r`.`sequence_nbr`
...@@ -3023,52 +3023,52 @@ ...@@ -3023,52 +3023,52 @@
</select> </select>
<select id="getWaterPoolVolumeInfo" resultType="java.util.Map"> <!-- <select id="getWaterPoolVolumeInfo" resultType="java.util.Map">-->
SELECT <!-- SELECT-->
IFNULL( sum( a.margin ), 0 ) AS margin, <!-- IFNULL( sum( a.margin ), 0 ) AS margin,-->
IFNULL( sum( volume ), 0 ) AS volume <!-- IFNULL( sum( volume ), 0 ) AS volume-->
FROM <!-- FROM-->
( <!-- (-->
SELECT <!-- SELECT-->
`ou`.`code` AS `code`, <!-- `ou`.`code` AS `code`,-->
ifnull(( <!-- ifnull((-->
abs(( <!-- abs((-->
ifnull( <!-- ifnull(-->
max(( <!-- max((-->
CASE <!-- CASE-->
WHEN ( `ei`.`name_key` = 'FHS_WirelessliquidDetector_WaterLevel' ) THEN <!-- WHEN ( `ei`.`name_key` = 'FHS_WirelessliquidDetector_WaterLevel' ) THEN-->
`ei`.`perf_value` <!-- `ei`.`perf_value`-->
END <!-- END-->
)), <!-- )),-->
ifnull( `rp`.`min_water_level`, 0 )) / <!-- ifnull( `rp`.`min_water_level`, 0 )) /-->
IF <!-- IF-->
(( <!-- ((-->
ifnull( `rp`.`max_water_level`, 0 ) = 0 <!-- ifnull( `rp`.`max_water_level`, 0 ) = 0-->
), <!-- ),-->
1, <!-- 1,-->
ifnull( `rp`.`max_water_level`, 0 )))) * ifnull( `rp`.`volume`, 0 )), <!-- ifnull( `rp`.`max_water_level`, 0 )))) * ifnull( `rp`.`volume`, 0 )),-->
0 <!-- 0-->
) AS `margin`, <!-- ) AS `margin`,-->
ifnull( `rp`.`volume`, 0 ) AS `volume` <!-- ifnull( `rp`.`volume`, 0 ) AS `volume`-->
FROM <!-- FROM-->
`cb_water_resource` `r` <!-- `cb_water_resource` `r`-->
LEFT JOIN `cb_org_usr` `ou` ON `ou`.`biz_org_code` = `r`.`biz_org_code` <!-- LEFT JOIN `cb_org_usr` `ou` ON `ou`.`biz_org_code` = `r`.`biz_org_code`-->
LEFT JOIN `cb_water_resource_pool` `rp` ON `rp`.`resource_id` = `r`.`sequence_nbr` <!-- LEFT JOIN `cb_water_resource_pool` `rp` ON `rp`.`resource_id` = `r`.`sequence_nbr`-->
LEFT JOIN `wl_equipment_specific` `es` ON `es`.`id` = `rp`.`level_device_id` <!-- LEFT JOIN `wl_equipment_specific` `es` ON `es`.`id` = `rp`.`level_device_id`-->
LEFT JOIN `wl_equipment_detail` `ed` ON `ed`.`id` = `es`.`equipment_detail_id` <!-- LEFT JOIN `wl_equipment_detail` `ed` ON `ed`.`id` = `es`.`equipment_detail_id`-->
LEFT JOIN `wl_equipment_index` `ei` ON `ei`.`equipment_id` = `ed`.`equipment_id` <!-- LEFT JOIN `wl_equipment_index` `ei` ON `ei`.`equipment_id` = `ed`.`equipment_id`-->
WHERE <!-- WHERE-->
`r`.`resource_type` IN ( 'pool', 'industryPool' ) <!-- `r`.`resource_type` IN ( 'pool', 'industryPool' )-->
AND `r`.`is_delete` = 1 <!-- AND `r`.`is_delete` = 1-->
AND `ou`.`code` IS NOT NULL <!-- AND `ou`.`code` IS NOT NULL-->
<if test="companyCode != null and companyCode != ''"> <!-- <if test="companyCode != null and companyCode != ''">-->
AND ou.`code` = #{companyCode} <!-- AND ou.`code` = #{companyCode}-->
</if> <!-- </if>-->
GROUP BY <!-- GROUP BY-->
`r`.`sequence_nbr` <!-- `r`.`sequence_nbr`-->
) a <!-- ) a-->
</select> <!-- </select>-->
<select id="getCarNum" resultType="java.lang.Integer"> <select id="getCarNum" resultType="java.lang.Integer">
SELECT SELECT
......
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