|
@@ -73,10 +73,12 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
sceneEntities.addAll(findByParentLike(item.getId()));
|
|
|
}
|
|
|
for (SceneEntity item : sceneEntities) {
|
|
|
- if (item.getCompanyOrgId() != null)
|
|
|
+ if (item.getCompanyOrgId() != null) {
|
|
|
item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
|
|
|
- if (item.getDeptOrgId() != null)
|
|
|
+ }
|
|
|
+ if (item.getDeptOrgId() != null) {
|
|
|
item.setDeptOrgName(orgInfoUtil.getOrgName(item.getDeptOrgId().intValue()));
|
|
|
+ }
|
|
|
}
|
|
|
List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);
|
|
|
sceneEntityPage.setRecords(sceneTree);
|
|
@@ -162,8 +164,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
scene.setDateUpdate(new Date());
|
|
|
scene.setDateCreate(new Date());
|
|
|
}
|
|
|
- if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0)
|
|
|
+ if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0) {
|
|
|
scene.setDeptOrgId(null);
|
|
|
+ }
|
|
|
|
|
|
// 如果没有设置父节点,则代表为跟节点,有则获取父节点实体
|
|
|
if (scene.getParentSceneId() == null || StringUtils.isBlank(scene.getParentSceneId().toString())) {
|
|
@@ -209,8 +212,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
public List<SceneEntity> findByParentLike(Long id) {
|
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
SceneEntity scene = new SceneEntity();
|
|
|
- if (id != null)
|
|
|
+ if (id != null) {
|
|
|
scene.setParentSceneIds("%," + id + ",%");
|
|
|
+ }
|
|
|
scene.setTenantId(currentUser.getTenantId());
|
|
|
scene.setStatus(1);
|
|
|
scene.setProgramItems(currentUser.getProgramItemList());
|
|
@@ -227,8 +231,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
public List<Long> findByParentIdsLike(Long id) {
|
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
SceneEntity scene = new SceneEntity();
|
|
|
- if (id != null)
|
|
|
+ if (id != null) {
|
|
|
scene.setParentSceneIds("%," + id + ",%");
|
|
|
+ }
|
|
|
scene.setTenantId(currentUser.getTenantId());
|
|
|
scene.setStatus(1);
|
|
|
scene.setProgramItems(currentUser.getProgramItemList());
|
|
@@ -268,8 +273,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
public boolean updateSceneById(SceneEntity scene) {
|
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
scene.setUpdateBy(currentUser.getName());
|
|
|
- if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0)
|
|
|
+ if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0) {
|
|
|
scene.setDeptOrgId(null);
|
|
|
+ }
|
|
|
// 获取修改前的parentIds,用于更新子节点的parentIds
|
|
|
SceneEntity cScene = sceneMapper.findSceneById(scene.getId());
|
|
|
String oldParentIds = cScene.getParentSceneIds();
|
|
@@ -347,7 +353,7 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
SceneEntity sceneEntity = sceneMapper.findSceneById(id);
|
|
|
SceneImageEntity sceneImageEntity = new SceneImageEntity();
|
|
|
sceneImageEntity.setSceneId(id);
|
|
|
- sceneImageEntity.setImageType(3l);
|
|
|
+ sceneImageEntity.setImageType(3L);
|
|
|
List<SceneImageEntity> sceneImageEntities = sceneImageService.findList(sceneImageEntity);
|
|
|
sceneEntity.setSceneImages(sceneImageEntities);
|
|
|
return sceneEntity;
|
|
@@ -380,8 +386,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
sceneEntity.setUserType(currentUser.getType());
|
|
|
//1是公司,2是公司及以下,3部门,4部门及以下,5自定义
|
|
|
sceneEntity.setPermissonType(currentUser.getPermissonType());
|
|
|
- if (id != null)
|
|
|
+ if (id != null) {
|
|
|
sceneEntity.setParentSceneIds("%," + id + ",%");
|
|
|
+ }
|
|
|
List<SceneEntity> sceneEntities = sceneMapper.findByParentId(sceneEntity);
|
|
|
for (SceneEntity item : sceneEntities) {
|
|
|
SceneImageEntity sceneImageEntity = new SceneImageEntity();
|
|
@@ -401,8 +408,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
sceneEntity.setUserType(currentUser.getType());
|
|
|
//1是公司,2是公司及以下,3部门,4部门及以下,5自定义
|
|
|
sceneEntity.setPermissonType(currentUser.getPermissonType());
|
|
|
- if (id != null)
|
|
|
+ if (id != null) {
|
|
|
sceneEntity.setParentSceneIds("%," + id + ",%");
|
|
|
+ }
|
|
|
List<SceneEntity> sceneEntities = sceneMapper.findByParentId(sceneEntity);
|
|
|
for (SceneEntity item : sceneEntities) {
|
|
|
SceneImageEntity sceneImageEntity = new SceneImageEntity();
|
|
@@ -412,10 +420,11 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
|
item.setSceneImages(sceneImageEntities);
|
|
|
//判断此场景是否有报警
|
|
|
List<AlarmDetailsDto> alarmList = alarmDetailsService.selectBySceneId(item.getId().intValue());
|
|
|
- if (alarmList.size() > 0)
|
|
|
+ if (alarmList.size() > 0) {
|
|
|
item.setIsAlarm(1);
|
|
|
- else
|
|
|
+ } else {
|
|
|
item.setIsAlarm(0);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);
|