Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 5a91d84b authored by 高建强's avatar 高建强
Browse files
Options

item:消防水池液位计算修改

parent aec51bae
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 43 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @ 5a91d84b
......@@ -1404,20 +1404,21 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
area = Double.valueOf(map.get("area").toString());
}
String maxlevel = map.get("max_level") != null ? map.get("max_level").toString() : "0.0";
String level = map.get("value") != null && StringUtil.isNumeric(map.get("value").toString()) ? String.format("%.2f", (Double.valueOf(map.get("value").toString()))) : maxlevel;
String volume = String.format("%.2f", Double.valueOf(level) * area);
// String level = map.get("value") != null && StringUtil.isNumeric(map.get("value").toString()) ? String.format("%.2f", (Double.valueOf(map.get("value").toString()))) : maxlevel;
String volume = map.get("volume") != null && StringUtil.isNumeric(map.get("volume").toString()) ? String.format("%.2f", (Double.valueOf(map.get("volume").toString()))) : String.format("%.2f", Double.valueOf(maxlevel) * area);
// String volume = String.format("%.2f", Double.valueOf(level) * area);
if (hashOperations.size("Analogue") > 0) {
if (ObjectUtils.isEmpty(map.get("CODE")) || !hashOperations.hasKey("Analogue", map.get("CODE"))) {
map.put("level", level);
if (ObjectUtils.isEmpty(map.get("code")) || !hashOperations.hasKey("Analogue", map.get("code"))) {
map.put("level", maxlevel);
map.put("volume", volume);
continue;
}
EquipCommunicationData data = (EquipCommunicationData) hashOperations.get("Analogue", map.get("CODE"));
map.put("level", StringUtil.isNumeric(data.getState()) ? data.getState() : level);
map.put("volume", String.format("%.2f", (Double.valueOf(map.get("level").toString()) * area)));
} else {
EquipCommunicationData data = (EquipCommunicationData) hashOperations.get("Analogue", map.get("code"));
String level = StringUtil.isNumeric(data.getState()) ? data.getState() : maxlevel;
map.put("level", level);
map.put("volume", map.get("volume") != null && StringUtil.isNumeric(map.get("volume").toString()) ? volume : String.format("%.2f", (Double.valueOf(level) * area)));
} else {
map.put("level", maxlevel);
map.put("volume", volume);
}
}
......
YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties
View file @ 5a91d84b
#DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.url = jdbc:mysql://172.16.10.85:3306/autosys_business_v3.0.0.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=root_123
spring.datasource.password=Amos2019Mysql8
spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
......
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_source.xml
View file @ 5a91d84b
......@@ -647,41 +647,16 @@
FROM
(
SELECT
MAX(
CASE
WHEN a.field_name = 'name' THEN
a.field_value
END
) AS name,
MAX(
CASE
WHEN a.field_name = 'code' THEN
a.field_value
END
) AS code,
MAX(
CASE
WHEN a.field_name = 'height' THEN
a.field_value
END
) AS max_level,
MAX(
CASE
WHEN a.field_name = 'lowWaterHeight' THEN
a.field_value
END
) AS alarm_level,
MAX(
CASE
WHEN a.field_name = 'bottomArea' THEN
a.field_value
END
) AS area,
3.6 AS value
MAX( CASE WHEN a.field_name = 'name' THEN a.field_value END ) AS `name`,
MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS `code`,
MAX( CASE WHEN a.field_name = 'height' THEN a.field_value END ) AS max_level,
MAX( CASE WHEN a.field_name = 'lowWaterHeight' THEN a.field_value END ) AS alarm_level,
MAX( CASE WHEN a.field_name = 'bottomArea' THEN a.field_value END ) AS area,
MAX( CASE WHEN a.field_name = 'volume' THEN a.field_value END ) AS volume
FROM
`wl_form_instance` a
WHERE
a.group_code IN ('pool', 'r_pool')
a.group_code IN ( 'pool', 'r_pool' )
GROUP BY
a.instance_id
) s
......
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