From ceafeccc436416c926960e5f5a398d0c31aba630 Mon Sep 17 00:00:00 2001 From: pepsi Date: Sat, 8 Oct 2022 16:17:58 +0800 Subject: [PATCH] modify project name & devops config --- Dockerfile | 2 +- .../log/platform/client/feign/XLogApi.java | 2 +- .../controller/api/OperateLogController.java | 21 ++++++++++++++++--- .../dto/OperateLogQueryDetailRespDTO.java | 10 +++++++++ .../server/dto/OperateLogQueryRespDTO.java | 6 ++++++ .../server/entity/OperateLogRecordEntity.java | 2 +- .../server/service/OperateLogService.java | 11 +++++++++- .../service/impl/OperateLogServiceImpl.java | 17 +++++++++++---- .../src/main/resources/bootstrap.yml | 2 +- .../server/service/OperateLogServiceTest.java | 2 +- 10 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryDetailRespDTO.java diff --git a/Dockerfile b/Dockerfile index 4fb9b8d..f760de7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM harbor.axzo.cn/images_base/jdk1.8-fc:v1 -COPY axzo-log-server/target/axzo-log-server.jar ./xlog.jar +COPY axzo-log-server/target/axzo-log-server.jar ./axzo-log-server.jar ENTRYPOINT [{ENTRYPOINT}] diff --git a/axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApi.java b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApi.java index 026b6e8..0bab777 100644 --- a/axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApi.java +++ b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApi.java @@ -18,7 +18,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; * @description: TODO * @date: 2022/9/16 */ -@FeignClient(name = "xlog", url = "http://xlog:8080", fallbackFactory = XLogApiFallback.class) +@FeignClient(name = "log-plat", url = "http://log-plat:8080", fallbackFactory = XLogApiFallback.class) public interface XLogApi { @PostMapping(value = "/api/operateLog/create", consumes = APPLICATION_JSON_VALUE) diff --git a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java index c6f864f..0af05a9 100644 --- a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java @@ -1,5 +1,6 @@ package cn.axzo.log.platform.server.controller.api; +import cn.axzo.log.platform.server.dto.OperateLogQueryDetailRespDTO; import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO; import cn.axzo.log.platform.server.dto.OperateLogReqDTO; @@ -39,7 +40,8 @@ public class OperateLogController { @RequestMapping(value = "/operateLog/create", method = RequestMethod.POST) @ApiOperation(value = "操作日志创建") - public CommonResponse operateLogCreate(@RequestBody @Valid OperateLogReqDTO req, BindingResult bindingResult) { + public CommonResponse operateLogCreate(@RequestBody @Valid OperateLogReqDTO req, + BindingResult bindingResult) { //参数缺失等返回 if (bindingResult.hasErrors()) { return CommonResponse.fail(bindingResult.getAllErrors().get(0).getDefaultMessage()); @@ -60,17 +62,30 @@ public class OperateLogController { if (bindingResult.hasErrors()) { return CommonResponse.fail(bindingResult.getAllErrors().get(0).getDefaultMessage()); } - //时间跨度校验 + //时间跨度校验。 if (DateUtil.betweenDay(req.getStartTime(), req.getEndTime(), true) > 7) { logger.error("start and end date interval greater than 7."); return CommonResponse.fail("the time span is greater than 7"); } try { - CommonPageResponse resp = operateLogService.queryForPageFromEs(req); + CommonPageResponse resp = operateLogService.queryForPage(req); return CommonResponse.success(resp); } catch (Exception e) { logger.error("query operate logs failed,", e); return CommonResponse.fail(e.getMessage()); } } + + + @RequestMapping(value = "/operateLog/queryDetail", method = RequestMethod.GET) + @ApiOperation(value = "操作日志详情查询") + public CommonResponse operateLogDetail(Long id) { + try { + OperateLogQueryDetailRespDTO detail = operateLogService.queryOperateLogDetail(id); + return CommonResponse.success(detail); + } catch (Exception e) { + return CommonResponse.fail(e.getMessage()); + } + + } } diff --git a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryDetailRespDTO.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryDetailRespDTO.java new file mode 100644 index 0000000..eb60451 --- /dev/null +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryDetailRespDTO.java @@ -0,0 +1,10 @@ +package cn.axzo.log.platform.server.dto; + +/*** + * @author: pepsi + * @description: 操作日志详情返回 + * @date: 2022/10/8 + */ +public class OperateLogQueryDetailRespDTO { + +} diff --git a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryRespDTO.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryRespDTO.java index 56a15dd..eb3740e 100644 --- a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryRespDTO.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryRespDTO.java @@ -14,6 +14,12 @@ import java.util.Date; @Data public class OperateLogQueryRespDTO { + /** + * 记录ID + */ + @ApiModelProperty(value = "ID", position = 0) + private int id; + /** * 操作人 */ diff --git a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/OperateLogRecordEntity.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/OperateLogRecordEntity.java index 7c78196..6435065 100644 --- a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/OperateLogRecordEntity.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/OperateLogRecordEntity.java @@ -18,7 +18,7 @@ import java.util.Date; @Setter @ToString @EqualsAndHashCode(callSuper = true) -@TableName("unified_log_record") +@TableName("log_record") public class OperateLogRecordEntity extends BaseEntity { /** * 调用方服务名 diff --git a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/OperateLogService.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/OperateLogService.java index b0306be..913208d 100644 --- a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/OperateLogService.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/OperateLogService.java @@ -1,5 +1,6 @@ package cn.axzo.log.platform.server.service; +import cn.axzo.log.platform.server.dto.OperateLogQueryDetailRespDTO; import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO; import cn.axzo.log.platform.server.dto.OperateLogReqDTO; @@ -24,7 +25,7 @@ public interface OperateLogService { * @param req * @return */ - CommonPageResponse queryForPage(OperateLogQueryReqDTO req); + CommonPageResponse queryForPage(OperateLogQueryReqDTO req) throws Exception; /** * query from es @@ -34,4 +35,12 @@ public interface OperateLogService { * @throws Exception */ CommonPageResponse queryForPageFromEs(OperateLogQueryReqDTO req) throws Exception; + + /** + * 查询每个日志的详情 + * + * @param id + * @return + */ + OperateLogQueryDetailRespDTO queryOperateLogDetail(Long id); } diff --git a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java index fd2f680..e294c8c 100644 --- a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java @@ -8,6 +8,7 @@ import cn.axzo.basics.organizational.api.OrganizationalUnitApi; import cn.axzo.basics.organizational.api.vo.response.OrganizationalUnitVO; import cn.axzo.basics.profiles.api.UserProfileServiceApi; import cn.axzo.basics.profiles.dto.basic.IdentityProfileDto; +import cn.axzo.log.platform.server.dto.OperateLogQueryDetailRespDTO; import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO; import cn.axzo.log.platform.server.dto.OperateLogReqDTO; @@ -110,9 +111,8 @@ public class OperateLogServiceImpl extends BaseEsService implements OperateLogSe } private OperateLogRecordEntity fieldFill(OperateLogReqDTO req) { - //补充 termimnal identityType featureName + //补充 termimnal identityType featureName. OperateLogRecordEntity unifiedLogRecord = operateLogConverter.toEntity(req); - // 通过接口调用，获取用户手机姓名 IdentityProfileDto identityProfile = qryIdentityProfile(req.getIdentityId(), req.getIdentityType()); if (identityProfile != null && identityProfile.getPersonProfile() != null) { @@ -128,8 +128,11 @@ public class OperateLogServiceImpl extends BaseEsService implements OperateLogSe } @Override - public CommonPageResponse queryForPage(OperateLogQueryReqDTO req) { - //todo 转 entity 对象 + public CommonPageResponse queryForPage(OperateLogQueryReqDTO req) throws Exception { + //这里做个区分。时从ES查询获取还是从DB获取. + if (esStorageFlag) { + return queryForPageFromEs(req); + } IPage page = operateLogRepository.pageLogRecord(req); //为空则返回空 List recordList = page.getRecords(); @@ -172,6 +175,12 @@ public class OperateLogServiceImpl extends BaseEsService implements OperateLogSe return CommonPageResponse.list(req.getPage(), req.getPageSize(), hits.getTotalHits().value, respList); } + @Override + public OperateLogQueryDetailRespDTO queryOperateLogDetail(Long id) { + //todo + return null; + } + /*** * 获取2个时间段之间的索引。startTime + 7 < endTime 即可。 * @param startDate diff --git a/axzo-log-server/src/main/resources/bootstrap.yml b/axzo-log-server/src/main/resources/bootstrap.yml index 55209ef..148622f 100644 --- a/axzo-log-server/src/main/resources/bootstrap.yml +++ b/axzo-log-server/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: application: - name: xlog + name: axzo-log-plat cloud: nacos: config: diff --git a/axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/OperateLogServiceTest.java b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/OperateLogServiceTest.java index f48acd0..8ecfd29 100644 --- a/axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/OperateLogServiceTest.java +++ b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/OperateLogServiceTest.java @@ -73,7 +73,7 @@ public class OperateLogServiceTest extends XlogApplicationTestBase { } @Test - public void testPageQuery() { + public void testPageQuery() throws Exception { OperateLogQueryReqDTO req = new OperateLogQueryReqDTO(); req.setPage(1L); req.setPageSize(3L);