diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java index 36c8384..a852a3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java @@ -65,6 +65,7 @@ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); List> mapList = corrodeDataService.getCorrodelistScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java index 36c8384..a852a3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java @@ -65,6 +65,7 @@ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); List> mapList = corrodeDataService.getCorrodelistScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 1ee91c5..5ce4795 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -91,9 +91,12 @@ viewMap.put("instantVelocity", 0); viewMap.put("ambocetorTemperture", 0); viewMap.put("logTime", sdf4.format(new Date())); + viewMap.put("position", ""); + } Integer peroidCount = gasFlowService.selectPhaseGasFlow(deviceDto.getDevcode(), beginTime, endTime); viewMap.put("peroidCount", ObjectUtils.isEmpty(peroidCount) ? 0 : peroidCount); + viewMap.put("position", deviceDto.getPosition()); viewMap.put("devcode", deviceDto.getDevcode()); viewMap.put("wellCode", deviceDto.getWellCode()); viewMap.put("deviceTypeName", deviceDto.getDeviceTypeName()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java index 36c8384..a852a3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java @@ -65,6 +65,7 @@ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); List> mapList = corrodeDataService.getCorrodelistScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 1ee91c5..5ce4795 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -91,9 +91,12 @@ viewMap.put("instantVelocity", 0); viewMap.put("ambocetorTemperture", 0); viewMap.put("logTime", sdf4.format(new Date())); + viewMap.put("position", ""); + } Integer peroidCount = gasFlowService.selectPhaseGasFlow(deviceDto.getDevcode(), beginTime, endTime); viewMap.put("peroidCount", ObjectUtils.isEmpty(peroidCount) ? 0 : peroidCount); + viewMap.put("position", deviceDto.getPosition()); viewMap.put("devcode", deviceDto.getDevcode()); viewMap.put("wellCode", deviceDto.getWellCode()); viewMap.put("deviceTypeName", deviceDto.getDeviceTypeName()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index ba4c596..de6aa53 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -152,7 +152,6 @@ deviceDto.put("watchNum", meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString()); deviceDto.put("uptime", sdf4.format((Date) meterRec.get("UPTIME"))); } - deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString()) + "/" + deviceDto.get("POSITION").toString()); }); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java index 36c8384..a852a3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java @@ -65,6 +65,7 @@ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); List> mapList = corrodeDataService.getCorrodelistScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 1ee91c5..5ce4795 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -91,9 +91,12 @@ viewMap.put("instantVelocity", 0); viewMap.put("ambocetorTemperture", 0); viewMap.put("logTime", sdf4.format(new Date())); + viewMap.put("position", ""); + } Integer peroidCount = gasFlowService.selectPhaseGasFlow(deviceDto.getDevcode(), beginTime, endTime); viewMap.put("peroidCount", ObjectUtils.isEmpty(peroidCount) ? 0 : peroidCount); + viewMap.put("position", deviceDto.getPosition()); viewMap.put("devcode", deviceDto.getDevcode()); viewMap.put("wellCode", deviceDto.getWellCode()); viewMap.put("deviceTypeName", deviceDto.getDeviceTypeName()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index ba4c596..de6aa53 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -152,7 +152,6 @@ deviceDto.put("watchNum", meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString()); deviceDto.put("uptime", sdf4.format((Date) meterRec.get("UPTIME"))); } - deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString()) + "/" + deviceDto.get("POSITION").toString()); }); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml index 60977e3..0c1d4e9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml @@ -57,9 +57,10 @@ dg.CELL AS cell, DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, - dg.CORRODE_RATE AS corrodRate + dg.PROBELOSS AS corrrodRate, + dg.status AS status FROM - data_corrode dg + data_corrrate dg INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID @@ -90,7 +91,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java index 36c8384..a852a3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/CorrodeDataController.java @@ -65,6 +65,7 @@ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); List> mapList = corrodeDataService.getCorrodelistScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 1ee91c5..5ce4795 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -91,9 +91,12 @@ viewMap.put("instantVelocity", 0); viewMap.put("ambocetorTemperture", 0); viewMap.put("logTime", sdf4.format(new Date())); + viewMap.put("position", ""); + } Integer peroidCount = gasFlowService.selectPhaseGasFlow(deviceDto.getDevcode(), beginTime, endTime); viewMap.put("peroidCount", ObjectUtils.isEmpty(peroidCount) ? 0 : peroidCount); + viewMap.put("position", deviceDto.getPosition()); viewMap.put("devcode", deviceDto.getDevcode()); viewMap.put("wellCode", deviceDto.getWellCode()); viewMap.put("deviceTypeName", deviceDto.getDeviceTypeName()); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index ba4c596..de6aa53 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -152,7 +152,6 @@ deviceDto.put("watchNum", meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString()); deviceDto.put("uptime", sdf4.format((Date) meterRec.get("UPTIME"))); } - deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString()) + "/" + deviceDto.get("POSITION").toString()); }); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml index 60977e3..0c1d4e9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml @@ -57,9 +57,10 @@ dg.CELL AS cell, DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, - dg.CORRODE_RATE AS corrodRate + dg.PROBELOSS AS corrrodRate, + dg.status AS status FROM - data_corrode dg + data_corrrate dg INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID @@ -90,7 +91,7 @@ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java index 781e032..9d4b11f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java @@ -6,20 +6,24 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dao.CorrodeDataMapper; import com.casic.missiles.modular.system.service.ICorrodeDataService; +import com.casic.missiles.modular.system.service.IDeviceService; +import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.*; @Service +@AllArgsConstructor public class CorrodeDataServiceImpl implements ICorrodeDataService { - @Autowired - CorrodeDataMapper corrodeDataMapper; - @Autowired - ICommonPermissionService permissionService; + + private final CorrodeDataMapper corrodeDataMapper; + private final ICommonPermissionService permissionService; + private final IDeviceService deviceService; // @Override // public List> getCorrodelistPage(DataScope dataScope, int currentIndex, int pageSize, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline, String areaId) { @@ -30,6 +34,7 @@ public List> getCorrodelistScopePage(DataScope dataScope, Page> page, String deptid, String beginTime, String endTime, String keywords) { List> mapList = corrodeDataMapper.getCorrodelistScopePage(dataScope, page, deptid, beginTime, endTime, keywords); for (Map map : mapList) { +// map.put("areaFullName", deviceService.getAreaFullNameById(deviceDto.getArea())); map.put("deptName", permissionService.getDeptName(Long.valueOf(map.get("deptid").toString()))); } return mapList;