Merge branch 'master' into obt

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -363,11 +363,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 String icon = null;
                 if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
                     fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
-                    icon = fYunFileConfig.getHost() + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
-                    if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
-                        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
-                        icon = fYunFileConfig.getHost() + imgViewPath + jsonObject.getString("icon");
-                    }
+                    icon = fYunFileConfig.getHost() + imgViewPath + jsonObject.getString("icon");
                     fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imgViewPath + jsonObject.getString("icon"));
                 }
 
@@ -430,8 +426,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                     statusJson.put("webSite", scenePlusVO.getWebSite());
                     statusJson.put("sceneNum", scenePlusVO.getNum());
                     statusJson.put("thumb", scenePlusVO.getThumb());
-                    statusJson.put("payStatus", scenePlusVO.getPayStatus());
-                    statusJson.put("recStatus", scenePlusVO.getRecStatus());
+                    statusJson.put("payStatus", 0);
+                    statusJson.put("recStatus", 'A');
                     FileUtils.writeFile(localDataPath + "status.json", statusJson.toString());
                     fYunFileService.uploadFile(localDataPath + "status.json", dataViewPath + "status.json");
                 }
@@ -678,10 +674,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
             fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
             icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
-            if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
-                fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
-                icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
-            }
             fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imageViewPath + jsonObject.getString("icon"));
 
             log.info("上传icon成功....");
@@ -734,8 +726,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             statusJson.put("webSite", scenePlusVO.getWebSite());
             statusJson.put("sceneNum", scenePlusVO.getNum());
             statusJson.put("thumb", scenePlusVO.getThumb());
-            statusJson.put("payStatus", scenePlusVO.getPayStatus());
-            statusJson.put("recStatus", scenePlusVO.getRecStatus());
+            statusJson.put("payStatus", 0);
+            statusJson.put("recStatus", "A");
             FileUtils.writeFile(localDataPath + "status.json", statusJson.toString());
 
             fYunFileService.uploadFile(localDataPath + "status.json", dataViewPath + "status.json");
@@ -1039,7 +1031,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         BeanUtil.copyProperties(scenePlusExt, scenePlusVO);
         BeanUtil.copyProperties(scenePlus, scenePlusVO);
 
-        //当mq排队数大于指定数量时使用弹性升缩
         return new Object[]{scenePlusVO, buildSceneMqMessage};
     }