场景中心代码迁移

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

@@ -1,6 +1,8 @@
 package com.fdkankan.scene;
 
+import com.fdkankan.common.constant.RedisUtil;
 import com.fdkankan.common.exception.GlobalExceptionHandler;
+import com.fdkankan.common.util.UploadToOssUtil;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -28,4 +30,14 @@ public class SceneApplication {
         return new GlobalExceptionHandler();
     }
 
+    @Bean
+    public RedisUtil redisUtil(){
+        return new RedisUtil();
+    }
+
+    @Bean
+    public UploadToOssUtil uploadToOssUtil(){
+        return new UploadToOssUtil();
+    }
+
 }

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

@@ -9,27 +9,27 @@ import java.io.IOException;
 
 public interface ISceneAppService extends IService<Scene> {
 
-    int saveInitialPage(SceneEditVO base) throws IOException;
+    int saveInitialPage(SceneEditVO base) throws Exception;
 
-    int saveFloorLogo(SceneEditVO base);
+    int saveFloorLogo(SceneEditVO base) throws Exception;
 
     int saveHot(SceneEditVO base) throws Exception;
 
-    int saveBackgroundMusic(SceneEditVO base);
+    int saveBackgroundMusic(SceneEditVO base) throws Exception;
 
     int saveSceneInfo(SceneEditVO base) throws Exception;
 
-    int saveSceneKey(SceneEditVO base);
+    int saveSceneKey(SceneEditVO base) throws Exception;
 
-    int saveTourList(SceneEditVO base);
+    int saveTourList(SceneEditVO base) throws Exception;
 
     Object uploadPic(String sceneNum, String folderName, MultipartFile file) throws IOException;
 
     Object uploadScreencapVoice(String sceneNum, MultipartFile file) throws IOException;
 
-    int saveScreencapFile(SceneEditVO base) throws IOException;
+    int saveScreencapFile(SceneEditVO base) throws Exception;
 
-    int saveHotVisible(SceneEditVO base) throws IOException;
+    int saveHotVisible(SceneEditVO base) throws Exception;
 
     int saveLinkPano(SceneEditVO base) throws Exception;
 

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

@@ -20,6 +20,7 @@ import com.fdkankan.scene.vo.SceneProVO;
 import com.fdkankan.scene.vo.SceneVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -49,6 +50,7 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
     @Autowired
     ISceneProService sceneProService;
     @Autowired
+    @Qualifier("uploadToOssUtil")
     UploadToOssUtil uploadToOssUtil;
 
 

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

@@ -11,13 +11,17 @@ import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.UploadToOssUtil;
 import com.fdkankan.common.util.WeiXinUtils;
 import com.fdkankan.scene.entity.Scene;
+import com.fdkankan.scene.entity.SceneExt;
 import com.fdkankan.scene.mapper.ISceneMapper;
 import com.fdkankan.scene.service.ISceneAppService;
+import com.fdkankan.scene.service.ISceneExtService;
+import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.scene.vo.SceneEditVO;
 import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -50,29 +54,35 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
     private String type;
 
     @Autowired
+    @Qualifier("uploadToOssUtil")
     UploadToOssUtil uploadToOssUtil;
     @Autowired
     RedisTemplate redisTemplate;
+    @Autowired
+    ISceneService sceneService;
+    @Autowired
+    ISceneExtService sceneExtService;
 
 
     @Override
-    public int saveInitialPage(SceneEditVO base) throws IOException {
+    public int saveInitialPage(SceneEditVO base) throws Exception {
         if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getInitialPoint())){
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if(Objects.isNull(scene)){
             return -2;
         }
+        SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getNum())
+                .append("images").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -101,7 +111,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         uploadToOssUtil.uploadMulFiles(uploadMap);
 
-        scene.setEntry(base.getInitialPoint());
+        sceneExt.setEntry(base.getInitialPoint());
         scene.setThumbStatus(1);
         scene.setThumb(prefixAli + imagesBuf.append("thumbSmallImg.jpg").toString());
         if("s3".equals(type)){
@@ -111,29 +121,32 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         scene.setUpdateTime(Calendar.getInstance().getTime());
         this.updateById(scene);
 
+        sceneExt.setUpdateTime(Calendar.getInstance().getTime());
+        sceneExtService.updateById(sceneExt);
+
         return 1;
     }
 
     @Override
-    public int saveFloorLogo(SceneEditVO base) {
+    public int saveFloorLogo(SceneEditVO base) throws Exception {
         if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getSize()) ||
                 StrUtil.isEmpty(base.getLogoType())){
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if(scene == null){
             return -2;
         }
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getNum())
+                .append("images").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -166,20 +179,21 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         String sid = base.getSid();
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if (scene == null ) {
             return -2;
         }
+        SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
 
         JSONObject jsonhot = JSONObject.parseObject(base.getHotData());
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getNum())
+                .append("images").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -276,11 +290,14 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         map.put(dataBuffer.toString() + "hot.json", dataBuf.toString() + "hot.json");
         uploadToOssUtil.uploadMulFiles(map);
 
-        scene.setHotsIds(hotsids);
         scene.setVersion(scene.getVersion() + 1);
         scene.setUpdateTime(Calendar.getInstance().getTime());
         this.updateById(scene);
 
+        sceneExt.setHotsIds(hotsids);
+        sceneExt.setUpdateTime(Calendar.getInstance().getTime());
+        sceneExtService.updateById(sceneExt);
+
         String strsceneInfos = FileUtils.readFile(dataBuffer.toString() + "scene.json");
         JSONObject scenejson = new JSONObject();
         if(strsceneInfos!=null){
@@ -298,19 +315,21 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
     }
 
     @Override
-    public int saveBackgroundMusic(SceneEditVO base) {
+    public int saveBackgroundMusic(SceneEditVO base) throws Exception {
         if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getMusicName())){
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if(scene == null){
             return -2;
         }
+        SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
 
+        JSONObject jsonhot = JSONObject.parseObject(base.getHotData());
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -321,11 +340,14 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         FileUtils.writeJsonFile(dataBuffer.toString() + "scene.json", map);
 
-        scene.setBgMusic(base.getMusicName());
         scene.setVersion(scene.getVersion() + 1);
         scene.setUpdateTime(Calendar.getInstance().getTime());
         this.updateById(scene);
 
+        sceneExt.setBgMusic(base.getMusicName());
+        sceneExt.setUpdateTime(Calendar.getInstance().getTime());
+        sceneExtService.updateById(sceneExt);
+
         return 1;
     }
 
@@ -336,14 +358,14 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if(scene == null){
             return -2;
         }
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -371,19 +393,19 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
     }
 
     @Override
-    public int saveSceneKey(SceneEditVO base) {
+    public int saveSceneKey(SceneEditVO base) throws Exception {
         if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getSceneKey())){
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if(scene == null){
             return -2;
         }
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -404,23 +426,25 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
     }
 
     @Override
-    public int saveTourList(SceneEditVO base) {
+    public int saveTourList(SceneEditVO base) throws Exception {
         if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getTourList())){
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if(scene == null){
             return -2;
         }
+        SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
+
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getNum())
+                .append("images").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -462,10 +486,13 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
             FileUtils.writeJsonFile(dataBuffer.toString() + "scene.json", jsonMap);
 
-            scene.setScreencapLen(screencapLen);
             scene.setVersion(scene.getVersion() + 1);
             scene.setUpdateTime(Calendar.getInstance().getTime());
             this.updateById(scene);
+
+            sceneExt.setScreencapLen(screencapLen);
+            sceneExt.setUpdateTime(Calendar.getInstance().getTime());
+            sceneExtService.updateById(sceneExt);
         }
 
         uploadToOssUtil.uploadMulFiles(map);
@@ -482,7 +509,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(sceneNum);
+        Scene scene = sceneService.getSceneBySceneCode(sceneNum);
         if(scene == null){
             return -2;
         }
@@ -524,10 +551,6 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             log.error("上传图片失败", e);
             throw new BusinessException(ErrorCode.FAILURE_CODE_5037);
         }finally {
-//            if(redisTemplate.hasKey(lockKey)){
-//                redisTemplate.delete(lockKey);
-//
-//            }
             redisUtil.unlock(lockKey, Thread.currentThread().getId());
         }
 
@@ -540,12 +563,13 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(sceneNum);
+        Scene scene = sceneService.getSceneBySceneCode(sceneNum);
         if(scene == null){
             return -2;
         }
+        SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
 
-        if (file.isEmpty() && file.getSize() <= 0) {
+        if(file.isEmpty() && file.getSize() <= 0) {
             return -99;
         }
 
@@ -585,10 +609,14 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             map.put("version", scene.getVersion()+1);
             FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + sceneNum + "/scene.json", map);
 
-            scene.setScreencapVoiceSrc(voiceSrc);
             scene.setVersion(scene.getVersion() + 1);
             scene.setUpdateTime(Calendar.getInstance().getTime());
             this.updateById(scene);
+
+            sceneExt.setScreencapVoiceSrc(voiceSrc);
+            sceneExt.setUpdateTime(Calendar.getInstance().getTime());
+            sceneExtService.updateById(sceneExt);
+
         }catch (Exception e){
             log.error("上传图片失败", e);
             throw new BusinessException(ErrorCode.FAILURE_CODE_5040);
@@ -600,20 +628,21 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
     }
 
     @Override
-    public int saveScreencapFile(SceneEditVO base) throws IOException {
+    public int saveScreencapFile(SceneEditVO base) throws Exception {
         if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getIndex()) ||
                 StringUtils.isEmpty(base.getCamerasData())){
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if(scene == null){
             return -2;
         }
+        SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -639,10 +668,13 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             map.put("version", scene.getVersion()+1);
             FileUtils.writeJsonFile(dataBuffer.toString() + "scene.json", map);
 
-            scene.setScreencapLen(0);
             scene.setVersion(scene.getVersion() + 1);
             scene.setUpdateTime(Calendar.getInstance().getTime());
             this.updateById(scene);
+
+            sceneExt.setScreencapLen(0);
+            sceneExt.setUpdateTime(Calendar.getInstance().getTime());
+            sceneExtService.updateById(sceneExt);
         }
 
         String filePath = dataBuffer.toString() + ConstantFileName.TOURLIST_FOLDER + File.separator + ConstantFileName.SCREEN_CRP_DATAFILE + base.getIndex() + ".json";
@@ -658,12 +690,12 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
     }
 
     @Override
-    public int saveHotVisible(SceneEditVO base) throws IOException {
+    public int saveHotVisible(SceneEditVO base) throws Exception {
         if(StrUtil.isEmpty(base.getData())){
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if (scene == null ) {
             return -2;
         }
@@ -672,11 +704,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getNum())
+                .append("images").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -714,7 +746,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if (scene == null ) {
             return -2;
         }
@@ -723,11 +755,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getNum())
+                .append("data").append(scene.getSceneCode())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getNum())
+                .append("images").append(scene.getSceneCode())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -778,10 +810,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             return -102;
         }
 
-        Scene scene = baseMapper.findByNum(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
         if (scene == null ) {
             return -2;
         }
+        SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
 
         String accessToken = WeiXinUtils.getAccessToken();
 
@@ -838,10 +871,14 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         map.put("version", scene.getVersion()+1);
         FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + base.getSceneNum() + "/scene.json", map);
 
-        scene.setScreencapVoiceSrc(voiceSrc);
         scene.setVersion(scene.getVersion());
         scene.setUpdateTime(Calendar.getInstance().getTime());
         this.updateById(scene);
+
+        sceneExt.setScreencapVoiceSrc(voiceSrc);
+        sceneExt.setUpdateTime(Calendar.getInstance().getTime());
+        sceneExtService.updateById(sceneExt);
+
         FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
         return originalFileName;
     }

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

@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -63,6 +64,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     @Autowired
     ISceneProMapper sceneProMapper;
     @Autowired
+    @Qualifier("uploadToOssUtil")
     UploadToOssUtil uploadToOssUtil;
     @Autowired
     ISceneProEditService sceneProEditService;

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

@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -74,6 +75,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private String sceneProNewUrl;
 
     @Autowired
+    @Qualifier("uploadToOssUtil")
     UploadToOssUtil uploadToOssUtil;
     @Autowired
     ISceneProExtService sceneProExtService;

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

@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -65,6 +66,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     @Autowired
     ISceneExtService sceneExtService;
     @Autowired
+    @Qualifier("uploadToOssUtil")
     UploadToOssUtil uploadToOssUtil;
 
     @Override

4dkankan-center-scene/src/main/resources/bootstrap.yml

@@ -20,6 +20,15 @@ prefix:
 
 oss:
   type: oss
+  point: http://oss-cn-shenzhen-internal.aliyuncs.com
+  key: LTAIUrvuHqj8pvry
+  secrey: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+  bucket:
+    bucket: 4dkankan
+    sdk: 4dscene
+  s3key: AKIAWCV5QFZ3ZNELKYUY
+  s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
+  s3bucket: 4dkankan
 
 hot:
   #获取含有热点的领域路径列表
@@ -36,3 +45,6 @@ scene:
     url: showProMobile.html?m=
     new:
       url: smobile.html?m=
+
+#服务器环境，dev为测试环境，formal为正式环境, hq横琴云副控制服务器
+environment: dev

4dkankan-center-scene/src/main/resources/mapper/scene/SceneProMapper.xml

@@ -6,7 +6,7 @@
         <id column="id" property="id" jdbcType="BIGINT" />
         <result column="scene_name" property="sceneName" jdbcType="BIGINT" />
         <result column="scene_dec" property="sceneDec" jdbcType="VARCHAR" />
-        <result column="web_site" property="webSite" jdbcType="varchar" />
+        <result column="web_site" property="webSite" jdbcType="VARCHAR" />
         <result column="thumb" property="thumb" jdbcType="VARCHAR" />
         <result column="user_id" property="userId" jdbcType="BIGINT" />
         <result column="camera_id" property="cameraId" jdbcType="BIGINT" />

4dkankan-common/pom.xml

@@ -220,7 +220,18 @@
             <artifactId>javax.mail</artifactId>
             <version>1.5.4</version>
         </dependency>
-
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.5</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.4</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

4dkankan-common/src/main/java/com/fdkankan/common/util/ConvertCommonUtils.java

@@ -1,7 +1,5 @@
 package com.fdkankan.common.util;
 
-//import com.fdkankan.base.proto.Common;
-
 import com.fdkankan.common.proto.Common;
 import com.fdkankan.common.proto.format.JsonFormat;
 import lombok.extern.log4j.Log4j2;

4dkankan-common/src/main/java/com/fdkankan/common/util/ConvertUtils.java

@@ -1,7 +1,5 @@
 package com.fdkankan.common.util;
 
-//import com.fdkankan.base.proto.Common;
-
 import com.fdkankan.common.proto.Visionmodeldata;
 import com.fdkankan.common.proto.format.JsonFormat;
 import lombok.extern.log4j.Log4j2;

4dkankan-common/src/main/java/com/fdkankan/common/util/CreateObjUtil.java

@@ -1,9 +1,9 @@
 package com.fdkankan.common.util;
 
-import com.fdkankan.base.proto.BigSceneProto.binary_mesh;
-import com.fdkankan.base.proto.Common;
-import com.fdkankan.base.proto.Visionmodeldata;
-import com.fdkankan.base.proto.format.JsonFormat;
+import com.fdkankan.common.proto.BigSceneProto.binary_mesh;
+import com.fdkankan.common.proto.Common;
+import com.fdkankan.common.proto.Visionmodeldata;
+import com.fdkankan.common.proto.format.JsonFormat;
 import com.fdkankan.common.constant.ConstantCmd;
 import com.fdkankan.common.constant.ConstantFileName;
 import com.fdkankan.common.constant.ConstantFilePath;

4dkankan-common/src/main/java/com/fdkankan/common/util/StreamGobbler.java

@@ -0,0 +1,61 @@
+package com.fdkankan.common.util;
+
+import java.io.*;
+
+public class StreamGobbler extends Thread {
+
+	InputStream is;  
+    String type;  
+    OutputStream os;  
+
+    public StreamGobbler(InputStream is, String type) {  
+        this(is, type, null);  
+    }  
+
+    StreamGobbler(InputStream is, String type, OutputStream redirect) {  
+        this.is = is;  
+        this.type = type;  
+        this.os = redirect;  
+    }  
+
+    public void run() {  
+        InputStreamReader isr = null;  
+        BufferedReader br = null;  
+        PrintWriter pw = null;  
+        try {  
+            if (os != null)  
+                pw = new PrintWriter(os);  
+
+            isr = new InputStreamReader(is);  
+            br = new BufferedReader(isr);  
+            String line=null;  
+            while ( (line = br.readLine()) != null) {  
+                if (pw != null)  
+                    pw.println(line);  
+                System.out.println(type + ">" + line);      
+            }  
+
+            if (pw != null)  
+                pw.flush();  
+        } catch (IOException ioe) {  
+            ioe.printStackTrace();    
+        } finally{  
+            try {  
+            	if(pw!=null)
+            	{
+            		 pw.close();  
+            	}
+            	if(br!=null)
+            	{
+            		br.close();  
+            	}
+            	if(isr!=null)
+            	{
+            		isr.close();  
+            	}
+            } catch (IOException e) {  
+                e.printStackTrace();  
+            }  
+        }  
+    }  
+}

4dkankan-common/src/main/java/com/fdkankan/common/util/UploadToOssUtil.java

@@ -61,7 +61,7 @@ public class UploadToOssUtil {
 	@Value("${oss.secrey}")
 	private String secrey;
 
-	@Value("${oss.bucket}")
+	@Value("${oss.bucket.bucket}")
 	private String bucket;
 
 	@Value("${oss.bucket.sdk}")