Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(service): 实现分页功能并优化设备权限管理

Browse Source 
- 在控制器层添加分页支持，将返回类型从 List 修改为 Page
- 实现服务层分页逻辑，集成 MyBatis Plus 分页插件
- 重构设备权限管理逻辑，区分超级管理员、普通用户和游客权限
- 添加营销用户和工程用户的特殊权限处理机制
- 迁移事件查询逻辑到统一的事件用户服务中
- 移除过时的设备用户映射器接口和 XML 查询方法
- 为暂降事件报告添加动态文件名生成功能
- 修复时间范围计算中的日期边界问题
- 优化台账树结构以支持多层级权限过滤
- 统计未读事件数量的查询逻辑优化
This commit is contained in:
xy
2026-04-14 19:09:23 +08:00
parent 460a10f3b5
commit e77108ebf5
33 changed files with 778 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsAlarmController.java
View File

@@ -2,6 +2,7 @@ package com.njcn.csharmonic.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -42,9 +43,9 @@ public class CsAlarmController extends BaseController {
@PostMapping("/queryAlarmList")
@ApiOperation("运行告警事件列表(app)")
@ApiImplicitParam(name = "param", value = "事件查询参数", required = true)
public HttpResult<List<AlarmVO>> queryAlarmList(@RequestBody LineParamDTO param) {
public HttpResult<Page<AlarmVO>> queryAlarmList(@RequestBody LineParamDTO param) {
String methodDescribe = getMethodDescribe("queryAlarmList");
List<AlarmVO> result = csAlarmService.queryAlarmList(param);
Page<AlarmVO> result = csAlarmService.queryAlarmList(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

31
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicController.java
View File

@@ -2,6 +2,7 @@ package com.njcn.csharmonic.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -42,17 +43,17 @@ public class CsHarmonicController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryHarmonicList")
@ApiOperation("稳态事件列表(app)")
@ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true)
public HttpResult<HarmonicVO> queryHarmonicList(@RequestBody LineParamDTO param) {
@ApiImplicitParam(name = "param", value = "事件查询参数", required = true)
public HttpResult<Page<HarmonicVO.LineHarmonicDetail>> queryHarmonicList(@RequestBody LineParamDTO param) {
String methodDescribe = getMethodDescribe("queryHarmonicList");
HarmonicVO vo = csHarmonicService.queryAppList(param);
Page<HarmonicVO.LineHarmonicDetail> vo = csHarmonicService.queryAppList(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryHarmonicDetail")
@ApiOperation("稳态事件详情(app)")
@ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true)
@ApiImplicitParam(name = "param", value = "事件查询参数", required = true)
public HttpResult<List<HarmonicDetailVO>> queryHarmonicDetail(@RequestBody LineParamDTO param) {
String methodDescribe = getMethodDescribe("queryHarmonicDetail");
List<HarmonicDetailVO> vo = csHarmonicService.queryHarmonicDetail(param);
@@ -62,7 +63,7 @@ public class CsHarmonicController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/addList")
@ApiOperation("批量写入数据")
@ApiImplicitParam(name = "list", value = "暂降事件查询参数", required = true)
@ApiImplicitParam(name = "list", value = "事件查询参数", required = true)
public HttpResult<Boolean> addList(@RequestBody List<CsHarmonic> list) {
String methodDescribe = getMethodDescribe("addList");
boolean result = csHarmonicService.saveOrUpdateBatch(list);
@@ -93,5 +94,25 @@ public class CsHarmonicController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryAppHarmonicCounts")
@ApiOperation("查询App稳态事件总数")
@ApiImplicitParam(name = "param", value = "事件查询参数", required = true)
public HttpResult<HarmonicVO> queryAppHarmonicCounts(@RequestBody LineParamDTO param) {
String methodDescribe = getMethodDescribe("queryAppHarmonicCounts");
HarmonicVO vo = csHarmonicService.queryAppHarmonicCounts(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryAppHarmonicLine")
@ApiOperation("查询App稳态越限监测点")
@ApiImplicitParam(name = "param", value = "事件查询参数", required = true)
public HttpResult<Page<HarmonicVO.LineHarmonicOverDays>> queryAppHarmonicLine(@RequestBody LineParamDTO param) {
String methodDescribe = getMethodDescribe("queryAppHarmonicLine");
Page<HarmonicVO.LineHarmonicOverDays> result = csHarmonicService.queryAppHarmonicLine(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

55
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java
View File

@@ -7,12 +7,14 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csharmonic.mapper.CsEventUserPOMapper;
import com.njcn.csharmonic.param.CldWarnParam;
import com.njcn.csharmonic.param.CsEventUserQueryPage;
import com.njcn.csharmonic.param.CsEventUserQueryParam;
import com.njcn.csharmonic.pojo.po.CsEventPO;
import com.njcn.csharmonic.pojo.po.CsEventUserPO;
import com.njcn.csharmonic.pojo.vo.EventDetailVO;
import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO;
import com.njcn.csharmonic.service.CsEventUserPOService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
@@ -40,7 +42,10 @@ import java.util.List;
@Api(tags = "事件")
@AllArgsConstructor
public class EventUserController extends BaseController {
private final CsEventUserPOService csEventUserPOService;
private final CsEventUserPOMapper csEventUserPOMapper;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryEvent")
@ApiOperation("暂降事件未读消息")
@@ -120,4 +125,54 @@ public class EventUserController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryTempEvent")
@ApiOperation("查询暂态事件(未读)")
@ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true)
public HttpResult<List<String>> queryTempEvent(@RequestBody CsEventUserQueryParam param) {
String methodDescribe = getMethodDescribe("queryTempEvent");
List<String> result = csEventUserPOMapper.queryTempEvent(param.getUserId(), param.getStartTime(), param.getEndTime(), param.getEventIds());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryTempHarmonic")
@ApiOperation("查询稳态事件(未读)")
@ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true)
public HttpResult<List<String>> queryTempHarmonic(@RequestBody CsEventUserQueryParam param) {
String methodDescribe = getMethodDescribe("queryTempEvent");
List<String> result = csEventUserPOMapper.queryTempHarmonic(param.getUserId(), param.getStartTime(), param.getEndTime(), param.getEventIds());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryAlarmEvent")
@ApiOperation("查询告警事件(未读)")
@ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true)
public HttpResult<List<String>> queryAlarmEvent(@RequestBody CsEventUserQueryParam param) {
String methodDescribe = getMethodDescribe("queryAlarmEvent");
List<String> result = csEventUserPOMapper.queryAlarmEvent(param.getUserId(), param.getStartTime(), param.getEndTime(), param.getEventIds());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryRunEvent")
@ApiOperation("查询运行事件(未读)")
@ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true)
public HttpResult<List<String>> queryRunEvent(@RequestBody CsEventUserQueryParam param) {
String methodDescribe = getMethodDescribe("queryRunEvent");
List<String> result = csEventUserPOMapper.queryRunEvent(param.getUserId(), param.getStartTime(), param.getEndTime(), param.getEventIds());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryAppEventCounts")
@ApiOperation("查询App暂态事件总数")
@ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true)
public HttpResult<EventStatisticVO> queryAppEventCounts(@RequestBody CsEventUserQueryPage param) {
String methodDescribe = getMethodDescribe("queryAppEventCounts");
EventStatisticVO result = csEventUserPOService.queryAppEventCounts(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

15
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java
View File

@@ -7,6 +7,7 @@ import com.njcn.csharmonic.param.CsEventUserQueryParam;
import com.njcn.csharmonic.pojo.dto.UnReadEventDto;
import com.njcn.csharmonic.pojo.po.CsEventUserPO;
import com.njcn.csharmonic.pojo.vo.EventDetailVO;
import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -35,4 +36,18 @@ public interface CsEventUserPOMapper extends BaseMapper<CsEventUserPO> {
Page<EventDetailVO> queryEventPageWeb(Page<EventDetailVO> returnpage,@Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage,@Param("devIds") List<String> collect);
//查询暂态事件(未读)
List<String> queryTempEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
//查询稳态事件(未读)
List<String> queryTempHarmonic(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
//查询告警事件(未读)
List<String> queryAlarmEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
//查询运行事件(未读)
List<String> queryRunEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
EventStatisticVO getEventCounts(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
}

11
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsHarmonicMapper.java
View File

@@ -1,7 +1,12 @@
package com.njcn.csharmonic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.csharmonic.pojo.po.CsHarmonic;
import com.njcn.csharmonic.pojo.vo.HarmonicVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,4 +18,10 @@ import com.njcn.csharmonic.pojo.po.CsHarmonic;
*/
public interface CsHarmonicMapper extends BaseMapper<CsHarmonic> {
HarmonicVO getHarmonicCounts(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
List<String> getOverDays(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
Page<HarmonicVO.LineHarmonicOverDays> getLineHarmonicOverDays(Page<HarmonicVO.LineHarmonicOverDays> page, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
}

85
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
View File

@@ -250,4 +250,89 @@
</if>
order by b.start_time desc
</select>
<select id="queryTempEvent" resultType="java.lang.String">
SELECT
t1.event_id
FROM
cs_event_user t1 right join cs_event t2 on t1.event_id = t2.id
WHERE
t1.user_id = #{userId}
and t1.`status`= 0
and t2.type = 0
<if test="ids != null and ids.size > 0">
and t2.line_id in
<foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="queryAlarmEvent" resultType="java.lang.String">
SELECT
t1.event_id
FROM
cs_event_user t1 right join cs_alarm t2 on t1.event_id = t2.id
WHERE
t1.user_id = #{userId}
and t1.`status`= 0
<if test="ids != null and ids.size > 0">
and (
<foreach collection="ids" item="tag" separator=" OR ">
FIND_IN_SET(#{tag}, t2.dev_list) > 0
</foreach>
)
</if>
</select>
<select id="queryRunEvent" resultType="java.lang.String">
SELECT
t1.event_id
FROM
cs_event_user t1 right join cs_event t2 on t1.event_id = t2.id
WHERE
t1.user_id = #{userId}
and t1.`status`= 0
and t2.type = 2
<if test="ids != null and ids.size > 0">
and t2.device_id in
<foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="queryTempHarmonic" resultType="java.lang.String">
SELECT
t1.event_id
FROM
cs_event_user t1 right join cs_harmonic t2 on t1.event_id = t2.id
WHERE
t1.user_id = #{userId}
and t1.`status`= 0
<if test="ids != null and ids.size > 0">
and t2.line_id in
<foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="getEventCounts" resultType="com.njcn.csharmonic.pojo.vo.event.EventStatisticVO">
SELECT
SUM(CASE WHEN tag = 'Evt_Sys_DipStr' THEN 1 ELSE 0 END) AS eventDown,
SUM(CASE WHEN tag = 'Evt_Sys_IntrStr' THEN 1 ELSE 0 END) AS eventOff,
SUM(CASE WHEN tag = 'Evt_Sys_SwlStr' THEN 1 ELSE 0 END) AS eventUp,
COUNT(*) AS allNum
FROM
cs_event
WHERE
type = 0
AND start_time BETWEEN #{startTime} AND #{endTime}
AND device_id IN
<foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
</mapper>

47
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsHarmonicMapper.xml Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.csharmonic.mapper.CsHarmonicMapper">
<select id="getHarmonicCounts" resultType="com.njcn.csharmonic.pojo.vo.HarmonicVO">
SELECT
COUNT(1) AS harmonicNums,
COUNT(DISTINCT TIME) AS overDays,
COUNT(DISTINCT line_id) AS overLineNums
FROM
cs_harmonic
WHERE
TIME BETWEEN #{startTime} AND #{endTime}
AND line_id IN
<foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
<select id="getOverDays" resultType="java.lang.String">
SELECT
DISTINCT time
FROM
cs_harmonic
WHERE
TIME BETWEEN #{startTime} AND #{endTime}
AND line_id IN
<foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
order by time asc
</select>
<select id="getLineHarmonicOverDays" resultType="com.njcn.csharmonic.pojo.vo.HarmonicVO$LineHarmonicOverDays">
SELECT
line_id lineId,
GROUP_CONCAT(DISTINCT time ORDER BY time SEPARATOR ', ') AS timeString
FROM cs_harmonic
WHERE TIME BETWEEN #{startTime} AND #{endTime}
AND line_id IN
<foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
GROUP BY line_id
</select>
</mapper>

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java
View File

@@ -9,6 +9,7 @@ import com.njcn.csharmonic.pojo.dto.UnReadEventDto;
import com.njcn.csharmonic.pojo.po.CsEventPO;
import com.njcn.csharmonic.pojo.po.CsEventUserPO;
import com.njcn.csharmonic.pojo.vo.EventDetailVO;
import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO;
import com.njcn.web.pojo.param.BaseParam;
import java.util.List;
@@ -46,5 +47,6 @@ public interface CsEventUserPOService extends IService<CsEventUserPO>{
*/
List<CsEventUserPO> queryEventListByUserId(String userIndex,List<String> eventList);
EventStatisticVO queryAppEventCounts(CsEventUserQueryPage csEventUserQueryPage);
}

3
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsAlarmService.java
View File

@@ -1,5 +1,6 @@
package com.njcn.csharmonic.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.csdevice.pojo.dto.LineParamDTO;
import com.njcn.csharmonic.pojo.po.CsAlarm;
@@ -17,7 +18,7 @@ import java.util.List;
*/
public interface ICsAlarmService extends IService<CsAlarm> {
List<AlarmVO> queryAlarmList(LineParamDTO param);
Page<AlarmVO> queryAlarmList(LineParamDTO param);
List<AlarmVO.AlarmDetail> queryAlarmDetail(LineParamDTO.DevParamDTO param);

7
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicService.java
View File

@@ -1,5 +1,6 @@
package com.njcn.csharmonic.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.csdevice.pojo.dto.LineParamDTO;
import com.njcn.csharmonic.pojo.po.CsHarmonic;
@@ -18,8 +19,12 @@ import java.util.List;
*/
public interface ICsHarmonicService extends IService<CsHarmonic> {
HarmonicVO queryAppList(LineParamDTO param);
Page<HarmonicVO.LineHarmonicDetail> queryAppList(LineParamDTO param);
List<HarmonicDetailVO> queryHarmonicDetail(LineParamDTO param);
HarmonicVO queryAppHarmonicCounts(LineParamDTO param);
Page<HarmonicVO.LineHarmonicOverDays> queryAppHarmonicLine(LineParamDTO param);
}

20
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsAlarmServiceImpl.java
View File

@@ -1,9 +1,11 @@
package com.njcn.csharmonic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -53,9 +55,9 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsAlarmMapper, CsAlarm> impl
private final EpdFeignClient epdFeignClient;
@Override
public List<AlarmVO> queryAlarmList(LineParamDTO param) {
List<AlarmVO> result = new ArrayList<>();
public Page<AlarmVO> queryAlarmList(LineParamDTO param) {
Page<AlarmVO> page1 = new Page<>();
Page<CsAlarm> page2 = new Page<> (param.getPageNum(), param.getPageSize());
List<CsLedger> lineLedger = csLedgerFeignClient.queryLine(param).getData();
if (CollectionUtil.isNotEmpty(lineLedger)) {
List<CsLedger> devLedger = new ArrayList<>();
@@ -69,7 +71,6 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsAlarmMapper, CsAlarm> impl
});
});
if (CollectionUtil.isNotEmpty(devLedger)) {
List<String> ownerDevList = csCommTerminalFeignClient.getDevIdsByUser(RequestUtil.getUserIndex()).getData();
List<String> devList = devLedger.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList());
@@ -87,14 +88,16 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsAlarmMapper, CsAlarm> impl
queryWrapper.ge(StrUtil.isNotBlank(param.getTime()), CsAlarm::getTime, calculateMonthStart(param.getTime()))
.le(StrUtil.isNotBlank(param.getTime()), CsAlarm::getTime, calculateMonthEnd(param.getTime()))
.orderByDesc(CsAlarm::getTime);
//先获取设备通讯数据
List<CsAlarm> list = list(queryWrapper);
Page<CsAlarm> csAlarmPage = this.baseMapper.selectPage(page2,queryWrapper);
BeanUtil.copyProperties(csAlarmPage, page1);
List<CsAlarm> list = csAlarmPage.getRecords();
if (CollectionUtil.isNotEmpty(list)) {
//获取用户推送事件
List<CsEventUserPO> userEvents = csEventUserPOService.queryEventListByUserId(RequestUtil.getUserIndex(), list.stream().map(CsAlarm::getId).collect(Collectors.toList()));
List<String> finalDevList = devList;
result = list.stream()
List<AlarmVO> result = list.stream()
.map(alarm -> {
AlarmVO alarmVO = new AlarmVO();
alarmVO.setEventId(alarm.getId());
@@ -114,10 +117,11 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsAlarmMapper, CsAlarm> impl
.filter(alarmVO -> alarmVO.getWarnNums() > 0)
.sorted((a1, a2) -> a2.getDate().compareTo(a1.getDate()))
.collect(Collectors.toList());
page1.setRecords(result);
}
}
}
return result;
return page1;
}
@Override

14
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
View File

@@ -499,13 +499,17 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
}
public List<String> getEventUser(String devId,boolean isAdmin) {
List<User> adminUser = appUserFeignClient.getAdminInfo().getData();
List<String> adminList = adminUser.stream().map(User::getId).collect(Collectors.toList());
List<String> list = csDeviceUserFeignClient.findUserById(devId).getData();
List<String> result = new ArrayList<>(list);
if (isAdmin) {
List<String> list = csDeviceUserFeignClient.findUserById(devId).getData();
adminList.addAll(list);
List<User> adminUser = appUserFeignClient.getAdminInfo().getData();
List<String> adminList = adminUser.stream().map(User::getId).collect(Collectors.toList());
result.addAll(adminList);
}
return adminList;
if (CollectionUtil.isNotEmpty(result)) {
result = result.stream().distinct().collect(Collectors.toList());
}
return result;
}
/**

100
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
View File

@@ -7,10 +7,10 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.csp.sentinel.util.StringUtil;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.constant.LogInfo;
import com.njcn.csdevice.api.CsCommTerminalFeignClient;
import com.njcn.csdevice.api.CsDeviceUserFeignClient;
import com.njcn.csdevice.api.CsLedgerFeignClient;
import com.njcn.csdevice.api.NodeFeignClient;
@@ -27,8 +27,8 @@ import com.njcn.csharmonic.pojo.dto.UnReadEventDto;
import com.njcn.csharmonic.pojo.po.CsEventPO;
import com.njcn.csharmonic.pojo.po.CsEventUserPO;
import com.njcn.csharmonic.pojo.vo.EventDetailVO;
import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO;
import com.njcn.csharmonic.service.CsEventUserPOService;
import com.njcn.harmonic.utils.PublicDataUtils;
import com.njcn.influx.pojo.dto.EventDataSetDTO;
import com.njcn.influx.service.EvtDataService;
import com.njcn.system.api.DicDataFeignClient;
@@ -68,6 +68,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
private final CsEventPOMapper csEventPOMapper;
private final NodeFeignClient nodeFeignClient;
private final CsDeviceUserFeignClient csDeviceUserFeignClient;
private final CsCommTerminalFeignClient csCommTerminalFeignClient;
@Override
public Integer queryEventCount(CsEventUserQueryParam csEventUserQueryParam) {
@@ -770,4 +771,99 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
queryWrapper.eq(CsEventUserPO::getUserId, userIndex).in(CsEventUserPO::getEventId, eventList);
return baseMapper.selectList(queryWrapper);
}
@Override
public EventStatisticVO queryAppEventCounts(CsEventUserQueryPage csEventUserQueryPage) {
EventStatisticVO result = new EventStatisticVO();
csEventUserQueryPage.setUserId(RequestUtil.getUserIndex());
String role = RequestUtil.getUserRole();
if(Objects.equals(role, LogInfo.UNKNOWN_ROLE)){
return result;
}
List<String> strings = JSONArray.parseArray(role, String.class);
if(CollectionUtils.isEmpty(strings)){
return result;
}
role=strings.get(0);
if( Objects.equals(role, AppRoleEnum.APP_VIP_USER.getCode())&&Objects.equals(csEventUserQueryPage.getType(),"3")){
csEventUserQueryPage.setLevel("3");
}
List<CsLedgerVO> data = csLedgerFeignClient.lineTree().getData();
if (CollectionUtils.isEmpty(data)) {
return result;
}
// 获取第一层节点（根节点），从第二层开始才是真正的工程
List<CsLedgerVO> firstLevelNodes = new ArrayList<>();
for (CsLedgerVO rootNode : data) {
List<CsLedgerVO> children = rootNode.getChildren();
if (CollectionUtil.isNotEmpty(children)) {
firstLevelNodes.addAll(children);
}
}
if (CollectionUtils.isEmpty(firstLevelNodes)) {
return result;
}
// 缓存查询条件到局部变量
String engineeringId = csEventUserQueryPage.getEngineeringid();
String projectId = csEventUserQueryPage.getProjectId();
String deviceId = csEventUserQueryPage.getDeviceId();
String lineId = csEventUserQueryPage.getLineId();
// 从第二层开始遍历：工程 -> 项目 -> 设备 -> 监测点
List<String> collect = new ArrayList<>();
for (CsLedgerVO engineering : firstLevelNodes) {
// 过滤工程
if (StringUtil.isNotBlank(engineeringId)
&& !Objects.equals(engineering.getId(), engineeringId)) {
continue;
}
List<CsLedgerVO> projects = engineering.getChildren();
if (CollectionUtils.isEmpty(projects)) {
continue;
}
for (CsLedgerVO project : projects) {
// 过滤项目
if (StringUtil.isNotBlank(projectId)
&& !Objects.equals(project.getId(), projectId)) {
continue;
}
List<CsLedgerVO> devices = project.getChildren();
if (CollectionUtils.isEmpty(devices)) {
continue;
}
for (CsLedgerVO device : devices) {
// 过滤设备
if (StringUtil.isNotBlank(deviceId)
&& !Objects.equals(device.getId(), deviceId)) {
continue;
}
// 如果传了监测点 ID，需要进一步过滤
if (StringUtil.isNotBlank(lineId)) {
List<CsLedgerVO> lines = device.getChildren();
if (CollectionUtil.isNotEmpty(lines)) {
boolean hasLine = lines.stream()
.anyMatch(line -> Objects.equals(line.getId(), lineId));
if (hasLine) {
collect.add(device.getId());
}
}
} else {
// 没有传监测点 ID，直接添加设备 ID
collect.add(device.getId());
}
}
}
}
if (CollectionUtils.isEmpty(collect)) {
return result;
} else {
result = baseMapper.getEventCounts(csEventUserQueryPage.getStartTime(),csEventUserQueryPage.getEndTime(),collect);
}
return result;
}
}

112
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicServiceImpl.java
View File

@@ -1,9 +1,11 @@
package com.njcn.csharmonic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -30,7 +32,6 @@ import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -46,13 +47,22 @@ import java.util.stream.Collectors;
@Service
public class CsHarmonicServiceImpl extends ServiceImpl<CsHarmonicMapper, CsHarmonic> implements ICsHarmonicService {
private static final Map<String, String> VALUE_TYPE_MAP = new HashMap<String, String>() {{
put("max", "最大值");
put("min", "最小值");
put("avg", "平均值");
put("cp95", "95%概率值");
}};
private final CsLedgerFeignClient csLedgerFeignClient;
private final CsEventUserPOService csEventUserPOService;
private final IRStatLimitRateDetailDService rStatLimitRateDetailDService;
private final CsCommTerminalFeignClient csCommTerminalFeignClient;
@Override
public HarmonicVO queryAppList(LineParamDTO param) {
public Page<HarmonicVO.LineHarmonicDetail> queryAppList(LineParamDTO param) {
Page<HarmonicVO.LineHarmonicDetail> result = new Page<>();
Page<CsHarmonic> page = new Page<> (param.getPageNum(), param.getPageSize());
HarmonicVO vo = new HarmonicVO();
List<CsLedger> lineLedger = csLedgerFeignClient.queryLine(param).getData();
if (CollectionUtil.isNotEmpty(lineLedger)) {
@@ -73,23 +83,17 @@ public class CsHarmonicServiceImpl extends ServiceImpl<CsHarmonicMapper, CsHarmo
.ge(StrUtil.isNotBlank(param.getTime()), CsHarmonic::getTime, PublicDataUtils.calculateMonthStart(param.getTime()))
.le(StrUtil.isNotBlank(param.getTime()), CsHarmonic::getTime, PublicDataUtils.calculateMonthEnd(param.getTime()))
.orderByDesc(CsHarmonic::getTime);
list = list(queryWrapper);
Page<CsHarmonic> csHarmonicPage = this.baseMapper.selectPage(page,queryWrapper);
BeanUtil.copyProperties(csHarmonicPage, result);
list = csHarmonicPage.getRecords();
}
if (CollectionUtil.isNotEmpty(list)) {
//获取所有台账数据
List<CsLedgerVO> ledgers = csLedgerFeignClient.getAllLedger().getData();
Map<String,CsLedgerVO> ledgerMap = ledgers.stream().collect(Collectors.toMap(CsLedgerVO::getId, item->item));
List<HarmonicVO.LineHarmonicDetail> lineHarmonicDetails = new ArrayList<>();
vo.setHarmonicNums(list.size());
//获取越限天数
Set<LocalDate> distinctTimes = list.stream().map(CsHarmonic::getTime).filter(Objects::nonNull).collect(Collectors.toSet());
int overDay = distinctTimes.size();
vo.setOverDays(overDay);
//获取监测点
Set<String> distinctLineIds = list.stream().map(CsHarmonic::getLineId).collect(Collectors.toSet());
int overLine = distinctLineIds.size();
vo.setOverLineNums(overLine);
//获取用户推送事件
List<CsEventUserPO> userEvents = csEventUserPOService.queryEventListByUserId(RequestUtil.getUserIndex(), list.stream().map(CsHarmonic::getId).collect(Collectors.toList()));
list.forEach(item->{
@@ -107,9 +111,10 @@ public class CsHarmonicServiceImpl extends ServiceImpl<CsHarmonicMapper, CsHarmo
lineHarmonicDetails.add(lineHarmonicDetail);
});
vo.setList(lineHarmonicDetails);
result.setRecords(lineHarmonicDetails);
}
}
return vo;
return result;
}
@Override
@@ -156,6 +161,85 @@ public class CsHarmonicServiceImpl extends ServiceImpl<CsHarmonicMapper, CsHarmo
return list;
}
@Override
public HarmonicVO queryAppHarmonicCounts(LineParamDTO param) {
HarmonicVO vo = new HarmonicVO();
List<CsLedger> lineLedger = csLedgerFeignClient.queryLine(param).getData();
if (CollectionUtil.isNotEmpty(lineLedger)) {
List<String> lineIds = lineLedger.stream().map(CsLedger::getId).collect(Collectors.toList());
//根据用户获取设备数据权限
List<String> ownerList = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData();
List<String> combinedLineIds = new ArrayList<>();
if (CollectionUtil.isNotEmpty(ownerList)) {
combinedLineIds = lineIds.stream()
.filter(ownerList::contains)
.distinct()
.collect(Collectors.toList());
}
if (CollectionUtil.isNotEmpty(combinedLineIds)) {
//查询数量
vo = this.baseMapper.getHarmonicCounts(
PublicDataUtils.calculateMonthStart(param.getTime())
,PublicDataUtils.calculateMonthEnd(param.getTime())
,combinedLineIds);
//查询日期
List<String> overDays = this.baseMapper.getOverDays(
PublicDataUtils.calculateMonthStart(param.getTime())
,PublicDataUtils.calculateMonthEnd(param.getTime())
,combinedLineIds);
vo.setOverDaysList(overDays);
}
}
return vo;
}
@Override
public Page<HarmonicVO.LineHarmonicOverDays> queryAppHarmonicLine(LineParamDTO param) {
Page<HarmonicVO.LineHarmonicOverDays> page = new Page<> (param.getPageNum(), param.getPageSize());
List<CsLedger> lineLedger = csLedgerFeignClient.queryLine(param).getData();
if (CollectionUtil.isNotEmpty(lineLedger)) {
List<String> lineIds = lineLedger.stream().map(CsLedger::getId).collect(Collectors.toList());
//根据用户获取设备数据权限
List<String> ownerList = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData();
List<String> combinedLineIds = new ArrayList<>();
if (CollectionUtil.isNotEmpty(ownerList)) {
combinedLineIds = lineIds.stream()
.filter(ownerList::contains)
.distinct()
.collect(Collectors.toList());
}
if (CollectionUtil.isNotEmpty(combinedLineIds)) {
page = this.baseMapper.getLineHarmonicOverDays(page
,PublicDataUtils.calculateMonthStart(param.getTime())
,PublicDataUtils.calculateMonthEnd(param.getTime())
,combinedLineIds);
List<HarmonicVO.LineHarmonicOverDays> lineHarmonicOverDays = page.getRecords();
if (CollectionUtil.isNotEmpty(lineHarmonicOverDays)) {
//获取所有台账数据
List<CsLedgerVO> ledgers = csLedgerFeignClient.getAllLedger().getData();
Map<String,CsLedgerVO> ledgerMap = ledgers.stream().collect(Collectors.toMap(CsLedgerVO::getId, item->item));
lineHarmonicOverDays.forEach(item->{
CsLedger ledger = lineLedger.stream().filter(item1->item1.getId().equals(item.getLineId())).findFirst().orElse(null);
item.setEngineeringName(ledgerMap.get(ledger.getPids().split(",")[1]).getName());
item.setProjectName(ledgerMap.get(ledger.getPids().split(",")[2]).getName());
item.setDevName(ledgerMap.get(ledger.getPids().split(",")[3]).getName());
item.setLineId(item.getLineId());
item.setLineName(ledger.getName());
item.setTimeList(Arrays.asList(item.getTimeString().split(", ")));
});
//对告警天数进行降序排序
lineHarmonicOverDays.sort((item1, item2) -> {
int size1 = item1.getTimeList() != null ? item1.getTimeList().size() : 0;
int size2 = item2.getTimeList() != null ? item2.getTimeList().size() : 0;
return Integer.compare(size2, size1);
});
page.setRecords(lineHarmonicOverDays);
}
}
}
return page;
}
/**
* 添加谐波数据到列表
@@ -221,7 +305,7 @@ public class CsHarmonicServiceImpl extends ServiceImpl<CsHarmonicMapper, CsHarmo
detail.setDataB(formatValue(values.get("B")));
detail.setDataC(formatValue(values.get("C")));
detail.setDataT(formatValue(values.get("T")));
detail.setValueType(phaseDataList.get(0).valueType);
detail.setValueType(VALUE_TYPE_MAP.get(phaseDataList.get(0).valueType));
detail.setOverLimitData(phaseDataList.get(0).overLimitValue);
detail.setHasT(values.containsKey("T"));
allDetails.add(detail);

39
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/HomePageServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
import com.njcn.csdevice.pojo.po.CsUserPins;
import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
import com.njcn.csdevice.pojo.vo.EngineeringHomePageVO;
import com.njcn.csharmonic.mapper.CsEventUserPOMapper;
import com.njcn.csharmonic.pojo.dto.UnReadEventDto;
import com.njcn.csharmonic.service.CsEventUserPOService;
import com.njcn.csharmonic.service.HomePageService;
@@ -30,7 +31,7 @@ import java.util.stream.Collectors;
@Slf4j
public class HomePageServiceImpl implements HomePageService {
private final CsEventUserPOService csEventUserPOService;
private final CsEventUserPOMapper csEventUserPOMapper;
private final EngineeringFeignClient engineeringFeignClient;
private final CsLedgerFeignClient csLedgerFeignClient;
private final CsUserPinsFeignClient csUserPinsFeignClient;
@@ -48,11 +49,6 @@ public class HomePageServiceImpl implements HomePageService {
Map<String, List<DevDetailDTO>> devMap = Objects.isNull(devList) ? new HashMap<>() :
devList.stream().collect(Collectors.groupingBy(DevDetailDTO::getEngineeringid));
// 获取未读事件
List<UnReadEventDto> unReadEventList = csEventUserPOService.queryEngineeringEventCount(RequestUtil.getUserIndex());
Map<String, List<UnReadEventDto>> unReadEventMap = Objects.isNull(unReadEventList) ? new HashMap<>() :
unReadEventList.stream().collect(Collectors.groupingBy(UnReadEventDto::getDeviceId));
// 遍历工程列表，从内存中获取设备数据
engineeringList.forEach(item -> {
EngineeringHomePageVO vo = new EngineeringHomePageVO();
@@ -69,19 +65,26 @@ public class HomePageServiceImpl implements HomePageService {
vo.setOfflineDevTotal((int) status1Count);
vo.setSort(item.getSort());
// 未读的告警数量
int alarmTotal = Objects.isNull(devs) ? 0 : devs.stream()
.map(DevDetailDTO::getEquipmentId)
.filter(Objects::nonNull)
.mapToInt(deviceId -> {
List<UnReadEventDto> events = unReadEventMap.get(deviceId);
return Objects.isNull(events) ? 0 : events.stream()
.mapToInt(UnReadEventDto::getCount)
.sum();
})
.sum();
vo.setAlarmTotal(alarmTotal);
// 获取项目事件数量
int alarmTotal = 0;
if (CollectionUtil.isNotEmpty(devs) && !Objects.isNull(devs)) {
// 获取暂态未读事件
List<String> allLineIds = devs.stream()
.filter(dev -> CollectionUtil.isNotEmpty(dev.getLineList()))
.flatMap(dev -> dev.getLineList().stream())
.distinct()
.collect(Collectors.toList());
List<String> tempEventList = csEventUserPOMapper.queryTempEvent(RequestUtil.getUserIndex(),"","",allLineIds);
alarmTotal = alarmTotal + (CollectionUtil.isNotEmpty(tempEventList)?tempEventList.size():0);
// 获取稳态未读事件
if (CollectionUtil.isNotEmpty(allLineIds)) {
List<String> tempHarmonicList = csEventUserPOMapper.queryTempHarmonic(RequestUtil.getUserIndex(),"","",allLineIds);
alarmTotal = alarmTotal + (CollectionUtil.isNotEmpty(tempHarmonicList)?tempHarmonicList.size():0);
}
}
vo.setAlarmTotal(alarmTotal);
result.add(vo);
});

12
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class RealDataServiceImpl implements RealDataService {
//判断设备类型 治理无线设备需要判断mqtt、云前置设备直接判断设备运行状态
CsEquipmentDeliveryPO dev = equipmentFeignClient.getDevByLineId(lineId).getData();
String devModelCode = dictTreeFeignClient.queryById(dev.getDevType()).getData().getCode();
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) {
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) {
if (dev.getRunStatus() == 1) {
throw new BusinessException("装置离线");
}
@@ -63,7 +63,7 @@ public class RealDataServiceImpl implements RealDataService {
//获取装置所用模板
CsLinePO po = csLineFeignClient.getById(lineId).getData();
String modelId = po.getDataModelId();
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) {
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) {
CsDataSet csDataSet = dataSetFeignClient.getBaseDataSet(modelId,1).getData();
askDeviceDataFeignClient.askCldRealData(dev.getId(),lineId,dev.getNodeId(),csDataSet.getIdx());
updateRedisUserSet("rtDataUserId:" + lineId, RequestUtil.getUserIndex(), 600L);
@@ -76,7 +76,7 @@ public class RealDataServiceImpl implements RealDataService {
//等待装置响应,获取询问结果
Thread.sleep(5000);
Object object;
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) {
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) {
object = redisUtil.getObjectByKey("devResponse:" + lineId);
} else {
object = redisUtil.getObjectByKey("devResponse");
@@ -105,7 +105,7 @@ public class RealDataServiceImpl implements RealDataService {
//判断设备类型 治理无线设备需要判断mqtt、云前置设备直接判断设备运行状态
CsEquipmentDeliveryPO dev = equipmentFeignClient.getDevByLineId(lineId).getData();
String devModelCode = dictTreeFeignClient.queryById(dev.getDevType()).getData().getCode();
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) {
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) {
if (dev.getRunStatus() == 1) {
throw new BusinessException("装置离线");
}
@@ -121,7 +121,7 @@ public class RealDataServiceImpl implements RealDataService {
CsLinePO po = csLineFeignClient.getById(lineId).getData();
String modelId = po.getDataModelId();
//根据指标来获取不同的数据集
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) {
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) {
CsDataSet csDataSet = dataSetFeignClient.getHarmonicDataSet(modelId,1,target).getData();
askDeviceDataFeignClient.askCldRealData(dev.getId(),lineId,dev.getNodeId(),csDataSet.getIdx());
} else {
@@ -131,7 +131,7 @@ public class RealDataServiceImpl implements RealDataService {
//等待装置响应,获取询问结果
Thread.sleep(2000);
Object object;
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) {
if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) {
object = redisUtil.getObjectByKey("devResponse:" + lineId);
} else {
object = redisUtil.getObjectByKey("devResponse");