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

1、app消息数据查询重构

Browse Source 
2、app消息已读未读方法重构
3、其余辅助功能添加
This commit is contained in:
xy
2026-04-01 20:28:04 +08:00
parent 33da822317
commit dbe09d70f4
59 changed files with 1529 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/AppProjectFeignClient.java
View File

@@ -3,9 +3,11 @@ package com.njcn.csdevice.api;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.fallback.AppProjectClientFallbackFactory;
import com.njcn.csdevice.pojo.param.AppProjectAddParm;
import com.njcn.csdevice.pojo.po.AppProjectPO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -19,4 +21,11 @@ public interface AppProjectFeignClient {
@PostMapping("/queryProjectById")
HttpResult<List<AppProjectPO>> queryProjectById(@RequestParam("ids") List<String> ids);
@PostMapping("/getProjectByName")
HttpResult<AppProjectPO> getProjectByName(@RequestParam("name") String name);
@PostMapping("/addAppProject")
HttpResult<AppProjectPO> addAppProject(@RequestBody AppProjectAddParm appProjectAddParm);
}

25
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsMarketDataFeignClient.java Normal file
View File

@@ -0,0 +1,25 @@
package com.njcn.csdevice.api;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.fallback.CsMarketDataClientFallbackFactory;
import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* @author xy
*/
@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/csMarketData", fallbackFactory = CsMarketDataClientFallbackFactory.class,contextId = "csMarketData")
public interface CsMarketDataFeignClient {
@PostMapping("/insert")
HttpResult<Boolean> insertData(@RequestParam("userId")String userId, @RequestParam("engineeringId")String engineeringId);
@PostMapping("/queryByUseId")
HttpResult<List<CsMarketDataVO>> queryByUseId(@RequestParam("userId")String userId);
}

15
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EngineeringFeignClient.java
View File

@@ -1,14 +1,23 @@
package com.njcn.csdevice.api;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.ServerInfo;
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.csdevice.api.fallback.AppProjectClientFallbackFactory;
import com.njcn.csdevice.pojo.param.CsEngineeringAddParm;
import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
import com.njcn.csdevice.pojo.po.CsEngineeringPO;
import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -20,4 +29,10 @@ public interface EngineeringFeignClient {
@PostMapping("/queryEngineering")
HttpResult<List<CsEngineeringVO>> queryEngineering(@Validated @RequestBody CsEngineeringQueryParm csEngineeringQueryParm);
@PostMapping("/getEngineeringByName")
HttpResult<CsEngineeringPO> getEngineeringByName(@RequestParam("name") String name);
@PostMapping("/addEngineering")
HttpResult<CsEngineeringPO> addEngineering(@Validated @RequestBody CsEngineeringAddParm csEngineeringAddParm);
}

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java
View File

@@ -51,6 +51,9 @@ public interface EquipmentFeignClient {
@PostMapping("/updateModuleNumber")
HttpResult<String> updateModuleNumber(@RequestParam("nDid") String nDid,@RequestParam("number") Integer number);
@PostMapping("/updateLedger")
HttpResult<String> updateLedger(@RequestParam("nDid") String nDid,@RequestParam("engineeringId") String engineeringId,@RequestParam("projectId") String projectId);
@PostMapping("/getAll")
HttpResult<List<CsEquipmentDeliveryPO>> getAll();

13
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/AppProjectClientFallbackFactory.java
View File

@@ -4,6 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.AppProjectFeignClient;
import com.njcn.csdevice.pojo.param.AppProjectAddParm;
import com.njcn.csdevice.pojo.po.AppProjectPO;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,18 @@ public class AppProjectClientFallbackFactory implements FallbackFactory<AppProje
log.error("{}异常，降级处理，异常为：{}","获取项目详情接口异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<AppProjectPO> getProjectByName(String name) {
log.error("{}异常，降级处理，异常为：{}","根据项目名称获取项目信息异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<AppProjectPO> addAppProject(AppProjectAddParm appProjectAddParm) {
log.error("{}异常，降级处理，异常为：{}","新增项目异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

44
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsMarketDataClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,44 @@
package com.njcn.csdevice.api.fallback;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.CsMarketDataFeignClient;
import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author xy
*/
@Slf4j
@Component
public class CsMarketDataClientFallbackFactory implements FallbackFactory<CsMarketDataFeignClient> {
@Override
public CsMarketDataFeignClient create(Throwable cause) {
//判断抛出异常是否为解码器抛出的业务异常
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (cause.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException) cause.getCause();
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new CsMarketDataFeignClient() {
@Override
public HttpResult<Boolean> insertData(String userId, String engineeringId) {
log.error("{}异常，降级处理，异常为：{}","根据用户、工程新增数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsMarketDataVO>> queryByUseId(String userId) {
log.error("{}异常，降级处理，异常为：{}","查询营销,工程数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

14
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EngineeringClientFallbackFactory.java
View File

@@ -4,7 +4,9 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.EngineeringFeignClient;
import com.njcn.csdevice.pojo.param.CsEngineeringAddParm;
import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
import com.njcn.csdevice.pojo.po.CsEngineeringPO;
import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,18 @@ public class EngineeringClientFallbackFactory implements FallbackFactory<Enginee
log.error("{}异常，降级处理，异常为：{}","查询工程列表接口异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<CsEngineeringPO> getEngineeringByName(String name) {
log.error("{}异常，降级处理，异常为：{}","根据工程名称获取工程信息异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<CsEngineeringPO> addEngineering(CsEngineeringAddParm csEngineeringAddParm) {
log.error("{}异常，降级处理，异常为：{}","新增工程异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java
View File

@@ -72,6 +72,12 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory<Equi
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<String> updateLedger(String nDid, String engineeringId, String projectId) {
log.error("{}异常，降级处理，异常为：{}","更新设备预设工程和项目id数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsEquipmentDeliveryPO>> getAll() {
log.error("{}异常，降级处理，异常为：{}","获取所有装置",cause.toString());

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/param/CsUserPinsParam.java
View File

@@ -22,7 +22,7 @@ public class CsUserPinsParam implements Serializable {
private Integer targetType;
@ApiModelProperty("目标ID（设备ID或工程ID）")
@NotBlank(message = "目标ID（设备ID或工程ID）")
@NotBlank(message = "目标ID（设备ID或工程ID）不能为空")
private String targetId;
}

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
View File

@@ -100,4 +100,10 @@ public class CsEquipmentDeliveryAddParm implements Serializable {
@ApiModelProperty(value="日志等级(NORMAL、DEBUG、WARN、ERROR)")
private String devLogLevel;
@ApiModelProperty(value="所属工程")
private String associatedEngineering;
@ApiModelProperty(value="所属项目")
private String associatedProject;
}

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
View File

@@ -104,4 +104,10 @@ public class CsEquipmentDeliveryAuditParm {
@ApiModelProperty(value="日志等级(NORMAL、DEBUG、WARN、ERROR)")
private String devLogLevel;
@ApiModelProperty(value="所属工程")
private String associatedEngineering;
@ApiModelProperty(value="所属项目")
private String associatedProject;
}

8
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppProjectPO.java
View File

@@ -28,26 +28,18 @@ public class AppProjectPO extends BaseEntity {
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
/**
* 项目名称
*/
@TableField(value = "name")
private String name;
// @TableField(value = "engineering_id")
// private String engineeringId;
/**
* 地市Id
*/
@TableField(value = "area")
private String area;
/**
* 0：删除 1：正常
*/

12
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
View File

@@ -136,4 +136,16 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
@TableField(value = "dev_log_level")
private String devLogLevel;
/**
* 所属工程
*/
@TableField(value = "associated_engineering")
private String associatedEngineering;
/**
* 所属项目
*/
@TableField(value = "associated_project")
private String associatedProject;
}

5
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CldLedgerVo.java
View File

@@ -31,7 +31,7 @@ public class CldLedgerVo implements Serializable {
private String engineeringDescription;
@ApiModelProperty(value = "项目信息")
private List<AppProjectPO> projectInfoList;
private List<ProjectVO> projectInfoList;
@ApiModelProperty(value = "设备信息")
private List<CsEquipmentDeliveryPO> deviceInfoList;
@@ -39,4 +39,7 @@ public class CldLedgerVo implements Serializable {
@ApiModelProperty(value = "监测点信息")
private List<CsLinePO> lineInfoList;
@ApiModelProperty("工程排序")
private Integer sort;
}

12
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java
View File

@@ -94,4 +94,16 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
@ApiModelProperty(value="前置服务器id")
private String nodeId ;
@ApiModelProperty(value="所属工程id")
private String associatedEngineering;
@ApiModelProperty(value="所属工程名称")
private String associatedEngineeringName;
@ApiModelProperty(value="所属项目id")
private String associatedProject;
@ApiModelProperty(value="所属项目名称")
private String associatedProjectName;
}

72
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java
View File

@@ -4,6 +4,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@@ -15,54 +16,59 @@ import java.util.List;
*/
@Data
public class DevCountVO {
//
@ApiModelProperty(value = "设备在线总数")
private Integer onLineDevCount;
public class DevCountVO implements Serializable {
/** 所有工程相关数据 **/
@ApiModelProperty(value = "所有工程设备在线总数")
private Integer onLineDevCount = 0;
private List<CsEquipmentDeliveryPO> onLineDevs;
@ApiModelProperty(value = "设备离线总数")
private Integer offLineDevCount;
@ApiModelProperty(value = "所有工程设备离线总数")
private Integer offLineDevCount = 0;
private List<CsEquipmentDeliveryPO> offLineDevs;
@ApiModelProperty(value = "警告数")
private Integer alarmCount;
@ApiModelProperty(value = "事件数")
private Integer eventCount;
@ApiModelProperty(value = "所有工程暂态事件数量(未读)")
private Integer eventCount = 0;
@ApiModelProperty(value = "所有工程稳态事件数量(未读)")
private Integer harmonicCount = 0;
@ApiModelProperty(value = "所有工程运行告警数量(未读)")
private Integer alarmCount = 0;
@ApiModelProperty(value = "所有工程运行事件数量(未读)")
private Integer runCount = 0;
@ApiModelProperty(value = "工程个数")
private Integer eningerCount;
@ApiModelProperty(value = "运行事件数")
private Integer runCount;
@ApiModelProperty(value = "稳态件数")
private Integer harmonicCount;
private Integer eningerCount = 0;
/** 当前工程相关数据 **/
@ApiModelProperty(value = "当前工程id")
private String currentId;
@ApiModelProperty(value = "当前工程设备在线总数")
private Integer currentOnLineDevCount;
private Integer currentOnLineDevCount = 0;
private List<CsEquipmentDeliveryPO> currentOnLineDevs;
@ApiModelProperty(value = "当前工程设备离线总数")
private Integer currentOffLineDevCount;
private Integer currentOffLineDevCount = 0;
private List<CsEquipmentDeliveryPO> currentOffLineDevs;
@ApiModelProperty(value = "设备警告数")
private Integer currentAlarmCount;
@ApiModelProperty(value = "暂态事件数")
private Integer currentEventCount;
@ApiModelProperty(value = "运行事件数")
private Integer currentRunCount;
@ApiModelProperty(value = "稳态件数")
private Integer currentHarmonicCount;
@ApiModelProperty(value = "当前工程暂态事件数量(未读)")
private Integer currentEventCount = 0;
@ApiModelProperty(value = "当前工程稳态事件数量(未读)")
private Integer currentHarmonicCount = 0;
@ApiModelProperty(value = "当前工程运行告警数量(未读)")
private Integer currentAlarmCount = 0;
@ApiModelProperty(value = "当前工程运行事件数量(未读)")
private Integer currentRunCount = 0;
@ApiModelProperty(value = "当前项目数")
private Integer currentProjectCount;
private Integer currentProjectCount = 0;
@ApiModelProperty(value = "反馈数")
private Integer feedBackCount;
private Integer feedBackCount = 0;
}

8
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EngineeringHomePageVO.java
View File

@@ -22,16 +22,16 @@ public class EngineeringHomePageVO implements Serializable {
private String engineeringName;
@ApiModelProperty(name = "devTotal",value = "设备总数")
private Integer devTotal;
private Integer devTotal = 0;
@ApiModelProperty(name = "onlineDevTotal",value = "在线设备数")
private Integer onlineDevTotal;
private Integer onlineDevTotal = 0;
@ApiModelProperty(name = "offlineDevTotal",value = "离线设备数")
private Integer offlineDevTotal;
private Integer offlineDevTotal = 0;
@ApiModelProperty(name = "alarmTotal",value = "告警数量(未读)")
private Integer alarmTotal;
private Integer alarmTotal = 0;
@ApiModelProperty(name = "isTop",value = "是否置顶 0:未置顶 1:已置顶")
private Integer isTop = 0;

20
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectVO.java Normal file
View File

@@ -0,0 +1,20 @@
package com.njcn.csdevice.pojo.vo;
import com.njcn.csdevice.pojo.po.AppProjectPO;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @author 徐扬
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ProjectVO extends AppProjectPO {
private String topoId;
}

11
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java
View File

@@ -15,6 +15,7 @@ import com.njcn.web.advice.DeviceLog;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -77,11 +78,13 @@ public class DeviceUserController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/devCount")
@ApiOperation("设备统计")
@ApiImplicitParam(name = "id", value = "工程id", required = true)
public HttpResult<DevCountVO> devCount(@RequestParam("id") String id){
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "工程id"),
@ApiImplicitParam(name = "time", value = "时间")
})
public HttpResult<DevCountVO> devCount(@RequestParam("id") String id,@RequestParam("time") String time){
String methodDescribe = getMethodDescribe("devCount");
DevCountVO result = csDeviceUserPOService.devCount (id);
DevCountVO result = csDeviceUserPOService.devCount(id,time);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

14
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
View File

@@ -303,6 +303,20 @@ public class EquipmentDeliveryController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/updateLedger")
@ApiOperation("更新设备预设工程和项目id")
@ApiImplicitParams({
@ApiImplicitParam(name = "nDid", value = "网络设备码", required = true),
@ApiImplicitParam(name = "engineeringId", value = "工程id", required = true),
@ApiImplicitParam(name = "projectId", value = "项目id", required = true)
})
public HttpResult<String> updateLedger(@RequestParam("nDid") String nDid,@RequestParam("engineeringId") String engineeringId,@RequestParam("projectId") String projectId){
String methodDescribe = getMethodDescribe("updateLedger");
csEquipmentDeliveryService.updateLedger(nDid,engineeringId,projectId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/rebootDevice")
@ApiOperation("重启设备")

9
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java
View File

@@ -61,6 +61,15 @@ public class CsLedgerController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/AppLineTree")
@ApiOperation("app端监测点树")
public HttpResult<List<CsLedgerVO>> appLineTree(){
String methodDescribe = getMethodDescribe("AppLineTree");
List<CsLedgerVO> list = csLedgerService.appLineTree();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/deviceTree")
@ApiOperation("四层设备树(装置层,根节点为治理设备和便携式设备)")

15
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java
View File

@@ -1,6 +1,5 @@
package com.njcn.csdevice.controller.project;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
@@ -66,11 +65,11 @@ public class AppProjectController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/addAppProject")
@ApiOperation("新增项目")
public HttpResult<Boolean> addAppProject(@Validated AppProjectAddParm appProjectAddParm){
public HttpResult<AppProjectPO> addAppProject(@Validated @RequestBody AppProjectAddParm appProjectAddParm){
String methodDescribe = getMethodDescribe("addAppProject");
AppProjectPO po = appProjectService.addAppProject(appProjectAddParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, ObjectUtil.isNotNull(po), methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/auditAppProject")
@@ -91,4 +90,14 @@ public class AppProjectController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getProjectByName")
@ApiOperation("根据项目名称获取项目信息")
@ApiImplicitParam(name = "name", value = "项目名称", required = true)
public HttpResult<AppProjectPO> getProjectByName(@RequestParam("name") String name){
String methodDescribe = getMethodDescribe("getProjectByName");
AppProjectPO po = appProjectService.getProjectByName(name);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
}
}

9
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsMarketDataController.java
View File

@@ -99,4 +99,13 @@ public class CsMarketDataController extends BaseController {
List<CsMarketDataVO> list = csMarketDataService.queryAllEnginner(userId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/insert")
@ApiOperation("根据用户、工程新增数据")
public HttpResult<Boolean> insertData(@RequestParam("userId")String userId, @RequestParam("engineeringId")String engineeringId){
String methodDescribe = getMethodDescribe("insertData");
Boolean result = csMarketDataService.insertData(userId,engineeringId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

10
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java
View File

@@ -104,4 +104,14 @@ public class EngineeringController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getEngineeringByName")
@ApiOperation("根据工程名称获取工程信息")
@ApiImplicitParam(name = "name", value = "工程名称", required = true)
public HttpResult<CsEngineeringPO> getEngineeringByName(@RequestParam("name") String name){
String methodDescribe = getMethodDescribe("getEngineeringByName");
CsEngineeringPO po = csEngineeringService.getEngineeringByName(name);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
}
}

16
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDeviceUserPOMapper.java
View File

@@ -2,6 +2,9 @@ package com.njcn.csdevice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
@@ -12,4 +15,17 @@ import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
* @version V1.0.0
*/
public interface CsDeviceUserPOMapper extends BaseMapper<CsDeviceUserPO> {
//查询暂态事件(未读)
int queryTempEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
//查询稳态事件(未读)
int queryTempHarmonic(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
//查询告警事件(未读)
int queryAlarmEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
//查询运行事件(未读)
int queryRunEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<String> ids);
}

1
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
View File

@@ -45,6 +45,7 @@
<if test="temp!=null and temp.searchValue != null and temp.searchValue !=''">
AND a.`name` like concat('%',#{temp.searchValue},'%')
</if>
AND a.`name` != '便携式项目'
order by a.create_time desc
</select>
</mapper>

68
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDeviceUserPOMapper.xml
View File

@@ -16,4 +16,72 @@
<!--@mbg.generated-->
primary_user_id, sub_user_id, device_id, create_by, create_time, update_by, update_time
</sql>
<select id="queryTempEvent" resultType="java.lang.Integer">
SELECT
COUNT(1)
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.Integer">
SELECT
COUNT(1)
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.Integer">
SELECT
COUNT(1)
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.Integer">
SELECT
COUNT(1)
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>
</mapper>

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/AppProjectService.java
View File

@@ -62,4 +62,7 @@ public interface AppProjectService extends IService<AppProjectPO> {
AppProjectPO updateData(AppProjectAuditParm param);
boolean delete(String id);
AppProjectPO getProjectByName(String name);
}

8
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsCommTerminalService.java
View File

@@ -1,25 +1,17 @@
package com.njcn.csdevice.service;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
public interface CsCommTerminalService {
List<String> getLineIdsByUser(String userId);
List<String> getPqUserIdsByUser(String userId);
PqsDeviceUnit lineUnitDetail(String lineId);
List<String> commGetDevIds(String userId);
}

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java
View File

@@ -23,7 +23,7 @@ public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
Boolean share(List<String> ids);
DevCountVO devCount(String id);
DevCountVO devCount(String id,String time);
String isPrimaryUser(String deviceId);

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java
View File

@@ -66,4 +66,6 @@ public interface CsEngineeringService extends IService<CsEngineeringPO>{
boolean deleteData(String id);
CsEngineeringPO getEngineeringByName(String name);
}

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
View File

@@ -122,6 +122,8 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
*/
void updateModuleNumber(String nDid, Integer number);
void updateLedger(String nDid,String engineeringId,String projectId);
boolean rebootDevice(String nDid);
/**

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsMarketDataService.java
View File

@@ -30,4 +30,6 @@ public interface CsMarketDataService extends IService<CsMarketData> {
List<CsMarketDataVO> queryAllEnginner(String userId);
Boolean follow(EngineerIdParam engineerIdParams);
Boolean insertData(String userId,String engineeringId);
}

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
public interface CsTouristDataPOService extends IService<CsTouristDataPO>{
Boolean add(List<CsTouristDataParm> csTouristDataParms);
Boolean add(List<CsTouristDataParm> csTouristDataParms);
List<CsTouristDataParmVO> queryAll();

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java
View File

@@ -31,6 +31,8 @@ public interface ICsLedgerService extends IService<CsLedger> {
*/
List<CsLedgerVO> getLineTree(String type);
List<CsLedgerVO> appLineTree();
/**
* 终端三层树
* @return

62
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.njcn.csdevice.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -57,10 +58,6 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
@Transactional(rollbackFor = Exception.class)
public AppProjectPO addAppProject(AppProjectAddParm appProjectAddOrAuditParm) {
AppProjectPO appProjectPO = new AppProjectPO ( );
// Boolean result = checkName (appProjectAddOrAuditParm.getUserId ( ), appProjectAddOrAuditParm.getName ( ));
// if (result) {
// throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
// }
if(checkName(appProjectAddOrAuditParm.getName(),"",appProjectAddOrAuditParm.getEngineeringId())){
throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
@@ -81,22 +78,8 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
appTopologyDiagramPO.setStatus ("1");
appTopologyDiagramPO.setTopoId(temp);
appTopologyDiagramService.save(appTopologyDiagramPO);
//如何使用拓扑图模板生成监测点模版
// List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOS = csLineTopologyDiagramTemplateService.queryByTopoId(temp);
// List<CsLineTopologyTemplate> collect = csLineTopologyTemplateVOS.stream().map(temp1 -> {
// CsLineTopologyTemplate csLineTopologyTemplate = new CsLineTopologyTemplate();
// BeanUtils.copyProperties(temp1, csLineTopologyTemplate);
// csLineTopologyTemplate.setId(null);
// csLineTopologyTemplate.setStatus("1");
// csLineTopologyTemplate.setTopoId(appTopologyDiagramPO.getId());
// return csLineTopologyTemplate;
// }).collect(Collectors.toList());
// csLineTopologyTemplates.addAll(collect);
});
csLineTopologyDiagramTemplateService.saveBatch(csLineTopologyTemplates);
}
if(Objects.nonNull( appProjectAddOrAuditParm.getFiles ( ))){
for (int i = 0; i < appProjectAddOrAuditParm.getFiles ( ).length; i++) {
@@ -157,13 +140,6 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
QueryWrapper<AppProjectPO> queryWrapper = new QueryWrapper ( );
queryWrapper.eq ("id", appProjectAuditParm.getId ( ));
AppProjectPO appProjectPO1 = appProjectMapper.selectOne (queryWrapper);
// if (appProjectAuditParm.getUserId ( ) != null || appProjectAuditParm.getName ( ) != null) {
// Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ),
// appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( ));
// if (result) {
// throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
// }
// }
//删除项目
if(Objects.equals("0",appProjectAuditParm.getStatus())){
QueryWrapper<CsLedger> queryWrapper1 = new QueryWrapper<>();
@@ -175,38 +151,26 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
this.lambdaUpdate().eq(AppProjectPO::getId,appProjectAuditParm.getId()).set(AppProjectPO::getStatus,"0").update();
appTopologyDiagramService.lambdaUpdate().eq(AppTopologyDiagramPO::getProjectId,appProjectAuditParm.getId()).set(AppTopologyDiagramPO::getStatus,"0").update();
CsLedger csLedger1 = new CsLedger();
csLedger1.setId(appProjectAuditParm.getId());
csLedger1.setState(0);
csLedger1.setState(0);
csLedgerMapper.updateById(csLedger1);
}
if(checkName(appProjectAuditParm.getName(),appProjectAuditParm.getId(),appProjectAuditParm.getEngineeringId())){
throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
}
BeanUtils.copyProperties (appProjectAuditParm, appProjectPO);
UpdateWrapper<AppProjectPO> updateWrapper = new UpdateWrapper ( );
updateWrapper.eq ("id", appProjectAuditParm.getId ( ));
int i = appProjectMapper.update (appProjectPO, updateWrapper);
// Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( ));
// if (result) {
// throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
// }
//删除拓扑图
if(CollectionUtils.isEmpty(appProjectAuditParm.getNewTopoIds())){
appTopologyDiagramService.lambdaUpdate().eq(AppTopologyDiagramPO::getProjectId,appProjectAuditParm.getId()).set(AppTopologyDiagramPO::getStatus,"0").update();
}else {
appTopologyDiagramService.lambdaUpdate().eq(AppTopologyDiagramPO::getProjectId,appProjectAuditParm.getId()).notIn(AppTopologyDiagramPO::getId,appProjectAuditParm.getNewTopoIds()).set(AppTopologyDiagramPO::getStatus,"0").update();
}
//如何使用拓扑图模板则将拓扑图模板复制绑定
@@ -227,26 +191,11 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
appTopologyDiagramPO.setStatus ("1");
appTopologyDiagramPO.setTopoId(temp);
appTopologyDiagramService.save(appTopologyDiagramPO);
//如何使用拓扑图模板生成监测点模版
// List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOS = csLineTopologyDiagramTemplateService.queryByTopoId(temp);
// List<CsLineTopologyTemplate> collect = csLineTopologyTemplateVOS.stream().map(temp1 -> {
// CsLineTopologyTemplate csLineTopologyTemplate = new CsLineTopologyTemplate();
// BeanUtils.copyProperties(temp1, csLineTopologyTemplate);
// csLineTopologyTemplate.setId(null);
// csLineTopologyTemplate.setStatus("1");
// csLineTopologyTemplate.setTopoId(appTopologyDiagramPO.getId());
// return csLineTopologyTemplate;
// }).collect(Collectors.toList());
// csLineTopologyTemplates.addAll(collect);
});
csLineTopologyDiagramTemplateService.saveBatch(csLineTopologyTemplates);
}
if(Objects.nonNull( appProjectAuditParm.getFiles ( ))){
for (int k = 0; k < appProjectAuditParm.getFiles ( ).length; k++) {
AppTopologyDiagramAddParm appTopologyDiagramAddParm = new AppTopologyDiagramAddParm ( );
appTopologyDiagramAddParm.setProjectId (appProjectPO.getId ( ));
appTopologyDiagramAddParm.setTopologyDiagramName (appProjectAuditParm.getFiles ( )[k].getOriginalFilename ( ));
@@ -255,10 +204,8 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
}
}
CsLedger csLedger2 = new CsLedger();
csLedger2.setId(appProjectAuditParm.getId());
if(StringUtils.isNotBlank(appProjectAuditParm.getName())){
csLedger2.setName(appProjectAuditParm.getName());
}
@@ -403,5 +350,12 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
return this.update(queryWrapper);
}
@Override
public AppProjectPO getProjectByName(String name) {
LambdaQueryWrapper<AppProjectPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AppProjectPO::getName,name).eq(AppProjectPO::getStatus,1);
return this.getOne(queryWrapper);
}
}

29
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsCommTerminalServiceImpl.java
View File

@@ -5,21 +5,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.csdevice.mapper.CsLinePOMapper;
import com.njcn.csdevice.mapper.PqsDeviceUnitMapper;
import com.njcn.csdevice.pojo.dto.DevDetailDTO;
import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import com.njcn.csdevice.pojo.po.CsLinePO;
import com.njcn.csdevice.service.CsCommTerminalService;
import com.njcn.csdevice.service.CsDeviceUserPOService;
import com.njcn.csdevice.service.CsEquipmentDeliveryService;
import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
import com.njcn.csdevice.pojo.vo.CsTouristDataParmVO;
import com.njcn.csdevice.service.*;
import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
import com.njcn.user.api.UserFeignClient;
import com.njcn.user.enums.AppRoleEnum;
import com.njcn.user.pojo.constant.UserType;
import com.njcn.user.pojo.vo.UserVO;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -38,6 +40,9 @@ public class CsCommTerminalServiceImpl implements CsCommTerminalService {
private final CsLinePOMapper csLinePOMapper;
private final UserFeignClient userFeignClient;
private final CsEquipmentDeliveryService csEquipmentDeliveryService;
private final CsMarketDataService csMarketDataService;
private final ICsLedgerService csLedgerService;
private final CsTouristDataPOService csTouristDataPOService;
@Override
@@ -96,6 +101,22 @@ public class CsCommTerminalServiceImpl implements CsCommTerminalService {
.and(w -> w.eq(CsDeviceUserPO::getPrimaryUserId, userId).or().eq(CsDeviceUserPO::getSubUserId, userId))
.eq(CsDeviceUserPO::getStatus, DataStateEnum.ENABLE.getCode()).list();
devIds = devList.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList());
//note 黄是在cs_market_data写入数据，是用户和工程的关系；
// 但是权限根据用户和设备来判断会有问题，还需要用户和工程的关系(针对营销 工程用户)，所以这边还要添加用户和工程的关系
List<CsMarketDataVO> list = csMarketDataService.queryByUseId(userId);
if (CollUtil.isNotEmpty(list)) {
List<String> engineerIds = list.stream().map(CsMarketDataVO::getEngineerId).distinct().collect(Collectors.toList());
List<DevDetailDTO> devs = csLedgerService.getDevInfoByEngineerIds(engineerIds);
devIds.addAll(devs.stream().map(DevDetailDTO::getEquipmentId).distinct().collect(Collectors.toList()));
}
//note 如果是游客，则还需要加入系统配置的设备
String roleString = RequestUtil.getUserRole();
if (roleString.contains(AppRoleEnum.TOURIST.getCode())) {
devIds.addAll(csTouristDataPOService.queryAll().stream().map(CsTouristDataParmVO::getDeviceId).distinct().collect(Collectors.toList()));
}
}
if (!CollUtil.isEmpty(devIds)) {
devIds = devIds.stream().distinct().collect(Collectors.toList());
}
return devIds;
}

351
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
View File

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.csdevice.enums.AlgorithmResponseEnum;
@@ -17,13 +16,9 @@ import com.njcn.csdevice.pojo.vo.CsLedgerVO;
import com.njcn.csdevice.pojo.vo.DevCountVO;
import com.njcn.csdevice.pojo.vo.DevUserVO;
import com.njcn.csdevice.service.*;
import com.njcn.csdevice.utils.StringUtil;
import com.njcn.csharmonic.api.EventUserFeignClient;
import com.njcn.csharmonic.param.CsEventUserQueryParam;
import com.njcn.csharmonic.pojo.vo.EventDetailVO;
import com.njcn.cssystem.api.FeedBackFeignClient;
import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm;
import com.njcn.cssystem.pojo.vo.CsFeedbackVO;
import com.njcn.harmonic.utils.PublicDataUtils;
import com.njcn.user.api.UserFeignClient;
import com.njcn.user.enums.AppRoleEnum;
import com.njcn.user.pojo.po.User;
@@ -35,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -124,114 +118,251 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
}
@Override
public DevCountVO devCount(String id) {
QueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new QueryWrapper<>();
public DevCountVO devCount(String id,String time) {
DevCountVO vo = new DevCountVO();
//获取app用户的台账树，包含四个层级 工程、项目、设备、监测点
List<CsLedgerVO> appLedger = iCsLedgerService.appLineTree();
if (CollectionUtil.isNotEmpty(appLedger)) {
//获取第一层项目层级
List<CsLedgerVO> firstLevelList = new ArrayList<>();
//获取第三层设备层级
List<CsLedgerVO> thirdLevelList = new ArrayList<>();
for (CsLedgerVO firstLevel : appLedger) {
firstLevelList.add(firstLevel);
if (CollectionUtil.isNotEmpty(firstLevel.getChildren())) {
for (CsLedgerVO secondLevel : firstLevel.getChildren()) {
if (CollectionUtil.isNotEmpty(secondLevel.getChildren())) {
thirdLevelList.addAll(secondLevel.getChildren());
}
}
}
}
//note 所有工程数据
//获取工程数量
if (CollectionUtil.isNotEmpty(firstLevelList)) {
vo.setEningerCount(firstLevelList.size());
}
DevCountVO devCountVO = new DevCountVO();
//获取设备总数、在线设备、离线设备
if (CollectionUtil.isNotEmpty(thirdLevelList)) {
List<String> devIds = thirdLevelList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
List<CsEquipmentDeliveryPO> devList = csEquipmentDeliveryMapper.selectBatchIds(devIds);
//在线设备
List<CsEquipmentDeliveryPO> onlineDevs = devList.stream().filter(dev -> Objects.equals(dev.getRunStatus(), 2)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(onlineDevs)) {
vo.setOnLineDevCount(onlineDevs.size());
vo.setOnLineDevs(onlineDevs);
}
//离线设备
List<CsEquipmentDeliveryPO> offlineDevs = devList.stream().filter(dev -> Objects.equals(dev.getRunStatus(), 1)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(offlineDevs)) {
vo.setOffLineDevCount(offlineDevs.size());
vo.setOffLineDevs(offlineDevs);
}
}
//获取未读事件数量
int eventCount = this.baseMapper.queryTempEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
vo.setEventCount(eventCount);
String userRole = RequestUtil.getUserRole();
List<String> strings = JSONArray.parseArray(userRole, String.class);
if(CollectionUtils.isEmpty(strings)){
throw new BusinessException(AlgorithmResponseEnum.UNKNOW_ROLE);
int harmonicCount = this.baseMapper.queryTempHarmonic(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
vo.setHarmonicCount(harmonicCount);
int alarmCount = this.baseMapper.queryAlarmEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
vo.setAlarmCount(alarmCount);
int runCount = this.baseMapper.queryRunEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
vo.setRunCount(runCount);
//note 当前工程数据
//当前工程id
vo.setCurrentId(id);
//设备集合
List<String> currentDevIds = new ArrayList<>();
//监测点集合
List<String> currentLineIds = new ArrayList<>();
//获取第一层项目层级
List<CsLedgerVO> currentProjectIds = new ArrayList<>();
// 遍历树结构，找到匹配的工程节点
for (CsLedgerVO engineering : appLedger) {
if (id.equals(engineering.getId())) {
// 找到工程节点，获取其子节点（项目层级）
if (CollectionUtil.isNotEmpty(engineering.getChildren())) {
for (CsLedgerVO project : engineering.getChildren()) {
currentProjectIds.add(project);
// 获取项目下的设备层级
if (CollectionUtil.isNotEmpty(project.getChildren())) {
currentDevIds.addAll(project.getChildren().stream().map(CsLedgerVO::getId).collect(Collectors.toList()));
// 获取设备下的监测点层级
for (CsLedgerVO device : project.getChildren()) {
if (CollectionUtil.isNotEmpty(device.getChildren())) {
currentLineIds.addAll(device.getChildren().stream().map(CsLedgerVO::getId).collect(Collectors.toList()));
}
}
}
}
}
break;
}
}
//获取项目数量
if (CollectionUtil.isNotEmpty(currentProjectIds)) {
vo.setCurrentProjectCount(currentProjectIds.size());
}
//获取设备总数、在线设备、离线设备
if (CollectionUtil.isNotEmpty(currentDevIds)) {
List<CsEquipmentDeliveryPO> devList = csEquipmentDeliveryMapper.selectBatchIds(currentDevIds);
//在线设备
List<CsEquipmentDeliveryPO> onlineDevs = devList.stream().filter(dev -> Objects.equals(dev.getRunStatus(), 2)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(onlineDevs)) {
vo.setCurrentOnLineDevCount(onlineDevs.size());
vo.setCurrentOnLineDevs(onlineDevs);
}
//离线设备
List<CsEquipmentDeliveryPO> offlineDevs = devList.stream().filter(dev -> Objects.equals(dev.getRunStatus(), 1)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(offlineDevs)) {
vo.setCurrentOffLineDevCount(offlineDevs.size());
vo.setCurrentOffLineDevs(offlineDevs);
}
}
//获取未读事件数量
if (CollectionUtil.isNotEmpty(currentLineIds)) {
int eventCount2 = this.baseMapper.queryTempEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentLineIds);
vo.setCurrentEventCount(eventCount2);
int harmonicCount2 = this.baseMapper.queryTempHarmonic(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentLineIds);
vo.setCurrentHarmonicCount(harmonicCount2);
}
if (CollectionUtil.isNotEmpty(currentDevIds)) {
int alarmCount2 = this.baseMapper.queryAlarmEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentDevIds);
vo.setCurrentAlarmCount(alarmCount2);
int runCount2 = this.baseMapper.queryRunEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentDevIds);
vo.setCurrentRunCount(runCount2);
}
}
userRole=strings.get(0);
List<String> device = roleEngineerDevService.getDevice();
if(CollectionUtils.isEmpty(device)){
devCountVO.setOnLineDevCount(0);
devCountVO.setOnLineDevs(new ArrayList<>());
devCountVO.setOffLineDevCount(0);
devCountVO.setOffLineDevs(new ArrayList<>());
}else {
queryWrapper.clear();
queryWrapper.in("id",device);
List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectList(queryWrapper);
List<CsEquipmentDeliveryPO> collect = csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 1).collect(Collectors.toList());
List<CsEquipmentDeliveryPO> collect2= csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 2).collect(Collectors.toList());
devCountVO.setOnLineDevCount(collect2.size());
devCountVO.setOnLineDevs(collect2);
devCountVO.setOffLineDevCount(collect.size());
devCountVO.setOffLineDevs(collect);
List<String> roleengineer = roleEngineerDevService.getRoleengineer();
devCountVO.setEningerCount(roleengineer.size());
}
List<CsLedgerVO> deviceTree = iCsLedgerService.getDeviceTree(null);
//由于多加了一程便携式设备
List<String> collect1 = deviceTree.stream()
.map(CsLedgerVO::getChildren).flatMap(Collection::stream)
.filter(temp -> temp.getId().equals(id))
.map(CsLedgerVO::getChildren).flatMap(Collection::stream)
.map(CsLedgerVO::getChildren).flatMap(Collection::stream)
.map(CsLedgerVO::getId).collect(Collectors.toList());
//求交集
device.retainAll(collect1);
if(CollectionUtils.isEmpty(device)){
devCountVO.setCurrentOnLineDevCount(0);
devCountVO.setCurrentOnLineDevs(new ArrayList<>());
devCountVO.setCurrentOffLineDevCount(0);
devCountVO.setCurrentOffLineDevs(new ArrayList<>());
devCountVO.setCurrentProjectCount(0);
}else {
queryWrapper.clear();
queryWrapper.in("id",device);
List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectList(queryWrapper);
List<CsEquipmentDeliveryPO> collect = csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 1).collect(Collectors.toList());
List<CsEquipmentDeliveryPO> collect2= csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 2).collect(Collectors.toList());
devCountVO.setCurrentOnLineDevCount(collect2.size());
devCountVO.setCurrentOnLineDevs(collect2);
devCountVO.setCurrentOffLineDevCount(collect.size());
devCountVO.setCurrentOffLineDevs(collect);
List<CsLedger> list = iCsLedgerService.lambdaQuery().eq(CsLedger::getPid, id).eq(CsLedger::getState, 1).list();
devCountVO.setCurrentProjectCount(list.size());
}
CsEventUserQueryParam csEventUserQueryParam = new CsEventUserQueryParam();
csEventUserQueryParam.setStatus("0");
List<EventDetailVO> data = eventUserFeignClient.queryEventList(csEventUserQueryParam).getData();
List<EventDetailVO> event = data.stream().filter(temp -> temp.getType() == 0).collect(Collectors.toList());
List<EventDetailVO> harmonic = data.stream().filter(temp -> temp.getType() == 1).collect(Collectors.toList());
List<EventDetailVO> alarm = data.stream().filter(temp -> temp.getType() == 3).collect(Collectors.toList());
if(Objects.equals(userRole, AppRoleEnum.APP_VIP_USER.getCode())){
alarm = alarm.stream().filter(temp -> Objects.equals("3", temp.getLevel())).collect(Collectors.toList());
}
List<EventDetailVO> run = data.stream().filter(temp -> temp.getType() == 2).collect(Collectors.toList());
if(Objects.equals(userRole,AppRoleEnum.APP_VIP_USER.getCode())||Objects.equals(userRole,AppRoleEnum.TOURIST.getCode())
||Objects.equals(userRole,AppRoleEnum.MARKET_USER.getCode())){
devCountVO.setFeedBackCount(0);
}else {
CsFeedbackQueryParm csFeedbackQueryParm = new CsFeedbackQueryParm();
csFeedbackQueryParm.setPageNum(1);
csFeedbackQueryParm.setPageSize(100000);
csFeedbackQueryParm.setStatus("1");
Page<CsFeedbackVO> data1 = feedBackFeignClient.queryFeedBackPage(csFeedbackQueryParm).getData();
List<CsFeedbackVO> collect = data1.getRecords().stream().filter(temp -> !Objects.equals(temp.getUserId(), RequestUtil.getUserIndex())).collect(Collectors.toList());
devCountVO.setFeedBackCount(collect.size());
}
//todo 后续添加警告数,事件数
devCountVO.setEventCount(event.size());
devCountVO.setAlarmCount(alarm.size());
devCountVO.setRunCount(run.size());
devCountVO.setHarmonicCount(harmonic.size());
List<EventDetailVO> curEvent = event.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
List<EventDetailVO> curHarmonic = harmonic.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
List<EventDetailVO> curAlarm = alarm.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
List<EventDetailVO> curRun = run.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
devCountVO.setCurrentEventCount(curEvent.size());
devCountVO.setCurrentAlarmCount(curAlarm.size());
devCountVO.setCurrentRunCount(curRun.size());
devCountVO.setCurrentHarmonicCount(curHarmonic.size());
return devCountVO;
return vo;
}
// @Override
// public DevCountVO devCount(String id,String time) {
// QueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new QueryWrapper<>();
//
// DevCountVO devCountVO = new DevCountVO();
//
// String userRole = RequestUtil.getUserRole();
// List<String> strings = JSONArray.parseArray(userRole, String.class);
// if(CollectionUtils.isEmpty(strings)){
// throw new BusinessException(AlgorithmResponseEnum.UNKNOW_ROLE);
//
// }
// userRole=strings.get(0);
//
// List<String> device = roleEngineerDevService.getDevice();
// if(CollectionUtils.isEmpty(device)){
// devCountVO.setOnLineDevCount(0);
// devCountVO.setOnLineDevs(new ArrayList<>());
// devCountVO.setOffLineDevCount(0);
// devCountVO.setOffLineDevs(new ArrayList<>());
// }else {
// queryWrapper.clear();
// queryWrapper.in("id",device);
//
// List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectList(queryWrapper);
// List<CsEquipmentDeliveryPO> collect = csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 1).collect(Collectors.toList());
// List<CsEquipmentDeliveryPO> collect2= csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 2).collect(Collectors.toList());
// devCountVO.setOnLineDevCount(collect2.size());
// devCountVO.setOnLineDevs(collect2);
// devCountVO.setOffLineDevCount(collect.size());
// devCountVO.setOffLineDevs(collect);
// List<String> roleengineer = roleEngineerDevService.getRoleengineer();
// devCountVO.setEningerCount(roleengineer.size());
// }
//
// List<CsLedgerVO> deviceTree = iCsLedgerService.getDeviceTree(null);
// //由于多加了一程便携式设备
// List<String> collect1 = deviceTree.stream()
// .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
// .filter(temp -> temp.getId().equals(id))
// .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
// .map(CsLedgerVO::getChildren).flatMap(Collection::stream)
// .map(CsLedgerVO::getId).collect(Collectors.toList());
// //求交集
// device.retainAll(collect1);
// if(CollectionUtils.isEmpty(device)){
// devCountVO.setCurrentOnLineDevCount(0);
// devCountVO.setCurrentOnLineDevs(new ArrayList<>());
// devCountVO.setCurrentOffLineDevCount(0);
// devCountVO.setCurrentOffLineDevs(new ArrayList<>());
// devCountVO.setCurrentProjectCount(0);
//
// }else {
// queryWrapper.clear();
// queryWrapper.in("id",device);
//
// List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectList(queryWrapper);
// List<CsEquipmentDeliveryPO> collect = csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 1).collect(Collectors.toList());
// List<CsEquipmentDeliveryPO> collect2= csEquipmentDeliveryPOS.stream().filter(temp -> temp.getRunStatus() == 2).collect(Collectors.toList());
// devCountVO.setCurrentOnLineDevCount(collect2.size());
// devCountVO.setCurrentOnLineDevs(collect2);
// devCountVO.setCurrentOffLineDevCount(collect.size());
// devCountVO.setCurrentOffLineDevs(collect);
// List<CsLedger> list = iCsLedgerService.lambdaQuery().eq(CsLedger::getPid, id).eq(CsLedger::getState, 1).list();
// devCountVO.setCurrentProjectCount(list.size());
// }
// CsEventUserQueryParam csEventUserQueryParam = new CsEventUserQueryParam();
// csEventUserQueryParam.setStatus("0");
//
// //查询暂态事件、运行事件还是使用之前的方法
// List<EventDetailVO> data = eventUserFeignClient.queryEventList(csEventUserQueryParam).getData();
// //查询稳态事件 先获取监测点id
// csLinePOService.getLinesByDevList(device);
//
//
// //查询运行告警事件
//
//
//
//
// List<EventDetailVO> event = data.stream().filter(temp -> temp.getType() == 0).collect(Collectors.toList());
// List<EventDetailVO> harmonic = data.stream().filter(temp -> temp.getType() == 1).collect(Collectors.toList());
// List<EventDetailVO> alarm = data.stream().filter(temp -> temp.getType() == 3).collect(Collectors.toList());
//
// if(Objects.equals(userRole, AppRoleEnum.APP_VIP_USER.getCode())){
// alarm = alarm.stream().filter(temp -> Objects.equals("3", temp.getLevel())).collect(Collectors.toList());
// }
// List<EventDetailVO> run = data.stream().filter(temp -> temp.getType() == 2).collect(Collectors.toList());
// if(Objects.equals(userRole,AppRoleEnum.APP_VIP_USER.getCode())||Objects.equals(userRole,AppRoleEnum.TOURIST.getCode())
// ||Objects.equals(userRole,AppRoleEnum.MARKET_USER.getCode())){
// devCountVO.setFeedBackCount(0);
//
// }else {
// CsFeedbackQueryParm csFeedbackQueryParm = new CsFeedbackQueryParm();
// csFeedbackQueryParm.setPageNum(1);
// csFeedbackQueryParm.setPageSize(100000);
// csFeedbackQueryParm.setStatus("1");
// Page<CsFeedbackVO> data1 = feedBackFeignClient.queryFeedBackPage(csFeedbackQueryParm).getData();
// List<CsFeedbackVO> collect = data1.getRecords().stream().filter(temp -> !Objects.equals(temp.getUserId(), RequestUtil.getUserIndex())).collect(Collectors.toList());
// devCountVO.setFeedBackCount(collect.size());
// }
//
// //todo 后续添加警告数,事件数
// devCountVO.setEventCount(event.size());
// devCountVO.setAlarmCount(alarm.size());
// devCountVO.setRunCount(run.size());
// devCountVO.setHarmonicCount(harmonic.size());
// List<EventDetailVO> curEvent = event.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
// List<EventDetailVO> curHarmonic = harmonic.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
// List<EventDetailVO> curAlarm = alarm.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
// List<EventDetailVO> curRun = run.stream().filter(temp -> Objects.equals(temp.getEngineeringid(), id)).collect(Collectors.toList());
//
// devCountVO.setCurrentEventCount(curEvent.size());
// devCountVO.setCurrentAlarmCount(curAlarm.size());
// devCountVO.setCurrentRunCount(curRun.size());
// devCountVO.setCurrentHarmonicCount(curHarmonic.size());
//
//
// return devCountVO;
// }
/**
* @Description: 判断当前用户是否是主用户 0-否1-是
* @Param:

13
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
View File

@@ -84,7 +84,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
csLedger1.setLevel(0);
csLedger1.setName(csEngineeringPO.getName());
csLedger1.setState(1);
csLedger1.setSort(0);
csLedger1.setSort(csEngineeringAddParm.getSort());
csLedgerMapper.insert(csLedger1);
//绑定用户
CsEngineeringUserPO po = new CsEngineeringUserPO();
@@ -164,7 +164,8 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryParm.getProvince ()),"province",csEngineeringQueryParm.getProvince ()).
eq (StringUtils.isNotBlank (csEngineeringQueryParm.getCity ()),"city",csEngineeringQueryParm.getCity ()).
eq ("status","1" ).
eq ("status","1" )
.ne("name","便携式工程").
like (StringUtils.isNotBlank (csEngineeringQueryParm.getName ()),"name",csEngineeringQueryParm.getName ()).orderByAsc("sort");
List<CsEngineeringPO> csEngineeringPOS = this.getBaseMapper ( ).selectList (queryWrapper);
csEngineeringVOList = csEngineeringPOS.stream ().map (temp->{
@@ -196,6 +197,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
queryWrapper.eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getProvince ()),"province",csEngineeringQueryPageParm.getProvince ()).
eq (StringUtils.isNotBlank (csEngineeringQueryPageParm.getCity ()),"city",csEngineeringQueryPageParm.getCity ()).
eq ("status","1" ).
ne("name","便携式工程").
like (StringUtils.isNotBlank (csEngineeringQueryPageParm.getName ()),"name",csEngineeringQueryPageParm.getName ()).orderByDesc("create_time");
Page<CsEngineeringPO> csEngineeringPOPage = this.getBaseMapper ( ).selectPage (tempPage, queryWrapper);
List<CsEngineeringVO> collect = csEngineeringPOPage.getRecords ( ).stream ( ).map (temp -> {
@@ -297,6 +299,13 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
return this.update(queryWrapper);
}
@Override
public CsEngineeringPO getEngineeringByName(String name) {
LambdaQueryWrapper<CsEngineeringPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CsEngineeringPO::getName,name).eq(CsEngineeringPO::getStatus,1);
return this.getOne(queryWrapper);
}
public String getAreaById(String id){
String areaName =redisUtil.getStringByKey (id);

46
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -24,6 +24,7 @@ import com.njcn.access.utils.MqttUtil;
import com.njcn.common.pojo.dto.DeviceLogDTO;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.csdevice.api.CsLogsFeignClient;
import com.njcn.csdevice.api.EngineeringFeignClient;
import com.njcn.csdevice.constant.DataParam;
import com.njcn.csdevice.enums.AlgorithmResponseEnum;
import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
@@ -107,6 +108,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
private final CsTerminalLogsMapper csTerminalLogsMapper;
private final ICsCommunicateService csCommunicateService;
private final ICsUserPinsService csUserPinsService;
private final EngineeringFeignClient engineeringFeignClient;
@Override
public void refreshDeviceDataCache() {
@@ -138,12 +140,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
csEquipmentDeliveryPo.setStatus (1);
csEquipmentDeliveryPo.setRunStatus(1);
csEquipmentDeliveryPo.setUsageStatus(1);
String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
csEquipmentDeliveryPo.setProcess(4);
} else if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
csEquipmentDeliveryPo.setProcess(2);
}
// String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
// if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
// csEquipmentDeliveryPo.setProcess(4);
// } else if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
// csEquipmentDeliveryPo.setProcess(2);
// }
csEquipmentDeliveryPo.setProcess(4);
//生成二维码文件
String qr = this.createQr(csEquipmentDeliveryAddParm.getNdid());
csEquipmentDeliveryPo.setQrPath(qr);
@@ -154,7 +157,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
csEquipmentProcess.setDevId(csEquipmentDeliveryAddParm.getNdid());
csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
csEquipmentProcess.setStartTime(LocalDateTime.now());
csEquipmentProcess.setProcess(1);
// csEquipmentProcess.setProcess(1);
csEquipmentProcess.setProcess(4);
csEquipmentProcess.setStatus (1);
csEquipmentProcessPOService.save(csEquipmentProcess);
result = this.save (csEquipmentDeliveryPo);
@@ -217,6 +221,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
return result;
}
BeanUtils.copyProperties (csEquipmentDeliveryPO,result);
result.setAssociatedEngineeringName(csLedgerService.findDataById(csEquipmentDeliveryPO.getAssociatedEngineering()).getName());
result.setAssociatedProjectName(csLedgerService.findDataById(csEquipmentDeliveryPO.getAssociatedProject()).getName());
return result;
}
@@ -239,15 +245,19 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
//根据设备id获取监测点id集合
List<CsLinePO> lineIds = csLinePOService.getLineByDev(device);
List<ProjectEquipmentVO> recordList = new ArrayList<>();
list.getRecords().forEach(temp->{
temp.setIsPrimaryUser(csDeviceUserPOService.isPrimaryUser(temp.getEquipmentId()));
//获取设备类型
SysDicTreePO po = dictTreeFeignClient.queryById(temp.getDevType()).getData();
temp.setDevType(po.getCode());
temp.setLineList(lineIds.stream().filter(line -> line.getDevId().equals(temp.getEquipmentId())).sorted(Comparator.comparing(CsLinePO::getLineId)).collect(Collectors.toList()));
if (!Objects.equals(DicDataEnum.PORTABLE.getCode(),temp.getDevType())) {
recordList.add(temp);
}
});
List<ProjectEquipmentVO> recordList = list.getRecords();
//获取用户置顶的设备
List<CsUserPins> topList = csUserPinsService.getPinToTopList();
List<String> targetIdList = topList.stream()
@@ -606,13 +616,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
csEquipmentDeliveryPO.setMac(path);
csEquipmentDeliveryPO.setRunStatus(1);
csEquipmentDeliveryPO.setStatus(1);
csEquipmentDeliveryPO.setProcess(2);
// csEquipmentDeliveryPO.setProcess(2);
csEquipmentDeliveryPO.setProcess(4);
csEquipmentDeliveryPO.setSort(100);
CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
csEquipmentProcess.setDevId(csEquipmentDeliveryPO.getNdid());
csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
csEquipmentProcess.setStartTime(LocalDateTime.now());
csEquipmentProcess.setProcess(1);
// csEquipmentProcess.setProcess(1);
csEquipmentProcess.setProcess(4);
csEquipmentProcess.setStatus(1);
collect1.add(csEquipmentProcess);
return csEquipmentDeliveryPO;
@@ -743,6 +755,20 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
}
}
@Override
public void updateLedger(String nDid,String engineeringId,String projectId) {
boolean result;
LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(CsEquipmentDeliveryPO::getNdid,nDid)
.ne(CsEquipmentDeliveryPO::getRunStatus,0)
.set(CsEquipmentDeliveryPO::getAssociatedEngineering,engineeringId)
.set(CsEquipmentDeliveryPO::getAssociatedProject,projectId);
result = this.update(lambdaUpdateWrapper);
if (result) {
refreshDeviceDataCache();
}
}
@Override
public boolean rebootDevice(String nDid) {
boolean result = false;

476
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
View File

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.csdevice.api.CsCommTerminalFeignClient;
import com.njcn.csdevice.api.CsMarketDataFeignClient;
import com.njcn.csdevice.constant.DataParam;
import com.njcn.csdevice.enums.LineBaseEnum;
import com.njcn.csdevice.mapper.*;
@@ -19,6 +21,7 @@ import com.njcn.csdevice.pojo.dto.LineParamDTO;
import com.njcn.csdevice.pojo.param.CsLedgerParam;
import com.njcn.csdevice.pojo.po.*;
import com.njcn.csdevice.pojo.vo.CsLedgerVO;
import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
import com.njcn.csdevice.service.*;
import com.njcn.csharmonic.api.PqSensitiveUserFeignClient;
import com.njcn.device.biz.pojo.po.PqSensitiveUser;
@@ -68,6 +71,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
private final PqSensitiveUserFeignClient pqSensitiveUserFeignClient;
private final UserFeignClient userFeignClient;
private final ICsUserPinsService csUserPinsService;
private final CsCommTerminalFeignClient csCommTerminalFeignClient;
private final CsMarketDataFeignClient csMarketDataFeignClient;
@Override
public List<CsLedgerVO> getLedgerTree() {
@@ -93,6 +99,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
List<String> device = roleEngineerDevService.getDevice();
//区分治理装置和云前置装置
List<String> zhiLianDevice = new ArrayList<>();
List<String> portableDevice = new ArrayList<>();
List<String> cldDevice = new ArrayList<>();
if (CollectionUtil.isNotEmpty(device)) {
List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectBatchIds(device);
@@ -112,6 +119,14 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
.map(CsEquipmentDeliveryPO::getId)
.forEach(zhiLianDevice::add)
);
DictTreeVO vo3 = dictTreeFeignClient.queryByCode(DicDataEnum.PORTABLE.getCode()).getData();
Optional.ofNullable(vo3)
.map(DictTreeVO::getId)
.ifPresent(id -> csEquipmentDeliveryPOS.stream()
.filter(item -> Objects.equals(item.getDevType(), id))
.map(CsEquipmentDeliveryPO::getId)
.forEach(portableDevice::add)
);
}
engineeringList = allList.stream().filter(item -> roleengineer.contains(item.getId())).collect(Collectors.toList());
List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
@@ -208,28 +223,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
portable.setPid("0");
portable.setId(IdUtil.simpleUUID());
//根据当前用户获取便携式设备
List<CsLedgerVO> ledger;
String role = RequestUtil.getUserRole();
List<String> roles = JSONArray.parseArray(role, String.class);
if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode()) || roles.contains(AppRoleEnum.REGULAR_USER.getCode())){
ledger = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
.collect(Collectors.toList());
} else {
LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId, RequestUtil.getUserIndex());
List<CsDeviceUserPO> list1 = csDeviceUserPOMapper.selectList(queryWrapper);
List<String> result = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list1)) {
result = list1.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
}
//针对未启用的装置判断
List<String> finalResult = result;
ledger = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0") && finalResult.contains(item.getId()))
.collect(Collectors.toList());
}
List<CsLedgerVO> ledger = allList.stream().filter(obj -> portableDevice.contains(obj.getId())).collect(Collectors.toList());
Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
.collect(Collectors.toMap(
CsLedgerVO::getId,
@@ -245,6 +239,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
c.setType("device");
c.setName(po.getName());
c.setSort(po.getSort());
c.setDevConType(po.getDevAccessMethod());
})
.filter(c -> poMap2.get(c.getId()).getUsageStatus() == 1)
.collect(Collectors.toList());
@@ -336,6 +331,112 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
return tree;
}
@Override
public List<CsLedgerVO> appLineTree() {
//根据用户获取监测点
List<String> lineIds = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData();
List<String> engineeringIds = roleEngineerDevService.getRoleengineer();
if (CollectionUtil.isEmpty(lineIds) && CollectionUtil.isEmpty(engineeringIds)) {
return Collections.emptyList();
}
//获取所有台账数据
List<CsLedgerVO> allList = this.baseMapper.getAll();
if (CollectionUtil.isEmpty(allList)) {
return Collections.emptyList();
}
Set<String> resultEngineeringIds = new HashSet<>();
//1. 反推：从监测点向上找到所有相关的工程
if (CollectionUtil.isNotEmpty(lineIds)) {
//过滤出监测点数据 (level=3)
List<CsLedgerVO> lineList = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.LINE_LEVEL.getCode()))
.filter(item -> lineIds.contains(item.getId()))
.collect(Collectors.toList());
//从监测点向上追溯到工程
lineList.forEach(line -> {
String[] pids = line.getPids().split(",");
//根据层级结构，工程 ID 在 pids 的第一个位置（索引为 1，因为索引 0 是"0"）
if (pids.length > LineBaseEnum.ENGINEERING_LEVEL.getCode() + 1) {
String engineeringId = pids[LineBaseEnum.ENGINEERING_LEVEL.getCode() + 1];
resultEngineeringIds.add(engineeringId);
}
});
}
//2. 正推：添加用户已有的工程 ID
if (CollectionUtil.isNotEmpty(engineeringIds)) {
resultEngineeringIds.addAll(engineeringIds);
}
if (CollectionUtil.isEmpty(resultEngineeringIds)) {
return Collections.emptyList();
}
//获取所有层级数据并排序
//监测点数据
List<CsLedgerVO> lineList = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.LINE_LEVEL.getCode()))
.filter(item -> lineIds.contains(item.getId()))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
//设备数据
List<CsLedgerVO> deviceList = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.DEVICE_LEVEL.getCode()))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
//项目数据
List<CsLedgerVO> projectList = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.PROJECT_LEVEL.getCode()))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
//工程数据，过滤掉名字是"便携式工程"的数据
List<CsLedgerVO> engineeringList = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), LineBaseEnum.ENGINEERING_LEVEL.getCode()))
.filter(item -> resultEngineeringIds.contains(item.getId()))
.filter(item -> !Objects.equals(item.getName(), "便携式工程"))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
//构建设备与监测点的关系
deviceList.forEach(device -> {
List<CsLedgerVO> children = lineList.stream()
.filter(line -> Objects.equals(line.getPid(), device.getId()))
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(children)) {
device.setChildren(children);
}
});
//构建项目与设备的关系
projectList.forEach(project -> {
List<CsLedgerVO> children = deviceList.stream()
.filter(device -> Objects.equals(device.getPid(), project.getId()))
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(children)) {
project.setChildren(children);
}
});
//构建工程与项目的关系
engineeringList.forEach(engineering -> {
List<CsLedgerVO> children = projectList.stream()
.filter(project -> Objects.equals(project.getPid(), engineering.getId()))
.collect(Collectors.toList());
//工程下面可以没有项目，所以即使 children 为空也要保留
engineering.setChildren(children);
});
return engineeringList;
}
/**
* 合并两个项目列表，根据项目 ID 去重并合并子节点
*/
@@ -432,6 +533,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
List<String> device = roleEngineerDevService.getDevice();
List<String> zhiLianDevice = new ArrayList<>();
List<String> portableDevice = new ArrayList<>();
List<String> cldDevice = new ArrayList<>();
if (CollectionUtil.isNotEmpty(device)) {
List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectBatchIds(device);
@@ -451,6 +553,14 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
.map(CsEquipmentDeliveryPO::getId)
.forEach(zhiLianDevice::add)
);
DictTreeVO vo3 = dictTreeFeignClient.queryByCode(DicDataEnum.PORTABLE.getCode()).getData();
Optional.ofNullable(vo3)
.map(DictTreeVO::getId)
.ifPresent(id -> csEquipmentDeliveryPOS.stream()
.filter(item -> Objects.equals(item.getDevType(), id))
.map(CsEquipmentDeliveryPO::getId)
.forEach(portableDevice::add)
);
}
engineeringList = allList.stream().filter(item -> roleengineer.contains(item.getId())).collect(Collectors.toList());
@@ -528,28 +638,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
portable.setPid("0");
portable.setId(IdUtil.simpleUUID());
List<CsLedgerVO> ledger;
String role = RequestUtil.getUserRole();
List<String> roles = JSONArray.parseArray(role, String.class);
if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode()) || roles.contains(AppRoleEnum.REGULAR_USER.getCode())){
ledger = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
.collect(Collectors.toList());
} else {
LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId, RequestUtil.getUserIndex());
List<CsDeviceUserPO> list1 = csDeviceUserPOMapper.selectList(queryWrapper);
List<String> result = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list1)) {
result = list1.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
}
//针对未启用的装置判断
List<String> finalResult = result;
ledger = allList.stream()
.filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0") && finalResult.contains(item.getId()))
.collect(Collectors.toList());
}
List<CsLedgerVO> ledger = allList.stream().filter(obj -> portableDevice.contains(obj.getId())).collect(Collectors.toList());
Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
.collect(Collectors.toMap(
CsLedgerVO::getId,
@@ -964,78 +1053,6 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
return tree;
}
// @Override
// public List<CsLedgerVO> getztProjectTree() {
// List<CsLedgerVO> engineeringList;
// List<CsLedgerVO> allList = this.baseMapper.getAll();
// /*获取用户工程，设备信息过滤*/
// List<String> roleengineer = roleEngineerDevService.getRoleengineer();
// List<String> device = roleEngineerDevService.getDevice();
// engineeringList = allList.stream().filter(item -> roleengineer.contains(item.getId())).collect(Collectors.toList());
// List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
//
// List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0")).
// peek(
// temp -> {
// CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(temp.getId());
// temp.setComFlag(po.getRunStatus());
// temp.setNDId(po.getNdid());
// temp.setType("device");
// }
// ).
// sorted(Comparator.comparing(CsLedgerVO::getSort))
// .collect(Collectors.toList());
// checkDevSetData(deviceList);
// projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
// engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList)));
//
// //获取便携式项目数
// CsLedgerVO portable = new CsLedgerVO();
// portable.setLevel(0);
// portable.setName(DataParam.PORTABLE_SYSTEM);
// portable.setPid("0");
// portable.setId(IdUtil.simpleUUID());
//
// CsLedgerVO project = new CsLedgerVO();
// project.setLevel(1);
// project.setName(DataParam.WIRELESS_PROJECT);
// project.setPid("0");
// project.setId(DataParam.WIRELESS_PROJECT_ID);
//
// List<CsLedgerVO> portables = allList.stream().filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0")).collect(Collectors.toList());
// checkDevSetData(portables);
// for (CsLedgerVO c : portables) {
// c.setPid(project.getId());
// CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
// c.setComFlag(po.getRunStatus());
// c.setNDId(po.getNdid());
// c.setType("device");
// }
// project.setChildren(portables);
//
// List<CsLedgerVO> wxProjectList = new ArrayList<>();
// wxProjectList.add(project);
//
// portable.setChildren(wxProjectList);
//
//
// CsLedgerVO government = new CsLedgerVO();
// government.setLevel(0);
// government.setName(DataParam.GOVERNANCE_SYSTEM);
// government.setPid("0");
// government.setId(IdUtil.simpleUUID());
// government.setChildren(engineeringList);
// List<CsLedgerVO> tree = new ArrayList<>();
//
// if (CollUtil.isNotEmpty(portables)) {
// tree.add(portable);
// }
// if (CollUtil.isNotEmpty(deviceList)) {
// tree.add(government);
// }
//
// return tree;
// }
@Override
public List<CsLedgerVO> objTree() {
@@ -1151,37 +1168,38 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
List<CsLedgerVO> allList = this.baseMapper.getAll();
if (CollectionUtil.isEmpty(allList)) {
CsLedgerVO government = new CsLedgerVO();
government.setLevel(0);
government.setName(DataParam.cldDev);
government.setLevel(-1);
government.setName("台账树");
government.setPid("0");
government.setId(IdUtil.simpleUUID());
government.setChildren(new ArrayList<>());
return government;
}
DictTreeVO cldDict = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
String cldDevTypeId = cldDict.getId();
List<CsLedgerVO> engineeringList = allList.stream()
.filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode()))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
List<CsLedgerVO> projectList = allList.stream()
.filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
List<CsLedgerVO> deviceList = allList.stream()
.filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode()))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
List<CsLedgerVO> lineList = allList.stream()
.filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode()))
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
if (CollectionUtil.isEmpty(deviceList)) {
CsLedgerVO government = new CsLedgerVO();
government.setLevel(0);
government.setName(DataParam.cldDev);
government.setLevel(-1);
government.setName("台账树");
government.setPid("0");
government.setId(IdUtil.simpleUUID());
government.setChildren(engineeringList);
@@ -1194,7 +1212,6 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
Map<String, String> lineDevMap = lineList.stream().collect(Collectors.toMap(CsLedgerVO::getId, CsLedgerVO::getPid));
Set<String> cldDevIds = devs.stream()
.filter(item -> item.getDevType().equals(cldDevTypeId))
.map(CsEquipmentDeliveryPO::getId)
.collect(Collectors.toSet());
@@ -1208,6 +1225,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
CsEquipmentDeliveryPO dev = devsMap.get(device.getId());
if (dev != null) {
device.setComFlag(dev.getRunStatus());
device.setDevConType(dev.getDevAccessMethod());
}
});
@@ -1222,30 +1240,33 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
});
engineeringList.forEach(engineering -> {
List<CsLedgerVO> projectChildren = new ArrayList<>();
for (CsLedgerVO project : projectList) {
if (project.getPid().equals(engineering.getId())) {
List<CsLedgerVO> projectDevices = projectToDeviceMap.getOrDefault(project.getId(), new ArrayList<>());
if (CollectionUtil.isNotEmpty(projectDevices)) {
List<CsLedgerVO> deviceChildren = new ArrayList<>();
for (CsLedgerVO device : projectDevices) {
if (cldDevIds.contains(device.getId())) {
List<CsLedgerVO> lineChildren = deviceToLineMap.getOrDefault(device.getId(), new ArrayList<>());
device.setChildren(lineChildren);
deviceChildren.add(device);
}
List<CsLedgerVO> sortedProjects = projectList.stream()
.filter(project -> project.getPid().equals(engineering.getId()))
.peek(project -> {
List<CsLedgerVO> projectDevices = projectToDeviceMap.getOrDefault(project.getId(), new ArrayList<>());
if (CollectionUtil.isNotEmpty(projectDevices)) {
List<CsLedgerVO> sortedDevices = projectDevices.stream()
.filter(device -> cldDevIds.contains(device.getId()))
.peek(device -> {
List<CsLedgerVO> sortedLines = deviceToLineMap.getOrDefault(device.getId(), new ArrayList<>())
.stream()
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
device.setChildren(sortedLines);
})
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
project.setChildren(sortedDevices);
}
project.setChildren(deviceChildren);
}
projectChildren.add(project);
}
}
engineering.setChildren(projectChildren);
})
.sorted(Comparator.comparing(CsLedgerVO::getSort))
.collect(Collectors.toList());
engineering.setChildren(sortedProjects);
});
CsLedgerVO government = new CsLedgerVO();
government.setLevel(0);
government.setName(DataParam.cldDev);
government.setLevel(-1);
government.setName("台账树");
government.setPid("0");
government.setId(IdUtil.simpleUUID());
government.setChildren(engineeringList);
@@ -1253,105 +1274,6 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
return government;
}
// @Override
// public CsLedgerVO cldTree() {
//
// List<CsLedgerVO> engineerTree = new ArrayList<>();
// List<CsLedgerVO> projectTree = new ArrayList<>();
// List<CsLedgerVO> deviceTree = new ArrayList<>();
// List<CsLedgerVO> lineTree = new ArrayList<>();
//
// List<CsLedgerVO> allList = this.baseMapper.getAll();
// if (CollectionUtil.isNotEmpty(allList)) {
// //工程集合
// List<CsLedgerVO> tree1 = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).collect(Collectors.toList());
// //项目集合
// List<CsLedgerVO> tree2 = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList());
// //设备集合
// List<CsLedgerVO> tree3 = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode())).collect(Collectors.toList());
// //监测点集合
// List<CsLedgerVO> tree4 = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())).collect(Collectors.toList());
//
// //筛选出云前置设备
// if (CollectionUtil.isNotEmpty(tree3)) {
// Set<String> list1 = new HashSet<>();
// List<String> devList = tree3.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
// List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devList);
// Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
// DictTreeVO vo1 = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
//
// //list1是 cld设备
// devs.forEach(item -> {
// if (item.getDevType().equals(vo1.getId())) {
// list1.add(item.getId());
// }
// });
// //list2是 非cld设备
// Set<String> list2 = devList.stream().filter(item -> !list1.contains(item)).collect(Collectors.toSet());
// List<CsLedgerVO> tree5 = tree3.stream().filter(vo -> list2.contains(vo.getId())).collect(Collectors.toList());
// Set<String> list3 = tree5.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet());
// projectTree = tree2.stream().filter(vo -> !list3.contains(vo.getId())).collect(Collectors.toList());
//
// List<CsLedgerVO> tree6 = tree2.stream().filter(vo -> list3.contains(vo.getId())).collect(Collectors.toList());
// Set<String> proList = tree6.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet());
// engineerTree = tree1.stream().filter(vo -> !proList.contains(vo.getId())).collect(Collectors.toList());
//
// if (CollectionUtil.isNotEmpty(list1)) {
// deviceTree = tree3.stream()
// .filter(vo -> list1.contains(vo.getId()))
// .peek(item -> {
// CsEquipmentDeliveryPO dev = devsMap.get(item.getId());
// if (dev != null) {
// item.setComFlag(dev.getRunStatus());
// }
// })
// .collect(Collectors.toList());
//
// lineTree = tree4.stream()
// .filter(vo -> list1.contains(vo.getPid()))
// .peek(item -> {
// CsEquipmentDeliveryPO dev = devsMap.get(item.getId());
// if (dev != null) {
// item.setComFlag(dev.getRunStatus());
// }
// })
// .collect(Collectors.toList());
// }
// }
// }
//
// if (CollectionUtil.isNotEmpty(deviceTree)) {
// List<CsLedgerVO> finalLineTree = lineTree;
// deviceTree.forEach(item -> {
// item.setChildren(getChildren(item, finalLineTree));
// });
// }
// if (CollectionUtil.isNotEmpty(projectTree)) {
// List<CsLedgerVO> finalDeviceTree = deviceTree;
// projectTree.forEach(item -> {
// item.setChildren(getChildren(item, finalDeviceTree));
// });
// }
// if (CollectionUtil.isNotEmpty(engineerTree)) {
// List<CsLedgerVO> finalProjectTree = projectTree;
// engineerTree.forEach(item -> {
// item.setChildren(getChildren(item, finalProjectTree));
// });
// }
//
// CsLedgerVO government = new CsLedgerVO();
// government.setLevel(0);
// government.setName(DataParam.cldDev);
// government.setPid("0");
// government.setId(IdUtil.simpleUUID());
// government.setChildren(engineerTree);
//
// return government;
// }
@Override
public List<DevDetailDTO> getInfoByIds(List<String> list) {
List<DevDetailDTO> details = new ArrayList<>();
@@ -1385,51 +1307,73 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
@Override
public List<DevDetailDTO> getDevInfoByEngineerIds(List<String> list) {
// 参数校验，确保 list 不为空
if (CollUtil.isEmpty(list)) {
return new ArrayList<>();
}
List<DevDetailDTO> details = new ArrayList<>();
//工程
// 工程
LambdaQueryWrapper<CsLedger> queryWrapper0 = new LambdaQueryWrapper<>();
queryWrapper0.in(CsLedger::getId, list);
List<CsLedger> engineering = this.list(queryWrapper0);
if (CollUtil.isEmpty(engineering)) {
return details;
}
Map<String, CsLedger> engineeringMap = engineering.stream().collect(Collectors.toMap(CsLedger::getId, item -> item));
//项目
// 项目
LambdaQueryWrapper<CsLedger> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CsLedger::getPid, list);
List<CsLedger> project = this.list(queryWrapper);
if (CollUtil.isEmpty(project)) {
return details;
}
Map<String, CsLedger> projectMap = project.stream().collect(Collectors.toMap(CsLedger::getId, item -> item));
//设备
// 设备
List<String> projectIds = project.stream().map(CsLedger::getId).collect(Collectors.toList());
LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.in(CsLedger::getPid, projectIds);
List<CsLedger> dev = this.list(queryWrapper2);
if (CollUtil.isNotEmpty(projectIds)) {
LambdaQueryWrapper<CsLedger> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.in(CsLedger::getPid, projectIds);
List<CsLedger> dev = this.list(queryWrapper2);
if (CollectionUtil.isNotEmpty(dev)) {
List<String> devIds = dev.stream().map(CsLedger::getId).collect(Collectors.toList());
List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devIds);
Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, item -> item));
if (CollUtil.isNotEmpty(dev)) {
List<String> devIds = dev.stream().map(CsLedger::getId).collect(Collectors.toList());
List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devIds);
Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, item -> item));
dev.forEach(item -> {
DevDetailDTO detail = new DevDetailDTO();
detail.setEquipmentName(item.getName());
detail.setEquipmentId(item.getId());
dev.forEach(item -> {
DevDetailDTO detail = new DevDetailDTO();
detail.setEquipmentName(item.getName());
detail.setEquipmentId(item.getId());
CsLedger csLedger = projectMap.get(item.getPid());
detail.setProjectId(csLedger.getId());
detail.setProjectName(csLedger.getName());
CsLedger csLedger = projectMap.get(item.getPid());
if (csLedger != null) {
detail.setProjectId(csLedger.getId());
detail.setProjectName(csLedger.getName());
CsLedger csLedger1 = engineeringMap.get(csLedger.getPid());
detail.setEngineeringid(csLedger1.getId());
detail.setEngineeringName(csLedger1.getName());
detail.setRunStatus(devsMap.get(item.getId()).getRunStatus());
CsLedger csLedger1 = engineeringMap.get(csLedger.getPid());
if (csLedger1 != null) {
detail.setEngineeringid(csLedger1.getId());
detail.setEngineeringName(csLedger1.getName());
}
}
details.add(detail);
});
CsEquipmentDeliveryPO devInfo = devsMap.get(item.getId());
if (devInfo != null) {
detail.setRunStatus(devInfo.getRunStatus());
}
details.add(detail);
});
}
}
return details;
}
@Override
public List<DevDetailDTO> getEngineeringHaveDevs(List<String> list) {
List<DevDetailDTO> result = new ArrayList<>();

31
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsMarketDataServiceImpl.java
View File

@@ -1,11 +1,15 @@
package com.njcn.csdevice.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.mapper.CsEngineeringMapper;
import com.njcn.csdevice.mapper.CsMarketDataMapper;
import com.njcn.csdevice.pojo.param.CsMarketDataParam;
import com.njcn.csdevice.pojo.param.EngineerIdParam;
import com.njcn.csdevice.pojo.po.CsEngineeringPO;
import com.njcn.csdevice.pojo.po.CsLedger;
import com.njcn.csdevice.pojo.po.CsMarketData;
import com.njcn.csdevice.pojo.vo.CsMarketDataVO;
import com.njcn.csdevice.service.CsMarketDataService;
import com.njcn.csdevice.service.ICsLedgerService;
@@ -13,16 +17,12 @@ import com.njcn.web.utils.RequestUtil;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.pojo.po.CsMarketData;
import com.njcn.csdevice.mapper.CsMarketDataMapper;
import org.springframework.transaction.annotation.Transactional;
/**
*
* Description:
@@ -79,7 +79,11 @@ public class CsMarketDataServiceImpl extends ServiceImpl<CsMarketDataMapper, CsM
@Override
public List<CsMarketDataVO> queryAllEnginner(String userId) {
List<CsMarketDataVO> result = new ArrayList<>();
List<CsLedger> list = csLedgerService.lambdaQuery().eq(CsLedger::getState, 1).eq(CsLedger::getLevel, 0).list();
List<CsLedger> list = csLedgerService.lambdaQuery()
.eq(CsLedger::getState, 1)
.eq(CsLedger::getLevel, 0)
.ne(CsLedger::getName, "便携式工程")
.list();
List<CsMarketDataVO> csMarketDataVOS = this.queryByUseId(userId);
List<String> collect = csMarketDataVOS.stream().map(CsMarketDataVO::getEngineerId).collect(Collectors.toList());
List<CsLedger> collect1 = list.stream().filter(temp -> !collect.contains(temp.getId())).collect(Collectors.toList());
@@ -115,4 +119,19 @@ public class CsMarketDataServiceImpl extends ServiceImpl<CsMarketDataMapper, CsM
this.saveBatch(csMarketData,20);
return true;
}
@Override
public Boolean insertData(String userId, String engineeringId) {
LambdaQueryWrapper<CsMarketData> queryWrap = new LambdaQueryWrapper<>();
queryWrap.eq(CsMarketData::getUserId,userId);
queryWrap.eq(CsMarketData::getEngineerId,engineeringId);
CsMarketData csMarketData = this.getOne(queryWrap);
if (csMarketData == null) {
csMarketData = new CsMarketData();
csMarketData.setUserId(userId);
csMarketData.setEngineerId(engineeringId);
this.save(csMarketData);
}
return true;
}
}

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTouristDataPOServiceImpl.java
View File

@@ -58,8 +58,7 @@ public class CsTouristDataPOServiceImpl extends ServiceImpl<CsTouristDataPOMappe
list.add(csTouristDataPO);
});
boolean b = this.saveBatch(list);
return b;
return this.saveBatch(list);
}
@Override

148
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java
View File

@@ -21,6 +21,7 @@ import com.njcn.csdevice.pojo.param.CsLineParam;
import com.njcn.csdevice.pojo.po.*;
import com.njcn.csdevice.pojo.vo.CldLedgerVo;
import com.njcn.csdevice.pojo.vo.DeviceInfo;
import com.njcn.csdevice.pojo.vo.ProjectVO;
import com.njcn.csdevice.service.*;
import com.njcn.csharmonic.api.EventFeignClient;
import com.njcn.csharmonic.pojo.po.CsEventPO;
@@ -34,10 +35,10 @@ import com.njcn.redis.utils.RedisUtil;
import com.njcn.system.api.DictTreeFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.pojo.po.SysDicTreePO;
import com.njcn.system.pojo.vo.DictTreeVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -67,6 +68,7 @@ class IcdServiceImpl implements IcdService {
private final OverLimitWlMapper overLimitWlMapper;
private final DictTreeFeignClient dictTreeFeignClient;
private final DateTimeFormatter microsecondFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
private final AppTopologyDiagramService appTopologyDiagramService;
@Override
public List<DeviceInfo> getLedgerInfo(IcdParam param) {
@@ -162,8 +164,9 @@ class IcdServiceImpl implements IcdService {
}
Integer level = csLedger.getLevel();
String[] pids = csLedger.getPids().split(StrUtil.COMMA);
Integer sort = csLedger.getSort();
// 设置工程信息（所有级别都需要）
setEngineeringInfo(vo, level, pids, id);
setEngineeringInfo(vo, level, pids, id, sort);
// 根据级别设置不同的业务数据
switch (level) {
case 0:
@@ -369,24 +372,6 @@ class IcdServiceImpl implements IcdService {
return replies;
}
// private CsTerminalReply buildTerminalReply(String replyId, CsEquipmentDeliveryPO device,
// List<CsLinePO> csLineList) {
// List<String> lineIds = csLineList.stream()
// .filter(line -> Objects.equals(line.getDeviceId(), device.getId()))
// .map(CsLinePO::getLineId)
// .collect(Collectors.toList());
//
// CsTerminalReply reply = new CsTerminalReply();
// reply.setId(IdUtil.simpleUUID());
// reply.setReplyId(replyId);
// reply.setNodeId(device.getNodeId());
// reply.setProcessNo(device.getNodeProcess());
// reply.setDeviceId(device.getId());
// reply.setLineId(String.join(",", lineIds));
// reply.setIsReceived(0);
// reply.setCode("allEvent");
// return reply;
// }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -500,7 +485,7 @@ class IcdServiceImpl implements IcdService {
/**
* 设置工程信息
*/
private void setEngineeringInfo(CldLedgerVo vo, Integer level, String[] pids, String id) {
private void setEngineeringInfo(CldLedgerVo vo, Integer level, String[] pids, String id, Integer sort) {
String engineeringId;
if (level == 0) {
@@ -519,6 +504,7 @@ class IcdServiceImpl implements IcdService {
vo.setProvince(po.getProvince());
vo.setCity(po.getCity());
vo.setEngineeringDescription(po.getDescription());
vo.setSort(sort);
}
}
@@ -526,8 +512,22 @@ class IcdServiceImpl implements IcdService {
* 处理0级数据（工程级别）
*/
private void handleLevel0(CldLedgerVo vo, String id) {
List<ProjectVO> result = new ArrayList<>();
List<AppProjectPO> projectInfoList = appProjectService.getProjectByEngineering(Collections.singletonList(id));
vo.setProjectInfoList(projectInfoList);
if (CollectionUtil.isNotEmpty(projectInfoList)) {
List<String> projectIds = projectInfoList.stream().map(AppProjectPO::getId).collect(Collectors.toList());
LambdaQueryWrapper<AppTopologyDiagramPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(AppTopologyDiagramPO::getProjectId,projectIds).eq(AppTopologyDiagramPO::getStatus,1);
List<AppTopologyDiagramPO> appTopologyDiagramPOList = appTopologyDiagramService.list(queryWrapper);
Map<String, AppTopologyDiagramPO> appTopologyDiagramPOMap = appTopologyDiagramPOList.stream().collect(Collectors.toMap(AppTopologyDiagramPO::getProjectId, item -> item));
projectInfoList.forEach(item->{
ProjectVO vo1 = new ProjectVO();
BeanUtils.copyProperties(item,vo1);
vo1.setTopoId(Objects.isNull(appTopologyDiagramPOMap.get(item.getId()))?null:appTopologyDiagramPOMap.get(item.getId()).getTopoId());
result.add(vo1);
});
}
vo.setProjectInfoList(result);
}
/**
@@ -535,19 +535,34 @@ class IcdServiceImpl implements IcdService {
*/
private void handleLevel1(CldLedgerVo vo, String id, String[] pids) {
// 设置项目信息
List<ProjectVO> result = new ArrayList<>();
List<AppProjectPO> appProjectPOS = appProjectService.listByIds(Collections.singletonList(id));
vo.setProjectInfoList(appProjectPOS);
if (CollectionUtil.isNotEmpty(appProjectPOS)) {
List<String> projectIds = appProjectPOS.stream().map(AppProjectPO::getId).collect(Collectors.toList());
LambdaQueryWrapper<AppTopologyDiagramPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(AppTopologyDiagramPO::getProjectId,projectIds).eq(AppTopologyDiagramPO::getStatus,1);
List<AppTopologyDiagramPO> appTopologyDiagramPOList = appTopologyDiagramService.list(queryWrapper);
Map<String, AppTopologyDiagramPO> appTopologyDiagramPOMap = appTopologyDiagramPOList.stream().collect(Collectors.toMap(AppTopologyDiagramPO::getProjectId, item -> item));
appProjectPOS.forEach(item->{
ProjectVO vo1 = new ProjectVO();
BeanUtils.copyProperties(item,vo1);
vo1.setTopoId(Objects.isNull(appTopologyDiagramPOMap.get(item.getId()))?null:appTopologyDiagramPOMap.get(item.getId()).getTopoId());
result.add(vo1);
});
}
vo.setProjectInfoList(result);
// 设置设备信息
List<CsEquipmentDeliveryPO> devList = csEquipmentDeliveryService.getDevListByProjectId(id);
if (CollectionUtil.isNotEmpty(devList)) {
//如果不是监测设备，则不展示
DictTreeVO cldDict = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
String cldDevTypeId = cldDict.getId();
List<CsEquipmentDeliveryPO> cldDevIds = devList.stream()
.filter(item -> item.getDevType().equals(cldDevTypeId))
.collect(Collectors.toList());
vo.setDeviceInfoList(cldDevIds);
}
vo.setDeviceInfoList(devList);
// if (CollectionUtil.isNotEmpty(devList)) {
// //如果不是监测设备，则不展示
// DictTreeVO cldDict = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
// String cldDevTypeId = cldDict.getId();
// List<CsEquipmentDeliveryPO> cldDevIds = devList.stream()
// .filter(item -> item.getDevType().equals(cldDevTypeId))
// .collect(Collectors.toList());
// vo.setDeviceInfoList(cldDevIds);
// }
}
/**
@@ -558,13 +573,43 @@ class IcdServiceImpl implements IcdService {
if (pids.length > 2) {
String projectId = pids[2];
List<AppProjectPO> project = appProjectService.listByIds(Collections.singletonList(projectId));
vo.setProjectInfoList(project);
List<ProjectVO> result = new ArrayList<>();
if (CollectionUtil.isNotEmpty(project)) {
List<String> projectIds = project.stream().map(AppProjectPO::getId).collect(Collectors.toList());
LambdaQueryWrapper<AppTopologyDiagramPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(AppTopologyDiagramPO::getProjectId,projectIds).eq(AppTopologyDiagramPO::getStatus,1);
List<AppTopologyDiagramPO> appTopologyDiagramPOList = appTopologyDiagramService.list(queryWrapper);
Map<String, AppTopologyDiagramPO> appTopologyDiagramPOMap = appTopologyDiagramPOList.stream().collect(Collectors.toMap(AppTopologyDiagramPO::getProjectId, item -> item));
project.forEach(item->{
ProjectVO vo1 = new ProjectVO();
BeanUtils.copyProperties(item,vo1);
vo1.setTopoId(Objects.isNull(appTopologyDiagramPOMap.get(item.getId()))?null:appTopologyDiagramPOMap.get(item.getId()).getTopoId());
result.add(vo1);
});
}
vo.setProjectInfoList(result);
}
// 设置设备信息
List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryService.listByIds(Collections.singletonList(id));
vo.setDeviceInfoList(csEquipmentDeliveryPOS);
// 设置线路信息
List<CsLinePO> list = csLinePOService.queryByDevId(id);
if (CollectionUtil.isNotEmpty(list)) {
list.forEach(item->{
if (Objects.isNull(item.getPt2Ratio())) {
item.setPt2Ratio(1.0);
}
if (Objects.isNull(item.getCt2Ratio())) {
item.setCt2Ratio(1.0);
}
if (Objects.isNull(item.getLineNo())) {
item.setLineNo(item.getClDid() == 0 ? null:item.getClDid());
}
if (Objects.isNull(item.getRunStatus())) {
item.setRunStatus(csEquipmentDeliveryPOS.get(0).getRunStatus());
}
});
}
vo.setLineInfoList(list);
}
@@ -574,18 +619,51 @@ class IcdServiceImpl implements IcdService {
private void handleLevel3(CldLedgerVo vo, String id, String[] pids) {
// 设置项目信息（项目ID在pids[2]位置）
if (pids.length > 2) {
List<ProjectVO> result = new ArrayList<>();
String projectId = pids[2];
List<AppProjectPO> appProjectPOS = appProjectService.listByIds(Collections.singletonList(projectId));
vo.setProjectInfoList(appProjectPOS);
if (CollectionUtil.isNotEmpty(appProjectPOS)) {
List<String> projectIds = appProjectPOS.stream().map(AppProjectPO::getId).collect(Collectors.toList());
LambdaQueryWrapper<AppTopologyDiagramPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(AppTopologyDiagramPO::getProjectId,projectIds).eq(AppTopologyDiagramPO::getStatus,1);
List<AppTopologyDiagramPO> appTopologyDiagramPOList = appTopologyDiagramService.list(queryWrapper);
Map<String, AppTopologyDiagramPO> appTopologyDiagramPOMap = appTopologyDiagramPOList.stream().collect(Collectors.toMap(AppTopologyDiagramPO::getProjectId, item -> item));
appProjectPOS.forEach(item->{
ProjectVO vo1 = new ProjectVO();
BeanUtils.copyProperties(item,vo1);
vo1.setTopoId(Objects.isNull(appTopologyDiagramPOMap.get(item.getId()))?null:appTopologyDiagramPOMap.get(item.getId()).getTopoId());
result.add(vo1);
});
}
vo.setProjectInfoList(result);
}
// 设置设备信息（设备ID在pids[3]位置）
List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS;
if (pids.length > 3) {
String deviceId = pids[3];
List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryService.listByIds(Collections.singletonList(deviceId));
csEquipmentDeliveryPOS = csEquipmentDeliveryService.listByIds(Collections.singletonList(deviceId));
vo.setDeviceInfoList(csEquipmentDeliveryPOS);
} else {
csEquipmentDeliveryPOS = new ArrayList<>();
}
// 设置线路信息
List<CsLinePO> line = csLinePOService.listByIds(Collections.singletonList(id));
if (CollectionUtil.isNotEmpty(line)) {
line.forEach(item->{
if (Objects.isNull(item.getPt2Ratio())) {
item.setPt2Ratio(1.0);
}
if (Objects.isNull(item.getCt2Ratio())) {
item.setCt2Ratio(1.0);
}
if (Objects.isNull(item.getLineNo())) {
item.setLineNo(item.getClDid() == 0 ? null:item.getClDid());
}
if (CollectionUtil.isNotEmpty(csEquipmentDeliveryPOS)) {
item.setRunStatus(csEquipmentDeliveryPOS.get(0).getRunStatus());
}
});
}
vo.setLineInfoList(line);
}

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java
View File

@@ -116,7 +116,7 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService {
List<String> collect = new ArrayList<>();
if(
Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode()) || Objects.equals(role,AppRoleEnum.REGULAR_USER_8000.getCode())){
Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode()) || Objects.equals(role,AppRoleEnum.REGULAR_USER_8000.getCode()) || Objects.equals(role,"bxs_user")){
csDeviceUserPOQueryWrapper.clear();
csDeviceUserPOQueryWrapper.eq("status","1").and(wq -> {
wq.eq("primary_user_id", userIndex)

10
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/WavePicFeignClient.java
View File

@@ -1,11 +1,18 @@
package com.njcn.csharmonic.api;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.ServerInfo;
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.api.fallback.WavePicClientFallbackFactory;
import com.njcn.csharmonic.pojo.vo.CsEventVO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
@@ -18,4 +25,7 @@ public interface WavePicFeignClient {
@GetMapping("/getWavePics")
HttpResult<CsEventVO> getWavePics(@RequestParam("eventId") String eventId);
@PostMapping("/updateEventById")
HttpResult<Boolean> updateEventById(@RequestParam("id") String id);
}

6
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/WavePicClientFallbackFactory.java
View File

@@ -29,6 +29,12 @@ public class WavePicClientFallbackFactory implements FallbackFactory<WavePicFeig
log.error("{}异常，降级处理，异常为：{}","获取事件波形图",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Boolean> updateEventById(String id) {
log.error("{}异常，降级处理，异常为：{}","修改事件信息异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
View File

@@ -123,4 +123,10 @@ public class CsEventPO extends BaseEntity {
*/
@TableField(value = "amplitude")
private Double amplitude;
/**
* 相别
*/
@TableField(value = "phase")
private String phase;
}

10
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsEventController.java
View File

@@ -152,6 +152,16 @@ public class CsEventController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/updateEventById")
@ApiOperation("修改事件信息(修改文件)")
@ApiImplicitParam(name = "id", value = "事件id", required = true)
public HttpResult<Boolean> updateEventById(@RequestParam("id") String id) {
String methodDescribe = getMethodDescribe("updateEventById");
Boolean result = csEventPOService.updateEventById(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getEventByTime")
@ApiOperation("根据时间获取无波形的暂态事件")

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

@@ -10,7 +10,6 @@ import com.njcn.csharmonic.pojo.vo.EventDetailVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
*
@@ -27,7 +26,13 @@ public interface CsEventUserPOMapper extends BaseMapper<CsEventUserPO> {
List<EventDetailVO> queryUserEventList(@Param("csEventUserQueryParam") CsEventUserQueryParam csEventUserQueryParam, @Param("devIds") List<String> devIds, @Param("flag") Boolean flag);
Page<EventDetailVO> queryEventpage(Page<EventDetailVO> returnpage, @Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage, @Param("devIds") List<String> devIds, @Param("flag") Boolean flag);
// Page<EventDetailVO> queryEventpage(Page<EventDetailVO> returnpage, @Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage, @Param("devIds") List<String> devIds, @Param("flag") Boolean flag);
/**
* app事件查询
*/
Page<EventDetailVO> queryEventpage(Page<EventDetailVO> returnpage, @Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage, @Param("devIds") List<String> devIds);
Page<EventDetailVO> queryEventPageWeb(Page<EventDetailVO> returnpage,@Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage,@Param("devIds") List<String> collect);
}

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

@@ -87,17 +87,73 @@
</select>
<!-- <select id="queryEventpage" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO">-->
<!-- select DISTINCT a.event_id id,-->
<!-- <if test="flag">-->
<!-- a.status status,-->
<!-- </if>-->
<!-- <if test="!flag">-->
<!-- 1 status,-->
<!-- </if>-->
<!-- b.device_id deviceId,b.line_id lineId,b.code code,b.start_time startTime,b.amplitude,b.persist_time,-->
<!-- round(b.amplitude,2) evtParamVVaDepth,round(b.persist_time,2) evtParamTm,b.tag tag ,b.wave_path wavePath,b.phase evtParamPhase,b.location evtParamPosition,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,d.name lineName-->
<!-- from cs_event_user a inner join cs_event b on a.event_id=b.id inner join cs_equipment_delivery c on b.device_id=c.id inner join cs_line d on d.device_id=b.device_id and d.clDid=b.cl_did where 1=1-->
<!-- and b.process=c.process-->
<!-- <if test="csEventUserQueryPage!=null and csEventUserQueryPage.endTime != null and csEventUserQueryPage.endTime !=''">-->
<!-- AND DATE(b.start_time) &lt;= DATE(#{csEventUserQueryPage.endTime})-->
<!-- </if>-->
<!-- <if test="csEventUserQueryPage!=null and csEventUserQueryPage.startTime != null and csEventUserQueryPage.startTime !=''">-->
<!-- AND DATE(b.start_time) &gt;= DATE(#{csEventUserQueryPage.startTime})-->
<!-- </if>-->
<!-- <if test="csEventUserQueryPage!=null and csEventUserQueryPage.target != null and csEventUserQueryPage.target.size()>0">-->
<!-- and b.tag in-->
<!-- <foreach collection="csEventUserQueryPage.target" index="index" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- and b.device_id in-->
<!-- <foreach collection="devIds" index="index" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != null and csEventUserQueryPage.type !=''">-->
<!-- AND b.type =#{ csEventUserQueryPage.type}-->
<!-- </if>-->
<!-- <if test="csEventUserQueryPage!=null and csEventUserQueryPage.level != null and csEventUserQueryPage.level !=''">-->
<!-- AND b.level IN-->
<!-- <foreach collection="csEventUserQueryPage.level.split(',')" item="level" open="(" separator="," close=")">-->
<!-- #{level}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="csEventUserQueryPage!=null and csEventUserQueryPage.status != null and csEventUserQueryPage.status !=''">-->
<!-- AND a.status =#{ csEventUserQueryPage.status}-->
<!-- </if>-->
<!-- <if test="csEventUserQueryPage!=null and csEventUserQueryPage.userId != null and csEventUserQueryPage.userId !=''">-->
<!-- and a.user_id=#{ csEventUserQueryPage.userId}-->
<!-- </if>-->
<!-- <if test="csEventUserQueryPage!=null and csEventUserQueryPage.sortField != null">-->
<!-- <choose>-->
<!-- <when test="csEventUserQueryPage.sortField == 0">-->
<!-- order by b.start_time desc-->
<!-- </when>-->
<!-- <when test="csEventUserQueryPage.sortField == 1">-->
<!-- order by b.amplitude desc-->
<!-- </when>-->
<!-- <when test="csEventUserQueryPage.sortField == 2">-->
<!-- order by b.persist_time desc-->
<!-- </when>-->
<!-- <otherwise>-->
<!-- order by b.start_time desc-->
<!-- </otherwise>-->
<!-- </choose>-->
<!-- </if>-->
<!-- </select>-->
<select id="queryEventpage" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO">
select DISTINCT a.event_id id,
<if test="flag">
a.status status,
</if>
<if test="!flag">
1 status,
</if>
b.device_id deviceId,b.line_id lineId,b.code code,
b.start_time startTime, b.amplitude evtParamVVaDepth,b.persist_time evtParamTm,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,d.name lineName
from cs_event_user a inner join cs_event b on a.event_id=b.id inner join cs_equipment_delivery c on b.device_id=c.id inner join cs_line d on d.device_id=b.device_id and d.clDid=b.cl_did where 1=1
select DISTINCT b.id,b.device_id deviceId,b.line_id lineId,b.code code,b.start_time startTime,b.amplitude,b.persist_time,
round(b.amplitude,2) evtParamVVaDepth,round(b.persist_time,2) evtParamTm,b.phase evtParamPhase,b.location evtParamPosition,
b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,d.name lineName
from cs_event b inner join cs_equipment_delivery c on b.device_id=c.id inner join cs_line d on d.device_id=b.device_id and d.clDid=b.cl_did where 1=1
and b.process=c.process
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.endTime != null and csEventUserQueryPage.endTime !=''">
AND DATE(b.start_time) &lt;= DATE(#{csEventUserQueryPage.endTime})
@@ -106,7 +162,6 @@
AND DATE(b.start_time) &gt;= DATE(#{csEventUserQueryPage.startTime})
</if>
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.target != null and csEventUserQueryPage.target.size()>0">
and b.tag in
<foreach collection="csEventUserQueryPage.target" index="index" item="item" open="(" separator="," close=")">
#{item}
@@ -116,6 +171,9 @@
<foreach collection="devIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.lineId != null and csEventUserQueryPage.lineId !=''">
AND b.line_id = #{csEventUserQueryPage.lineId}
</if>
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != null and csEventUserQueryPage.type !=''">
AND b.type =#{ csEventUserQueryPage.type}
</if>
@@ -125,12 +183,6 @@
#{level}
</foreach>
</if>
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.status != null and csEventUserQueryPage.status !=''">
AND a.status =#{ csEventUserQueryPage.status}
</if>
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.userId != null and csEventUserQueryPage.userId !=''">
and a.user_id=#{ csEventUserQueryPage.userId}
</if>
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.sortField != null">
<choose>
<when test="csEventUserQueryPage.sortField == 0">
@@ -147,6 +199,7 @@
</otherwise>
</choose>
</if>
</select>
<select id="queryEventPageWeb" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO">

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

@@ -66,6 +66,8 @@ public interface CsEventPOService extends IService<CsEventPO>{
void addCldEvent(CldEventParam param);
Boolean updateEventById(String id);
List<CsEventPO> getEventByTime(List<String> lineList, String startTime, String endTime);
List<EventStatisticsVo> getEventStatistics(CsEventUserQueryParam param);

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

@@ -71,7 +71,7 @@ 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).collect(Collectors.toList());
List<String> devList = devLedger.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList());
// 取 ownerDevList 和 devList 的交集
if (CollectionUtil.isNotEmpty(ownerDevList)) {
@@ -108,7 +108,7 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsAlarmMapper, CsAlarm> impl
.collect(Collectors.toList());
alarmVO.setWarnNums(matchedDevIds.size());
alarmVO.setDevIds(matchedDevIds);
alarmVO.setIsRead(userEvents.stream().filter(item1->item1.getEventId().equals(alarm.getId())).findFirst().map(CsEventUserPO::getStatus).orElse(0));
alarmVO.setIsRead(userEvents.stream().filter(item1->item1.getEventId().equals(alarm.getId())).findFirst().map(CsEventUserPO::getStatus).orElse(1));
return alarmVO;
})
.filter(alarmVO -> alarmVO.getWarnNums() > 0)

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

@@ -402,6 +402,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
eventPo.setProcess(4);
eventPo.setPersistTime(param.getDuration());
eventPo.setAmplitude(param.getAmplitude() * 100);
eventPo.setPhase(param.getPhase());
this.baseMapper.insert(eventPo);
//influxDB数据录入
List<String> records = new ArrayList<String>();
@@ -479,6 +480,24 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
}
}
@Override
public Boolean updateEventById(String id) {
boolean result = false;
CsEventPO po = this.baseMapper.selectById(id);
if (po != null) {
LambdaQueryWrapper<RmpEventDetailPO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(RmpEventDetailPO::getEventId,id);
RmpEventDetailPO po2 = wlRmpEventDetailMapper.selectOne(wrapper);
po2.setWavePath(po2.getWavePath());
po2.setFileFlag(1);
int row = wlRmpEventDetailMapper.updateById(po2);
if (row > 0) {
result = true;
}
}
return result;
}
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());
@@ -538,6 +557,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
rmpEventDetailPO.setEventDescribe(getTag(param.getEventType()));
rmpEventDetailPO.setPhase(param.getPhase());
rmpEventDetailPO.setDealFlag(0);
rmpEventDetailPO.setFileFlag(0);
wlRmpEventDetailMapper.insert(rmpEventDetailPO);
}

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

@@ -41,8 +41,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -229,7 +227,6 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
@Override
public Page<EventDetailVO> queryEventpage(CsEventUserQueryPage csEventUserQueryPage) {
Page<EventDetailVO> returnpage = new Page<> (csEventUserQueryPage.getPageNum ( ), csEventUserQueryPage.getPageSize ( ));
Boolean flag =Boolean.TRUE;
csEventUserQueryPage.setUserId(RequestUtil.getUserIndex());
String role = RequestUtil.getUserRole();
@@ -322,119 +319,243 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
if (CollectionUtils.isEmpty(collect)) {
return returnpage;
}
returnpage = this.getBaseMapper().queryEventpage(returnpage, csEventUserQueryPage, collect, flag);
// 先获取原始记录
List<EventDetailVO> originalRecords = returnpage.getRecords();
if (CollectionUtil.isNotEmpty(originalRecords)) {
// 过滤出满足 lineId 条件的记录
List<EventDetailVO> filteredRecords = new ArrayList<>();
for (EventDetailVO temp : originalRecords) {
// 如果没有传 lineId 或者 lineId 匹配，则处理该记录
if (StringUtil.isBlank(csEventUserQueryPage.getLineId())
|| Objects.equals(temp.getLineId(), csEventUserQueryPage.getLineId())) {
DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData();
temp.setEquipmentName(devDetail.getEquipmentName());
temp.setProjectId(devDetail.getProjectId());
temp.setProjectName(devDetail.getProjectName());
temp.setEngineeringid(devDetail.getEngineeringid());
temp.setEngineeringName(devDetail.getEngineeringName());
EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
temp.setShowName(Objects.isNull(ele) ? temp.getTag() : ele.getShowName());
temp.setCode(Objects.isNull(ele) ? null : ele.getDefaultValue());
if (Objects.equals(csEventUserQueryPage.getType(), "0")) {
List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>();
for (EleEvtParm eleEvtParm : data1) {
EventDataSetDTO eventDataSetDTO = new EventDataSetDTO();
BeanUtils.copyProperties(eleEvtParm, eventDataSetDTO);
if (Objects.equals(eventDataSetDTO.getName(), "Evt_Param_Position")) {
continue;
}
EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName());
if (evtData == null) {
eventDataSetDTO.setValue("-");
} else {
if (Objects.equals(eleEvtParm.getName(), "Evt_Param_VVaDepth") || Objects.equals(eleEvtParm.getName(), "Evt_Param_Tm")) {
BigDecimal bd = new BigDecimal(evtData.getValue());
bd = bd.setScale(2, RoundingMode.HALF_UP);
eventDataSetDTO.setValue(Optional.ofNullable(bd.toString()).orElse("-"));
} else {
eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("-"));
}
}
eventDataSetDTOS.add(eventDataSetDTO);
}
temp.setDataSet(eventDataSetDTOS);
List<EventDataSetDTO> evtParamVVaDepth = eventDataSetDTOS.stream()
.filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_VVaDepth"))
.collect(Collectors.toList());
if (CollectionUtil.isEmpty(evtParamVVaDepth)) {
temp.setEvtParamVVaDepth("-");
} else {
if (Objects.equals(evtParamVVaDepth.get(0).getValue(),"-")) {
temp.setEvtParamVVaDepth("-");
} else {
BigDecimal bd = new BigDecimal(evtParamVVaDepth.get(0).getValue());
bd = bd.setScale(2, RoundingMode.HALF_UP);
temp.setEvtParamVVaDepth(bd + (Objects.isNull(evtParamVVaDepth.get(0).getUnit()) ? "" : evtParamVVaDepth.get(0).getUnit()));
}
}
List<EventDataSetDTO> evtParamPosition = eventDataSetDTOS.stream()
.filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Position"))
.collect(Collectors.toList());
if (CollectionUtil.isEmpty(evtParamPosition)) {
temp.setEvtParamPosition("-");
} else {
temp.setEvtParamPosition(evtParamPosition.get(0).getValue());
}
if (Objects.equals(temp.getEvtParamPosition(), "-")) {
if (!Objects.isNull(temp.getLocation())) {
temp.setEvtParamPosition(Objects.equals(temp.getLocation(), "grid") ? "电网侧" : "负载侧");
}
}
List<EventDataSetDTO> evtParamTm = eventDataSetDTOS.stream()
.filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Tm"))
.collect(Collectors.toList());
if (CollectionUtil.isEmpty(evtParamTm)) {
temp.setEvtParamTm("-");
} else {
if (Objects.equals(evtParamTm.get(0).getValue(),"-")) {
temp.setEvtParamTm("-");
} else {
BigDecimal bd = new BigDecimal(evtParamTm.get(0).getValue());
bd = bd.setScale(2, RoundingMode.HALF_UP);
temp.setEvtParamTm(bd + (Objects.isNull(evtParamTm.get(0).getUnit()) ? "" : evtParamTm.get(0).getUnit()));
}
}
List<EventDataSetDTO> evtParamPhase = eventDataSetDTOS.stream()
.filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Phase"))
.collect(Collectors.toList());
if (CollectionUtil.isEmpty(evtParamPhase)) {
temp.setEvtParamPhase("-");
} else {
temp.setEvtParamPhase(evtParamPhase.get(0).getValue()
+ (Objects.isNull(evtParamPhase.get(0).getUnit()) ? "" : evtParamPhase.get(0).getUnit()));
}
}
// 将处理后的记录添加到结果列表
filteredRecords.add(temp);
}
}
// 清空原来的记录，加入过滤后的记录
returnpage.setRecords(filteredRecords);
returnpage = this.getBaseMapper().queryEventpage(returnpage, csEventUserQueryPage, collect);
if (CollectionUtil.isNotEmpty(returnpage.getRecords())) {
List<String> ids = returnpage.getRecords().stream().map(EventDetailVO::getId).collect(Collectors.toList());
List<CsEventUserPO> userEvents = this.queryEventListByUserId(RequestUtil.getUserIndex(),ids);
returnpage.getRecords().forEach(temp -> {
//台账信息
DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData();
temp.setEquipmentName(devDetail.getEquipmentName());
temp.setProjectId(devDetail.getProjectId());
temp.setProjectName(devDetail.getProjectName());
temp.setEngineeringid(devDetail.getEngineeringid());
temp.setEngineeringName(devDetail.getEngineeringName());
//监测位置
temp.setEvtParamPosition(Objects.equals(temp.getLocation(), "grid") ? "电网侧" : "负载侧");
//暂态事件类型
EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
temp.setShowName(Objects.isNull(ele) ? temp.getTag() : ele.getShowName());
temp.setCode(Objects.isNull(ele) ? null : ele.getDefaultValue());
//匹配已读/未读状态
temp.setStatus(userEvents.stream().filter(item1->item1.getEventId().equals(temp.getId())).findFirst().map(CsEventUserPO::getStatus).orElse(1));
});
}
return returnpage;
}
// @Override
// public Page<EventDetailVO> queryEventpage(CsEventUserQueryPage csEventUserQueryPage) {
// Page<EventDetailVO> returnpage = new Page<> (csEventUserQueryPage.getPageNum ( ), csEventUserQueryPage.getPageSize ( ));
//
// csEventUserQueryPage.setUserId(RequestUtil.getUserIndex());
// String role = RequestUtil.getUserRole();
// if(Objects.equals(role, LogInfo.UNKNOWN_ROLE)){
// return returnpage;
// }
// List<String> strings = JSONArray.parseArray(role, String.class);
// if(CollectionUtils.isEmpty(strings)){
// return returnpage;
// }
// 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 returnpage;
// }
//
// // 获取第一层节点（根节点），从第二层开始才是真正的工程
// 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 returnpage;
// }
//
// // 缓存查询条件到局部变量
// 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 returnpage;
// }
// //如果是游客用户，没有消息推送的数据，展示设备的所有数据
// if(strings.contains(AppRoleEnum.TOURIST.getCode())){
// returnpage = this.getBaseMapper().queryTouristEvent(returnpage, csEventUserQueryPage, collect, false);
// } else {
// returnpage = this.getBaseMapper().queryEventpage(returnpage, csEventUserQueryPage, collect, true);
// }
// // 先获取原始记录
// List<EventDetailVO> originalRecords = returnpage.getRecords();
// if (CollectionUtil.isNotEmpty(originalRecords)) {
// // 过滤出满足 lineId 条件的记录
// List<EventDetailVO> filteredRecords = new ArrayList<>();
// for (EventDetailVO temp : originalRecords) {
// // 如果没有传 lineId 或者 lineId 匹配，则处理该记录
// if (StringUtil.isBlank(csEventUserQueryPage.getLineId())
// || Objects.equals(temp.getLineId(), csEventUserQueryPage.getLineId())) {
//
// DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData();
// temp.setEquipmentName(devDetail.getEquipmentName());
// temp.setProjectId(devDetail.getProjectId());
// temp.setProjectName(devDetail.getProjectName());
// temp.setEngineeringid(devDetail.getEngineeringid());
// temp.setEngineeringName(devDetail.getEngineeringName());
//
// EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
// temp.setShowName(Objects.isNull(ele) ? temp.getTag() : ele.getShowName());
// temp.setCode(Objects.isNull(ele) ? null : ele.getDefaultValue());
//
// if (Objects.equals(csEventUserQueryPage.getType(), "0")) {
// List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
// List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>();
// for (EleEvtParm eleEvtParm : data1) {
// EventDataSetDTO eventDataSetDTO = new EventDataSetDTO();
// BeanUtils.copyProperties(eleEvtParm, eventDataSetDTO);
// if (Objects.equals(eventDataSetDTO.getName(), "Evt_Param_Position")) {
// continue;
// }
// EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName());
// if (evtData == null) {
// eventDataSetDTO.setValue("-");
// } else {
// if (Objects.equals(eleEvtParm.getName(), "Evt_Param_VVaDepth") || Objects.equals(eleEvtParm.getName(), "Evt_Param_Tm")) {
// BigDecimal bd = new BigDecimal(evtData.getValue());
// bd = bd.setScale(2, RoundingMode.HALF_UP);
// eventDataSetDTO.setValue(Optional.ofNullable(bd.toString()).orElse("-"));
// } else {
// eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("-"));
// }
// }
// eventDataSetDTOS.add(eventDataSetDTO);
// }
// temp.setDataSet(eventDataSetDTOS);
//
// List<EventDataSetDTO> evtParamVVaDepth = eventDataSetDTOS.stream()
// .filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_VVaDepth"))
// .collect(Collectors.toList());
//
// if (CollectionUtil.isEmpty(evtParamVVaDepth)) {
// temp.setEvtParamVVaDepth("-");
// } else {
// if (Objects.equals(evtParamVVaDepth.get(0).getValue(),"-")) {
// temp.setEvtParamVVaDepth("-");
// } else {
// BigDecimal bd = new BigDecimal(evtParamVVaDepth.get(0).getValue());
// bd = bd.setScale(2, RoundingMode.HALF_UP);
// temp.setEvtParamVVaDepth(bd + (Objects.isNull(evtParamVVaDepth.get(0).getUnit()) ? "" : evtParamVVaDepth.get(0).getUnit()));
// }
// }
//
// List<EventDataSetDTO> evtParamPosition = eventDataSetDTOS.stream()
// .filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Position"))
// .collect(Collectors.toList());
// if (CollectionUtil.isEmpty(evtParamPosition)) {
// temp.setEvtParamPosition("-");
// } else {
// temp.setEvtParamPosition(evtParamPosition.get(0).getValue());
// }
// if (Objects.equals(temp.getEvtParamPosition(), "-")) {
// if (!Objects.isNull(temp.getLocation())) {
// temp.setEvtParamPosition(Objects.equals(temp.getLocation(), "grid") ? "电网侧" : "负载侧");
// }
// }
//
// List<EventDataSetDTO> evtParamTm = eventDataSetDTOS.stream()
// .filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Tm"))
// .collect(Collectors.toList());
// if (CollectionUtil.isEmpty(evtParamTm)) {
// temp.setEvtParamTm("-");
// } else {
// if (Objects.equals(evtParamTm.get(0).getValue(),"-")) {
// temp.setEvtParamTm("-");
// } else {
// BigDecimal bd = new BigDecimal(evtParamTm.get(0).getValue());
// bd = bd.setScale(2, RoundingMode.HALF_UP);
// temp.setEvtParamTm(bd + (Objects.isNull(evtParamTm.get(0).getUnit()) ? "" : evtParamTm.get(0).getUnit()));
// }
// }
//
// List<EventDataSetDTO> evtParamPhase = eventDataSetDTOS.stream()
// .filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_Phase"))
// .collect(Collectors.toList());
// if (CollectionUtil.isEmpty(evtParamPhase)) {
// temp.setEvtParamPhase("-");
// } else {
// temp.setEvtParamPhase(evtParamPhase.get(0).getValue()
// + (Objects.isNull(evtParamPhase.get(0).getUnit()) ? "" : evtParamPhase.get(0).getUnit()));
// }
// }
// // 将处理后的记录添加到结果列表
// filteredRecords.add(temp);
// }
// }
// // 清空原来的记录，加入过滤后的记录
// returnpage.setRecords(filteredRecords);
// }
// return returnpage;
// }
@Override
public Page<EventDetailVO> queryEventPageWeb(CsEventUserQueryPage csEventUserQueryPage) {
Page<EventDetailVO> returnpage = new Page<> (csEventUserQueryPage.getPageNum ( ), csEventUserQueryPage.getPageSize ( ));

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

@@ -65,15 +65,16 @@ public class CsHarmonicServiceImpl extends ServiceImpl<CsHarmonicMapper, CsHarmo
.filter(ownerList::contains)
.distinct()
.collect(Collectors.toList());
} else {
combinedLineIds = lineIds;
}
LambdaQueryWrapper<CsHarmonic> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CsHarmonic::getLineId, combinedLineIds)
.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<CsHarmonic> list = list(queryWrapper);
List<CsHarmonic> list = new ArrayList<>();
if (CollectionUtil.isNotEmpty(combinedLineIds)) {
LambdaQueryWrapper<CsHarmonic> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CsHarmonic::getLineId, combinedLineIds)
.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);
}
if (CollectionUtil.isNotEmpty(list)) {
//获取所有台账数据
List<CsLedgerVO> ledgers = csLedgerFeignClient.getAllLedger().getData();
@@ -102,7 +103,7 @@ public class CsHarmonicServiceImpl extends ServiceImpl<CsHarmonicMapper, CsHarmo
lineHarmonicDetail.setLineName(ledger.getName());
lineHarmonicDetail.setStatisticsDate(item.getTime());
lineHarmonicDetail.setOverLimitDesc(item.getTag());
lineHarmonicDetail.setIsRead(userEvents.stream().filter(item1->item1.getEventId().equals(item.getId())).findFirst().map(CsEventUserPO::getStatus).orElse(0));
lineHarmonicDetail.setIsRead(userEvents.stream().filter(item1->item1.getEventId().equals(item.getId())).findFirst().map(CsEventUserPO::getStatus).orElse(1));
lineHarmonicDetails.add(lineHarmonicDetail);
});
vo.setList(lineHarmonicDetails);

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

@@ -8,7 +8,6 @@ import com.njcn.csdevice.pojo.dto.DevDetailDTO;
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.CsLedgerVO;
import com.njcn.csdevice.pojo.vo.EngineeringHomePageVO;
import com.njcn.csharmonic.pojo.dto.UnReadEventDto;
import com.njcn.csharmonic.service.CsEventUserPOService;
@@ -41,25 +40,36 @@ public class HomePageServiceImpl implements HomePageService {
List<EngineeringHomePageVO> result = new ArrayList<>();
List<CsEngineeringVO> engineeringList = engineeringFeignClient.queryEngineering(new CsEngineeringQueryParm()).getData();
if (CollectionUtils.isNotEmpty(engineeringList)) {
// 提取所有工程 ID
List<String> engineeringIds = engineeringList.stream().map(CsEngineeringVO::getId).collect(Collectors.toList());
//根据工程获取设备信息
// 批量获取所有工程的设备信息
List<DevDetailDTO> devList = csLedgerFeignClient.getDevInfoByEngineerIds(engineeringIds).getData();
Map<String, List<DevDetailDTO>> devMap = devList.stream().collect(Collectors.groupingBy(DevDetailDTO::getEngineeringid));
//获取未读事件
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 = unReadEventList.stream().collect(Collectors.groupingBy(UnReadEventDto::getDeviceId));
engineeringList.forEach(item->{
Map<String, List<UnReadEventDto>> unReadEventMap = Objects.isNull(unReadEventList) ? new HashMap<>() :
unReadEventList.stream().collect(Collectors.groupingBy(UnReadEventDto::getDeviceId));
// 遍历工程列表，从内存中获取设备数据
engineeringList.forEach(item -> {
EngineeringHomePageVO vo = new EngineeringHomePageVO();
vo.setEngineeringId(item.getId());
vo.setEngineeringName(item.getName());
// 从 Map 中获取该工程的设备列表 (无设备时为 null 或空列表)
List<DevDetailDTO> devs = devMap.get(item.getId());
vo.setDevTotal(Objects.isNull(devs) ? 0:devs.size());
vo.setDevTotal(Objects.isNull(devs) ? 0 : devs.size());
long status1Count = devs == null ? 0 : devs.stream().filter(d -> d.getRunStatus() == 1).count();
long status2Count = devs == null ? 0 : devs.stream().filter(d -> d.getRunStatus() == 2).count();
vo.setOnlineDevTotal((int) status2Count);
vo.setOfflineDevTotal((int) status1Count);
vo.setSort(item.getSort());
//未读的告警数量
// 未读的告警数量
int alarmTotal = Objects.isNull(devs) ? 0 : devs.stream()
.map(DevDetailDTO::getEquipmentId)
.filter(Objects::nonNull)
@@ -71,10 +81,11 @@ public class HomePageServiceImpl implements HomePageService {
})
.sum();
vo.setAlarmTotal(alarmTotal);
result.add(vo);
});
//获取用户是否有置顶的工程
// 获取用户是否有置顶的工程
List<CsUserPins> pinList = csUserPinsFeignClient.getPinToTopList().getData();
if (CollectionUtils.isNotEmpty(pinList)) {
List<String> targetIdList = pinList.stream()
@@ -107,5 +118,4 @@ public class HomePageServiceImpl implements HomePageService {
return result;
}
}

6
cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java
View File

@@ -87,9 +87,9 @@ public class CsAppReportServiceImpl extends ServiceImpl<CsAppReportMapper, CsApp
@Override
public List<ReportHarmonicVO> getReportList(LineParamDTO param) {
String startTime = PublicDataUtils.calculateMonthStart(param.getTime());
String endTime = PublicDataUtils.calculateMonthEnd(param.getTime());
String[] timeRange = PublicDataUtils.calculateTimeRange(param.getTime());
String startTime = timeRange[0];
String endTime = timeRange[1];
LocalDate startLocalDate = LocalDate.parse(startTime, DateTimeFormatter.ISO_LOCAL_DATE);
LocalDate endLocalDate = LocalDate.parse(endTime, DateTimeFormatter.ISO_LOCAL_DATE);

69
cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/DataTaskServiceImpl.java
View File

@@ -36,8 +36,10 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -237,10 +239,15 @@ public class DataTaskServiceImpl implements IDataTaskService {
alarmIds = data2.stream().map(CsEventPO::getId).collect(Collectors.toList());
}
List<String> filteredData1 = new ArrayList<>();
if (CollUtil.isNotEmpty(data1)) {
filteredData1 = filterTimeIntervals(data1, 6);
}
//只要有一个不为空，就需要统计
if (CollUtil.isNotEmpty(data1) || CollUtil.isNotEmpty(alarmIds)) {
if (CollUtil.isNotEmpty(filteredData1) || CollUtil.isNotEmpty(alarmIds)) {
// 对中断时间数据进行过滤，只保留间隔超过 6 小时的时间段
l0.add(item);
l1.add(data1 != null ? Collections.singletonList(String.join("，", data1)) : null);
l1.add(filteredData1 != null && !filteredData1.isEmpty() ? Collections.singletonList(String.join("，", filteredData1)) : null);
l2.add(alarmIds);
}
});
@@ -283,6 +290,64 @@ public class DataTaskServiceImpl implements IDataTaskService {
}
}
/**
* 过滤时间间隔，只保留超过指定小时数的时间段
*
* @param timePeriods 时间段列表，格式如 ["2026-03-18 08:26:24 ~ 2026-03-18 08:27:45", "2026-03-18 08:29:46 ~ 2026-03-18 08:31:07"]
* @param hours 最小间隔小时数
* @return 过滤后的时间段列表
*/
private List<String> filterTimeIntervals(List<String> timePeriods, int hours) {
if (CollUtil.isEmpty(timePeriods)) {
return timePeriods;
}
List<String> result = new ArrayList<>();
// 将所有时间段展开为独立的字符串
for (String periodStr : timePeriods) {
if (periodStr == null || periodStr.trim().isEmpty()) {
continue;
}
// 分割多个时间段（中文逗号分隔）
String[] periods = periodStr.split(",");
for (String period : periods) {
period = period.trim();
if (period.isEmpty()) {
continue;
}
// 解析时间段，格式："2026-03-18 08:26:24 ~ 2026-03-18 08:27:45"
String[] parts = period.split("~");
if (parts.length != 2) {
continue;
}
try {
String startTimeStr = parts[0].trim();
String endTimeStr = parts[1].trim();
LocalDateTime startTime = LocalDateTime.parse(startTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
LocalDateTime endTime = LocalDateTime.parse(endTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
// 计算时间间隔（小时）
long hoursBetween = ChronoUnit.HOURS.between(startTime, endTime);
// 如果间隔超过指定的小时数，则添加到结果中
if (hoursBetween >= hours) {
result.add(period);
}
} catch (Exception e) {
log.warn("解析时间段失败：{}", period, e);
}
}
}
return result;
}
//获取设备最新的一条数据
public List<PqsCommunicate> getRawDataLatest(String devId) {
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(PqsCommunicate.class);