接口异常处理

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/AlarmController.java

@@ -1,41 +1,41 @@
-//package com.zd.laboratory.controller;
-//
-//import com.zd.algorithm.api.alarm.entity.AlarmLog;
-//import com.zd.common.core.annotation.PreAuthorize;
-//import com.zd.common.core.web.controller.BaseController;
-//import com.zd.laboratory.service.IAlarmLogService;
-//import com.zd.model.domain.per.PerFun;
-//import com.zd.model.domain.per.PerPrefix;
-//import com.zd.model.page.TableDataInfo;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import java.util.List;
-//
-///**
-// * 电话报警日志
-// */
-//@Api(tags = {"电话报警日志"})
-//@RestController
-//@RequestMapping("/alarmLog")
-//public class AlarmController extends BaseController {
-//
-//    @Autowired
-//    private IAlarmLogService alarmLogService;
-//
-//    /**
-//     * 查询算法结果列表
-//     */
-//    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_ALARM + PerFun.LIST)
-//    @ApiOperation("查询列表")
-//    @GetMapping("/list")
-//    public TableDataInfo<AlarmLog> list(AlarmLog alarmLog) {
-//        startPage();
-//        List<AlarmLog> list = alarmLogService.selectAlarmLogList(alarmLog);
-//        return getDataTable(list);
-//    }
-//}
+package com.zd.laboratory.controller;
+
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.service.IAlarmLogService;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 电话报警日志
+ */
+@Api(tags = {"电话报警日志"})
+@RestController
+@RequestMapping("/alarmLog")
+public class AlarmController extends BaseController {
+
+    @Autowired
+    private IAlarmLogService alarmLogService;
+
+    /**
+     * 查询算法结果列表
+     */
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_ALARM + PerFun.LIST)
+    @ApiOperation("查询列表")
+    @GetMapping("/list")
+    public TableDataInfo<AlarmLog> list(AlarmLog alarmLog) {
+        startPage();
+        List<AlarmLog> list = alarmLogService.selectAlarmLogList(alarmLog);
+        return getDataTable(list);
+    }
+}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/AlarmLogMapper.java

@@ -1,64 +1,64 @@
-//package com.zd.laboratory.mapper;
-//
-//import com.zd.algorithm.api.alarm.entity.AlarmLog;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * 电话报警推送日志Mapper接口
-// *
-// * @author liubo
-// * @date 2021-11-11
-// */
-//public interface AlarmLogMapper {
-//    /**
-//     * 查询电话报警推送日志
-//     *
-//     * @param id 电话报警推送日志主键
-//     * @return 电话报警推送日志
-//     */
-//    public AlarmLog selectAlarmLogById(Long id);
-//
-//    /**
-//     * 查询电话报警推送日志列表
-//     *
-//     * @param alarmLog 电话报警推送日志
-//     * @return 电话报警推送日志集合
-//     */
-//    public List<AlarmLog> selectAlarmLogList(AlarmLog alarmLog);
-//
-//    /**
-//     * 新增电话报警推送日志
-//     *
-//     * @param alarmLog 电话报警推送日志
-//     * @return 结果
-//     */
-//    public int insertAlarmLog(AlarmLog alarmLog);
-//
-//    /**
-//     * 修改电话报警推送日志
-//     *
-//     * @param alarmLog 电话报警推送日志
-//     * @return 结果
-//     */
-//    public int updateAlarmLog(AlarmLog alarmLog);
-//
-//    /**
-//     * 删除电话报警推送日志
-//     *
-//     * @param id 电话报警推送日志主键
-//     * @return 结果
-//     */
-//    public int deleteAlarmLogById(Long id);
-//
-//    /**
-//     * 批量删除电话报警推送日志
-//     *
-//     * @param ids 需要删除的数据主键集合
-//     * @return 结果
-//     */
-//    public int deleteAlarmLogByIds(Long[] ids);
-//
-//    List<AlarmLog> selectNoBackAlarmLogList(Map<String, Object> params);
-//}
+package com.zd.laboratory.mapper;
+
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 电话报警推送日志Mapper接口
+ *
+ * @author liubo
+ * @date 2021-11-11
+ */
+public interface AlarmLogMapper {
+    /**
+     * 查询电话报警推送日志
+     *
+     * @param id 电话报警推送日志主键
+     * @return 电话报警推送日志
+     */
+    public AlarmLog selectAlarmLogById(Long id);
+
+    /**
+     * 查询电话报警推送日志列表
+     *
+     * @param alarmLog 电话报警推送日志
+     * @return 电话报警推送日志集合
+     */
+    public List<AlarmLog> selectAlarmLogList(AlarmLog alarmLog);
+
+    /**
+     * 新增电话报警推送日志
+     *
+     * @param alarmLog 电话报警推送日志
+     * @return 结果
+     */
+    public int insertAlarmLog(AlarmLog alarmLog);
+
+    /**
+     * 修改电话报警推送日志
+     *
+     * @param alarmLog 电话报警推送日志
+     * @return 结果
+     */
+    public int updateAlarmLog(AlarmLog alarmLog);
+
+    /**
+     * 删除电话报警推送日志
+     *
+     * @param id 电话报警推送日志主键
+     * @return 结果
+     */
+    public int deleteAlarmLogById(Long id);
+
+    /**
+     * 批量删除电话报警推送日志
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAlarmLogByIds(Long[] ids);
+
+    List<AlarmLog> selectNoBackAlarmLogList(Map<String, Object> params);
+}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/AlarmLogServiceImpl.java

@@ -1,92 +1,92 @@
-//package com.zd.laboratory.service.impl;
-//
-//import com.zd.algorithm.api.alarm.entity.AlarmLog;
-//import com.zd.laboratory.mapper.AlarmLogMapper;
-//import com.zd.laboratory.service.IAlarmLogService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * 电话报警推送日志Service业务层处理
-// *
-// * @author liubo
-// */
-//@Service
-//public class AlarmLogServiceImpl implements IAlarmLogService {
-//    @Autowired
-//    private AlarmLogMapper alarmLogMapper;
-//
-//    /**
-//     * 查询电话报警推送日志
-//     *
-//     * @param id 电话报警推送日志主键
-//     * @return 电话报警推送日志
-//     */
-//    @Override
-//    public AlarmLog selectAlarmLogById(Long id) {
-//        return alarmLogMapper.selectAlarmLogById(id);
-//    }
-//
-//    /**
-//     * 查询电话报警推送日志列表
-//     *
-//     * @param alarmLog 电话报警推送日志
-//     * @return 电话报警推送日志
-//     */
-//    @Override
-//    public List<AlarmLog> selectAlarmLogList(AlarmLog alarmLog) {
-//        return alarmLogMapper.selectAlarmLogList(alarmLog);
-//    }
-//
-//    /**
-//     * 新增电话报警推送日志
-//     *
-//     * @param alarmLog 电话报警推送日志
-//     * @return 结果
-//     */
-//    @Override
-//    public int insertAlarmLog(AlarmLog alarmLog) {
-//        return alarmLogMapper.insertAlarmLog(alarmLog);
-//    }
-//
-//    /**
-//     * 修改电话报警推送日志
-//     *
-//     * @param alarmLog 电话报警推送日志
-//     * @return 结果
-//     */
-//    @Override
-//    public int updateAlarmLog(AlarmLog alarmLog) {
-//        return alarmLogMapper.updateAlarmLog(alarmLog);
-//    }
-//
-//    /**
-//     * 批量删除电话报警推送日志
-//     *
-//     * @param ids 需要删除的电话报警推送日志主键
-//     * @return 结果
-//     */
-//    @Override
-//    public int deleteAlarmLogByIds(Long[] ids) {
-//        return alarmLogMapper.deleteAlarmLogByIds(ids);
-//    }
-//
-//    /**
-//     * 删除电话报警推送日志信息
-//     *
-//     * @param id 电话报警推送日志主键
-//     * @return 结果
-//     */
-//    @Override
-//    public int deleteAlarmLogById(Long id) {
-//        return alarmLogMapper.deleteAlarmLogById(id);
-//    }
-//
-//    @Override
-//    public List<AlarmLog> selectNoBackAlarmLogList(Map<String, Object> params) {
-//        return alarmLogMapper.selectNoBackAlarmLogList(params);
-//    }
-//}
+package com.zd.laboratory.service.impl;
+
+import com.zd.algorithm.api.alarm.entity.AlarmLog;
+import com.zd.laboratory.mapper.AlarmLogMapper;
+import com.zd.laboratory.service.IAlarmLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 电话报警推送日志Service业务层处理
+ *
+ * @author liubo
+ */
+@Service
+public class AlarmLogServiceImpl implements IAlarmLogService {
+    @Autowired
+    private AlarmLogMapper alarmLogMapper;
+
+    /**
+     * 查询电话报警推送日志
+     *
+     * @param id 电话报警推送日志主键
+     * @return 电话报警推送日志
+     */
+    @Override
+    public AlarmLog selectAlarmLogById(Long id) {
+        return alarmLogMapper.selectAlarmLogById(id);
+    }
+
+    /**
+     * 查询电话报警推送日志列表
+     *
+     * @param alarmLog 电话报警推送日志
+     * @return 电话报警推送日志
+     */
+    @Override
+    public List<AlarmLog> selectAlarmLogList(AlarmLog alarmLog) {
+        return alarmLogMapper.selectAlarmLogList(alarmLog);
+    }
+
+    /**
+     * 新增电话报警推送日志
+     *
+     * @param alarmLog 电话报警推送日志
+     * @return 结果
+     */
+    @Override
+    public int insertAlarmLog(AlarmLog alarmLog) {
+        return alarmLogMapper.insertAlarmLog(alarmLog);
+    }
+
+    /**
+     * 修改电话报警推送日志
+     *
+     * @param alarmLog 电话报警推送日志
+     * @return 结果
+     */
+    @Override
+    public int updateAlarmLog(AlarmLog alarmLog) {
+        return alarmLogMapper.updateAlarmLog(alarmLog);
+    }
+
+    /**
+     * 批量删除电话报警推送日志
+     *
+     * @param ids 需要删除的电话报警推送日志主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAlarmLogByIds(Long[] ids) {
+        return alarmLogMapper.deleteAlarmLogByIds(ids);
+    }
+
+    /**
+     * 删除电话报警推送日志信息
+     *
+     * @param id 电话报警推送日志主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAlarmLogById(Long id) {
+        return alarmLogMapper.deleteAlarmLogById(id);
+    }
+
+    @Override
+    public List<AlarmLog> selectNoBackAlarmLogList(Map<String, Object> params) {
+        return alarmLogMapper.selectNoBackAlarmLogList(params);
+    }
+}

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/AlarmLogMapper.xml

@@ -5,14 +5,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.AlarmLogMapper">
 
     <resultMap type="com.zd.algorithm.api.alarm.entity.AlarmLog" id="AlarmLogResult">
-        <result property="id"    column="id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="phone"    column="phone"    />
-        <result property="status"    column="status"    />
-        <result property="notice"    column="notice"    />
-        <result property="method"    column="method"    />
-        <result property="isBack"    column="is_back"    />
+        <result property="id" column="id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="phone" column="phone"/>
+        <result property="status" column="status"/>
+        <result property="notice" column="notice"/>
+        <result property="method" column="method"/>
+        <result property="isBack" column="is_back"/>
     </resultMap>
 
     <sql id="selectAlarmLogVo">