Skip to content

G
gassafety-progress
Commit 17ec5efc authored by wuqinghua's avatar wuqinghua
Browse files
Options

2022-3-18 吴卿华

parent 39edb35e
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 46 deletions
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java
View file @ 17ec5efc
...@@ -54,7 +54,7 @@ public class PipeInterfaceController extends BaseController { ...@@ -54,7 +54,7 @@ public class PipeInterfaceController extends BaseController {
/** /**
* 调压箱数据查询接口 * 调压箱数据查询接口 使用中
* @return * @return
*/ */
@RequestBody @RequestBody
...@@ -65,22 +65,25 @@ public class PipeInterfaceController extends BaseController { ...@@ -65,22 +65,25 @@ public class PipeInterfaceController extends BaseController {
List<DeviceData> list=new ArrayList<>(); List<DeviceData> list=new ArrayList<>();
//调压箱数据查询方法 //调压箱数据查询方法
List<DeviceData> deviceData = iPipeInterfaceService.selectDeviceData(); List<DeviceData> deviceData = iPipeInterfaceService.selectDeviceData();
//查询下级全部数据方法 // //查询下级全部数据方法
List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1"); // List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1");
// for (int i=0;i<deviceData.size();i++){
// boolean bo=false;
// for (int s=0;s<pressureFlows1.size();s++){
// if (pressureFlows1.get(s).getDeviceId().equals(deviceData.get(i).getDeviceId())){
// bo=true;
// break;
// }
// }
// if (bo){
// deviceData.get(i).setIconType(2);
// list.add(deviceData.get(i));
// }
// }
for (int i=0;i<deviceData.size();i++){ for (int i=0;i<deviceData.size();i++){
boolean bo=false; deviceData.get(i).setIconType(2);
for (int s=0;s<pressureFlows1.size();s++){ list.add(deviceData.get(i));
if (pressureFlows1.get(s).getDeviceId().equals(deviceData.get(i).getDeviceId())){ }
bo=true;
break;
}
}
if (bo){
deviceData.get(i).setIconType(2);
list.add(deviceData.get(i));
}
}
deviceList.setData(list); deviceList.setData(list);
return deviceList; return deviceList;
} }
...@@ -302,7 +305,7 @@ public class PipeInterfaceController extends BaseController { ...@@ -302,7 +305,7 @@ public class PipeInterfaceController extends BaseController {
/** /**
* 场站信息查询接口 * 场站信息查询接口 使用中
* @return * @return
*/ */
@RequestBody @RequestBody
...@@ -311,23 +314,28 @@ public class PipeInterfaceController extends BaseController { ...@@ -311,23 +314,28 @@ public class PipeInterfaceController extends BaseController {
TSiteStationInfoDataList tSiteStationInfoDataList=new TSiteStationInfoDataList(); TSiteStationInfoDataList tSiteStationInfoDataList=new TSiteStationInfoDataList();
//场站信息查询方法 //场站信息查询方法
List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData(); List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData();
//查询下级全部数据方法
List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("2");
List<TSiteStationInfoData> list=new ArrayList<>(); List<TSiteStationInfoData> list=new ArrayList<>();
// //查询下级全部数据方法
// List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("2");
// for (int i=0;i<tSiteStationInfoData.size();i++){
// boolean bo=false;
// for (int s=0;s<pressureFlows1.size();s++){
// if (pressureFlows1.get(s).getDeviceId()!=null){
// if (pressureFlows1.get(s).getDeviceId().equals(tSiteStationInfoData.get(i).getSiteStationId())){
// bo=true;
// break;
// }
// }
// }
// if (bo){
// tSiteStationInfoData.get(i).setIconType(4);
// list.add(tSiteStationInfoData.get(i));
// }
// }
for (int i=0;i<tSiteStationInfoData.size();i++){ for (int i=0;i<tSiteStationInfoData.size();i++){
boolean bo=false; tSiteStationInfoData.get(i).setIconType(4);
for (int s=0;s<pressureFlows1.size();s++){ list.add(tSiteStationInfoData.get(i));
if (pressureFlows1.get(s).getDeviceId()!=null){
if (pressureFlows1.get(s).getDeviceId().equals(tSiteStationInfoData.get(i).getSiteStationId())){
bo=true;
break;
}
}
}
if (bo){
tSiteStationInfoData.get(i).setIconType(4);
list.add(tSiteStationInfoData.get(i));
}
} }
tSiteStationInfoDataList.setData(list); tSiteStationInfoDataList.setData(list);
return tSiteStationInfoDataList; return tSiteStationInfoDataList;
...@@ -531,7 +539,7 @@ public class PipeInterfaceController extends BaseController { ...@@ -531,7 +539,7 @@ public class PipeInterfaceController extends BaseController {
/** /**
* 阀门数据查询接口 * 阀门数据查询接口 使用中
* @return * @return
*/ */
@RequestBody @RequestBody
...@@ -542,20 +550,24 @@ public class PipeInterfaceController extends BaseController { ...@@ -542,20 +550,24 @@ public class PipeInterfaceController extends BaseController {
List<DeviceData> list =new ArrayList<>(); List<DeviceData> list =new ArrayList<>();
//查询阀门井数据 //查询阀门井数据
List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData(); List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData();
//查询下级全部数据方法 // //查询下级全部数据方法
List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1"); // List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1");
// for (int i=0;i<pipeDates.size();i++){
// boolean bo=false;
// for (int s=0;s<pressureFlows1.size();s++){
// if (pressureFlows1.get(s).getDeviceId().equals(pipeDates.get(i).getDeviceId())){
// bo=true;
// break;
// }
// }
// if (bo){
// pipeDates.get(i).setIconType(3);
// list.add(pipeDates.get(i));
// }
// }
for (int i=0;i<pipeDates.size();i++){ for (int i=0;i<pipeDates.size();i++){
boolean bo=false; pipeDates.get(i).setIconType(3);
for (int s=0;s<pressureFlows1.size();s++){ list.add(pipeDates.get(i));
if (pressureFlows1.get(s).getDeviceId().equals(pipeDates.get(i).getDeviceId())){
bo=true;
break;
}
}
if (bo){
pipeDates.get(i).setIconType(3);
list.add(pipeDates.get(i));
}
} }
deviceDataList.setData(list); deviceDataList.setData(list);
return deviceDataList; return deviceDataList;
......
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