From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/controller/SmLogManageController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/controller/SmLogManageController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/controller/SmLogManageController.java
index f464efe..966b9b8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/controller/SmLogManageController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/controller/SmLogManageController.java
@@ -2,16 +2,22 @@
import cn.gistack.sm.log.entity.SmLogManage;
import cn.gistack.sm.log.service.ISmLogManageService;
+import cn.gistack.sm.log.util.IpUtils;
+import cn.gistack.sm.log.vo.AppStatisticsVO;
+import cn.gistack.sm.log.vo.SmLogManageVO;
import cn.gistack.sm.patrol.entity.PatrolConfig;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @ClassName 日志管理
@@ -31,8 +37,25 @@
@ApiOperation(value="日志管理-添加", notes="日志管理-添加")
@PostMapping(value = "/add")
- public R add(@RequestBody SmLogManage smLogManage) {
+ public R add(@RequestBody SmLogManage smLogManage, HttpServletRequest request) {
+ smLogManage.setIp(IpUtils.getIpAddr(request));
return R.data(smLogManageService.save(smLogManage));
}
+ @ApiOperation(value="日志管理-分页查询", notes="日志管理-分页查询")
+ @GetMapping(value = "/page")
+ public R page(SmLogManageVO smLogManage, Query query) {
+// IPage<SmLogManage> page = smLogManageService.page(Condition.getPage(query), Condition.getQueryWrapper(smLogManage).orderByDesc("create_time"));
+
+ IPage<SmLogManageVO> page = smLogManageService.selectPage(Condition.getPage(query),smLogManage);
+
+ return R.data(page);
+ }
+
+ @ApiOperation(value="查询app使用人数", notes="查询app使用人数")
+ @GetMapping(value = "/getAppStatistics")
+ public R getAppStatistics(AppStatisticsVO appStatisticsVO){
+ return R.data(smLogManageService.getAppStatistics(appStatisticsVO));
+ }
+
}
--
Gitblit v1.9.3