skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/controller/SmLogManageController.java
@@ -3,11 +3,15 @@ import cn.gistack.sm.log.entity.SmLogManage; import cn.gistack.sm.log.service.ISmLogManageService; 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.springblade.core.tool.utils.ObjectUtil; import org.springframework.web.bind.annotation.*; @@ -34,6 +38,16 @@ 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){ skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.java
@@ -3,7 +3,9 @@ import cn.gistack.sm.log.entity.SmLogManage; import cn.gistack.sm.log.vo.AppStatistics; import cn.gistack.sm.log.vo.AppStatisticsVO; import cn.gistack.sm.log.vo.SmLogManageVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,4 +21,6 @@ List<AppStatistics> getAppStatistics(@Param("vo") AppStatisticsVO appStatisticsVO); Integer getAppUserNum(); List<SmLogManageVO> selectMyPage(IPage<SmLogManageVO> page, @Param("vo") SmLogManageVO smLogManage); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
@@ -16,7 +16,7 @@ COUNT(*), to_char(create_time,'yyyy-mm-dd') AS useTime, CREATE_USER FROM SK002.SM_LOG_MANAGE FROM SM_LOG_MANAGE WHERE IS_DELETED = 0 AND SOURCE = 'APP' <if test="vo.startTime !=null and vo.startTime !=''"> AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{vo.startTime} @@ -28,4 +28,16 @@ ) A GROUP BY A.useTime </select> <select id="selectMyPage" resultType="cn.gistack.sm.log.vo.SmLogManageVO"> SELECT L.*,U.real_name createUserName FROM SM_LOG_MANAGE L LEFT JOIN BLADE_USER U ON U.ID = L.CREATE_USER WHERE L.IS_DELETED = 0 <if test="vo.createUserName !=null and vo.createUserName !=''"> AND U.REAL_NAME LIKE CONCAT('%',#{vo.createUserName},'%') </if> <if test="vo.operationDescription !=null and vo.operationDescription !=''"> AND L.OPERATION_DESCRIPTION LIKE CONCAT('%',#{vo.operationDescription},'%') </if> ORDER BY L.CREATE_TIME DESC </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/service/ISmLogManageService.java
@@ -3,6 +3,8 @@ import cn.gistack.sm.log.entity.SmLogManage; import cn.gistack.sm.log.vo.AppStatistics; import cn.gistack.sm.log.vo.AppStatisticsVO; import cn.gistack.sm.log.vo.SmLogManageVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; /** @@ -14,4 +16,6 @@ */ public interface ISmLogManageService extends BaseService<SmLogManage> { AppStatisticsVO getAppStatistics(AppStatisticsVO appStatisticsVO); IPage<SmLogManageVO> selectPage(IPage<SmLogManageVO> page, SmLogManageVO smLogManage); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/service/impl/ISmLogManageServiceImpl.java
@@ -5,7 +5,9 @@ import cn.gistack.sm.log.service.ISmLogManageService; import cn.gistack.sm.log.vo.AppStatistics; import cn.gistack.sm.log.vo.AppStatisticsVO; import cn.gistack.sm.log.vo.SmLogManageVO; import cn.gistack.system.user.feign.IUserClient; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; @@ -36,4 +38,9 @@ appStatisticsVO.setList(appStatistics); return appStatisticsVO; } @Override public IPage<SmLogManageVO> selectPage(IPage<SmLogManageVO> page, SmLogManageVO smLogManage) { return page.setRecords(baseMapper.selectMyPage(page,smLogManage)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/vo/SmLogManageVO.java
New file @@ -0,0 +1,12 @@ package cn.gistack.sm.log.vo; import cn.gistack.sm.log.entity.SmLogManage; import lombok.Data; @Data public class SmLogManageVO extends SmLogManage { /** * 访问人 */ private String createUserName; }
