From 3acc4cdc76da98a472ccd4a43abb343cbc72306f Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Wed, 30 Aug 2023 19:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/equipment/CsLogController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsLogController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsLogController.java index 2eb5662..be4b66b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsLogController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsLogController.java @@ -1,5 +1,6 @@ package com.njcn.csdevice.controller.equipment; +import com.alibaba.fastjson.JSONArray; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.dto.DeviceLogDTO; @@ -11,6 +12,7 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.pojo.param.CsMarketDataParam; import com.njcn.csdevice.pojo.po.CsLogsPO; import com.njcn.csdevice.service.impl.CsLogsPOService; +import com.njcn.user.enums.AppRoleEnum; import com.njcn.web.controller.BaseController; import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.utils.RequestUtil; @@ -19,6 +21,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -61,9 +65,12 @@ public class CsLogController extends BaseController { @ApiImplicitParam(name = "baseParam", value = "查询日志参数", required = true) public HttpResult> queryLog(@RequestBody BaseParam baseParam){ String username = RequestUtil.getUsername(); + String userRole = RequestUtil.getUserRole(); + List strings = JSONArray.parseArray(userRole, String.class); String methodDescribe = getMethodDescribe("queryLog"); - List list = csLogsPOService.lambdaQuery().eq(CsLogsPO::getUserName, username). - between(CsLogsPO::getCreateTime,baseParam.getSearchBeginTime(),baseParam.getSearchEndTime()).list(); + List list = csLogsPOService.lambdaQuery().eq(!strings.contains(AppRoleEnum.OPERATION_MANAGER.getCode()),CsLogsPO::getUserName, username). + ge(StringUtils.isNotBlank(baseParam.getSearchBeginTime()),CsLogsPO::getCreateTime,baseParam.getSearchBeginTime()). + le(StringUtils.isNotBlank(baseParam.getSearchEndTime()),CsLogsPO::getCreateTime,baseParam.getSearchEndTime()).orderByDesc(CsLogsPO::getCreateTime).list(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); }