From 8926d27639d8cb9826941b482926f774bd10dc92 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 16 一月 2024 17:28:48 +0800
Subject: [PATCH] 增加引导井关联相机ptz
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 395 ++++++++++++++++++++++++++++----------------------------
1 files changed, 199 insertions(+), 196 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
index 6970cce..16aebd2 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -9,11 +9,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
-import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellDeptVo;
-import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;
-import com.ruoyi.alarmpoints.well.domain.RTU_DATA_YJ_8;
+import com.ruoyi.alarmpoints.well.domain.*;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
+import com.ruoyi.alarmpoints.well.mapper.ArdWellGuideCameraMapper;
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysConfig;
@@ -50,6 +48,9 @@
private static final Logger log = LoggerFactory.getLogger(ArdAlarmpointsWellServiceImpl.class);
@Resource
private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
+ @Resource
+ private ArdWellGuideCameraMapper ardWellGuideCameraMapper;
+
@Autowired
protected Validator validator;
@@ -137,6 +138,7 @@
ardAlarmpointsWell.setUpdateTime(DateUtils.getNowDate());
return ardAlarmpointsWellMapper.updateArdAlarmpointsWell(ardAlarmpointsWell);
}
+
@Override
@Transactional
public int updateArdAlarmpointsWellByWellId(ArdAlarmpointsWell ardAlarmpointsWell) {
@@ -144,6 +146,7 @@
ardAlarmpointsWell.setUpdateTime(DateUtils.getNowDate());
return ardAlarmpointsWellMapper.updateArdAlarmpointsWellByWellId(ardAlarmpointsWell);
}
+
/**
* 鎵归噺鍒犻櫎浜曠鐞�
*
@@ -312,11 +315,11 @@
}
@Override
- public List<ArdAlarmpointsWell> getNearbyWellList(Double longitudeCenter,Double latitudeCenter, Long deptId, Integer range) {
+ public List<ArdAlarmpointsWell> getNearbyWellList(Double longitudeCenter, Double latitudeCenter, Long deptId, Integer range) {
List<ArdAlarmpointsWell> nearbyWellList = new ArrayList<>();
try {
if (longitudeCenter != null && latitudeCenter != null) {
- ArdAlarmpointsWell ardAlarmpointsWell=new ArdAlarmpointsWell();
+ ArdAlarmpointsWell ardAlarmpointsWell = new ArdAlarmpointsWell();
ardAlarmpointsWell.setDeptId(deptId);
List<ArdAlarmpointsWell> ardAlarmpointsWells = ardAlarmpointsWellMapper.selectArdAlarmpointsWellList(ardAlarmpointsWell);
if (ardAlarmpointsWells.size() > 0) {
@@ -341,167 +344,167 @@
@Override
public Map<String, Object> getWellDataByWellId(String wellId, List<SysConfig> config) {
ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(wellId);
- Map<String,Object> result = new HashMap();
- if(ardAlarmpointsWell.getWellId() != null){
- result.put("wellId",ardAlarmpointsWell.getWellId());
- }else{
- result.put("wellId","");
+ Map<String, Object> result = new HashMap();
+ if (ardAlarmpointsWell.getWellId() != null) {
+ result.put("wellId", ardAlarmpointsWell.getWellId());
+ } else {
+ result.put("wellId", "");
}
- if(ardAlarmpointsWell.getWellNumber() != null){
- result.put("wellNumber",ardAlarmpointsWell.getWellNumber());
- }else{
- result.put("wellNumber","");
+ if (ardAlarmpointsWell.getWellNumber() != null) {
+ result.put("wellNumber", ardAlarmpointsWell.getWellNumber());
+ } else {
+ result.put("wellNumber", "");
}
- if(ardAlarmpointsWell.getOilProduction() != null){
- result.put("oilProduction",ardAlarmpointsWell.getOilProduction());
- }else{
- result.put("oilProduction","");
+ if (ardAlarmpointsWell.getOilProduction() != null) {
+ result.put("oilProduction", ardAlarmpointsWell.getOilProduction());
+ } else {
+ result.put("oilProduction", "");
}
- if(ardAlarmpointsWell.getWellBlock() != null){
- result.put("wellBlock",ardAlarmpointsWell.getWellBlock());
- }else{
- result.put("wellBlock","");
+ if (ardAlarmpointsWell.getWellBlock() != null) {
+ result.put("wellBlock", ardAlarmpointsWell.getWellBlock());
+ } else {
+ result.put("wellBlock", "");
}
- if(ardAlarmpointsWell.getProductionDate() != null){
- result.put("productionDate",ardAlarmpointsWell.getProductionDate());
- }else{
- result.put("productionDate","");
+ if (ardAlarmpointsWell.getProductionDate() != null) {
+ result.put("productionDate", ardAlarmpointsWell.getProductionDate());
+ } else {
+ result.put("productionDate", "");
}
- if(ardAlarmpointsWell.getDisplacementMode() != null){
- result.put("displacementMode",ardAlarmpointsWell.getDisplacementMode());
- }else{
- result.put("displacementMode","");
+ if (ardAlarmpointsWell.getDisplacementMode() != null) {
+ result.put("displacementMode", ardAlarmpointsWell.getDisplacementMode());
+ } else {
+ result.put("displacementMode", "");
}
- if(ardAlarmpointsWell.getSurroundingEnvironment() != null){
- result.put("surroundingEnvironment",ardAlarmpointsWell.getSurroundingEnvironment());
- }else{
- result.put("surroundingEnvironment","");
+ if (ardAlarmpointsWell.getSurroundingEnvironment() != null) {
+ result.put("surroundingEnvironment", ardAlarmpointsWell.getSurroundingEnvironment());
+ } else {
+ result.put("surroundingEnvironment", "");
}
- if(ardAlarmpointsWell.getWellType() != null){
- result.put("wellType",ardAlarmpointsWell.getWellType());
- }else{
- result.put("wellType","");
+ if (ardAlarmpointsWell.getWellType() != null) {
+ result.put("wellType", ardAlarmpointsWell.getWellType());
+ } else {
+ result.put("wellType", "");
}
- if(ardAlarmpointsWell.getInstalledLoad() != null){
- result.put("installedLoad",ardAlarmpointsWell.getInstalledLoad());
- }else{
- result.put("installedLoad","");
+ if (ardAlarmpointsWell.getInstalledLoad() != null) {
+ result.put("installedLoad", ardAlarmpointsWell.getInstalledLoad());
+ } else {
+ result.put("installedLoad", "");
}
- if(ardAlarmpointsWell.getMeteringStation() != null){
- result.put("meteringStation",ardAlarmpointsWell.getMeteringStation());
- }else{
- result.put("meteringStation","");
+ if (ardAlarmpointsWell.getMeteringStation() != null) {
+ result.put("meteringStation", ardAlarmpointsWell.getMeteringStation());
+ } else {
+ result.put("meteringStation", "");
}
- if(ardAlarmpointsWell.getTransferStation() != null){
- result.put("transferStation",ardAlarmpointsWell.getTransferStation());
- }else{
- result.put("transferStation","");
+ if (ardAlarmpointsWell.getTransferStation() != null) {
+ result.put("transferStation", ardAlarmpointsWell.getTransferStation());
+ } else {
+ result.put("transferStation", "");
}
- if(ardAlarmpointsWell.getDehydrationStation() != null){
- result.put("dehydrationStation",ardAlarmpointsWell.getDehydrationStation());
- }else{
- result.put("dehydrationStation","");
+ if (ardAlarmpointsWell.getDehydrationStation() != null) {
+ result.put("dehydrationStation", ardAlarmpointsWell.getDehydrationStation());
+ } else {
+ result.put("dehydrationStation", "");
}
- if(ardAlarmpointsWell.getRunStatus() != null){
- result.put("runStatus",ardAlarmpointsWell.getRunStatus());
- }else{
- result.put("runStatus","");
+ if (ardAlarmpointsWell.getRunStatus() != null) {
+ result.put("runStatus", ardAlarmpointsWell.getRunStatus());
+ } else {
+ result.put("runStatus", "");
}
- if(ardAlarmpointsWell.getLongitude() != null){
- result.put("longitude",ardAlarmpointsWell.getLongitude());
- }else{
- result.put("longitude","");
+ if (ardAlarmpointsWell.getLongitude() != null) {
+ result.put("longitude", ardAlarmpointsWell.getLongitude());
+ } else {
+ result.put("longitude", "");
}
- if(ardAlarmpointsWell.getLatitude() != null){
- result.put("latitude",ardAlarmpointsWell.getLatitude());
- }else{
- result.put("latitude","");
+ if (ardAlarmpointsWell.getLatitude() != null) {
+ result.put("latitude", ardAlarmpointsWell.getLatitude());
+ } else {
+ result.put("latitude", "");
}
- if(ardAlarmpointsWell.getAltitude() != null){
- result.put("altitude",ardAlarmpointsWell.getAltitude());
- }else{
- result.put("altitude","");
+ if (ardAlarmpointsWell.getAltitude() != null) {
+ result.put("altitude", ardAlarmpointsWell.getAltitude());
+ } else {
+ result.put("altitude", "");
}
- if(ardAlarmpointsWell.getUserId() != null){
- result.put("userId",ardAlarmpointsWell.getUserId());
- }else{
- result.put("userId","");
+ if (ardAlarmpointsWell.getUserId() != null) {
+ result.put("userId", ardAlarmpointsWell.getUserId());
+ } else {
+ result.put("userId", "");
}
- if(ardAlarmpointsWell.getDeptId() != null){
- result.put("deptId",ardAlarmpointsWell.getDeptId());
+ if (ardAlarmpointsWell.getDeptId() != null) {
+ result.put("deptId", ardAlarmpointsWell.getDeptId());
SysDept sysDept = sysDeptMapper.selectDeptById(ardAlarmpointsWell.getDeptId());//鏌ヨ鍏磋叮鐐规墍鍦ㄩ儴闂�
- if(sysDept != null){
- result.put("deptName",sysDept.getDeptName());
- }else{
- result.put("deptName","");
+ if (sysDept != null) {
+ result.put("deptName", sysDept.getDeptName());
+ } else {
+ result.put("deptName", "");
}
- }else{
- result.put("deptId","");
- result.put("deptName","");
+ } else {
+ result.put("deptId", "");
+ result.put("deptName", "");
}
- if(ardAlarmpointsWell.getCreateBy() != null){
- result.put("createBy",ardAlarmpointsWell.getCreateBy());
- }else{
- result.put("createBy","");
+ if (ardAlarmpointsWell.getCreateBy() != null) {
+ result.put("createBy", ardAlarmpointsWell.getCreateBy());
+ } else {
+ result.put("createBy", "");
}
- if(ardAlarmpointsWell.getCreateTime() != null){
- result.put("createTime",ardAlarmpointsWell.getCreateTime());
- }else{
- result.put("createTime","");
+ if (ardAlarmpointsWell.getCreateTime() != null) {
+ result.put("createTime", ardAlarmpointsWell.getCreateTime());
+ } else {
+ result.put("createTime", "");
}
- if(ardAlarmpointsWell.getUpdateBy() != null){
- result.put("updateBy",ardAlarmpointsWell.getUpdateBy());
- }else{
- result.put("updateBy","");
+ if (ardAlarmpointsWell.getUpdateBy() != null) {
+ result.put("updateBy", ardAlarmpointsWell.getUpdateBy());
+ } else {
+ result.put("updateBy", "");
}
- if(ardAlarmpointsWell.getUpdateTime() != null){
- result.put("updateTime",ardAlarmpointsWell.getUpdateTime());
- }else{
- result.put("updateTime","");
+ if (ardAlarmpointsWell.getUpdateTime() != null) {
+ result.put("updateTime", ardAlarmpointsWell.getUpdateTime());
+ } else {
+ result.put("updateTime", "");
}
- if(ardAlarmpointsWell.getGuideP1() != null){
- result.put("guideP1",ardAlarmpointsWell.getGuideP1());
- }else{
- result.put("guideP1","");
- }
- if(ardAlarmpointsWell.getGuideP2() != null){
- result.put("guideP2",ardAlarmpointsWell.getGuideP2());
- }else{
- result.put("guideP2","");
- }
- if(ardAlarmpointsWell.getGuideT1() != null){
- result.put("guideT1",ardAlarmpointsWell.getGuideT1());
- }else{
- result.put("guideT1","");
- }
- if(ardAlarmpointsWell.getGuideT2() != null){
- result.put("guideT2",ardAlarmpointsWell.getGuideT2());
- }else{
- result.put("guideT2","");
- }
- if(ardAlarmpointsWell.getGuideZ1() != null){
- result.put("guideZ1",ardAlarmpointsWell.getGuideZ1());
- }else{
- result.put("guideZ1","");
- }
- if(ardAlarmpointsWell.getGuideZ2() != null){
- result.put("guideZ2",ardAlarmpointsWell.getGuideZ2());
- }else{
- result.put("guideZ2","");
- }
- if(config.size() != 0){
+ //if(ardAlarmpointsWell.getGuideP1() != null){
+ // result.put("guideP1",ardAlarmpointsWell.getGuideP1());
+ //}else{
+ // result.put("guideP1","");
+ //}
+ //if(ardAlarmpointsWell.getGuideP2() != null){
+ // result.put("guideP2",ardAlarmpointsWell.getGuideP2());
+ //}else{
+ // result.put("guideP2","");
+ //}
+ //if(ardAlarmpointsWell.getGuideT1() != null){
+ // result.put("guideT1",ardAlarmpointsWell.getGuideT1());
+ //}else{
+ // result.put("guideT1","");
+ //}
+ //if(ardAlarmpointsWell.getGuideT2() != null){
+ // result.put("guideT2",ardAlarmpointsWell.getGuideT2());
+ //}else{
+ // result.put("guideT2","");
+ //}
+ //if(ardAlarmpointsWell.getGuideZ1() != null){
+ // result.put("guideZ1",ardAlarmpointsWell.getGuideZ1());
+ //}else{
+ // result.put("guideZ1","");
+ //}
+ //if(ardAlarmpointsWell.getGuideZ2() != null){
+ // result.put("guideZ2",ardAlarmpointsWell.getGuideZ2());
+ //}else{
+ // result.put("guideZ2","");
+ //}
+ if (config.size() != 0) {
String oracle = config.get(0).getConfigValue();
String[] oracleArr = oracle.split(";");
- if(oracleArr.length == 3){
+ if (oracleArr.length == 3) {
String url = oracle.split(";")[0];
String username = oracle.split(";")[1];
String password = oracle.split(";")[2];
try {
- int checkMark = checkTable(url,username,password,"\'RTU_DATA_YJ_8\'");//涓夊巶琛ㄥ瓨鍦�
- if(checkMark == 1){
- Map<String,Object> resultRTU = getRtuDataYjByJH(url,username,password,"RTU_DATA_YJ_8","\'" + wellId + "\'");
+ int checkMark = checkTable(url, username, password, "\'RTU_DATA_YJ_8\'");//涓夊巶琛ㄥ瓨鍦�
+ if (checkMark == 1) {
+ Map<String, Object> resultRTU = getRtuDataYjByJH(url, username, password, "RTU_DATA_YJ_8", "\'" + wellId + "\'");
result.putAll(resultRTU);
- }else{
+ } else {
result.put("wellRunningState", "n");//娌逛簳杩愯鐘舵��
result.put("totalPowerConsumption", "n");//鎬昏�楃數閲�
result.put("communicationMachine", "n");//璁惧閫氳
@@ -533,18 +536,18 @@
} catch (Exception e) {
e.printStackTrace();
}
- }else if(oracleArr.length == 4){
+ } else if (oracleArr.length == 4) {
String url = oracle.split(";")[0];
String username = oracle.split(";")[1];
String password = oracle.split(";")[2];
String prod = oracle.split(";")[3];
try {
//int checkMark = checkTable(url,username,password,"\'RTU_DATA_YJ_8\'");//涓夊巶琛ㄥ瓨鍦�
- int checkMark = checkTable(url,username,password,"\'" + prod + ".RTU_DATA_YJ_8\'");//涓夊巶琛ㄥ瓨鍦�
- if(checkMark == 1){
- Map<String,Object> resultRTU = getRtuDataYjByJH(url,username,password,prod + ".RTU_DATA_YJ_8","\'" + wellId + "\'");
+ int checkMark = checkTable(url, username, password, "\'" + prod + ".RTU_DATA_YJ_8\'");//涓夊巶琛ㄥ瓨鍦�
+ if (checkMark == 1) {
+ Map<String, Object> resultRTU = getRtuDataYjByJH(url, username, password, prod + ".RTU_DATA_YJ_8", "\'" + wellId + "\'");
result.putAll(resultRTU);
- }else{
+ } else {
result.put("wellRunningState", "n");//娌逛簳杩愯鐘舵��
result.put("totalPowerConsumption", "n");//鎬昏�楃數閲�
result.put("communicationMachine", "n");//璁惧閫氳
@@ -577,7 +580,7 @@
e.printStackTrace();
}
}
- }else{
+ } else {
result.put("wellRunningState", "n");//娌逛簳杩愯鐘舵��
result.put("totalPowerConsumption", "n");//鎬昏�楃數閲�
result.put("communicationMachine", "n");//璁惧閫氳
@@ -609,7 +612,7 @@
return result;
}
- public int checkTable(String url,String username,String password,String tableName) throws ClassNotFoundException, SQLException {
+ public int checkTable(String url, String username, String password, String tableName) throws ClassNotFoundException, SQLException {
Connection connection = null;
Statement updateStatement = null;
@@ -618,7 +621,7 @@
try {
Class.forName("oracle.jdbc.OracleDriver");
- connection = DriverManager.getConnection(url,username,password);
+ connection = DriverManager.getConnection(url, username, password);
//Statement 瀵硅薄 鍙戦�乻ql
updateStatement = connection.createStatement();
//鏌ヨ
@@ -626,7 +629,7 @@
ResultSet resultSet = queryStatement.executeQuery("select count(*) from user_tables where table_name = upper(" + tableName + ")");
int result = 0;
- while(resultSet.next()){
+ while (resultSet.next()) {
int column = resultSet.getInt(1);
result = column;
}
@@ -635,19 +638,19 @@
e.printStackTrace();
return 0;
} finally {
- if (updateStatement != null){
+ if (updateStatement != null) {
updateStatement.close();
}
- if (queryStatement != null){
+ if (queryStatement != null) {
queryStatement.close();
}
- if (connection != null){
+ if (connection != null) {
connection.close();
}
}
}
- public Map<String,Object> getRtuDataYjByJH(String url,String username,String password,String tableName,String JH) throws ClassNotFoundException, SQLException{
+ public Map<String, Object> getRtuDataYjByJH(String url, String username, String password, String tableName, String JH) throws ClassNotFoundException, SQLException {
Connection connection = null;
Statement updateStatement = null;
@@ -656,7 +659,7 @@
try {
Class.forName("oracle.jdbc.OracleDriver");
- connection = DriverManager.getConnection(url,username,password);
+ connection = DriverManager.getConnection(url, username, password);
//Statement 瀵硅薄 鍙戦�乻ql
updateStatement = connection.createStatement();
//鏌ヨ
@@ -665,8 +668,8 @@
"select rdy.JH,max(rdy.RQ) as RQ from RTU_DATA_YJ_8 rdy group by rdy.JH" +
")t on rdy0.JH = t.JH and rdy0.RQ = t.RQ where rdy0.JH = " + JH);
- Map<String,Object> result = new HashMap();
- while(resultSet.next()){
+ Map<String, Object> result = new HashMap();
+ while (resultSet.next()) {
result.put("wellRunningState", "n");
result.put("totalPowerConsumption", "n");//鎬昏�楃數閲�
result.put("communicationMachine", "n");//璁惧閫氳
@@ -675,108 +678,108 @@
result.put("meteringPlantWaterPressure", "n");//璁￠噺闂存幒姘村帇鍔�//
result.put("torque", "n");//鎵煩
- if(resultSet.getString("MAT") != null){//鍥炴补娓╁害
+ if (resultSet.getString("MAT") != null) {//鍥炴补娓╁害
result.put("MAT", resultSet.getString("MAT"));
- }else{
+ } else {
result.put("MAT", "n");
}
- if(resultSet.getString("TGP") != null){//浜曞彛娌瑰帇
+ if (resultSet.getString("TGP") != null) {//浜曞彛娌瑰帇
result.put("TGP", resultSet.getString("TGP"));
- }else{
+ } else {
result.put("TGP", "n");
}
- if(resultSet.getString("CPV") != null){//浜曞彛濂楀帇
+ if (resultSet.getString("CPV") != null) {//浜曞彛濂楀帇
result.put("CPV", resultSet.getString("CPV"));
- }else{
+ } else {
result.put("CPV", "n");
}
- if(resultSet.getString("ADL") != null){//A鐩哥數娴�
+ if (resultSet.getString("ADL") != null) {//A鐩哥數娴�
result.put("ADL", resultSet.getString("ADL"));
- }else{
+ } else {
result.put("ADL", "n");
}
- if(resultSet.getString("ADY") != null){//A鐩哥數鍘�
+ if (resultSet.getString("ADY") != null) {//A鐩哥數鍘�
result.put("ADY", resultSet.getString("ADY"));
- }else{
+ } else {
result.put("ADY", "n");
}
- if(resultSet.getString("BDL") != null){//B鐩哥數娴�
+ if (resultSet.getString("BDL") != null) {//B鐩哥數娴�
result.put("BDL", resultSet.getString("BDL"));
- }else{
+ } else {
result.put("BDL", "n");
}
- if(resultSet.getString("BDY") != null){//B鐩哥數鍘�
+ if (resultSet.getString("BDY") != null) {//B鐩哥數鍘�
result.put("BDY", resultSet.getString("BDY"));
- }else{
+ } else {
result.put("BDY", "n");
}
- if(resultSet.getString("CDL") != null){//C鐩哥數娴�
+ if (resultSet.getString("CDL") != null) {//C鐩哥數娴�
result.put("CDL", resultSet.getString("CDL"));
- }else{
+ } else {
result.put("CDL", "n");
}
- if(resultSet.getString("CDY") != null){//C鐩哥數鍘�
+ if (resultSet.getString("CDY") != null) {//C鐩哥數鍘�
result.put("CDY", resultSet.getString("CDY"));
- }else{
+ } else {
result.put("CDY", "n");
}
- if(resultSet.getString("UCV") != null){//涓婅鐢垫祦
+ if (resultSet.getString("UCV") != null) {//涓婅鐢垫祦
result.put("UCV", resultSet.getString("UCV"));
- }else{
+ } else {
result.put("UCV", "n");
}
- if(resultSet.getString("DCV") != null){//涓嬭鐢垫祦
+ if (resultSet.getString("DCV") != null) {//涓嬭鐢垫祦
result.put("DCV", resultSet.getString("DCV"));
- }else{
+ } else {
result.put("DCV", "n");
}
- if(resultSet.getString("SLV") != null){//鍐茬▼
+ if (resultSet.getString("SLV") != null) {//鍐茬▼
result.put("SLV", resultSet.getString("SLV"));
- }else{
+ } else {
result.put("SLV", "n");
}
- if(resultSet.getString("CHC") != null){//鍐叉
+ if (resultSet.getString("CHC") != null) {//鍐叉
result.put("CHC", resultSet.getString("CHC"));
- }else{
+ } else {
result.put("CHC", "n");
}
- if(resultSet.getString("BPV") != null){//浜曞彛鍥炲帇
+ if (resultSet.getString("BPV") != null) {//浜曞彛鍥炲帇
result.put("BPV", resultSet.getString("BPV"));
- }else{
+ } else {
result.put("BPV", "n");
}
- if(resultSet.getString("ZWG") != null){//鎬绘棤鍔熷姛鐜�
+ if (resultSet.getString("ZWG") != null) {//鎬绘棤鍔熷姛鐜�
result.put("ZWG", resultSet.getString("ZWG"));
- }else{
+ } else {
result.put("ZWG", "n");
}
- if(resultSet.getString("ZYG") != null){//鎬绘湁鍔熷姛鐜�
+ if (resultSet.getString("ZYG") != null) {//鎬绘湁鍔熷姛鐜�
result.put("ZYG", resultSet.getString("ZYG"));
- }else{
+ } else {
result.put("ZYG", "n");
}
- if(resultSet.getString("GYS") != null){//鍔熺巼鍥犳暟
+ if (resultSet.getString("GYS") != null) {//鍔熺巼鍥犳暟
result.put("GYS", resultSet.getString("GYS"));
- }else{
+ } else {
result.put("GYS", "n");
}
- if(resultSet.getString("UWL") != null){//鏈�澶ц浇鑽�
+ if (resultSet.getString("UWL") != null) {//鏈�澶ц浇鑽�
result.put("UWL", resultSet.getString("UWL"));
- }else{
+ } else {
result.put("UWL", "n");
}
- if(resultSet.getString("DWL") != null){//鏈�灏忚浇鑽�
+ if (resultSet.getString("DWL") != null) {//鏈�灏忚浇鑽�
result.put("DWL", resultSet.getString("DWL"));
- }else{
+ } else {
result.put("DWL", "n");
}
- if(resultSet.getString("ZHS") != null){//杞��
+ if (resultSet.getString("ZHS") != null) {//杞��
result.put("ZHS", resultSet.getString("ZHS"));
- }else{
+ } else {
result.put("ZHS", "n");
}
}
- if(result.size() == 0){
+ if (result.size() == 0) {
result.put("wellRunningState", "n");//娌逛簳杩愯鐘舵��
result.put("totalPowerConsumption", "n");//鎬昏�楃數閲�
result.put("communicationMachine", "n");//璁惧閫氳
@@ -807,13 +810,13 @@
}
return result;
} finally {
- if (updateStatement != null){
+ if (updateStatement != null) {
updateStatement.close();
}
- if (queryStatement != null){
+ if (queryStatement != null) {
queryStatement.close();
}
- if (connection != null){
+ if (connection != null) {
connection.close();
}
}
--
Gitblit v1.9.3