diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 33a4f3f..2c40a6a 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -24,6 +24,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} compile diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 33a4f3f..2c40a6a 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -24,6 +24,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} compile diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java deleted file mode 100644 index 4cdac09..0000000 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.AddressConfigDTO; -import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.service.IAddressConfigService; -import com.casic.missiles.modular.system.utils.TimeUtil; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -/** - * IP配置控制器 - * - * @author a203 - */ -@Controller -@RequestMapping("/system") -public class AddressConfigController extends BaseController { - - private final IAddressConfigService configService; - - public AddressConfigController(IAddressConfigService configService) { - this.configService = configService; - } - - /** - * 最新IP配置 - */ - @GetMapping(value = "/recentAddress") - @ResponseBody - public Object recentAddress() { - AddressConfigDTO lastConfig = configService.selectLastConfig(); - return ResponseData.success(lastConfig); - } - - /** - * 设置IP - */ - @PostMapping(value = "/update") - @ResponseBody - public Object update(@RequestBody AddressConfig config) { - config.setUpdateTime(TimeUtil.getCurrentTime()); - configService.save(config); - return ResponseData.success(); - } -} \ No newline at end of file diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 33a4f3f..2c40a6a 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -24,6 +24,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} compile diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java deleted file mode 100644 index 4cdac09..0000000 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.AddressConfigDTO; -import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.service.IAddressConfigService; -import com.casic.missiles.modular.system.utils.TimeUtil; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -/** - * IP配置控制器 - * - * @author a203 - */ -@Controller -@RequestMapping("/system") -public class AddressConfigController extends BaseController { - - private final IAddressConfigService configService; - - public AddressConfigController(IAddressConfigService configService) { - this.configService = configService; - } - - /** - * 最新IP配置 - */ - @GetMapping(value = "/recentAddress") - @ResponseBody - public Object recentAddress() { - AddressConfigDTO lastConfig = configService.selectLastConfig(); - return ResponseData.success(lastConfig); - } - - /** - * 设置IP - */ - @PostMapping(value = "/update") - @ResponseBody - public Object update(@RequestBody AddressConfig config) { - config.setUpdateTime(TimeUtil.getCurrentTime()); - configService.save(config); - return ResponseData.success(); - } -} \ 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 new file mode 100644 index 0000000..2287758 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -0,0 +1,79 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.model.AddressConfig; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.IAddressConfigService; +import com.casic.missiles.modular.system.service.ILogService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * IP配置控制器 + * + * @author a203 + */ +@Controller +@RequestMapping("/system") +public class SystemConfigController extends BaseController { + + private final IAddressConfigService configService; + private final ILogService logService; + + public SystemConfigController(IAddressConfigService configService, ILogService logService) { + this.configService = configService; + this.logService = logService; + } + + /** + * 最新IP配置 + */ + @GetMapping(value = "/recentAddress") + @ResponseBody + public Object recentAddress() { + AddressConfigDTO lastConfig = configService.selectLastConfig(); + return ResponseData.success(lastConfig); + } + + /** + * 设置IP + */ + @PostMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody AddressConfig config) { + config.setUpdateTime(TimeUtil.getCurrentTime()); + configService.save(config); + return ResponseData.success(); + } + + /** + * 机器人交互日志 + */ + @GetMapping(value = "/robotListPage") + @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); + return ResponseData.success(super.packForBT(page)); + } +} \ No newline at end of file diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 33a4f3f..2c40a6a 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -24,6 +24,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} compile diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java deleted file mode 100644 index 4cdac09..0000000 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.AddressConfigDTO; -import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.service.IAddressConfigService; -import com.casic.missiles.modular.system.utils.TimeUtil; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -/** - * IP配置控制器 - * - * @author a203 - */ -@Controller -@RequestMapping("/system") -public class AddressConfigController extends BaseController { - - private final IAddressConfigService configService; - - public AddressConfigController(IAddressConfigService configService) { - this.configService = configService; - } - - /** - * 最新IP配置 - */ - @GetMapping(value = "/recentAddress") - @ResponseBody - public Object recentAddress() { - AddressConfigDTO lastConfig = configService.selectLastConfig(); - return ResponseData.success(lastConfig); - } - - /** - * 设置IP - */ - @PostMapping(value = "/update") - @ResponseBody - public Object update(@RequestBody AddressConfig config) { - config.setUpdateTime(TimeUtil.getCurrentTime()); - configService.save(config); - return ResponseData.success(); - } -} \ 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 new file mode 100644 index 0000000..2287758 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -0,0 +1,79 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.model.AddressConfig; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.IAddressConfigService; +import com.casic.missiles.modular.system.service.ILogService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * IP配置控制器 + * + * @author a203 + */ +@Controller +@RequestMapping("/system") +public class SystemConfigController extends BaseController { + + private final IAddressConfigService configService; + private final ILogService logService; + + public SystemConfigController(IAddressConfigService configService, ILogService logService) { + this.configService = configService; + this.logService = logService; + } + + /** + * 最新IP配置 + */ + @GetMapping(value = "/recentAddress") + @ResponseBody + public Object recentAddress() { + AddressConfigDTO lastConfig = configService.selectLastConfig(); + return ResponseData.success(lastConfig); + } + + /** + * 设置IP + */ + @PostMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody AddressConfig config) { + config.setUpdateTime(TimeUtil.getCurrentTime()); + configService.save(config); + return ResponseData.success(); + } + + /** + * 机器人交互日志 + */ + @GetMapping(value = "/robotListPage") + @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); + 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 new file mode 100644 index 0000000..9858895 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.OperationLog; + +/** + * @author a203 + */ +public interface LogMapper extends BaseMapper { + +} diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 33a4f3f..2c40a6a 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -24,6 +24,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} compile diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java deleted file mode 100644 index 4cdac09..0000000 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.AddressConfigDTO; -import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.service.IAddressConfigService; -import com.casic.missiles.modular.system.utils.TimeUtil; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -/** - * IP配置控制器 - * - * @author a203 - */ -@Controller -@RequestMapping("/system") -public class AddressConfigController extends BaseController { - - private final IAddressConfigService configService; - - public AddressConfigController(IAddressConfigService configService) { - this.configService = configService; - } - - /** - * 最新IP配置 - */ - @GetMapping(value = "/recentAddress") - @ResponseBody - public Object recentAddress() { - AddressConfigDTO lastConfig = configService.selectLastConfig(); - return ResponseData.success(lastConfig); - } - - /** - * 设置IP - */ - @PostMapping(value = "/update") - @ResponseBody - public Object update(@RequestBody AddressConfig config) { - config.setUpdateTime(TimeUtil.getCurrentTime()); - configService.save(config); - return ResponseData.success(); - } -} \ 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 new file mode 100644 index 0000000..2287758 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -0,0 +1,79 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.model.AddressConfig; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.IAddressConfigService; +import com.casic.missiles.modular.system.service.ILogService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * IP配置控制器 + * + * @author a203 + */ +@Controller +@RequestMapping("/system") +public class SystemConfigController extends BaseController { + + private final IAddressConfigService configService; + private final ILogService logService; + + public SystemConfigController(IAddressConfigService configService, ILogService logService) { + this.configService = configService; + this.logService = logService; + } + + /** + * 最新IP配置 + */ + @GetMapping(value = "/recentAddress") + @ResponseBody + public Object recentAddress() { + AddressConfigDTO lastConfig = configService.selectLastConfig(); + return ResponseData.success(lastConfig); + } + + /** + * 设置IP + */ + @PostMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody AddressConfig config) { + config.setUpdateTime(TimeUtil.getCurrentTime()); + configService.save(config); + return ResponseData.success(); + } + + /** + * 机器人交互日志 + */ + @GetMapping(value = "/robotListPage") + @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); + 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 new file mode 100644 index 0000000..9858895 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.OperationLog; + +/** + * @author a203 + */ +public interface LogMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..1dd542e --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.OperationLog; + +import java.util.List; + +/** + * @author a203 + */ +public interface ILogService extends IService { + /** + * 查询最新IP配置信息 + * + * @param type 日志类型 + * @return {@link List} + */ + List selectLogListPage(String type); +} diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 33a4f3f..2c40a6a 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -24,6 +24,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} compile diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java deleted file mode 100644 index 4cdac09..0000000 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.AddressConfigDTO; -import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.service.IAddressConfigService; -import com.casic.missiles.modular.system.utils.TimeUtil; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -/** - * IP配置控制器 - * - * @author a203 - */ -@Controller -@RequestMapping("/system") -public class AddressConfigController extends BaseController { - - private final IAddressConfigService configService; - - public AddressConfigController(IAddressConfigService configService) { - this.configService = configService; - } - - /** - * 最新IP配置 - */ - @GetMapping(value = "/recentAddress") - @ResponseBody - public Object recentAddress() { - AddressConfigDTO lastConfig = configService.selectLastConfig(); - return ResponseData.success(lastConfig); - } - - /** - * 设置IP - */ - @PostMapping(value = "/update") - @ResponseBody - public Object update(@RequestBody AddressConfig config) { - config.setUpdateTime(TimeUtil.getCurrentTime()); - configService.save(config); - return ResponseData.success(); - } -} \ 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 new file mode 100644 index 0000000..2287758 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -0,0 +1,79 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.model.AddressConfig; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.IAddressConfigService; +import com.casic.missiles.modular.system.service.ILogService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * IP配置控制器 + * + * @author a203 + */ +@Controller +@RequestMapping("/system") +public class SystemConfigController extends BaseController { + + private final IAddressConfigService configService; + private final ILogService logService; + + public SystemConfigController(IAddressConfigService configService, ILogService logService) { + this.configService = configService; + this.logService = logService; + } + + /** + * 最新IP配置 + */ + @GetMapping(value = "/recentAddress") + @ResponseBody + public Object recentAddress() { + AddressConfigDTO lastConfig = configService.selectLastConfig(); + return ResponseData.success(lastConfig); + } + + /** + * 设置IP + */ + @PostMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody AddressConfig config) { + config.setUpdateTime(TimeUtil.getCurrentTime()); + configService.save(config); + return ResponseData.success(); + } + + /** + * 机器人交互日志 + */ + @GetMapping(value = "/robotListPage") + @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); + 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 new file mode 100644 index 0000000..9858895 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.OperationLog; + +/** + * @author a203 + */ +public interface LogMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..1dd542e --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.OperationLog; + +import java.util.List; + +/** + * @author a203 + */ +public interface ILogService extends IService { + /** + * 查询最新IP配置信息 + * + * @param type 日志类型 + * @return {@link List} + */ + List selectLogListPage(String type); +} 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 new file mode 100644 index 0000000..d2edbbc --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.LogMapper; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.ILogService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * IP配置信息 服务实现类 + * + * @author a203 + */ +@Service +public class LogServiceImpl extends ServiceImpl implements ILogService { + + public LogServiceImpl() { + + } + + @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; + } + return logs; + } +} diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 33a4f3f..2c40a6a 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -24,6 +24,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} compile diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java deleted file mode 100644 index 4cdac09..0000000 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.AddressConfigDTO; -import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.service.IAddressConfigService; -import com.casic.missiles.modular.system.utils.TimeUtil; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -/** - * IP配置控制器 - * - * @author a203 - */ -@Controller -@RequestMapping("/system") -public class AddressConfigController extends BaseController { - - private final IAddressConfigService configService; - - public AddressConfigController(IAddressConfigService configService) { - this.configService = configService; - } - - /** - * 最新IP配置 - */ - @GetMapping(value = "/recentAddress") - @ResponseBody - public Object recentAddress() { - AddressConfigDTO lastConfig = configService.selectLastConfig(); - return ResponseData.success(lastConfig); - } - - /** - * 设置IP - */ - @PostMapping(value = "/update") - @ResponseBody - public Object update(@RequestBody AddressConfig config) { - config.setUpdateTime(TimeUtil.getCurrentTime()); - configService.save(config); - return ResponseData.success(); - } -} \ 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 new file mode 100644 index 0000000..2287758 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -0,0 +1,79 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.model.AddressConfig; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.IAddressConfigService; +import com.casic.missiles.modular.system.service.ILogService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * IP配置控制器 + * + * @author a203 + */ +@Controller +@RequestMapping("/system") +public class SystemConfigController extends BaseController { + + private final IAddressConfigService configService; + private final ILogService logService; + + public SystemConfigController(IAddressConfigService configService, ILogService logService) { + this.configService = configService; + this.logService = logService; + } + + /** + * 最新IP配置 + */ + @GetMapping(value = "/recentAddress") + @ResponseBody + public Object recentAddress() { + AddressConfigDTO lastConfig = configService.selectLastConfig(); + return ResponseData.success(lastConfig); + } + + /** + * 设置IP + */ + @PostMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody AddressConfig config) { + config.setUpdateTime(TimeUtil.getCurrentTime()); + configService.save(config); + return ResponseData.success(); + } + + /** + * 机器人交互日志 + */ + @GetMapping(value = "/robotListPage") + @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); + 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 new file mode 100644 index 0000000..9858895 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.OperationLog; + +/** + * @author a203 + */ +public interface LogMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..1dd542e --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.OperationLog; + +import java.util.List; + +/** + * @author a203 + */ +public interface ILogService extends IService { + /** + * 查询最新IP配置信息 + * + * @param type 日志类型 + * @return {@link List} + */ + List selectLogListPage(String type); +} 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 new file mode 100644 index 0000000..d2edbbc --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.LogMapper; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.ILogService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * IP配置信息 服务实现类 + * + * @author a203 + */ +@Service +public class LogServiceImpl extends ServiceImpl implements ILogService { + + public LogServiceImpl() { + + } + + @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; + } + return logs; + } +} diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 9fdf570..8ce4d9d 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -25,6 +25,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 33a4f3f..2c40a6a 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -24,6 +24,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} compile diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java deleted file mode 100644 index 4cdac09..0000000 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/AddressConfigController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.AddressConfigDTO; -import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.service.IAddressConfigService; -import com.casic.missiles.modular.system.utils.TimeUtil; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -/** - * IP配置控制器 - * - * @author a203 - */ -@Controller -@RequestMapping("/system") -public class AddressConfigController extends BaseController { - - private final IAddressConfigService configService; - - public AddressConfigController(IAddressConfigService configService) { - this.configService = configService; - } - - /** - * 最新IP配置 - */ - @GetMapping(value = "/recentAddress") - @ResponseBody - public Object recentAddress() { - AddressConfigDTO lastConfig = configService.selectLastConfig(); - return ResponseData.success(lastConfig); - } - - /** - * 设置IP - */ - @PostMapping(value = "/update") - @ResponseBody - public Object update(@RequestBody AddressConfig config) { - config.setUpdateTime(TimeUtil.getCurrentTime()); - configService.save(config); - return ResponseData.success(); - } -} \ 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 new file mode 100644 index 0000000..2287758 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -0,0 +1,79 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AddressConfigDTO; +import com.casic.missiles.modular.system.model.AddressConfig; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.IAddressConfigService; +import com.casic.missiles.modular.system.service.ILogService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * IP配置控制器 + * + * @author a203 + */ +@Controller +@RequestMapping("/system") +public class SystemConfigController extends BaseController { + + private final IAddressConfigService configService; + private final ILogService logService; + + public SystemConfigController(IAddressConfigService configService, ILogService logService) { + this.configService = configService; + this.logService = logService; + } + + /** + * 最新IP配置 + */ + @GetMapping(value = "/recentAddress") + @ResponseBody + public Object recentAddress() { + AddressConfigDTO lastConfig = configService.selectLastConfig(); + return ResponseData.success(lastConfig); + } + + /** + * 设置IP + */ + @PostMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody AddressConfig config) { + config.setUpdateTime(TimeUtil.getCurrentTime()); + configService.save(config); + return ResponseData.success(); + } + + /** + * 机器人交互日志 + */ + @GetMapping(value = "/robotListPage") + @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); + 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 new file mode 100644 index 0000000..9858895 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/LogMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.OperationLog; + +/** + * @author a203 + */ +public interface LogMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..1dd542e --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/ILogService.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.OperationLog; + +import java.util.List; + +/** + * @author a203 + */ +public interface ILogService extends IService { + /** + * 查询最新IP配置信息 + * + * @param type 日志类型 + * @return {@link List} + */ + List selectLogListPage(String type); +} 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 new file mode 100644 index 0000000..d2edbbc --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/LogServiceImpl.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.LogMapper; +import com.casic.missiles.modular.system.model.OperationLog; +import com.casic.missiles.modular.system.service.ILogService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * IP配置信息 服务实现类 + * + * @author a203 + */ +@Service +public class LogServiceImpl extends ServiceImpl implements ILogService { + + public LogServiceImpl() { + + } + + @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; + } + return logs; + } +} diff --git a/casic-shelter/pom.xml b/casic-shelter/pom.xml index 9fdf570..8ce4d9d 100644 --- a/casic-shelter/pom.xml +++ b/casic-shelter/pom.xml @@ -25,6 +25,12 @@ com.casic + casic-admin-core + ${core.version} + provided + + + com.casic casic-admin-support ${admin.version} provided 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 6379660..9aab314 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 @@ -16,10 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author a203 @@ -35,14 +32,12 @@ private final IRegionPlanService regionPlanService; private final IRoutePlanService routePlanService; private final ITaskService taskService; + private final IOperationLogService logService; - public SocketServiceImpl(IRobotService robotService, - ITyphoonService typhoonService, - IShipService shipService, - IShelterPositionService shelterPositionService, - IRegionPlanService regionPlanService, - IRoutePlanService routePlanService, - ITaskService taskService) { + public SocketServiceImpl(IRobotService robotService, ITyphoonService typhoonService, + IShipService shipService, IShelterPositionService shelterPositionService, + IRegionPlanService regionPlanService, IRoutePlanService routePlanService, + ITaskService taskService, IOperationLogService logService) { this.robotService = robotService; this.typhoonService = typhoonService; this.shipService = shipService; @@ -50,6 +45,7 @@ this.regionPlanService = regionPlanService; this.routePlanService = routePlanService; this.taskService = taskService; + this.logService = logService; } private boolean isCorrectData(byte[] bytes) { @@ -82,19 +78,31 @@ byte[] data = (byte[]) msg; log.info("channelRead message ===> " + Arrays.toString(data)); /** + * 记录log + * */ + OperationLog log = new OperationLog(); + log.setLogType("2"); + log.setLogName("水下机器人Socket数据通信"); + log.setClassName(this.getClass().getSimpleName()); + log.setMethod("communicate"); + log.setCreateTime(new Date()); + log.setSucceed("成功"); + + /** * 回应客户端 * */ if (isCorrectData(data)) { int dataType = data[2]; int robotId = decodeRobotId(data); + + log.setUserId((long) robotId); /** * 先解析再回应 * */ switch (dataType) { case 0x01: - //水下机器人信息 RobotInfo robotInfo = DecodeData.decodeRobotInfo(data); - log.info("robotInfo ===> " + JSON.toJSONString(robotInfo)); + log.setMessage("水下机器人信息"); robotService.save(robotInfo); break; case 0x02: @@ -103,17 +111,15 @@ switch (planType) { case 0x01: String robotRegion = DecodeData.decodeRobotRegion(data); - log.info("区域覆盖 ===> " + robotRegion); - //区域覆盖 + log.setMessage("算法结果:区域覆盖"); RegionPlan regionPlan = new RegionPlan(); regionPlan.setPlanTime(TimeUtil.getCurrentTime()); regionPlan.setRegionResult(robotRegion); regionPlanService.save(regionPlan); break; case 0x02: - //路径规划 String robotRoute = DecodeData.decodeRobotRoute(data); - log.info("路径规划 ===> " + robotRoute); + log.setMessage("算法结果:路径规划"); RoutePlan routePlan = new RoutePlan(); routePlan.setRobotId(robotId); routePlan.setPlanTime(TimeUtil.getCurrentTime()); @@ -132,48 +138,42 @@ task.setCreateTime(TimeUtil.getCurrentTime()); switch (taskType) { case 0x01: - //定向任务开始 String directedTask = DecodeData.decodeDirectedTask(data); - log.info("定向任务开始 ===> " + directedTask); + log.setMessage("定向任务开始"); task.setTaskType("1"); task.setTaskData(directedTask); taskService.save(task); break; case 0x02: - //航路点任务开始 String routeTask = DecodeData.decodeTaskRoute(data); - log.info("航路点任务开始 ===> " + routeTask); + log.setMessage("航路点任务开始"); task.setTaskType("2"); task.setTaskData(routeTask); taskService.save(task); break; case 0x03: - //定深直航任务开始 String flightTask = DecodeData.decodeDirectFlightTask(data); - log.info("定深直航任务开始 ===> " + flightTask); + log.setMessage("定深直航任务开始"); task.setTaskType("3"); task.setTaskData(flightTask); taskService.save(task); break; case 0x04: - //驻留任务开始 String resideTask = DecodeData.decodeResideTask(data); - log.info("驻留任务开始 ===> " + resideTask); + log.setMessage("驻留任务开始"); task.setTaskType("4"); task.setTaskData(resideTask); taskService.save(task); break; case 0x05: - //投放任务开始 String putTask = DecodeData.decodePutTask(data); - log.info("投放任务开始 ===> " + putTask); + log.setMessage("投放任务开始"); task.setTaskType("5"); task.setTaskData(putTask); taskService.save(task); break; case 0x0F: - //任务终止 - log.info("任务终止 ===> robotId: " + robotId); + log.setMessage("任务终止"); taskService.updateTaskById(robotId); break; default: @@ -187,7 +187,8 @@ * 方舱通过Socket发送短信给203后台，然后203后台将短信内容加密之后用卫星发送给203自己的岸基软件，然后解密之后再传给西工大岸基软件 * */ String decodeSMS = DecodeData.decodeSMS(data); - log.info("decodeSMS ===> " + decodeSMS); + log.setMessage(decodeSMS); + System.out.println("decodeSMS ===> " + decodeSMS); /** * 与卫星通信 @@ -199,10 +200,9 @@ ctx.write(EncodeData.encodeSMS(decodeSMS)); break; case 0x05: - //环境数据请求 String envRequest = DecodeData.decodeEnvRequest(data); + log.setMessage("机器人请求环境数据"); //{"hour":"12","lng":109.32222199129043,"lat":17.39223199775081} - log.info("envRequest ===> " + envRequest); JSONObject envJsonObject = JSON.parseObject(envRequest); String hour = envJsonObject.getString("hour"); @@ -244,13 +244,11 @@ objectMap = EncodeData.encodeEnvironment(envLng, envLat, detailDTO, date, "0", hour); } - log.info(JSON.toJSONString(objectMap)); ctx.writeAndFlush(JSON.toJSONString(objectMap)); break; case 0x06: - //AIS数据请求 String aisRequest = DecodeData.decodeAISRequest(data); - log.info("aisRequest ===> " + aisRequest); + log.setMessage("机器人请求AIS数据请求"); //{"radius":58,"lng":109.32222199129043,"lat":17.39223199775081,"age":12} JSONObject aisJsonObject = JSON.parseObject(aisRequest); @@ -270,19 +268,18 @@ String requestValue = aisLat * 600000 + "," + aisLng * 600000 + "," + radius; List ships = shipService.shipsInCircle(requestValue, age); - log.info(JSON.toJSONString(ships)); Map map = EncodeData.encodeAIS(aisLng, aisLat, ships); ctx.writeAndFlush(JSON.toJSONString(map)); break; case 0x07: - //方舱位置 ShelterPosition shelterPosition = DecodeData.decodeShelterPosition(data); - log.info("shelterPosition ===> " + JSON.toJSONString(shelterPosition)); + log.setMessage("方舱位置"); shelterPositionService.save(shelterPosition); break; default: break; } } + logService.save(log); } }