设备昵称

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -293,9 +293,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public Object findCameraDetailByChildName(String token, String childName) {
-        User user = this.getByToken(token);
+        User userVo = this.getByToken(token);
         CameraVo cameraVo = cameraService.getVoByChildName(childName);
-        if(user != null){
+        if(userVo != null && userVo.getId()!= null){
+            User user = this.getById(userVo.getId());
             cameraVo.setNickName(user.getNickName());
         }else {
             if(cameraVo.getType().equals(9)){

src/main/java/com/fdkankan/ucenter/vo/response/AppSceneVo.java

@@ -34,6 +34,8 @@ public class AppSceneVo {
     private String dataSource;
     private Integer sceneType;
 
+    private String buildType;
+
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);
     }

src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -5,7 +5,7 @@
     <select id="pageList" resultType="com.fdkankan.ucenter.vo.response.AppSceneVo">
         SELECT p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
         p.status,pay_status,thumb,web_site,0 as is_upgrade,view_count,
-         p.camera_id,p.user_id ,p.data_source,p.scene_type
+         p.camera_id,p.user_id ,p.data_source,p.scene_type,build_type
         FROM t_scene_pro p
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'   AND ( p.status = 1 OR p.status = -2) AND p.scene_type != 99
@@ -16,7 +16,7 @@
         UNION
         SELECT p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,num,title as scene_name,description as scene_dec,
         scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,view_count,
-        p.camera_id,p.user_id,e.data_source,p.scene_type
+        p.camera_id,p.user_id,e.data_source,p.scene_type,build_type
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="sceneJoinCamera"></include>