|
@@ -43,7 +43,7 @@ public class MonitorInfoController {
|
|
|
@Autowired
|
|
|
private DeviceParmService deviceParmService;
|
|
|
@Autowired
|
|
|
- private RedisUtil redisUtil;
|
|
|
+ private RedisUtil redisUtil;
|
|
|
@Autowired
|
|
|
private SceneService sceneService;
|
|
|
@Autowired
|
|
@@ -51,9 +51,9 @@ public class MonitorInfoController {
|
|
|
@Autowired
|
|
|
private AlarmDetailsService alarmDetailsService;
|
|
|
@Autowired
|
|
|
- private DeviceAttributeSpecsService deviceAttributeSpecsService;
|
|
|
+ private DeviceAttributeSpecsService deviceAttributeSpecsService;
|
|
|
@Autowired
|
|
|
- private DeviceAttributeService deviceAttributeService;
|
|
|
+ private DeviceAttributeService deviceAttributeService;
|
|
|
@Autowired
|
|
|
private MonitorDataReportService monitorDataReportService;
|
|
|
@Autowired
|
|
@@ -61,34 +61,35 @@ public class MonitorInfoController {
|
|
|
@Autowired
|
|
|
private DeviceSetupRecordService deviceSetupRecordService;
|
|
|
|
|
|
+
|
|
|
@ApiOperation(value = "按场景ID查询供水量出水量耗药量耗电量(已废弃)")
|
|
|
- @RequestMapping(value = "/findTotalUsageBySceneId",method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/findTotalUsageBySceneId", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- public AjaxMessage<SceneUsageDto> findTotalUsageBySceneId(@ApiParam(value = "场景ID", required = true) @RequestParam Long id,@ApiParam(value = "类型(0综合调度 1综合展示)", required = false) @RequestParam(required = false) Integer... type) {
|
|
|
+ public AjaxMessage<SceneUsageDto> findTotalUsageBySceneId(@ApiParam(value = "场景ID", required = true) @RequestParam Long id, @ApiParam(value = "类型(0综合调度 1综合展示)", required = false) @RequestParam(required = false) Integer... type) {
|
|
|
SceneUsageDto sceneUsageDto = new SceneUsageDto();
|
|
|
//查询场景下的所有设备信息
|
|
|
- sceneUsageDto.setYieldWaterUsage(monitorDataReportService.getAmountCount(null,id.intValue(),null,3,1).doubleValue());
|
|
|
- sceneUsageDto.setIntakeWaterUsage(monitorDataReportService.getAmountCount(null,id.intValue(),null,4,1).doubleValue());
|
|
|
- sceneUsageDto.setPowerUsage(monitorDataReportService.getAmountCount(null,id.intValue(),null,5,1).doubleValue());
|
|
|
- sceneUsageDto.setDrugUsage(monitorDataReportService.getAmountCount(null,id.intValue(),null,6,1).doubleValue());
|
|
|
+ sceneUsageDto.setYieldWaterUsage(monitorDataReportService.getAmountCount(null, id.intValue(), null, 3, 1).doubleValue());
|
|
|
+ sceneUsageDto.setIntakeWaterUsage(monitorDataReportService.getAmountCount(null, id.intValue(), null, 4, 1).doubleValue());
|
|
|
+ sceneUsageDto.setPowerUsage(monitorDataReportService.getAmountCount(null, id.intValue(), null, 5, 1).doubleValue());
|
|
|
+ sceneUsageDto.setDrugUsage(monitorDataReportService.getAmountCount(null, id.intValue(), null, 6, 1).doubleValue());
|
|
|
if (type != null && type.length > 0) {
|
|
|
sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getYieldWaterUsage()).divide(BigDecimal.valueOf(10000), 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
sceneUsageDto.setIntakeWaterUsage(sceneUsageDto.getIntakeWaterUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getIntakeWaterUsage()).divide(BigDecimal.valueOf(10000), 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
sceneUsageDto.setPowerUsage(sceneUsageDto.getPowerUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getPowerUsage()).divide(BigDecimal.valueOf(10000), 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
- sceneUsageDto.setDrugUsage(sceneUsageDto.getDrugUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getDrugUsage()).setScale( 3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
- }else {
|
|
|
+ sceneUsageDto.setDrugUsage(sceneUsageDto.getDrugUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getDrugUsage()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
+ } else {
|
|
|
sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getYieldWaterUsage()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
sceneUsageDto.setIntakeWaterUsage(sceneUsageDto.getIntakeWaterUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getIntakeWaterUsage()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
sceneUsageDto.setPowerUsage(sceneUsageDto.getPowerUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getPowerUsage()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
sceneUsageDto.setDrugUsage(sceneUsageDto.getDrugUsage() != null ? BigDecimal.valueOf(sceneUsageDto.getDrugUsage()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() : 0d);
|
|
|
}
|
|
|
- return new AjaxMessage<>(ResultStatus.OK,sceneUsageDto);
|
|
|
+ return new AjaxMessage<>(ResultStatus.OK, sceneUsageDto);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "按场景ID查询供水量出水量耗药量耗电量")
|
|
|
- @RequestMapping(value = "/findTotalUsageBySceneIdForComDsiplay",method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/findTotalUsageBySceneIdForComDsiplay", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- public AjaxMessage<SceneUsageDto> findTotalUsageBySceneIdForComDsiplay(@ApiParam(value = "场景ID", required = true) @RequestParam Long id,@ApiParam(value = "场景类型(0水源 1水厂 2泵站)", required = false) @RequestParam(required = false) Integer type) {
|
|
|
+ public AjaxMessage<SceneUsageDto> findTotalUsageBySceneIdForComDsiplay(@ApiParam(value = "场景ID", required = true) @RequestParam Long id, @ApiParam(value = "场景类型(0水源 1水厂 2泵站)", required = false) @RequestParam(required = false) Integer type) {
|
|
|
SceneUsageDto sceneUsageDto = new SceneUsageDto();
|
|
|
|
|
|
//查询场景下的所有设备信息
|
|
@@ -117,14 +118,14 @@ public class MonitorInfoController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "按场景ID查询所有标签信息")
|
|
|
- @RequestMapping(value = "/findBySceneId",method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/findBySceneId", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public AjaxMessage<List<MonitorInfoEntity>> findBySceneId(
|
|
|
@ApiParam(value = "场景ID", required = true) @RequestParam Long id,
|
|
|
@ApiParam(value = "图片类型(0鸟瞰图 1工艺图)", required = false) @RequestParam(required = false) Integer imageType,
|
|
|
@ApiParam(value = "设备ID", required = false) @RequestParam(required = false) Long deviceId,
|
|
|
@ApiParam(value = "类型(0综合调度 1综合展示)", required = false) @RequestParam(required = false) Integer... type
|
|
|
- ) {
|
|
|
+ ) {
|
|
|
MonitorInfoEntity monitorInfoEntity = new MonitorInfoEntity();
|
|
|
monitorInfoEntity.setSceneId(id);
|
|
|
if (imageType != null) {
|
|
@@ -158,26 +159,28 @@ public class MonitorInfoController {
|
|
|
|
|
|
/**
|
|
|
* 更新指令状态
|
|
|
+ *
|
|
|
* @param sceneId
|
|
|
* @param item
|
|
|
*/
|
|
|
- public void updateCommonState(Long sceneId,Integer type,MonitorInfoEntity item) {
|
|
|
- DeviceSetupRecordEntity parm= new DeviceSetupRecordEntity();
|
|
|
+ public void updateCommonState(Long sceneId, Integer type, MonitorInfoEntity item) {
|
|
|
+ DeviceSetupRecordEntity parm = new DeviceSetupRecordEntity();
|
|
|
parm.setDeviceId(item.getDeviceId());
|
|
|
parm.setAttributeId(item.getAttributeId());
|
|
|
parm.setType(type);
|
|
|
DeviceSetupRecordEntity recordEntity = deviceSetupRecordService.selectLastOne(parm);
|
|
|
- if(recordEntity!=null) {
|
|
|
+ if (recordEntity != null) {
|
|
|
item.setCommonState(recordEntity.getState());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 更新标签值
|
|
|
+ *
|
|
|
* @param sceneId
|
|
|
* @param item
|
|
|
*/
|
|
|
- public void getMonitorInfo(Long sceneId,MonitorInfoEntity item) {
|
|
|
+ public void getMonitorInfo(Long sceneId, MonitorInfoEntity item) {
|
|
|
//查询报警信息
|
|
|
List<AlarmDetailsDto> alarmDetailsDtos = alarmDetailsService.selectByDeviceId(sceneId, item.getDeviceId().intValue());
|
|
|
Map<Integer, AlarmDetailsDto> mapAlarm = new HashMap<>();
|
|
@@ -229,11 +232,12 @@ public class MonitorInfoController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @RequestMapping(value="getDeviceParmByDeviceId" , method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "getDeviceParmByDeviceId", method = RequestMethod.GET)
|
|
|
@ApiOperation(value = "查询单个设备参数信息(标签设置)")
|
|
|
- public AjaxMessage<List<DeviceParmEntity>> getByDeviceId(@ApiParam(value = "场景id",required = true) @RequestParam Integer sceneId,@ApiParam(value = "设备id",required = true) @RequestParam Integer id){
|
|
|
- return new AjaxMessage<>(ResultStatus.OK, deviceParmService.selectByDeviceIdForGis(sceneId,id));
|
|
|
+ public AjaxMessage<List<DeviceParmEntity>> getByDeviceId(@ApiParam(value = "场景id", required = true) @RequestParam Integer sceneId, @ApiParam(value = "设备id", required = true) @RequestParam Integer id) {
|
|
|
+ return new AjaxMessage<>(ResultStatus.OK, deviceParmService.selectByDeviceIdForGis(sceneId, id));
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 新增
|
|
|
*/
|
|
@@ -255,6 +259,7 @@ public class MonitorInfoController {
|
|
|
int result = monitorInfoService.addMonitorInfo(monitorInfo) ? 1 : 0;
|
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 批量新增
|
|
|
*/
|
|
@@ -294,7 +299,7 @@ public class MonitorInfoController {
|
|
|
@ApiOperation(value = "单个编辑")
|
|
|
@RequestMapping(value = "/edit", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public AjaxMessage<Integer> editMonitorInfo(@ApiParam(value = "标签信息", required = true) @RequestBody MonitorInfoEntity monitorInfo) {
|
|
|
+ public AjaxMessage<Integer> editMonitorInfo(@ApiParam(value = "标签信息", required = true) @RequestBody MonitorInfoEntity monitorInfo) {
|
|
|
int result = monitorInfoService.updateMonitorInfoById(monitorInfo) ? 1 : 0;
|
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
|
}
|
|
@@ -309,6 +314,7 @@ public class MonitorInfoController {
|
|
|
int result = monitorInfoService.delMonitorInfoByIds(ids) ? 1 : 0;
|
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 操作标签--查询设备属性
|
|
|
*/
|
|
@@ -327,8 +333,14 @@ public class MonitorInfoController {
|
|
|
@RequestMapping(value = "/setSetupForDevice", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public AjaxMessage<Integer> setSetupForDevice(
|
|
|
- @ApiParam(value = "标签ID", required = true)@RequestParam Long id,
|
|
|
- @ApiParam(value = "参数", required = true)@RequestParam String parms) {
|
|
|
+ @ApiParam(value = "标签ID", required = true) @RequestParam Long id,
|
|
|
+ @ApiParam(value = "参数", required = true) @RequestParam String parms,
|
|
|
+ @ApiParam(value = "密钥", required = true) @RequestParam String password) {
|
|
|
+ //校验密钥
|
|
|
+ boolean isPass = deviceSetupMethodService.checkPassword(password);
|
|
|
+ if (!isPass) {
|
|
|
+ return new AjaxMessage<>(ResultStatus.OP_PASSWORD_ERROR);
|
|
|
+ }
|
|
|
//查询操作方法
|
|
|
try {
|
|
|
MonitorInfoEntity monitorInfo = monitorInfoService.findMonitorInfoById(id);
|
|
@@ -337,7 +349,7 @@ public class MonitorInfoController {
|
|
|
long deviceId = monitorInfo.getDeviceId();
|
|
|
long attributeId = monitorInfo.getAttributeId();
|
|
|
long sceneId = monitorInfo.getSceneId();
|
|
|
- int result = deviceSetupMethodService.setSetupForDevice(type, sceneId,deviceId, attributeId,parms) ? 1 : 0;
|
|
|
+ int result = deviceSetupMethodService.setSetupForDevice(type, sceneId, deviceId, attributeId, parms) ? 1 : 0;
|
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
|
}
|
|
|
} catch (Exception ex) {
|