场景增加显示部门信息

.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_1_7_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.amqp:spring-amqp:2.1.7.RELEASE">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../Program Files/repository/org/springframework/amqp/spring-amqp/2.1.7.RELEASE/spring-amqp-2.1.7.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../Program Files/repository/org/springframework/amqp/spring-amqp/2.1.7.RELEASE/spring-amqp-2.1.7.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../Program Files/repository/org/springframework/amqp/spring-amqp/2.1.7.RELEASE/spring-amqp-2.1.7.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_1_7_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.amqp:spring-rabbit:2.1.7.RELEASE">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../Program Files/repository/org/springframework/amqp/spring-rabbit/2.1.7.RELEASE/spring-rabbit-2.1.7.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../Program Files/repository/org/springframework/amqp/spring-rabbit/2.1.7.RELEASE/spring-rabbit-2.1.7.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../Program Files/repository/org/springframework/amqp/spring-rabbit/2.1.7.RELEASE/spring-rabbit-2.1.7.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

sms_water/src/main/java/com/huaxu/entity/SceneEntity.java

@@ -54,6 +54,16 @@ public class SceneEntity implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private Long deptOrgId;
 
+    /** 所属公司 */
+    @ApiModelProperty(value = "所属公司")
+    @TableField(exist = false)
+    private String companyOrgName;
+
+    /** 所属部门 */
+    @ApiModelProperty(value = "所属部门")
+    @TableField(exist = false)
+    private String deptOrgName;
+
     /** 场景类型 */
     @ApiModelProperty(value = "场景类型")
     private Long sceneTypeId;

sms_water/src/main/java/com/huaxu/service/SceneService.java

@@ -6,17 +6,20 @@ import com.huaxu.common.Reflections;
 import com.huaxu.common.StringUtils;
 import com.huaxu.dao.SceneImageMapper;
 import com.huaxu.dao.SceneMapper;
+import com.huaxu.dto.DeviceDto;
 import com.huaxu.entity.SceneEntity;
 import com.huaxu.entity.SceneImageEntity;
 import com.huaxu.entity.SceneTypeEntity;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.util.OrgInfoUtil;
 import com.huaxu.util.Snowflake;
 import com.huaxu.util.UserUtil;
 import javafx.scene.Scene;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -46,6 +49,8 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
     private SceneMapper sceneMapper;
     @Resource
     private SceneImageService sceneImageService;
+    @Autowired
+    private OrgInfoUtil orgInfoUtil;
 
     /**
      * 自定义分页查询，含关联实体对像
@@ -62,7 +67,11 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
         //查询子节点的信息
         List<SceneEntity> sceneEntities = newArrayList();
         for (SceneEntity item : sceneEntityPage.getRecords()) {
-             sceneEntities.addAll(findByParentLike(item.getId()));
+            sceneEntities.addAll(findByParentLike(item.getId()));
+        }
+        for (SceneEntity item : sceneEntities) {
+            item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
+            item.setDeptOrgName(orgInfoUtil.getOrgName(item.getDeptOrgId().intValue()));
         }
         List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);
         sceneEntityPage.setRecords(sceneTree);