Merge remote-tracking branch 'origin/master'

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

@@ -782,46 +782,34 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scene.setNum(projectNum);
         scene.setSpace(0L);
 
-        scene.setSceneSource(1);
-
-        if(pic!=null&&pic.length()>5)
-        {
+        if (pic != null && pic.length() > 5) {
             scene.setThumb(pic);
-        }
-        else
-        {
+        } else {
             scene.setThumb(ConstantUrl.DEFAULT_SCENE_PIC);
         }
-        scene.setThumb(scene.getThumb().concat("?t=")+System.currentTimeMillis());
+        scene.setThumb(scene.getThumb().concat("?t=") + System.currentTimeMillis());
 
-        if(!ObjectUtils.isEmpty(userName)){
+        if (!ObjectUtils.isEmpty(userName)) {
             scene.setUserId(userId);
         }
 
-        if(sceneShootCount == null)
-        {
+        if (sceneShootCount == null) {
             scene.setShootCount(0);
-        }
-        else
-        {
+        } else {
             scene.setShootCount(sceneShootCount);
         }
-        if(sceneName!=null)
-        {
+        if (sceneName != null) {
             scene.setSceneName(sceneName);
         }
-        if(sceneDec!=null)
-        {
-            scene.setSceneDec("<p>"+ new String(sceneDec.getBytes("UTF-8"))+"</p>");
+        if (sceneDec != null) {
+            scene.setSceneDec("<p>" + new String(sceneDec.getBytes("UTF-8")) + "</p>");
         }
 
-        if(sceneType!=null)
-        {
+        if (sceneType != null) {
             scene.setSceneType(sceneType);
         }
 
-        if(gps!=null&&!gps.trim().equals(""))
-        {
+        if (gps != null && !gps.trim().equals("")) {
             scene.setGps(gps);
         }