Merge branch 'test'

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -84,6 +84,7 @@ public enum ResultCode  {
     MACHINE_CODE_ERROR(50065, "机器码错误!"),
     SCENE_REBUILD_ERROR2(50066, "原始资源已冻结，重算失败。"),
     CAMERA_AUTHORIZE_ERROR(50067, "相机授权目前不支持四维看看相机类型"),
+    CAMERA_AUTHORIZE_TYPE_ERROR(50068, "请更换相同类型的相机"),
 
     ;
 

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

@@ -137,7 +137,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
                     AuthorizeCameraDetail detail = new AuthorizeCameraDetail();
                     detail.setSnCode(snCode);
                     detail.setCameraId(camera.getId());
-                    detail.setCameraType(CameraUtils.getCameraType(cameraDetail.getType()));
+                    detail.setCameraType(cameraDetail.getType());
                     detail.setCameraTypeStr(CameraUtils.getCameraTypeStr(detail.getCameraType()));
                     detailHashMap.put(snCode,detail);
                 }
@@ -192,6 +192,9 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
         if(byCameraId == null){
             throw new BusinessException(ResultCode.UPDATE_CAMERA_NO_IN);
         }
+        if(!byCameraId.getType().equals(cameraDetail.getCameraType())){
+            throw new BusinessException(ResultCode.CAMERA_AUTHORIZE_TYPE_ERROR);
+        }
         try {
             CamRegSDto dtos = new CamRegSDto();
             dtos.setMachineCode(authorizeCamera.getMachineCode());
@@ -207,7 +210,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
                 throw new BusinessException(ResultCode.GET_MACHINE_CODE_ERROR);
             }
             AuthorizeCameraLog authorizeCameraLog = authorizeCameraLogService.saveLog(cameraDetail, snCode, authorizeKey);
-            authorizeCameraDetailService.updateSnCode(cameraDetail.getId(),bySnCode.getId(),CameraUtils.getCameraType(byCameraId.getType()),snCode);
+            authorizeCameraDetailService.updateSnCode(cameraDetail.getId(),bySnCode.getId(),byCameraId.getType(),snCode);
             return authorizeCameraLog;
         }catch (Exception e){
             throw new BusinessException(ResultCode.GET_MACHINE_CODE_ERROR);

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

@@ -640,7 +640,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             List<CameraDetail> cameraIds1 = cameraDetailService.getByCameraIds(cameraList.stream().map(Camera::getId).collect(Collectors.toList()));
             for (CameraDetail cameraDetail : cameraIds1) {
-                snCodeMap.put(cameraMap.get(cameraDetail.getCameraId()), CameraUtils.getCameraTypeStr(CameraUtils.getCameraType(cameraDetail.getType())));
+                snCodeMap.put(cameraMap.get(cameraDetail.getCameraId()), CameraUtils.getCameraTypeStr(cameraDetail.getType()));
             }
         }
 

src/main/java/com/fdkankan/manage/util/CameraUtils.java

@@ -18,9 +18,10 @@ public class CameraUtils {
     public static  String getCameraTypeStr(Integer type){
         switch (type){
             case 1 : return "四维看看";
-            case 2 : return "四维看见";
-            case 3 : return "四维深时";
-            case 4 : return "四维深光";
+            case 4 : return "四维看看";
+            case 9 : return "四维看见";
+            case 10 : return "四维深时";
+            case 11 : return "四维深光";
         }
         return "";
     }

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

@@ -4,14 +4,14 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.DownOrderVo">
         select o.* ,
-               null as customer_name,null as customer_type,null as end_customer,null as use_type ,null as project_num ,
+               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 downType,null as agentName,null as agentId,
                 u.user_name  ,
               '线上' as payMethod
         from  t_download_order o
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>
-        <if test="param.customerType!=null or param.payMethod==1 or param.useType!=null">
+        <if test="param.customerType==1 or param.payMethod==1 or param.useType!=null">
            and  o.rec_status = 'ABC'
         </if>
         union all

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

@@ -4,14 +4,14 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
         select o.* ,
-               null as customer_name,null as customer_type,null as end_customer,null as use_type ,null as project_num ,
+               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,
                '线上' as payMethod
         from  t_increment_order o
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>
-        <if test="param.customerType!=null or param.payMethod==1 or param.useType!=null">
+        <if test="param.customerType==1 or param.payMethod==1 or param.useType!=null">
            and o.rec_status = 'ABC'
         </if>
         union all