Merge branch 'test'

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -240,11 +240,12 @@ public class LaserService {
         //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
         switch (status){
             case -1 : return "场景已删除";
-            case 0 : return "计算中";
+            case 0 :
+            case 4 :
+                return "计算中";
             case 1 : return "计算失败";
             case 2 : return "计算成功";
             case 3 : return "封存";
-            case 4 : return "生成OBJ中";
             default: return "";
         }
     }

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -595,6 +595,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if(cameraType == null){
                 throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
             }
+            wifiNamePrefix = cameraType.getWifiNamePrefix();
 
         }
         LambdaUpdateWrapper<Camera> cameraLambdaUpdateWrapper = new LambdaUpdateWrapper<>();

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -278,8 +278,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         Long sceneCameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
-        Long space = null;
-        space = scenePro == null ? 0 :scenePro.getSpace();
+        Long space = scenePro == null ? 0 :scenePro.getSpace();
         String dataSource = scenePro == null ? null :scenePro.getDataSource();
         if(scenePlus !=null){
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
@@ -318,10 +317,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 //            throw new BusinessException(ResultCode.MOVE_ERROR_COPY);
 //        }
 
-        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11) {       //深时场景
+        if((cameraDetail.getType() == 10 || cameraDetail.getType() == 11) && status ==-2) {       //深时场景
             //迁移深时 dataSource
             File file = new File(dataSource + "_laserData");
             if (!file.exists()) {
+                log.info("迁移失败--dataSource:{}，sceneNum:{},toSnCode:{}",dataSource + "_laserData",param.getNum(),param.getSnCode());
                 throw new BusinessException(ResultCode.MOVE_ERROR);
             }
         }

src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -16,6 +16,7 @@ public class SceneVo {
     private String userName;        //绑定账号
     private Integer viewCount;      //浏览量
     private Integer status;         //状态
+    private Integer buildObjStatus = 1;         //生成OBJ状态,0，未生成 1完成，2计算中
     private String statusString;    //中文状态
     private Integer payStatus;      //
     private String sceneVersion;   //场景版本

src/main/resources/mapper/manage/IncrementOrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.fdkankan.manage.mapper.IIncrementOrderMapper">
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
-        select o.* ,
+        select o.id,o.trade_time ,o.order_sn,o.member_levels,o.amount,o.count,o.pay_type,o.number,o.pay_status,o.time_zone_off,o.increment_id,o.create_time,
                null as customer_name,0 as customer_type,null as end_customer,null as use_type ,null as project_num ,
                null as remark,null as agentName,null as agentId,
                 u.user_name,u.nick_name,
@@ -15,7 +15,9 @@
            and o.rec_status = 'ABC'
         </if>
         union all
-        SELECT o.*,u.user_name,u.nick_name ,'线下'as payMethod from t_increment_order_mg o
+        select o.id,o.trade_time ,o.order_sn,o.member_levels,o.amount,o.count,o.pay_type,o.number,o.pay_status,o.time_zone_off,o.increment_id,o.create_time,
+        o.customer_name,o.customer_type,o.end_customer,o.use_type,o.project_num,o.remark,o.agent_name,o.agent_id,
+        u.user_name,u.nick_name ,'线下'as payMethod from t_increment_order_mg o
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>
         <if test="param.customerType!=null">