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 443ab93..896f76e 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 @@ -47,7 +47,6 @@ public class ScIndexController { - @ApiOperation(value = "告警提醒") @GetMapping("alarmReminder") public AjaxResult alarmReminder(ScreenParamDto dto){ @@ -89,4 +88,10 @@ public class ScIndexController { public AjaxResult getGtList(ScreenParamDto dto){ return service.getGtList(dto); } + + @ApiOperation(value = "工程下拉选集合") + @GetMapping("getProList") + public AjaxResult getProList(ScreenParamDto dto){ + return service.getProList(dto); + } } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IScIndexMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IScIndexMapper.java index bce77bc..0bff514 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IScIndexMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IScIndexMapper.java @@ -1,5 +1,6 @@ package com.securitycontrol.screen.mapper; +import com.securitycontrol.entity.background.vo.GtVo; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.entity.screen.vo.ConstrQuality; import com.securitycontrol.entity.screen.vo.MapRiskVo; @@ -146,4 +147,18 @@ public interface IScIndexMapper { */ @MapKey("bidCode") List> getDangerNum(@Param("orgId") String orgId, @Param("params") ScreenParamDto dto); + + /** + * 查询杆塔集合 + * @param dto + * @return + */ + List getGtList(ScreenParamDto dto); + + /** + * 工程下拉选集合 + * @param dto + * @return + */ + List getProList(ScreenParamDto 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 1f5c408..a66ca84 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 @@ -114,4 +114,11 @@ public interface IScIndexService { * @return */ AjaxResult getGtList(ScreenParamDto dto); + + /** + * 查询工程下拉选集合 + * @param dto + * @return + */ + AjaxResult getProList(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 3815641..b1ef434 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 @@ -3,6 +3,7 @@ package com.securitycontrol.screen.service.impl; import com.securitycontrol.common.core.constant.Constant; import com.securitycontrol.common.core.utils.aes.DateTimeHelper; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.GtVo; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.entity.screen.vo.ConstrQuality; import com.securitycontrol.entity.screen.vo.MapRiskVo; @@ -333,7 +334,29 @@ public class ScIndexServiceImpl implements IScIndexService { @Override public AjaxResult getGtList(ScreenParamDto dto) { + try{ + List list=mapper.getGtList(dto); + return AjaxResult.success(list); + }catch (Exception e){ + log.error(e.toString()); + } + return AjaxResult.success(new ArrayList<>()); + } - return null; + /** + * 工程下拉选结合 + * @param dto + * @return + */ + @Override + public AjaxResult getProList(ScreenParamDto dto) { + + try{ + List list=mapper.getProList(dto); + return AjaxResult.success(list); + }catch (Exception e){ + log.error(e.toString()); + } + return AjaxResult.success(new ArrayList<>()); } } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml index a952f7b..3168d30 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml @@ -60,9 +60,10 @@ IFNULL(tdv.is_warn,'0') AS warn FROM tb_pro_bd tpd INNER JOIN tb_bd_device tbd ON tpd.id = tbd.bd_id - INNER JOIN sys_dict sd ON sd.dict_code = tbd.devic_type AND sd.del_flag = 0 AND sd.dict_code= #{typeCode} + INNER JOIN sys_dict sd ON sd.dict_code = tbd.devic_type AND sd.del_flag = 0 LEFT JOIN tb_device_detail tdd ON tdd.device_id = tbd.device_id AND tdd.del_flag = 0 LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id + where tbd.devic_type=1902 + + \ No newline at end of file