floor_plan_angle、floor_plan_compass 改为浮点型

4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -161,12 +161,12 @@ public class SceneJsonBean {
     /**
      * 户型角度
      */
-    private Integer floorPlanAngle;
+    private Float floorPlanAngle;
 
     /**
      * 指南针角度
      */
-    private Integer floorPlanCompass;
+    private Float floorPlanCompass;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneEditInfoExt.java

@@ -38,10 +38,10 @@ public class SceneEditInfoExt {
     private Long editInfoId;
 
     @TableField("floor_plan_angle")
-    private Integer floorPlanAngle;
+    private Float floorPlanAngle;
 
     @TableField("floor_plan_compass")
-    private Integer floorPlanCompass;
+    private Float floorPlanCompass;
 
     /**
      * 大场景序号(随心装场景码)  原pro_edit表中的字段

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -185,8 +185,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
         if(sceneEditInfoExt == null){
             sceneEditInfoExt = new SceneEditInfoExt();
-            sceneEditInfoExt.setFloorPlanAngle(0);
-            sceneEditInfoExt.setFloorPlanCompass(0);
+            sceneEditInfoExt.setFloorPlanAngle(0f);
+            sceneEditInfoExt.setFloorPlanCompass(0f);
         }
 
 //        if(sceneEditControls == null){
@@ -361,10 +361,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         BeanUtil.copyProperties(sceneEditInfoExt, sceneInfoVO);
         BeanUtil.copyProperties(sceneEditInfo, sceneInfoVO);
         if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
-            sceneInfoVO.setFloorPlanAngle(0);
+            sceneInfoVO.setFloorPlanAngle(0f);
         }
         if(Objects.isNull(sceneInfoVO.getFloorPlanCompass())){
-            sceneInfoVO.setFloorPlanCompass(0);
+            sceneInfoVO.setFloorPlanCompass(0f);
         }
         sceneInfoVO.setControls(BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class));
         sceneInfoVO.setNum(num);
@@ -436,10 +436,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             this.setExtData(sceneInfoVO, scenePro.getCameraId());
             sceneInfoVO.setScenePassword(null);
             if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
-                sceneInfoVO.setFloorPlanAngle(0);
+                sceneInfoVO.setFloorPlanAngle(0f);
             }
             if(Objects.isNull(sceneInfoVO.getFloorPlanCompass())){
-                sceneInfoVO.setFloorPlanCompass(0);
+                sceneInfoVO.setFloorPlanCompass(0f);
             }
             return sceneInfoVO;
         }
@@ -453,10 +453,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         this.setExtData(sceneInfoVO, scenePro.getCameraId());
         sceneInfoVO.setScenePassword(null);
         if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
-            sceneInfoVO.setFloorPlanAngle(0);
+            sceneInfoVO.setFloorPlanAngle(0f);
         }
         if(Objects.isNull(sceneInfoVO.getFloorPlanCompass())){
-            sceneInfoVO.setFloorPlanCompass(0);
+            sceneInfoVO.setFloorPlanCompass(0f);
         }
         redisUtil.set(key, JSON.toJSONString(sceneInfoVO));
 
@@ -507,14 +507,14 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         String floors = fileInfoJson.getString("floors");
         String cadInfo = null;
-        Integer angel = null;
-        Integer compass = null;
+        Float angel = null;
+        Float compass = null;
         String floorJsonData = fileInfoJson.getString("floorJsonData");
         if(StrUtil.isNotBlank(floorJsonData)){
             JSONObject jsonObject = JSON.parseObject(floorJsonData);
             cadInfo = jsonObject.getString("cadInfo");
-            angel = jsonObject.getInteger("angle");
-            compass = jsonObject.getInteger("compass");
+            angel = jsonObject.getFloat("angle");
+            compass = jsonObject.getFloat("compass");
         }
 //        String filePaths = fileInfoJson.getString("filePaths");
 //        Byte reSet = fileInfoJson.getByte("reset");

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -2328,7 +2328,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 return jsonObject;
             }).collect(Collectors.toList());
             //按时间倒叙排序
-            Collections.sort(tags, Comparator.comparing(t -> t.getLong("createTime")));
+            Collections.sort(tags, Comparator.comparingLong(t -> t.getLongValue("createTime")));
             tags.parallelStream().forEach(t->t.remove("createTime"));
         }
         result.put("tags", tags);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -150,12 +150,12 @@ public class SceneInfoVO {
     /**
      * 户型角度
      */
-    private Integer floorPlanAngle;
+    private Float floorPlanAngle;
 
     /**
      * 指南针角度
      */
-    private Integer floorPlanCompass;
+    private Float floorPlanCompass;