lyhzzz 2 months ago
parent
commit
930d9f759d

+ 3 - 0
src/main/java/com/fdkankan/fusion/entity/ScenePlus.java

@@ -121,4 +121,7 @@ public class ScenePlus implements Serializable {
 
     @TableField("has_floorplan_ai")
     private Integer hasFloorplanAi;
+
+    @TableField("k_no")
+    private String kNo;
 }

+ 13 - 9
src/main/java/com/fdkankan/fusion/mq/consumer/CaseAddSceneConsumer.java

@@ -75,13 +75,14 @@ public class CaseAddSceneConsumer {
                 caseEntity.setCaseTitle(kNumber);
                 caseEntity.setUserName(user.getUserName());
                 caseEntity.setSysUserId(jyUser.getSysUserId());
+                caseEntity.setKNumber(kNumber);
                 caseService.save(caseEntity);
             }
 
             CaseParam caseParam = new CaseParam();
             caseParam.setCaseId(caseEntity.getCaseId());
 
-            caseParam.setSceneNumParam(getSceneParam(scenePlus));
+            caseParam.setSceneNumParam(getSceneParam(kNumber));
 
             caseService.addScene(caseParam);
 
@@ -94,16 +95,19 @@ public class CaseAddSceneConsumer {
 
     }
 
-    public List<SceneNumParam> getSceneParam (ScenePlus scenePlus){
-        List<Integer> typeList =  getTypeBySceneSource(scenePlus.getSceneSource());
-
+    public List<SceneNumParam> getSceneParam (String KNumber){
         List<SceneNumParam> params = new ArrayList<>();
-        for (Integer type : typeList) {
-            SceneNumParam sceneNumParam = new SceneNumParam();
-            sceneNumParam.setNumList(Arrays.asList(scenePlus.getNum()));
-            sceneNumParam.setType(type);
-            params.add(sceneNumParam);
+        List<ScenePlus> scenePlus = scenePlusService.getKNumber(KNumber);
+        for (ScenePlus plus : scenePlus) {
+            List<Integer> typeList =  getTypeBySceneSource(plus.getSceneSource());
+            for (Integer type : typeList) {
+                SceneNumParam sceneNumParam = new SceneNumParam();
+                sceneNumParam.setNumList(Arrays.asList(plus.getNum()));
+                sceneNumParam.setType(type);
+                params.add(sceneNumParam);
+            }
         }
+
         return params;
     }
 

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/IScenePlusService.java

@@ -25,4 +25,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
 
     List<ScenePlus> getByNumListAndAi(List<String> numList);
+
+    List<ScenePlus> getKNumber(String kNumber);
 }

+ 7 - 0
src/main/java/com/fdkankan/fusion/service/impl/ScenePlusServiceImpl.java

@@ -53,4 +53,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         wrapper.eq(ScenePlus::getHasFloorplanAi,1);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<ScenePlus> getKNumber(String kNumber) {
+        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePlus::getKNo,kNumber);
+        return this.list(wrapper);
+    }
 }