Merge remote-tracking branch 'origin/master-cn' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/service/ISceneDownloadLogService.java
#	src/main/java/com/fdkankan/ucenter/service/impl/SceneDownloadLogServiceImpl.java

src/main/java/com/fdkankan/ucenter/constant/CameraTypelEnum.java

@@ -0,0 +1,72 @@
+package com.fdkankan.ucenter.constant;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public enum CameraTypelEnum {
+
+    FD_KK_1(1,"四维看看", Arrays.asList(1,2,12,13,14),false),
+    FD_KK_2(4,"四维看看", Arrays.asList(1,2,12,13,14),false),
+    FD_KJ(9,"四维看见", Arrays.asList(3),false),
+    FD_SS_LASER(10,"深时", Arrays.asList(4),true),
+    FD_SG_LASER(11,"深光", Arrays.asList(5),true),
+    FD_SX_LASER(12,"深巡", Arrays.asList(7),true),
+
+    ;
+
+    Integer cameraType;
+    String name;
+    List<Integer> sceneSource;
+    Boolean isLaser;
+
+    CameraTypelEnum(Integer cameraType, String name, List<Integer>sceneSource , Boolean isLaser) {
+        this.cameraType = cameraType;
+        this.name = name;
+        this.sceneSource = sceneSource;
+        this.isLaser = isLaser;
+    }
+
+    public Integer getCameraType() {
+        return cameraType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Integer> getSceneSource() {
+        return sceneSource;
+    }
+
+    public Boolean getLaser() {
+        return isLaser;
+    }
+
+    public static List<Map<String, Object>> getAllProperties() {
+        return Arrays.stream(values())
+                .map(vo -> {
+                    Map<String, Object> props = new HashMap<>();
+                    props.put("name", vo.name);
+                    props.put("cameraType", vo.cameraType);
+                    props.put("sceneSource", vo.sceneSource);
+                    props.put("isLaser", vo.isLaser);
+                    return props;
+                })
+                .collect(Collectors.toList());
+    }
+
+    public static CameraTypelEnum getByCameraType(Integer cameraType) {
+        for (CameraTypelEnum value : CameraTypelEnum.values()) {
+            if(value.cameraType.equals(cameraType)){
+                return value;
+            }
+        }
+        return null;
+    }
+
+
+
+}

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

@@ -11,6 +11,8 @@ import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.OssPath;
+import com.fdkankan.ucenter.constant.CameraConstant;
+import com.fdkankan.ucenter.constant.CameraTypelEnum;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.httpClient.service.LaserService;
@@ -108,12 +110,15 @@ public class AppSceneService {
         Page<AppSceneVo> page =  scenePlusMapper.pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<String> numList = page.getRecords().stream().map(AppSceneVo::getNum).collect(Collectors.toList());
 
-        HashMap<String, JSONObject> ssSceneMap = new HashMap<>();
-        if(param.getCameraType() == 10 ){  //深时
-            ssSceneMap = laserService.list(numList,4);
+
+        CameraTypelEnum cameraTypelEnum = CameraTypelEnum.getByCameraType(param.getCameraType());
+        if(cameraTypelEnum == null){
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6028, CameraConstant.FAILURE_MSG_6028);
         }
-        if( param.getCameraType() == 11){  //深光
-            ssSceneMap = laserService.list(numList,5);
+
+        HashMap<String, JSONObject> ssSceneMap = new HashMap<>();
+        if(cameraTypelEnum.getLaser() ){  //深时
+            ssSceneMap = laserService.list(numList,cameraTypelEnum.getSceneSource().get(0));
         }
 
 //        Set<Long> cameraIdSet = page.getRecords().stream().map(AppSceneVo::getCameraId).collect(Collectors.toSet());
@@ -124,7 +129,7 @@ public class AppSceneService {
         //相机登录     sceneSourceType 取值皆为0
 
         for (AppSceneVo record : page.getRecords()) {
-            if(param.getCameraType() == 10 || param.getCameraType() == 11){  //深时
+            if(cameraTypelEnum.getLaser()){  //深时
                 JSONObject ssObj = ssSceneMap.get(record.getNum());
                 if(ssObj!=null){
                     record.setSceneName(ssObj.getString("title"));

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

@@ -89,16 +89,6 @@ public class DownService implements IDownService {
             downVo.setDownloadUrl(sceneDownloadLog.getDownloadUrl());
             return downVo;
         }
-        //下载过，有更改
-        if(sceneDownloadLog != null){
-            String redisKey = RedisKey.PREFIX_DOWNLOAD_PROGRESS;
-            if(isUp == 1){
-                redisKey = RedisKey.PREFIX_DOWNLOAD_PROGRESS_V4;
-            }
-            downVo.setDownloadStatus(2);
-            redisUtil.del(String.format(redisKey,sceneNum));  // 清除旧的下载信息
-            return downVo;
-        }
         return downVo;
     }
 

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

@@ -50,6 +50,8 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
     IVirtualOrderService virtualOrderService;
     @Autowired
     IExpansionOrderService expansionOrderService;
+    @Autowired
+    IDownloadOrderService downloadOrderService;
 
     @Override
     public Invoice getByOrderId(Long orderId) {
@@ -163,6 +165,13 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
                     money = incrementOrder.getAmount();
                 }
                 break;
+
+            case 3 :
+                DownloadOrder downloadOrder = downloadOrderService.getById(orderId);
+                if(downloadOrder.getPayStatus() == 1){
+                    money = downloadOrder.getAmount();
+                }
+                break;
         }
         return money;
     }