From 43e16c94183714d698ad2323c092c0d47a192589 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 5 Dec 2023 15:37:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=81=BF=E8=83=BD=E4=BA=91=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/pojo/vo/LineDetailVO.java | 3 -- .../controller/HistoryResultController.java | 5 +- .../mapping/RStatLimitTargetDMapper.xml | 46 ++++++++++--------- .../com/njcn/user/api/UserFeignClient.java | 2 +- .../njcn/user/controller/UserController.java | 7 ++- 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailVO.java index c18d2de0b..e60f32fca 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailVO.java @@ -43,9 +43,6 @@ public class LineDetailVO implements Serializable { @ApiModelProperty("监测点Id") private String lineId; - @ApiModelProperty("监测点名称") - private String lineName; - @ApiModelProperty("测量间隔（1-10分钟）") private Integer timeInterval; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java index 7f860c3b3..d4fec6599 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java @@ -108,8 +108,9 @@ public class HistoryResultController extends BaseController { String methodDescribe = getMethodDescribe("getLinesTarget"); List list = limitRateDService.list(new LambdaQueryWrapper() .in(RStatLimitRateDPO::getLineId, param.getIds()) - .in(RStatLimitRateDPO::getTime, param.getStartTime()) - .in(RStatLimitRateDPO::getTime, param.getEndTime()) + .eq(RStatLimitRateDPO::getPhasicType, "T") + .ge(RStatLimitRateDPO::getTime, param.getStartTime()) + .le(RStatLimitRateDPO::getTime, param.getEndTime()) ); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml index 214536fd6..7b666cff4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml @@ -232,27 +232,31 @@ diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java index abc264d28..20056f7cd 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java @@ -70,6 +70,6 @@ public interface UserFeignClient { * @param deptId * @return */ - @GetMapping("/getUserByDeptIds") + @PostMapping("/getUserByDeptIds") HttpResult> getUserByDeptIds(@RequestBody List deptId); } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java index 80c5e92fa..7c63cb2b5 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java @@ -419,6 +419,9 @@ public class UserController extends BaseController { String methodDescribe = getMethodDescribe("getUserByIdList"); List users = userService.list((new LambdaQueryWrapper() .in(CollUtil.isNotEmpty(ids),User::getId,ids) + .isNotNull(User::getDeptId) + .ne(User::getDeptId,"") + .ne(User::getState,"0") )); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe); } @@ -456,11 +459,11 @@ public class UserController extends BaseController { * @return */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @GetMapping("/getUserByDeptIds") + @PostMapping("/getUserByDeptIds") @ApiOperation("根据部门ids查询用户信息") @ApiImplicitParam(name = "deptId", value = "用户部门id", required = true) public HttpResult> getUserByDeptIds(@RequestBody List deptId) { - String methodDescribe = getMethodDescribe("getUpByDeptIds"); + String methodDescribe = getMethodDescribe("getUserByDeptIds"); List users = userService.list(new LambdaQueryWrapper() .in(User::getDeptId,deptId) .eq(User::getSmsNotice,1)