diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java index 01b94e2b7..718bfa542 100644 --- a/src/main/java/com/nis/domain/log/BaseLogEntity.java +++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java @@ -7,7 +7,7 @@ import com.nis.util.excel.ExcelField; public class BaseLogEntity extends BaseEntity { private static final long serialVersionUID = 8321337584518281424L; - + @ExcelField(title="cfg_id",sort=1) protected Integer cfgId; @ExcelField(title="found_time",sort=5) protected String foundTime; //发现时间,timestamp @@ -29,6 +29,7 @@ public class BaseLogEntity extends BaseEntity { @Expose @ExcelField(title="client_port",sort=43) protected String sPort; //客户端ip端口 + protected Integer service; //配置表的serviceId @ExcelField(title="entrance_id",dictType="ENTRANCE",sort=7) protected Integer entranceId; //出入口编号 @@ -60,6 +61,7 @@ public class BaseLogEntity extends BaseEntity { protected String sceneFile;//现场日志文件地址 protected Integer functionId; + @ExcelField(title="action",dictType="SERVICE_ACTION",sort=2) protected Integer action; protected String date;//配置界面日志总量查询时间 diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java index 14cee9753..461f9c725 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java @@ -122,7 +122,7 @@ public class NtcCollectRadiusLogController extends BaseController { }else{ hColumns+=","; } - String cfgIndexInfoNoExport=","+hColumns; + String cfgIndexInfoNoExport=",cfg_id,action,"+hColumns; noExportMap.put("radius_log",cfgIndexInfoNoExport); dataMap.put("radius_log",list); /*}*/