111

src/main/java/com/fdkankan/scene/Interceptor/InitEditInfoAspect.java

@@ -68,6 +68,7 @@ public class InitEditInfoAspect {
 		//请求4a接口获取用户信息
 		Map<String, Object> parameter = WebUtil.getParameter(joinPoint, request);
 		String num = (String) parameter.get("num");
+		Integer subgroup = (Integer) parameter.get("subgroup");
 
 		List<Scene> scenes = sceneService.listByNum(num);
 		if(CollUtil.isEmpty(scenes)){

src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -575,8 +575,8 @@ public class SceneEditController{
      * @return com.fdkankan.scene.vo.SceneAuthVO
      **/
     @PostMapping(value = "/getAuth")
-    public SceneAuthVO getAuth(@RequestParam("num") String num) throws Exception{
-        return sceneEditService.getAuth(num);
+    public SceneAuthVO getAuth(@RequestParam("num") String num, @RequestParam(value = "subgroup", defaultValue = 0)Integer subgroup) throws Exception{
+        return sceneEditService.getAuth(num, subgroup);
     }
 //
 //    /**

src/main/java/com/fdkankan/scene/entity/Scene.java

@@ -56,6 +56,9 @@ public class Scene extends Model<Scene> {
     @TableField("FLOORPLANANGLE")
     private String floorplanangle;
 
+    @TableField("SUBGROUP")
+    private Integer subgroup;
+
 
     @Override
     public Serializable pkVal() {

src/main/java/com/fdkankan/scene/service/ISceneEditService.java

@@ -17,7 +17,7 @@ import java.io.IOException;
  **/
 public interface ISceneEditService {
 
-    SceneAuthVO getAuth(String num);
+    SceneAuthVO getAuth(String num, Integer subgroup);
 
 //    ResultData locales(LocalesParamVO param) throws Exception;
 

src/main/java/com/fdkankan/scene/service/SceneService.java

@@ -30,7 +30,7 @@ public interface SceneService extends IService<Scene> {
 
     void outFileByKey2(String key, HttpServletResponse response) throws IOException;
 
-    Scene getByNum(String num);
+    Scene getByNum(String num, Integer subgroup);
 
     List<Scene> listByNum(String num);
 

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -95,7 +95,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
     @Override
     public SceneEditInfoVO saveScene(SceneEditInfoParamVO param) {
 
-        Scene scenePlus = sceneService.getByNum(param.getNum());
+        Scene scenePlus = sceneService.getByNum(param.getNum(), param.getSubgroup());
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }

src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -82,8 +82,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
     private SceneFileMappingService sceneFileMappingService;
 
     @Override
-    public SceneAuthVO getAuth(String num){
-        Scene scenePlus = scenePlusService.getByNum(num);
+    public SceneAuthVO getAuth(String num, Integer subgroup){
+        Scene scenePlus = scenePlusService.getByNum(num, subgroup);
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -94,7 +94,7 @@ public class SceneProServiceImpl implements ISceneProService {
     @Override
     public ResultData saveInitialPage(FileNameAndDataParamVO param) throws Exception{
 
-        Scene scenePlus = scenePlusService.getByNum(param.getNum());
+        Scene scenePlus = scenePlusService.getByNum(param.getNum(), param.getSubgroup());
         if(scenePlus == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -119,11 +119,11 @@ public class SceneProServiceImpl implements ISceneProService {
     @Override
     public ResultData addOrUpdateTag(SaveTagsParamVO param) throws Exception {
 
-        Scene scenePlus = scenePlusService.getByNum(param.getNum());
+        Scene scenePlus = scenePlusService.getByNum(param.getNum(), param.getSubgroup());
         if (scenePlus == null)
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
 
-        this.addOrUpdateHotData(param.getNum(), param.getHotDataList());
+        this.addOrUpdateHotData(param.getNum(), param.getSubgroup(), param.getHotDataList());
 
         this.addOrUpdateIcons(param.getNum(), param.getIcons());
 

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -38,6 +38,7 @@ import java.net.URLConnection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * <p>
@@ -153,8 +154,8 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
     }
 
     @Override
-    public Scene getByNum(String num) {
-        return this.getOne(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num));
+    public Scene getByNum(String num, Integer subgroup) {
+        return this.getOne(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num).eq(Scene::getSubgroup, subgroup));
     }
 
     @Override

src/main/java/com/fdkankan/scene/vo/BaseDataParamVO.java

@@ -20,4 +20,6 @@ public class BaseDataParamVO {
     @NotBlank(message = "数据不能为空")
     private String data;
 
+    private Integer subgroup = 0;
+
 }

src/main/java/com/fdkankan/scene/vo/BaseSceneParamVO.java

@@ -20,4 +20,6 @@ public class BaseSceneParamVO {
     @NotBlank(message = "场景码不能为空")
     private String num;
 
+    private Integer subgroup = 0;
+
 }

src/main/java/com/fdkankan/scene/vo/SaveTagsParamVO.java

@@ -16,10 +16,7 @@ import lombok.Data;
  * @since 2022/2/8
  **/
 @Data
-public class SaveTagsParamVO {
-
-    @NotBlank(message = "场景码不能为空")
-    private String num;
+public class SaveTagsParamVO extends BaseSceneParamVO{
 
     @Valid
     @NotNull(message = "热点数据不能为空")

src/main/java/com/fdkankan/scene/vo/SceneInfoParamVO.java

@@ -19,13 +19,7 @@ import javax.validation.constraints.NotBlank;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SceneInfoParamVO {
-
-    /**
-     * 场景码
-     */
-    @NotBlank(message = "场景码不能为空")
-    private String num;
+public class SceneInfoParamVO extends BaseSceneParamVO{
 
     /**
      * 请求来源，1-代表编辑页面，2-代表查看页面，默认查看页面