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")
private String lineId;
@ApiModelProperty("监测点名称")
private String lineName;
@ApiModelProperty("测量间隔（1-10分钟）")
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");
List<RStatLimitRateDPO> list = limitRateDService.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
.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);

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

@@ -232,27 +232,31 @@
</where>
</select>
<select id="getLinesTarget" resultType="java.lang.String">
SELECT
select
my_index
FROM
r_stat_limit_target_d
<where>
<if test=" ids != null and ids.size > 0">
AND my_index IN
<foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test=" startTime != null and startTime !=''">
AND time_id >= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
AND time_id &lt;= #{endTime}
</if>
</where>
GROUP BY
my_index
HAVING
allCount >0
from (
SELECT
my_index,
sum( all_time ) AS allCount
FROM
r_stat_limit_target_d
<where>
<if test=" ids != null and ids.size > 0">
AND my_index IN
<foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test=" startTime != null and startTime !=''">
AND time_id >= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
AND time_id &lt;= #{endTime}
</if>
</where>
GROUP BY
my_index
HAVING
allCount >0) a
</select>
</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
* @return
*/
@GetMapping("/getUserByDeptIds")
@PostMapping("/getUserByDeptIds")
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");
List<User> users = userService.list((new LambdaQueryWrapper<User>()
.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<List<User>> getUserByDeptIds(@RequestBody List<String> deptId) {
String methodDescribe = getMethodDescribe("getUpByDeptIds");
String methodDescribe = getMethodDescribe("getUserByDeptIds");
List<User> users = userService.list(new LambdaQueryWrapper<User>()
.in(User::getDeptId,deptId)
.eq(User::getSmsNotice,1)