修改场景保存逻辑

http://192.168.0.21/index.php?m=bug&f=view&bugID=21888

platform-shop/src/main/java/com/platform/controller/SceneController.java

@@ -116,7 +116,7 @@ public class SceneController extends AbstractController{
                 sceneEntity.setName(sceneParam.getName());
             }
             sceneEntity.setSceneNum(sceneParam.getSceneNum());
-            int result = sceneService.save(sceneEntity,true);
+            int result = sceneService.save(sceneEntity,false);
             if(result==0){
                 log.error("场景已经被绑定!");
                 return R.error("场景已经被绑定!");

platform-shop/src/main/java/com/platform/service/impl/SceneServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.platform.dao.SceneDao;
 import com.platform.entity.SceneEntity;
 import com.platform.service.SceneService;
+import com.platform.utils.DateUtils;
 import com.platform.utils.R;
 import com.platform.vos.ReturnDTO;
 import org.apache.commons.lang.StringUtils;
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,12 +53,13 @@ public class SceneServiceImpl implements SceneService {
 
     @Override
     public int save(SceneEntity sceneEntity,boolean checkName) {
-        if(checkName){
-            SceneEntity SceneEntity = sceneDao.findByName(sceneEntity.getName());
-            if(SceneEntity != null){
+        SceneEntity SceneEntity = sceneDao.findByName(sceneEntity.getName());
+        if(SceneEntity != null){
+            if(ObjectUtils.isEmpty(checkName) || checkName){
                 log.error("场景已经被绑定");
                 return 0;
             }
+            sceneEntity.setName(sceneEntity.getName().concat(DateUtils.format(new Date(),"MMddHHmmssSSS")));
         }
         return sceneDao.save(sceneEntity);
     }