diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/TowerAssInspectDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/TowerAssInspectDto.java new file mode 100644 index 0000000..7820d4d --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/TowerAssInspectDto.java @@ -0,0 +1,17 @@ +package com.securitycontrol.entity.screen.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author lsun + */ +@Data +public class TowerAssInspectDto extends ScreenDto { + + @ApiModelProperty("杆塔id") + private String gtId; + + @ApiModelProperty("设备id") + private String deviceId; +} 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 new file mode 100644 index 0000000..3f8431a --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java @@ -0,0 +1,46 @@ +package com.securitycontrol.entity.screen.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author lsun + */ +@Data +public class TowerAssInspectVo { + @ApiModelProperty("设备id") + private String deviceId; + @ApiModelProperty("设备名称") + private String deviceName; + @ApiModelProperty("设备类别") + private String type; + + @ApiModelProperty("实时检测类别") + private String dataType; + @ApiModelProperty("采集值") + private String val; + + @ApiModelProperty("告警内容") + private String warnContent; + @ApiModelProperty("预警时间") + private String warnTime; + + @ApiModelProperty("区域名称") + private String areaName; + + @ApiModelProperty("检测点名称") + private String modeName; + + @ApiModelProperty("本次变化值") + private String thisChangeVal; + + @ApiModelProperty("累计变化值") + private String changeVal; + + @ApiModelProperty("检测时间") + private String updateTime; + + @ApiModelProperty("状态") + private String isWarn; + +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/TowerAssInspectController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/TowerAssInspectController.java index fbe9cab..7463680 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/TowerAssInspectController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/TowerAssInspectController.java @@ -1,10 +1,98 @@ package com.securitycontrol.screen.controller; import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.core.web.page.TableDataInfo; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.screen.dto.TowerAssInspectDto; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import com.securitycontrol.screen.service.TowerAssInspectService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * @author lsun * 组塔检测 */ +@RestController +@RequestMapping("/largeScreen/towerAssInspect/") +@Slf4j public class TowerAssInspectController extends BaseController { + + @Resource(name = "TowerAssInspectService") + private TowerAssInspectService service; + + /** + * 设备列表 + * @param dto + * @return + */ + @ApiOperation(value = "设备列表") + @GetMapping("getDeviceList") + @Log(title = "组塔检测", menu = "组塔检测->设备列表", grade = OperationType.QUERY_BUSINESS, details = "查询设备列表", type = "业务日志") + public AjaxResult getDeviceList(TowerAssInspectDto dto) { + return service.getDeviceList(dto); + } + + /** + * 实时检测 + * @param dto + * @return + */ + @ApiOperation(value = "实时检测") + @GetMapping("getRealTimeDetection ") + @Log(title = "组塔检测", menu = "组塔检测->实时检测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") + public AjaxResult getRealTimeDetection(TowerAssInspectDto dto) { + return service.getRealTimeDetection(dto); + } + + /** + * 当日检测变化趋势 + * @param dto + * @return + */ + @ApiOperation(value = "当日检测变化趋势") + @GetMapping("getTrend ") + @Log(title = "组塔检测", menu = "组塔检测->当日检测变化趋势", grade = OperationType.QUERY_BUSINESS, details = "查询当日检测变化趋势", type = "业务日志") + public AjaxResult getTrend(TowerAssInspectDto dto) { + return service.getTrend(dto); + } + + @ApiOperation(value = "实时告警") + @GetMapping("getRealTimeAlarmList") + @Log(title = "实时告警", menu = "告警管理->实时告警", grade = OperationType.QUERY_BUSINESS, details = "查询实时告警列表", type = "业务日志") + public TableDataInfo getRealTimeAlarmList(TowerAssInspectDto dto) { + try{ + startLayPage(); + List list = service.getRealTimeAlarmList(dto); + return getDataTableLayui(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBadLayui(new ArrayList<>(),"请求出错了"); + } + } + + @ApiOperation(value = "历史记录") + @GetMapping("getHistoryList") + @Log(title = "历史记录", menu = "告警管理->历史记录", grade = OperationType.QUERY_BUSINESS, details = "查询历史记录列表", type = "业务日志") + public TableDataInfo getHistoryList(TowerAssInspectDto dto) { + try{ + startLayPage(); + List list = service.getHistoryList(dto); + return getDataTableLayui(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBadLayui(new ArrayList<>(),"请求出错了"); + } + } + } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/TowerAssInspectMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/TowerAssInspectMapper.java index f9d9ad0..dfbcaaa 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/TowerAssInspectMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/TowerAssInspectMapper.java @@ -1,8 +1,24 @@ package com.securitycontrol.screen.mapper; +import com.securitycontrol.entity.screen.dto.TowerAssInspectDto; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import org.springframework.stereotype.Repository; + +import java.util.List; + /** * @author lsun * 组塔检测 */ +@Repository(value = "TowerAssInspectMapper") public interface TowerAssInspectMapper { + List getDeviceList(TowerAssInspectDto dto); + + List getRealTimeDetection(TowerAssInspectDto dto); + + List getTrend(TowerAssInspectDto dto); + + List getRealTimeAlarmList(TowerAssInspectDto dto); + + List getHistoryList(TowerAssInspectDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/TowerAssInspectService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/TowerAssInspectService.java index 949731c..fea19c2 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/TowerAssInspectService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/TowerAssInspectService.java @@ -1,8 +1,25 @@ package com.securitycontrol.screen.service; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.screen.dto.TowerAssInspectDto; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; + +import java.util.List; + /** * @author lsun * 组塔检测 */ public interface TowerAssInspectService { + + AjaxResult getDeviceList(TowerAssInspectDto dto); + + AjaxResult getRealTimeDetection(TowerAssInspectDto dto); + + AjaxResult getTrend(TowerAssInspectDto dto); + + List getRealTimeAlarmList(TowerAssInspectDto dto); + + List getHistoryList(TowerAssInspectDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/TowerAssInspectServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/TowerAssInspectServiceImpl.java new file mode 100644 index 0000000..4436830 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/TowerAssInspectServiceImpl.java @@ -0,0 +1,88 @@ +package com.securitycontrol.screen.service.impl; + +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.screen.dto.TowerAssInspectDto; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import com.securitycontrol.entity.system.TreeBuild; +import com.securitycontrol.entity.system.vo.TreeNode; +import com.securitycontrol.screen.mapper.TowerAssInspectMapper; +import com.securitycontrol.screen.service.TowerAssInspectService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author lsun + * 组塔检测 + */ +@Slf4j +@Service(value = "TowerAssInspectService") +public class TowerAssInspectServiceImpl implements TowerAssInspectService { + @Resource(name = "TowerAssInspectMapper") + private TowerAssInspectMapper mapper; + + /** + * 设备列表 + * @param dto + * @return + */ + @Override + public AjaxResult getDeviceList(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getDeviceList(dto); + } catch (Exception e) { + log.error("设备列表-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getRealTimeDetection(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getRealTimeDetection(dto); + } catch (Exception e) { + log.error("实时检测-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getTrend(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getTrend(dto); + } catch (Exception e) { + log.error("当日检测变化趋势-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public List getRealTimeAlarmList(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getRealTimeAlarmList(dto); + } catch (Exception e) { + log.error("获取实时告警列表",e); + } + return list; + } + + @Override + public List getHistoryList(TowerAssInspectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getHistoryList(dto); + } catch (Exception e) { + log.error("获取历史记录列表",e); + } + return list; + } +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml index 4955731..3077a7c 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml @@ -4,7 +4,7 @@ + SELECT tbd.device_id as deviceId,tbd.device_name as deviceName, + CASE + WHEN tbd.`status` = '1' AND tdv.is_warn = '1' THEN '2' + WHEN tbd.`status` = '1' AND tdv.is_warn = '0' THEN '1' + WHEN tbd.`status` = '0' THEN '0' + END type + FROM t_pro_gt tpg + LEFT JOIN tb_bd_device tbd ON tpg.gt_id = tbd.gt_id + LEFT JOIN tb_device_detail tdd ON tdd.device_id = tbd.device_id + LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id + WHERE tpg.gt_id = #{gtId} + + + + + + + + + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java index 03c9c57..b2787ec 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java @@ -62,6 +62,13 @@ public class SelectController extends BaseController { return service.getBuildLists(); } + + @ApiOperation(value = "杆塔表下拉选") + @GetMapping("getGtLists") + public AjaxResult getGtLists(String bidCode) { + return service.getGtLists(bidCode); + } + @ApiOperation(value = "字典集合下拉选") @GetMapping("getDictLists") public AjaxResult getDictLists(SelectDto dto) { diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java index 08d5469..19162f0 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java @@ -139,4 +139,6 @@ public interface ISelectMapper { List getProList(SelectDto dto); List getSelectLists(); + + List getGtLists(@Param("bidCode") String bidCode); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java index c8d0e87..db3f1be 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java @@ -141,5 +141,15 @@ public interface ISelectService { */ AjaxResult getProList(SelectDto dto); + /** + * 建管单位下拉选 + * @return + */ AjaxResult getSelectLists(); + + /** + * 杆塔表下拉选 + * @return + */ + AjaxResult getGtLists(String bidCode); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java index f69fff6..183ef85 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java @@ -205,6 +205,17 @@ public class SelectServiceImpl implements ISelectService { return AjaxResult.success(list); } + @Override + public AjaxResult getGtLists(String bidCode) { + List list = new ArrayList<>(); + try { + list = mapper.getGtLists(bidCode); + } catch (Exception e) { + log.error("杆塔表下拉选",e); + } + return AjaxResult.success(list); + } + @Override public AjaxResult getBdLists(SelectDto dto) { diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml index 7cec034..c0988ee 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml @@ -138,4 +138,9 @@ WHERE sd.dict_code = '999' AND sd.del_flag = 0 ORDER BY sd2.dict_sort + + \ No newline at end of file