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

代码提交

Browse Source
This commit is contained in:
huangzj
2023-09-25 15:47:12 +08:00
parent 60da09b59b
commit a220f48cc9
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,13 +18,13 @@ import java.util.List;
public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{ public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
Boolean add(String id); Boolean add(String id);
Boolean share(List<String> ids); Boolean share(List<String> ids);
DevCountVO devCount(String id); DevCountVO devCount(String id);
String isPrimaryUser(String deviceId); String isPrimaryUser(String deviceId);
Boolean transfer( List<String> ids,String useId); Boolean transfer( List<String> ids,String useId);

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

@@ -82,12 +82,12 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
if( Objects.equals(role, AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role, AppRoleEnum.ROOT.getCode())){ if( Objects.equals(role, AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role, AppRoleEnum.ROOT.getCode())){
csEventUserQueryParam.setUserId(null); csEventUserQueryParam.setUserId(null);
} }
if(CollectionUtil.isEmpty(csEventUserQueryParam.getTarget())&&Objects.equals(csEventUserQueryParam.getType(),"0")){ // if(CollectionUtil.isEmpty(csEventUserQueryParam.getTarget())&&Objects.equals(csEventUserQueryParam.getType(),"0")){
/*获取所有暂态事件类型*/ // /*获取所有暂态事件类型*/
List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.APP_EVENT.getCode()).getData(); // List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.APP_EVENT.getCode()).getData();
List<String> collect = data.stream().map(DictData::getCode).collect(Collectors.toList()); // List<String> collect = data.stream().map(DictData::getCode).collect(Collectors.toList());
csEventUserQueryParam.setTarget(collect); // csEventUserQueryParam.setTarget(collect);
} // }
List<EventDetailVO> list = this.getBaseMapper().queryUserEventList(csEventUserQueryParam); List<EventDetailVO> list = this.getBaseMapper().queryUserEventList(csEventUserQueryParam);
list.forEach(temp->{ list.forEach(temp->{