|
@@ -144,7 +144,6 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 保存
|
|
* 保存
|
|
*/
|
|
*/
|
|
@@ -152,13 +151,13 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
scene.setTenantId(currentUser.getTenantId());
|
|
scene.setTenantId(currentUser.getTenantId());
|
|
scene.setStatus(1);
|
|
scene.setStatus(1);
|
|
- if(currentUser!=null) {
|
|
|
|
|
|
+ if (currentUser != null) {
|
|
scene.setCreateBy(currentUser.getName());
|
|
scene.setCreateBy(currentUser.getName());
|
|
scene.setUpdateBy(currentUser.getName());
|
|
scene.setUpdateBy(currentUser.getName());
|
|
scene.setDateUpdate(new Date());
|
|
scene.setDateUpdate(new Date());
|
|
scene.setDateCreate(new Date());
|
|
scene.setDateCreate(new Date());
|
|
}
|
|
}
|
|
- if(scene.getDeptOrgId()!=null&&scene.getDeptOrgId()==0)
|
|
|
|
|
|
+ if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0)
|
|
scene.setDeptOrgId(null);
|
|
scene.setDeptOrgId(null);
|
|
|
|
|
|
// 如果没有设置父节点,则代表为跟节点,有则获取父节点实体
|
|
// 如果没有设置父节点,则代表为跟节点,有则获取父节点实体
|
|
@@ -198,10 +197,11 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 根据父级ID查询所有子节点及本身
|
|
* 根据父级ID查询所有子节点及本身
|
|
*/
|
|
*/
|
|
- public List<SceneEntity> findByParentLike(Long id) {
|
|
|
|
|
|
+ public List<SceneEntity> findByParentLike(Long id) {
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
SceneEntity scene = new SceneEntity();
|
|
SceneEntity scene = new SceneEntity();
|
|
if (id != null)
|
|
if (id != null)
|
|
@@ -215,10 +215,11 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
List<SceneEntity> list = sceneMapper.findByParentIdsLike(scene);
|
|
List<SceneEntity> list = sceneMapper.findByParentIdsLike(scene);
|
|
return list;
|
|
return list;
|
|
}
|
|
}
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 根据父级ID查询所有子节点及本身
|
|
* 根据父级ID查询所有子节点及本身
|
|
*/
|
|
*/
|
|
- public List<Long> findByParentIdsLike(Long id) {
|
|
|
|
|
|
+ public List<Long> findByParentIdsLike(Long id) {
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
SceneEntity scene = new SceneEntity();
|
|
SceneEntity scene = new SceneEntity();
|
|
if (id != null)
|
|
if (id != null)
|
|
@@ -236,13 +237,14 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
}
|
|
}
|
|
return longs;
|
|
return longs;
|
|
}
|
|
}
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 修改根居ID
|
|
* 修改根居ID
|
|
*/
|
|
*/
|
|
public boolean updateSceneById(SceneEntity scene) {
|
|
public boolean updateSceneById(SceneEntity scene) {
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
scene.setUpdateBy(currentUser.getName());
|
|
scene.setUpdateBy(currentUser.getName());
|
|
- if(scene.getDeptOrgId()!=null&&scene.getDeptOrgId()==0)
|
|
|
|
|
|
+ if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0)
|
|
scene.setDeptOrgId(null);
|
|
scene.setDeptOrgId(null);
|
|
// 获取修改前的parentIds,用于更新子节点的parentIds
|
|
// 获取修改前的parentIds,用于更新子节点的parentIds
|
|
SceneEntity cScene = sceneMapper.findSceneById(scene.getId());
|
|
SceneEntity cScene = sceneMapper.findSceneById(scene.getId());
|
|
@@ -274,7 +276,7 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
|
|
|
}
|
|
}
|
|
- o.setParentSceneIds("%,"+scene.getId()+",%");
|
|
|
|
|
|
+ o.setParentSceneIds("%," + scene.getId() + ",%");
|
|
List<SceneEntity> list = sceneMapper.findByParentIdsLike(o);
|
|
List<SceneEntity> list = sceneMapper.findByParentIdsLike(o);
|
|
for (SceneEntity e : list) {
|
|
for (SceneEntity e : list) {
|
|
if (!e.getId().equals(scene.getId()) && e.getParentSceneId() != null && oldParentIds != null) {
|
|
if (!e.getId().equals(scene.getId()) && e.getParentSceneId() != null && oldParentIds != null) {
|
|
@@ -285,9 +287,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//删除之前的图片信息
|
|
//删除之前的图片信息
|
|
- sceneImageService.updateBySceneId(scene.getId());
|
|
|
|
|
|
+ sceneImageService.updateBySceneId(scene.getId());
|
|
//增加场景图片
|
|
//增加场景图片
|
|
- if(scene.getSceneImages()!=null) {
|
|
|
|
|
|
+ if (scene.getSceneImages() != null) {
|
|
for (SceneImageEntity sceneImage : scene.getSceneImages()) {
|
|
for (SceneImageEntity sceneImage : scene.getSceneImages()) {
|
|
sceneImage.setCreateBy(currentUser.getName());
|
|
sceneImage.setCreateBy(currentUser.getName());
|
|
sceneImage.setDateCreate(new Date());
|
|
sceneImage.setDateCreate(new Date());
|
|
@@ -320,11 +322,11 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- public List<SceneEntity> findByParentSceneIds(Long[] Ids) {
|
|
|
|
|
|
+ public List<SceneEntity> findByParentSceneIds(Long[] Ids) {
|
|
return sceneMapper.findByParentSceneIds(Ids);
|
|
return sceneMapper.findByParentSceneIds(Ids);
|
|
}
|
|
}
|
|
|
|
|
|
- public List<SceneEntity> selectByTypeName(SceneEntity sceneEntity) {
|
|
|
|
|
|
+ public List<SceneEntity> selectByTypeName(SceneEntity sceneEntity) {
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
sceneEntity.setTenantId(currentUser.getTenantId());
|
|
sceneEntity.setTenantId(currentUser.getTenantId());
|
|
sceneEntity.setProgramItems(currentUser.getProgramItemList());
|
|
sceneEntity.setProgramItems(currentUser.getProgramItemList());
|
|
@@ -333,4 +335,19 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
|
|
sceneEntity.setPermissonType(currentUser.getPermissonType());
|
|
sceneEntity.setPermissonType(currentUser.getPermissonType());
|
|
return sceneMapper.selectByTypeName(sceneEntity);
|
|
return sceneMapper.selectByTypeName(sceneEntity);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public List<SceneEntity> findByParentId(Long id) {
|
|
|
|
+ SceneEntity sceneEntity = new SceneEntity();
|
|
|
|
+ LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
|
+ sceneEntity.setTenantId(currentUser.getTenantId());
|
|
|
|
+ sceneEntity.setProgramItems(currentUser.getProgramItemList());
|
|
|
|
+ sceneEntity.setUserType(currentUser.getType());
|
|
|
|
+ //1是公司,2是公司及以下,3部门,4部门及以下,5自定义
|
|
|
|
+ sceneEntity.setPermissonType(currentUser.getPermissonType());
|
|
|
|
+ if (id != null)
|
|
|
|
+ sceneEntity.setParentSceneIds("%," + id + ",%");
|
|
|
|
+ List<SceneEntity> sceneEntities = sceneMapper.findByParentId(sceneEntity);
|
|
|
|
+ List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);
|
|
|
|
+ return sceneTree;
|
|
|
|
+ }
|
|
}
|
|
}
|