feat: 获取预警详情

shuili-system/src/main/java/com/kms/yxgh/common/controller/WarningController.java

@@ -1,6 +1,7 @@
 package com.kms.yxgh.common.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.kms.yxgh.base.Response;
 import com.kms.yxgh.common.dto.WarningDto;
 import com.kms.yxgh.common.dto.WarningQueDto;
 import com.kms.yxgh.common.dto.WarningStatisticDto;
@@ -10,11 +11,7 @@ import com.shuili.common.core.domain.SearchParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.kms.yxgh.base.Response;
 
 
 @RestController
@@ -39,4 +36,10 @@ public class WarningController {
     public Response<WarningStatisticDto> statistic(@RequestBody WarningStatisticQueDto sp) {
         return Response.ok(warningService.statistic(sp));
     }
+
+    @GetMapping("/{type}/{id}")
+    @ApiOperation("预警详情")
+    public Response<WarningDto> info(@PathVariable("type") String type, @PathVariable("id") String id) {
+        return Response.ok(warningService.selectByTypeAndId(type, id));
+    }
 }

shuili-system/src/main/java/com/kms/yxgh/common/domain/DeviceCheckingRecordView.java

@@ -28,6 +28,12 @@ public class DeviceCheckingRecordView {
     @TableField("TYPE")
     private String type;
 
+    @TableField("DEVICE_ID")
+    private String deviceId;
+
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+
     @TableField("STATUS")
     private String status;
 

shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningDto.java

@@ -29,6 +29,12 @@ public class WarningDto {
     @ApiModelProperty("名称")
     private String name;
 
+    @ApiModelProperty("设备id")
+    private String deviceId;
+
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
     @ApiModelProperty("类型")
     private String type;
 

shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java

@@ -1,5 +1,6 @@
 package com.kms.yxgh.common.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -98,4 +99,13 @@ public class WarningService {
     }
 
 
+    public WarningDto selectByTypeAndId(String type, String id) {
+        Wrapper<DeviceCheckingRecordView> wrapper = Wrappers.<DeviceCheckingRecordView>lambdaQuery()
+                .eq(DeviceCheckingRecordView::getType, type)
+                .eq(DeviceCheckingRecordView::getId, id);
+        DeviceCheckingRecordView deviceCheckingRecordView = warningMapper.selectOne(wrapper);
+        WarningDto warningDto = new WarningDto();
+        BeanCopyUtils.copy(deviceCheckingRecordView, warningDto);
+        return warningDto;
+    }
 }

sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql

@@ -950,10 +950,10 @@ CREATE TABLE `bs_sgc_sz_bxgcnrgl` (
 
 
 CREATE OR REPLACE VIEW `v_bs_sgc_dtsbr` AS
-SELECT df.`ID`, df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
+SELECT df.`ID`, df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,df.`DEVICE_ID`,df.`DEVICE_NAME`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_df_dtsbr` AS df
 LEFT JOIN `bs_sgc_df_gcda` AS gc ON df.`DIKE_CODE` = gc.`DIKE_CODE` AND gc.`EXPR_DATE` is null
 union all
-SELECT sz.`ID`, sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
+SELECT sz.`ID`, sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,sz.`DEVICE_ID`,sz.`DEVICE_NAME`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_sz_dtsbr` AS sz
 LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null

sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql

@@ -548,11 +548,11 @@ CREATE TABLE `bs_sgc_sz_bxgcnrgl` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸病险工程项目任务关联表';
 
 CREATE OR REPLACE VIEW `v_bs_sgc_dtsbr` AS
-SELECT df.`ID`, df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
+SELECT df.`ID`, df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,df.`DEVICE_ID`,df.`DEVICE_NAME`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_df_dtsbr` AS df
 LEFT JOIN `bs_sgc_df_gcda` AS gc ON df.`DIKE_CODE` = gc.`DIKE_CODE` AND gc.`EXPR_DATE` is null
 union all
-SELECT sz.`ID`, sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
+SELECT sz.`ID`, sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,sz.`DEVICE_ID`,sz.`DEVICE_NAME`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_sz_dtsbr` AS sz
 LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null