Browse Source

任务来源:机场

任务描述:运行日志查询、导出功能开发
develop
wubin 1 year ago
parent
commit
6dff8a804c
3 changed files with 15 additions and 5 deletions
  1. +12
    -0
      tuoheng-admin/sql/V2/tuoheng_airport_platform_DML.sql
  2. +3
    -3
      tuoheng-admin/src/main/java/com/tuoheng/admin/controller/alarmLog/AlarmLogController.java
  3. +0
    -2
      tuoheng-admin/src/main/java/com/tuoheng/admin/pojo/vo/AlarmLogVo.java

+ 12
- 0
tuoheng-admin/sql/V2/tuoheng_airport_platform_DML.sql View File

@@ -7,3 +7,15 @@ ALTER TABLE sys_dept DROP note;

-- 修改部门表结束

-- 机场日志表修改开始
ALTER TABLE airport_log CHANGE aid airport_id int COMMENT '机场ID';
ALTER TABLE airport_log DROP COLUMN msg;
ALTER TABLE airport_log CHANGE aname airport_name VARCHAR(255) COMMENT '机场名称';
ALTER TABLE airport_log CHANGE platformcode platform_code VARCHAR(255) COMMENT '业务平台代码';
ALTER TABLE airport_log CHANGE platformName platform_name VARCHAR(255) COMMENT '业务平台名称';
ALTER TABLE airport_log CHANGE taskid inspection_id VARCHAR(255) COMMENT '所属任务id';
ALTER TABLE airport_log CHANGE task_name inspection_name VARCHAR(255) COMMENT '所属任务名称';
ALTER TABLE airport_log CHANGE recordid record_id VARCHAR(255) COMMENT '所属任务记录id';
ALTER TABLE airport_log ADD COLUMN record_name VARCHAR(255) COMMENT '所属任务记录名称';
-- 机场日志表修改结束


+ 3
- 3
tuoheng-admin/src/main/java/com/tuoheng/admin/controller/alarmLog/AlarmLogController.java View File

@@ -44,12 +44,12 @@ public class AlarmLogController extends BaseController {
/**
* 导出Excel
*
* @param registerInformationQuery 查询参数
* @param alarmLogQuery 查询参数
* @return
*/
@GetMapping("/exportExcel")
public JsonResult exportExcel(@Valid AlarmLogQuery registerInformationQuery) {
JsonResult<IPage<AlarmLogVo>> iPageJsonResult = alarmLogService.queryAlarmLog(registerInformationQuery);
public JsonResult exportExcel(@Valid AlarmLogQuery alarmLogQuery) {
JsonResult<IPage<AlarmLogVo>> iPageJsonResult = alarmLogService.queryAlarmLog(alarmLogQuery);
if(ObjectUtil.isEmpty(iPageJsonResult) || iPageJsonResult.getCode() != JsonResult.SUCCESS || ObjectUtil.isEmpty(iPageJsonResult.getData())){
return JsonResult.error("未查询到数据,请确认查询条件!");
}

+ 0
- 2
tuoheng-admin/src/main/java/com/tuoheng/admin/pojo/vo/AlarmLogVo.java View File

@@ -1,7 +1,5 @@
package com.tuoheng.admin.pojo.vo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.tuoheng.common.annotation.Excel;
import lombok.Data;

Loading…
Cancel
Save