修改数据统计

business-service/src/main/java/com/ozs/mapper/TerminalIgnoreAlarmMapper.java

@@ -1,7 +1,11 @@
 package com.ozs.mapper;
 
+import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2023-04-11
  */
 public interface TerminalIgnoreAlarmMapper extends BaseMapper<TerminalIgnoreAlarm> {
-
+    /**
+     * 查询终端忽略报警信息列表
+     *@param terminalCode 终端编码
+     */
+    List<TerminalIgnoreAlarm> list(@Param("terminalCode") String terminalCode);
+    /**
+     * 终端忽略报警信息根据alarmId查询详情
+     *@param alarmId 报警编码
+     */
+    MsgAlarm selectDetailByAlarmId(String alarmId);
 }

business-service/src/main/java/com/ozs/service/TerminalIgnoreAlarmService.java

@@ -1,7 +1,11 @@
 package com.ozs.service;
 
+import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-04-11
  */
 public interface TerminalIgnoreAlarmService extends IService<TerminalIgnoreAlarm> {
+    /**
+     * 查询终端忽略报警信息列表
+     *@param terminalCode 终端编码
+     */
+    List<TerminalIgnoreAlarm> list(@Param("terminalCode") String terminalCode);
 
+    /**
+     * 终端忽略报警信息根据alarmId查询详情
+     *@param alarmId 报警编码
+     */
+    MsgAlarm selectDetailByAlarmId(String alarmId);
 }

business-service/src/main/java/com/ozs/service/impl/TerminalIgnoreAlarmServiceImpl.java

@@ -1,11 +1,15 @@
 package com.ozs.service.impl;
 
+import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.ozs.mapper.TerminalIgnoreAlarmMapper;
 import com.ozs.service.TerminalIgnoreAlarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +20,17 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TerminalIgnoreAlarmServiceImpl extends ServiceImpl<TerminalIgnoreAlarmMapper, TerminalIgnoreAlarm> implements TerminalIgnoreAlarmService {
+    @Autowired
+    private TerminalIgnoreAlarmMapper terminalIgnoreAlarmMapper;
+    @Override
+    public List<TerminalIgnoreAlarm> list(String terminalCode) {
+        List<TerminalIgnoreAlarm> list = terminalIgnoreAlarmMapper.list(terminalCode);
+        return list;
+    }
 
+    @Override
+    public MsgAlarm selectDetailByAlarmId(String alarmId) {
+        MsgAlarm msgAlarm = terminalIgnoreAlarmMapper.selectDetailByAlarmId(alarmId);
+        return msgAlarm;
+    }
 }

business-service/src/main/resources/mapper/TerminalIgnoreAlarmMapper.xml

@@ -1,5 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.mapper.TerminalIgnoreAlarmMapper">
+    <resultMap id="TerminalIgnoreAlarmResult" type="com.ozs.entity.TerminalIgnoreAlarm">
+        <id column="id" property="id"/>
+        <result column="terminal_code" property="terminalCode"/>
+        <result column="alarm_id" property="alarmId"/>
+        <result column="ignore_time" property="ignoreTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+    <select id="list" resultMap="TerminalIgnoreAlarmResult" >
+        SELECT
+        a.terminal_code,
+        a.alarm_id,
+        a.ignore_time,
+        a.create_by,
+        a.create_time,
+        a.update_by,
+        a.update_time,
+        a.remark
+        FROM terminal_ignore_alarm as a
+        where a.terminalCode = #{terminalCode}
+    </select>
+
+    <select id="selectDetailByAlarmId" resultType="com.ozs.entity.MsgAlarm">
+        select * from msg_alarm
+        <where>
+            <if test="alarmId != null and alarmId != ''">
+                and alarmId = #{alarmId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/TerminalIgnoreAlarmController.java

@@ -1,9 +1,18 @@
 package com.ozs.web.controller.accountmanagment;
 
 
+import com.ozs.common.core.controller.BaseController;
+import com.ozs.service.TerminalIgnoreAlarmService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -14,7 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/terminal-ignore-alarm")
-public class TerminalIgnoreAlarmController {
+public class TerminalIgnoreAlarmController extends BaseController {
+    @Autowired
+    private TerminalIgnoreAlarmService terminalIgnoreAlarmService;
 
 }