Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.灿能云部分远程接口调整

Browse Source
This commit is contained in:
wr
2023-12-05 15:37:03 +08:00
parent 7aeb215809
commit 43e16c9418
5 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailVO.java
View File

@@ -43,9 +43,6 @@ public class LineDetailVO implements Serializable {
@ApiModelProperty("监测点Id") @ApiModelProperty("监测点Id")
private String lineId; private String lineId;
@ApiModelProperty("监测点名称")
private String lineName;
@ApiModelProperty("测量间隔（1-10分钟）") @ApiModelProperty("测量间隔（1-10分钟）")
private Integer timeInterval; private Integer timeInterval;

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java
View File

@@ -108,8 +108,9 @@ public class HistoryResultController extends BaseController {
String methodDescribe = getMethodDescribe("getLinesTarget"); String methodDescribe = getMethodDescribe("getLinesTarget");
List<RStatLimitRateDPO> list = limitRateDService.list(new LambdaQueryWrapper<RStatLimitRateDPO>() List<RStatLimitRateDPO> list = limitRateDService.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
.in(RStatLimitRateDPO::getLineId, param.getIds()) .in(RStatLimitRateDPO::getLineId, param.getIds())
.in(RStatLimitRateDPO::getTime, param.getStartTime()) .eq(RStatLimitRateDPO::getPhasicType, "T")
.in(RStatLimitRateDPO::getTime, param.getEndTime()) .ge(RStatLimitRateDPO::getTime, param.getStartTime())
.le(RStatLimitRateDPO::getTime, param.getEndTime())
); );
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);

46
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
View File

@@ -232,27 +232,31 @@
</where> </where>
</select> </select>
<select id="getLinesTarget" resultType="java.lang.String"> <select id="getLinesTarget" resultType="java.lang.String">
SELECT select
my_index my_index
FROM from (
r_stat_limit_target_d SELECT
<where> my_index,
<if test=" ids != null and ids.size > 0"> sum( all_time ) AS allCount
AND my_index IN FROM
<foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'> r_stat_limit_target_d
#{item} <where>
</foreach> <if test=" ids != null and ids.size > 0">
</if> AND my_index IN
<if test=" startTime != null and startTime !=''"> <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
AND time_id >= #{startTime} #{item}
</if> </foreach>
<if test="endTime != null and endTime != ''"> </if>
AND time_id &lt;= #{endTime} <if test=" startTime != null and startTime !=''">
</if> AND time_id >= #{startTime}
</where> </if>
GROUP BY <if test="endTime != null and endTime != ''">
my_index AND time_id &lt;= #{endTime}
HAVING </if>
allCount >0 </where>
GROUP BY
my_index
HAVING
allCount >0) a
</select> </select>
</mapper> </mapper>

2
pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java
View File

@@ -70,6 +70,6 @@ public interface UserFeignClient {
* @param deptId * @param deptId
* @return * @return
*/ */
@GetMapping("/getUserByDeptIds") @PostMapping("/getUserByDeptIds")
HttpResult<List<User>> getUserByDeptIds(@RequestBody List<String> deptId); HttpResult<List<User>> getUserByDeptIds(@RequestBody List<String> deptId);
} }

7
pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
View File

@@ -419,6 +419,9 @@ public class UserController extends BaseController {
String methodDescribe = getMethodDescribe("getUserByIdList"); String methodDescribe = getMethodDescribe("getUserByIdList");
List<User> users = userService.list((new LambdaQueryWrapper<User>() List<User> users = userService.list((new LambdaQueryWrapper<User>()
.in(CollUtil.isNotEmpty(ids),User::getId,ids) .in(CollUtil.isNotEmpty(ids),User::getId,ids)
.isNotNull(User::getDeptId)
.ne(User::getDeptId,"")
.ne(User::getState,"0")
)); ));
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe);
} }
@@ -456,11 +459,11 @@ public class UserController extends BaseController {
* @return * @return
*/ */
@OperateInfo(info = LogEnum.SYSTEM_COMMON) @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/getUserByDeptIds") @PostMapping("/getUserByDeptIds")
@ApiOperation("根据部门ids查询用户信息") @ApiOperation("根据部门ids查询用户信息")
@ApiImplicitParam(name = "deptId", value = "用户部门id", required = true) @ApiImplicitParam(name = "deptId", value = "用户部门id", required = true)
public HttpResult<List<User>> getUserByDeptIds(@RequestBody List<String> deptId) { public HttpResult<List<User>> getUserByDeptIds(@RequestBody List<String> deptId) {
String methodDescribe = getMethodDescribe("getUpByDeptIds"); String methodDescribe = getMethodDescribe("getUserByDeptIds");
List<User> users = userService.list(new LambdaQueryWrapper<User>() List<User> users = userService.list(new LambdaQueryWrapper<User>()
.in(User::getDeptId,deptId) .in(User::getDeptId,deptId)
.eq(User::getSmsNotice,1) .eq(User::getSmsNotice,1)