diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java index 687860f..b50c7b1 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java @@ -43,6 +43,8 @@ public class OperatingQualityVo { @ApiModelProperty(value = "区域名称") private String createTime; + @ApiModelProperty(value = "单位") + private String unit; diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java index 88ae13d..fc69afd 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java @@ -40,9 +40,11 @@ public class TowerAssInspectVo { @ApiModelProperty("累计变化值") private String changeVal; - @ApiModelProperty("检测时间") private String updateTime; + @ApiModelProperty("检测时间") + private String createTime; + @ApiModelProperty("状态") private String isWarn; diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java index f01491d..88cab6d 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java @@ -46,6 +46,7 @@ public class OperatingController extends BaseController { @RequestMapping(value = "/FiniteSpace", method = RequestMethod.POST) @ApiOperation(value = "作业环境-有限空间检测设备查询") + @Log(title = "作业环境", menu = "作业环境->有限空间检测设备查询", grade = OperationType.QUERY_BUSINESS, details = "有限空间检测设备查询", type = "业务日志") public AjaxResult getFiniteSpace(@RequestBody OperatingQualityDto dto) { try { List list = service.getFiniteSpace(dto); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java index ff06840..443ab93 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java @@ -1,6 +1,8 @@ package com.securitycontrol.screen.controller; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.screen.service.IScIndexService; import io.swagger.annotations.ApiOperation; @@ -25,6 +27,7 @@ public class ScIndexController { @ApiOperation(value = "工程统计") @GetMapping("proStatusStatistics") + @Log(title = "省侧施工大屏", menu = "省侧施工大屏->首页", grade = OperationType.QUERY_BUSINESS, details = "省侧施工大屏展示", type = "业务日志") public AjaxResult proStatusStatistics(ScreenParamDto dto){ return service.proStatusStatistics(dto); } @@ -35,12 +38,16 @@ public class ScIndexController { return service.riskStatistics(dto); } + @ApiOperation(value = "施工质量") @GetMapping("constrQuality") public AjaxResult constrQuality(ScreenParamDto dto){ return service.constrQuality(dto); } + + + @ApiOperation(value = "告警提醒") @GetMapping("alarmReminder") public AjaxResult alarmReminder(ScreenParamDto dto){ @@ -80,6 +87,6 @@ public class ScIndexController { @ApiOperation(value = "杆塔集合查询") @GetMapping("getGtList") public AjaxResult getGtList(ScreenParamDto dto){ - return service.efficiencyAnalysis(dto); + return service.getGtList(dto); } } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IScIndexService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IScIndexService.java index a9da2ec..1f5c408 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IScIndexService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IScIndexService.java @@ -107,4 +107,11 @@ public interface IScIndexService { * @date 2024/3/28 13:39 */ AjaxResult efficiencyAnalysis(ScreenParamDto dto); + + /** + * 省侧施工大屏 展示 + * @param dto + * @return + */ + AjaxResult getGtList(ScreenParamDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java index f8041aa..3815641 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java @@ -330,4 +330,10 @@ public class ScIndexServiceImpl implements IScIndexService { } return AjaxResult.success(dataList); } + + @Override + public AjaxResult getGtList(ScreenParamDto dto) { + + return null; + } } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml index f037c92..d249bbc 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml @@ -57,7 +57,9 @@ - SELECT - tdd.data_type as dataType, - tdv.val as val, - tdv.is_warn as isWarn - FROM tb_device_detail tdd - LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id - LEFT JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id - LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id - WHERE tpb.bid_code = #{bidCode} + SELECT + tdd.mode_name as dataType, + tdv.val as val, tdv.unit, + tdv.is_warn as isWarn + FROM tb_device_detail tdd + LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id + LEFT JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id + LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id + WHERE tpb.bid_code = #{bidCode} and tbd.device_code='1902001' @@ -23,24 +23,31 @@ tbd.status AS status FROM tb_bd_device tbd - LEFT JOIN - tb_pro_bd tpb ON tpb.bid_code = #{bidCode} AND tpb.id = tbd.bd_id - WHERE - tbd.devic_type = 1902 and tbd.device_code = 1902003 + LEFT JOIN tb_pro_bd tpb ON tpb.id = tbd.bd_id + WHERE tbd.devic_type = 1909 and tpb.bid_code = #{bidCode} @@ -52,39 +59,40 @@ FROM tb_bd_device tbd LEFT JOIN - tb_pro_bd tpb ON tpb.bid_code = #{bidCode} AND tpb.id = tbd.bd_id + tb_pro_bd tpb ON tpb.id = tbd.bd_id WHERE - tbd.devic_type = 1902 and tbd.device_code = 1902004 + tbd.devic_type = 1910 and tpb.bid_code = #{bidCode} + @@ -103,8 +111,7 @@ LEFT JOIN tb_area ta ON tbd.area_id = ta.area_id LEFT JOIN tb_his_device_value thdv ON tdd.id = thdv.attribute_id LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id - WHERE tpb.bid_code = #{bidCode} - AND tbd.device_code = 1902001 + WHERE tpb.bid_code = #{bidCode} and tbd.devic_type = 1908 AND tbd.device_id LIKE CONCAT('%', #{deviceId}, '%') diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml index bb32229..5038714 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml @@ -40,12 +40,14 @@ \ No newline at end of file