diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 4d49c9e..afc5341 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -7,8 +7,9 @@ import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.dto.DataLogDTO; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.IAddressConfigService; import com.casic.missiles.modular.system.service.ILogService; import com.casic.missiles.modular.system.utils.TimeUtil; @@ -68,26 +69,14 @@ } /** - * 机器人交互日志 + * 交互日志 */ - @GetMapping(value = "/robotListPage") + @GetMapping(value = "/logListPage") @ResponseBody - public Object robotListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("2"); - page.setRecords(operationLogs); - return ResponseData.success(super.packForBT(page)); - } - - /** - * 岸基软件交互日志 - */ - @GetMapping(value = "/shelterListPage") - @ResponseBody - public Object shelterListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("3"); - page.setRecords(operationLogs); + public Object logListPage(String type) { + Page page = PageFactory.defaultPage(); + List dataLogs = logService.selectLogListPage(type, page); + page.setRecords(dataLogs); return ResponseData.success(super.packForBT(page)); } } \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 4d49c9e..afc5341 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -7,8 +7,9 @@ import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.dto.DataLogDTO; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.IAddressConfigService; import com.casic.missiles.modular.system.service.ILogService; import com.casic.missiles.modular.system.utils.TimeUtil; @@ -68,26 +69,14 @@ } /** - * 机器人交互日志 + * 交互日志 */ - @GetMapping(value = "/robotListPage") + @GetMapping(value = "/logListPage") @ResponseBody - public Object robotListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("2"); - page.setRecords(operationLogs); - return ResponseData.success(super.packForBT(page)); - } - - /** - * 岸基软件交互日志 - */ - @GetMapping(value = "/shelterListPage") - @ResponseBody - public Object shelterListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("3"); - page.setRecords(operationLogs); + public Object logListPage(String type) { + Page page = PageFactory.defaultPage(); + List dataLogs = logService.selectLogListPage(type, page); + page.setRecords(dataLogs); return ResponseData.success(super.packForBT(page)); } } \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java index 9858895..9fdbbfd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -1,11 +1,23 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author a203 */ -public interface LogMapper extends BaseMapper { - +public interface LogMapper extends BaseMapper { + /** + * 获取log记录-分页 + * + * @param type 日期 + * @param page 分页 + * @return {@link List} + */ + List selectLogPage(@Param("type") String type, @Param("page") Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 4d49c9e..afc5341 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -7,8 +7,9 @@ import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.dto.DataLogDTO; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.IAddressConfigService; import com.casic.missiles.modular.system.service.ILogService; import com.casic.missiles.modular.system.utils.TimeUtil; @@ -68,26 +69,14 @@ } /** - * 机器人交互日志 + * 交互日志 */ - @GetMapping(value = "/robotListPage") + @GetMapping(value = "/logListPage") @ResponseBody - public Object robotListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("2"); - page.setRecords(operationLogs); - return ResponseData.success(super.packForBT(page)); - } - - /** - * 岸基软件交互日志 - */ - @GetMapping(value = "/shelterListPage") - @ResponseBody - public Object shelterListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("3"); - page.setRecords(operationLogs); + public Object logListPage(String type) { + Page page = PageFactory.defaultPage(); + List dataLogs = logService.selectLogListPage(type, page); + page.setRecords(dataLogs); return ResponseData.success(super.packForBT(page)); } } \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java index 9858895..9fdbbfd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -1,11 +1,23 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author a203 */ -public interface LogMapper extends BaseMapper { - +public interface LogMapper extends BaseMapper { + /** + * 获取log记录-分页 + * + * @param type 日期 + * @param page 分页 + * @return {@link List} + */ + List selectLogPage(@Param("type") String type, @Param("page") Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml new file mode 100644 index 0000000..073a854 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + ID AS id, + LOG_TYPE AS logType, + USER_ID AS userId, + CREATE_TIME AS createTime, + DATA_CONTENT AS dataContent, + STATUS AS status + + + + \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 4d49c9e..afc5341 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -7,8 +7,9 @@ import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.dto.DataLogDTO; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.IAddressConfigService; import com.casic.missiles.modular.system.service.ILogService; import com.casic.missiles.modular.system.utils.TimeUtil; @@ -68,26 +69,14 @@ } /** - * 机器人交互日志 + * 交互日志 */ - @GetMapping(value = "/robotListPage") + @GetMapping(value = "/logListPage") @ResponseBody - public Object robotListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("2"); - page.setRecords(operationLogs); - return ResponseData.success(super.packForBT(page)); - } - - /** - * 岸基软件交互日志 - */ - @GetMapping(value = "/shelterListPage") - @ResponseBody - public Object shelterListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("3"); - page.setRecords(operationLogs); + public Object logListPage(String type) { + Page page = PageFactory.defaultPage(); + List dataLogs = logService.selectLogListPage(type, page); + page.setRecords(dataLogs); return ResponseData.success(super.packForBT(page)); } } \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java index 9858895..9fdbbfd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -1,11 +1,23 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author a203 */ -public interface LogMapper extends BaseMapper { - +public interface LogMapper extends BaseMapper { + /** + * 获取log记录-分页 + * + * @param type 日期 + * @param page 分页 + * @return {@link List} + */ + List selectLogPage(@Param("type") String type, @Param("page") Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml new file mode 100644 index 0000000..073a854 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + ID AS id, + LOG_TYPE AS logType, + USER_ID AS userId, + CREATE_TIME AS createTime, + DATA_CONTENT AS dataContent, + STATUS AS status + + + + \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java new file mode 100644 index 0000000..b21c7ca --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.dto; + +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import lombok.Data; + +/** + * @author a203 + */ +@Data +public class DataLogDTO { + + private Long id; + + private String logType; + + private String userId; + + private String createTime; + + private String dataContent; + + private String status; + + public DataLogDTO(InteractiveDataLog dataLog) { + this.id = dataLog.getId(); + this.userId = value(dataLog.getUserId()); + this.createTime = dataLog.getCreateTime(); + this.dataContent = dataLog.getDataContent(); + this.status = dataLog.getStatus(); + } + + private String value(Object o) { + if (o == null) { + return ""; + } else { + return o.toString(); + } + } +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 4d49c9e..afc5341 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -7,8 +7,9 @@ import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.dto.DataLogDTO; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.IAddressConfigService; import com.casic.missiles.modular.system.service.ILogService; import com.casic.missiles.modular.system.utils.TimeUtil; @@ -68,26 +69,14 @@ } /** - * 机器人交互日志 + * 交互日志 */ - @GetMapping(value = "/robotListPage") + @GetMapping(value = "/logListPage") @ResponseBody - public Object robotListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("2"); - page.setRecords(operationLogs); - return ResponseData.success(super.packForBT(page)); - } - - /** - * 岸基软件交互日志 - */ - @GetMapping(value = "/shelterListPage") - @ResponseBody - public Object shelterListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("3"); - page.setRecords(operationLogs); + public Object logListPage(String type) { + Page page = PageFactory.defaultPage(); + List dataLogs = logService.selectLogListPage(type, page); + page.setRecords(dataLogs); return ResponseData.success(super.packForBT(page)); } } \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java index 9858895..9fdbbfd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -1,11 +1,23 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author a203 */ -public interface LogMapper extends BaseMapper { - +public interface LogMapper extends BaseMapper { + /** + * 获取log记录-分页 + * + * @param type 日期 + * @param page 分页 + * @return {@link List} + */ + List selectLogPage(@Param("type") String type, @Param("page") Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml new file mode 100644 index 0000000..073a854 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + ID AS id, + LOG_TYPE AS logType, + USER_ID AS userId, + CREATE_TIME AS createTime, + DATA_CONTENT AS dataContent, + STATUS AS status + + + + \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java new file mode 100644 index 0000000..b21c7ca --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.dto; + +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import lombok.Data; + +/** + * @author a203 + */ +@Data +public class DataLogDTO { + + private Long id; + + private String logType; + + private String userId; + + private String createTime; + + private String dataContent; + + private String status; + + public DataLogDTO(InteractiveDataLog dataLog) { + this.id = dataLog.getId(); + this.userId = value(dataLog.getUserId()); + this.createTime = dataLog.getCreateTime(); + this.dataContent = dataLog.getDataContent(); + this.status = dataLog.getStatus(); + } + + private String value(Object o) { + if (o == null) { + return ""; + } else { + return o.toString(); + } + } +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java new file mode 100644 index 0000000..26bca1e --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * 西工大、天通交互日志模型 + * + * @author a203 + */ +@TableName("bus_data_log") +@Data +public class InteractiveDataLog extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + @TableField("LOG_TYPE") + private Integer logType; + + @TableField("USER_ID") + private String userId; + + @TableField("CREATE_TIME") + private String createTime; + + @TableField("DATA_CONTENT") + private String dataContent; + + @TableField("STATUS") + private String status; +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 4d49c9e..afc5341 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -7,8 +7,9 @@ import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.dto.DataLogDTO; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.IAddressConfigService; import com.casic.missiles.modular.system.service.ILogService; import com.casic.missiles.modular.system.utils.TimeUtil; @@ -68,26 +69,14 @@ } /** - * 机器人交互日志 + * 交互日志 */ - @GetMapping(value = "/robotListPage") + @GetMapping(value = "/logListPage") @ResponseBody - public Object robotListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("2"); - page.setRecords(operationLogs); - return ResponseData.success(super.packForBT(page)); - } - - /** - * 岸基软件交互日志 - */ - @GetMapping(value = "/shelterListPage") - @ResponseBody - public Object shelterListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("3"); - page.setRecords(operationLogs); + public Object logListPage(String type) { + Page page = PageFactory.defaultPage(); + List dataLogs = logService.selectLogListPage(type, page); + page.setRecords(dataLogs); return ResponseData.success(super.packForBT(page)); } } \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java index 9858895..9fdbbfd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -1,11 +1,23 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author a203 */ -public interface LogMapper extends BaseMapper { - +public interface LogMapper extends BaseMapper { + /** + * 获取log记录-分页 + * + * @param type 日期 + * @param page 分页 + * @return {@link List} + */ + List selectLogPage(@Param("type") String type, @Param("page") Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml new file mode 100644 index 0000000..073a854 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + ID AS id, + LOG_TYPE AS logType, + USER_ID AS userId, + CREATE_TIME AS createTime, + DATA_CONTENT AS dataContent, + STATUS AS status + + + + \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java new file mode 100644 index 0000000..b21c7ca --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.dto; + +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import lombok.Data; + +/** + * @author a203 + */ +@Data +public class DataLogDTO { + + private Long id; + + private String logType; + + private String userId; + + private String createTime; + + private String dataContent; + + private String status; + + public DataLogDTO(InteractiveDataLog dataLog) { + this.id = dataLog.getId(); + this.userId = value(dataLog.getUserId()); + this.createTime = dataLog.getCreateTime(); + this.dataContent = dataLog.getDataContent(); + this.status = dataLog.getStatus(); + } + + private String value(Object o) { + if (o == null) { + return ""; + } else { + return o.toString(); + } + } +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java new file mode 100644 index 0000000..26bca1e --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * 西工大、天通交互日志模型 + * + * @author a203 + */ +@TableName("bus_data_log") +@Data +public class InteractiveDataLog extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + @TableField("LOG_TYPE") + private Integer logType; + + @TableField("USER_ID") + private String userId; + + @TableField("CREATE_TIME") + private String createTime; + + @TableField("DATA_CONTENT") + private String dataContent; + + @TableField("STATUS") + private String status; +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java index 1dd542e..58c501d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java @@ -1,19 +1,22 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import java.util.List; /** * @author a203 */ -public interface ILogService extends IService { +public interface ILogService extends IService { /** - * 查询最新IP配置信息 + * 交互日志查询 * - * @param type 日志类型 - * @return {@link List} + * @param type log分类 + * @param page 分页对象 + * @return {@link List} */ - List selectLogListPage(String type); + List selectLogListPage(String type, Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 4d49c9e..afc5341 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -7,8 +7,9 @@ import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.dto.DataLogDTO; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.IAddressConfigService; import com.casic.missiles.modular.system.service.ILogService; import com.casic.missiles.modular.system.utils.TimeUtil; @@ -68,26 +69,14 @@ } /** - * 机器人交互日志 + * 交互日志 */ - @GetMapping(value = "/robotListPage") + @GetMapping(value = "/logListPage") @ResponseBody - public Object robotListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("2"); - page.setRecords(operationLogs); - return ResponseData.success(super.packForBT(page)); - } - - /** - * 岸基软件交互日志 - */ - @GetMapping(value = "/shelterListPage") - @ResponseBody - public Object shelterListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("3"); - page.setRecords(operationLogs); + public Object logListPage(String type) { + Page page = PageFactory.defaultPage(); + List dataLogs = logService.selectLogListPage(type, page); + page.setRecords(dataLogs); return ResponseData.success(super.packForBT(page)); } } \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java index 9858895..9fdbbfd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -1,11 +1,23 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author a203 */ -public interface LogMapper extends BaseMapper { - +public interface LogMapper extends BaseMapper { + /** + * 获取log记录-分页 + * + * @param type 日期 + * @param page 分页 + * @return {@link List} + */ + List selectLogPage(@Param("type") String type, @Param("page") Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml new file mode 100644 index 0000000..073a854 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + ID AS id, + LOG_TYPE AS logType, + USER_ID AS userId, + CREATE_TIME AS createTime, + DATA_CONTENT AS dataContent, + STATUS AS status + + + + \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java new file mode 100644 index 0000000..b21c7ca --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.dto; + +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import lombok.Data; + +/** + * @author a203 + */ +@Data +public class DataLogDTO { + + private Long id; + + private String logType; + + private String userId; + + private String createTime; + + private String dataContent; + + private String status; + + public DataLogDTO(InteractiveDataLog dataLog) { + this.id = dataLog.getId(); + this.userId = value(dataLog.getUserId()); + this.createTime = dataLog.getCreateTime(); + this.dataContent = dataLog.getDataContent(); + this.status = dataLog.getStatus(); + } + + private String value(Object o) { + if (o == null) { + return ""; + } else { + return o.toString(); + } + } +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java new file mode 100644 index 0000000..26bca1e --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * 西工大、天通交互日志模型 + * + * @author a203 + */ +@TableName("bus_data_log") +@Data +public class InteractiveDataLog extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + @TableField("LOG_TYPE") + private Integer logType; + + @TableField("USER_ID") + private String userId; + + @TableField("CREATE_TIME") + private String createTime; + + @TableField("DATA_CONTENT") + private String dataContent; + + @TableField("STATUS") + private String status; +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java index 1dd542e..58c501d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java @@ -1,19 +1,22 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import java.util.List; /** * @author a203 */ -public interface ILogService extends IService { +public interface ILogService extends IService { /** - * 查询最新IP配置信息 + * 交互日志查询 * - * @param type 日志类型 - * @return {@link List} + * @param type log分类 + * @param page 分页对象 + * @return {@link List} */ - List selectLogListPage(String type); + List selectLogListPage(String type, Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java index d2edbbc..817d1f5 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java @@ -1,34 +1,43 @@ package com.casic.missiles.modular.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.dao.LogMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.ILogService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** - * IP配置信息 服务实现类 + * Log 服务实现类 * * @author a203 */ @Service -public class LogServiceImpl extends ServiceImpl implements ILogService { +public class LogServiceImpl extends ServiceImpl implements ILogService { - public LogServiceImpl() { + private final AbstractDictService dictService; + public LogServiceImpl(AbstractDictService dictService) { + this.dictService = dictService; } @Override - public List selectLogListPage(String type) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("LOG_TYPE", type); - List logs = this.baseMapper.selectList(queryWrapper); - if (logs.isEmpty()) { - return null; + public List selectLogListPage(String type, Page page) { + List dataLogs = this.baseMapper.selectLogPage(type, page); + if (!dataLogs.isEmpty()) { + List logs = new ArrayList<>(); + for (InteractiveDataLog dataLog : dataLogs) { + DataLogDTO logDTO = new DataLogDTO(dataLog); + logDTO.setLogType(dictService.getDictNameByCode("dataLogType", String.valueOf(dataLog.getLogType()))); + logs.add(logDTO); + } + return logs; } - return logs; + return null; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 4d49c9e..afc5341 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -7,8 +7,9 @@ import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.dto.DataLogDTO; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.IAddressConfigService; import com.casic.missiles.modular.system.service.ILogService; import com.casic.missiles.modular.system.utils.TimeUtil; @@ -68,26 +69,14 @@ } /** - * 机器人交互日志 + * 交互日志 */ - @GetMapping(value = "/robotListPage") + @GetMapping(value = "/logListPage") @ResponseBody - public Object robotListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("2"); - page.setRecords(operationLogs); - return ResponseData.success(super.packForBT(page)); - } - - /** - * 岸基软件交互日志 - */ - @GetMapping(value = "/shelterListPage") - @ResponseBody - public Object shelterListPage() { - Page page = PageFactory.defaultPage(); - List operationLogs = logService.selectLogListPage("3"); - page.setRecords(operationLogs); + public Object logListPage(String type) { + Page page = PageFactory.defaultPage(); + List dataLogs = logService.selectLogListPage(type, page); + page.setRecords(dataLogs); return ResponseData.success(super.packForBT(page)); } } \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java index 9858895..9fdbbfd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -1,11 +1,23 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author a203 */ -public interface LogMapper extends BaseMapper { - +public interface LogMapper extends BaseMapper { + /** + * 获取log记录-分页 + * + * @param type 日期 + * @param page 分页 + * @return {@link List} + */ + List selectLogPage(@Param("type") String type, @Param("page") Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml new file mode 100644 index 0000000..073a854 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/mapping/LogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + ID AS id, + LOG_TYPE AS logType, + USER_ID AS userId, + CREATE_TIME AS createTime, + DATA_CONTENT AS dataContent, + STATUS AS status + + + + \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java new file mode 100644 index 0000000..b21c7ca --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DataLogDTO.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.system.dto; + +import com.casic.missiles.modular.system.model.InteractiveDataLog; +import lombok.Data; + +/** + * @author a203 + */ +@Data +public class DataLogDTO { + + private Long id; + + private String logType; + + private String userId; + + private String createTime; + + private String dataContent; + + private String status; + + public DataLogDTO(InteractiveDataLog dataLog) { + this.id = dataLog.getId(); + this.userId = value(dataLog.getUserId()); + this.createTime = dataLog.getCreateTime(); + this.dataContent = dataLog.getDataContent(); + this.status = dataLog.getStatus(); + } + + private String value(Object o) { + if (o == null) { + return ""; + } else { + return o.toString(); + } + } +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java new file mode 100644 index 0000000..26bca1e --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/InteractiveDataLog.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * 西工大、天通交互日志模型 + * + * @author a203 + */ +@TableName("bus_data_log") +@Data +public class InteractiveDataLog extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + @TableField("LOG_TYPE") + private Integer logType; + + @TableField("USER_ID") + private String userId; + + @TableField("CREATE_TIME") + private String createTime; + + @TableField("DATA_CONTENT") + private String dataContent; + + @TableField("STATUS") + private String status; +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java index 1dd542e..58c501d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java @@ -1,19 +1,22 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import java.util.List; /** * @author a203 */ -public interface ILogService extends IService { +public interface ILogService extends IService { /** - * 查询最新IP配置信息 + * 交互日志查询 * - * @param type 日志类型 - * @return {@link List} + * @param type log分类 + * @param page 分页对象 + * @return {@link List} */ - List selectLogListPage(String type); + List selectLogListPage(String type, Page page); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java index d2edbbc..817d1f5 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java @@ -1,34 +1,43 @@ package com.casic.missiles.modular.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.dao.LogMapper; -import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.dto.DataLogDTO; +import com.casic.missiles.modular.system.model.InteractiveDataLog; import com.casic.missiles.modular.system.service.ILogService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** - * IP配置信息 服务实现类 + * Log 服务实现类 * * @author a203 */ @Service -public class LogServiceImpl extends ServiceImpl implements ILogService { +public class LogServiceImpl extends ServiceImpl implements ILogService { - public LogServiceImpl() { + private final AbstractDictService dictService; + public LogServiceImpl(AbstractDictService dictService) { + this.dictService = dictService; } @Override - public List selectLogListPage(String type) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("LOG_TYPE", type); - List logs = this.baseMapper.selectList(queryWrapper); - if (logs.isEmpty()) { - return null; + public List selectLogListPage(String type, Page page) { + List dataLogs = this.baseMapper.selectLogPage(type, page); + if (!dataLogs.isEmpty()) { + List logs = new ArrayList<>(); + for (InteractiveDataLog dataLog : dataLogs) { + DataLogDTO logDTO = new DataLogDTO(dataLog); + logDTO.setLogType(dictService.getDictNameByCode("dataLogType", String.valueOf(dataLog.getLogType()))); + logs.add(logDTO); + } + return logs; } - return logs; + return null; } } diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java index 0bb1106..1d5e791 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java @@ -34,7 +34,7 @@ private final IRegionPlanService regionPlanService; private final IRoutePlanService routePlanService; private final ITaskService taskService; - private final IOperationLogService logService; + private final ILogService logService; private final ISatelliteService satelliteService; private NRSerialPort serialPort; @@ -44,7 +44,7 @@ IOceanService oceanService, IShipService shipService, IShelterPositionService shelterPositionService, IRegionPlanService regionPlanService, IRoutePlanService routePlanService, ITaskService taskService, - IOperationLogService logService, ISatelliteService satelliteService) { + ILogService logService, ISatelliteService satelliteService) { this.robotService = robotService; this.typhoonService = typhoonService; this.oceanService = oceanService; @@ -119,18 +119,28 @@ switch (type) { case 0x01: //读取北斗/GPS位置信息 + saveDataLog(2, "", "GPS,V", "0"); sendToSocket("GPS,V"); break; case 0x02: //数据接收 - sendToSocket(new String(data)); + //1.先得到发送的DTU数据 + byte[] dtuData = new byte[data.length - 4]; + System.arraycopy(data, 4, dtuData, 0, data.length - 4); + sendToSocket(new String(dtuData)); + //2.DTU数据是加密过的，需要解密 + String s = new String(TEA.decrypt(dtuData)); + saveDataLog(2, "", s, "0"); + sendToSocket(s); break; case 0x03: //数据发送成功 + saveDataLog(2, "", "SEND DATA SUCCESS!", "0"); sendToSocket("SEND DATA SUCCESS!"); break; case 0x04: //数据发送失败 + saveDataLog(2, "", "SEND DATA ERROR!", "0"); sendToSocket("SEND DATA ERROR!"); break; case 0x05: @@ -141,6 +151,7 @@ break; } } else { + saveDataLog(2, "", new String(data), "0"); log.info(new String(data)); } } @@ -148,6 +159,9 @@ private void sendToSocket(String value) { if (channelHandler != null) { channelHandler.writeAndFlush(value); + saveDataLog(1, "", value, "0"); + } else { + saveDataLog(1, "", value, "1"); } } @@ -187,16 +201,6 @@ public void communicate(ChannelHandlerContext ctx, Object msg) { byte[] data = (byte[]) msg; log.info("channelRead message ===> " + Arrays.toString(data)); - /** - * 记录log - * */ - OperationLog operationLog = new OperationLog(); - operationLog.setLogType("2"); - operationLog.setLogName("水下机器人Socket数据通信"); - operationLog.setClassName(this.getClass().getSimpleName()); - operationLog.setMethod("communicate"); - operationLog.setCreateTime(new Date()); - operationLog.setSucceed("成功"); /** * 回应客户端 @@ -204,15 +208,13 @@ if (isCorrectData(data)) { int dataType = data[2]; int robotId = decodeRobotId(data); - - operationLog.setUserId((long) robotId); /** * 先解析再回应 * */ switch (dataType) { case 0x01: RobotInfo robotInfo = DecodeData.decodeRobotInfo(data); - operationLog.setMessage("水下机器人信息"); + saveDataLog(0, String.valueOf(robotId), robotInfo, "0"); robotService.save(robotInfo); break; case 0x02: @@ -221,7 +223,7 @@ switch (planType) { case 0x01: String robotRegion = DecodeData.decodeRobotRegion(data); - operationLog.setMessage("算法结果:区域覆盖"); + saveDataLog(0, String.valueOf(robotId), robotRegion, "0"); RegionPlan regionPlan = new RegionPlan(); regionPlan.setPlanTime(TimeUtil.getCurrentTime()); regionPlan.setRegionResult(robotRegion); @@ -229,7 +231,7 @@ break; case 0x02: String robotRoute = DecodeData.decodeRobotRoute(data); - operationLog.setMessage("算法结果:路径规划"); + saveDataLog(0, String.valueOf(robotId), robotRoute, "0"); RoutePlan routePlan = new RoutePlan(); routePlan.setRobotId(robotId); routePlan.setPlanTime(TimeUtil.getCurrentTime()); @@ -249,41 +251,41 @@ switch (taskType) { case 0x01: String directedTask = DecodeData.decodeDirectedTask(data); - operationLog.setMessage("定向任务开始"); + saveDataLog(0, String.valueOf(robotId), directedTask, "0"); task.setTaskType("1"); task.setTaskData(directedTask); taskService.save(task); break; case 0x02: String routeTask = DecodeData.decodeTaskRoute(data); - operationLog.setMessage("航路点任务开始"); + saveDataLog(0, String.valueOf(robotId), routeTask, "0"); task.setTaskType("2"); task.setTaskData(routeTask); taskService.save(task); break; case 0x03: String flightTask = DecodeData.decodeDirectFlightTask(data); - operationLog.setMessage("定深直航任务开始"); + saveDataLog(0, String.valueOf(robotId), flightTask, "0"); task.setTaskType("3"); task.setTaskData(flightTask); taskService.save(task); break; case 0x04: String resideTask = DecodeData.decodeResideTask(data); - operationLog.setMessage("驻留任务开始"); + saveDataLog(0, String.valueOf(robotId), resideTask, "0"); task.setTaskType("4"); task.setTaskData(resideTask); taskService.save(task); break; case 0x05: String putTask = DecodeData.decodePutTask(data); - operationLog.setMessage("投放任务开始"); + saveDataLog(0, String.valueOf(robotId), putTask, "0"); task.setTaskType("5"); task.setTaskData(putTask); taskService.save(task); break; case 0x0F: - operationLog.setMessage("任务终止"); + saveDataLog(0, String.valueOf(robotId), "任务终止", "0"); taskService.updateTaskById(robotId); break; default: @@ -297,8 +299,7 @@ * 方舱通过Socket发送短信给203后台，然后203后台将短信内容加密之后用卫星发送给203自己的岸基软件，然后解密之后再传给西工大岸基软件 * */ String decodeSMS = DecodeData.decodeSMS(data); - log.info(decodeSMS); - operationLog.setMessage(decodeSMS); + saveDataLog(0, String.valueOf(robotId), decodeSMS, "0"); byte[] bytes; if (decodeSMS.startsWith("*") || decodeSMS.startsWith("?")) { @@ -314,11 +315,12 @@ } if (serialPort != null && serialPort.isConnected()) { SerialPortManager.sendToPort(serialPort, bytes); + saveDataLog(3, String.valueOf(robotId), decodeSMS, "0"); } break; case 0x05: String envRequest = DecodeData.decodeEnvRequest(data); - operationLog.setMessage("机器人请求环境数据"); + saveDataLog(0, String.valueOf(robotId), envRequest, "0"); //{"hour":"12","lng":109.32222199129043,"lat":17.39223199775081} JSONObject envJsonObject = JSON.parseObject(envRequest); @@ -361,10 +363,11 @@ objectMap = EncodeData.encodeEnvironment(envLng, envLat, detailDTO, oceanDetail); } ctx.writeAndFlush(JSON.toJSONString(objectMap)); + saveDataLog(1, String.valueOf(robotId), objectMap, "0"); break; case 0x06: String aisRequest = DecodeData.decodeAISRequest(data); - operationLog.setMessage("机器人请求AIS数据请求"); + saveDataLog(0, String.valueOf(robotId), aisRequest, "0"); //{"radius":58,"lng":109.32222199129043,"lat":17.39223199775081,"age":12} JSONObject aisJsonObject = JSON.parseObject(aisRequest); @@ -386,16 +389,32 @@ List ships = shipService.shipsInCircle(requestValue, age); Map map = EncodeData.encodeAIS(aisLng, aisLat, ships); ctx.writeAndFlush(JSON.toJSONString(map)); + saveDataLog(1, String.valueOf(robotId), map, "0"); break; case 0x07: ShelterPosition shelterPosition = DecodeData.decodeShelterPosition(data); - operationLog.setMessage("方舱位置"); + saveDataLog(0, String.valueOf(robotId), shelterPosition, "0"); shelterPositionService.save(shelterPosition); break; default: break; } + } else { + saveDataLog(0, "", null, "1"); } -// logService.save(operationLog); + } + + private void saveDataLog(int type, String id, Object data, String status) { + InteractiveDataLog dataLog = new InteractiveDataLog(); + dataLog.setLogType(type); + dataLog.setUserId(id); + dataLog.setCreateTime(TimeUtil.getCurrentTime()); + if (data instanceof String) { + dataLog.setDataContent((String) data); + } else { + dataLog.setDataContent(JSON.toJSONString(data)); + } + dataLog.setStatus(status); + logService.save(dataLog); } }