|
@@ -20,6 +20,7 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.logging.SimpleFormatter;
|
|
|
import java.util.stream.Collectors;
|
|
|
+import java.util.stream.Stream;
|
|
|
|
|
|
@Service
|
|
|
public class GenSceneNumService {
|
|
@@ -45,18 +46,25 @@ public class GenSceneNumService {
|
|
|
logger.info("旧指房未使用场景码数量是:{},阈值:{}",tbSceneNumList.size(),count);
|
|
|
|
|
|
if(tbSceneNumList.size() <count){
|
|
|
- List<TbSceneNum> dbCodes = tbSceneNumMapper.selectAll();
|
|
|
- Set<String> collect = dbCodes.stream().map(TbSceneNum::getCode).collect(Collectors.toSet());
|
|
|
- List<TbScene> dbCodes2 = tbSceneMapper.selectAll();
|
|
|
- Set<String> collect2 = dbCodes2.stream().map(TbScene::getNum).collect(Collectors.toSet());
|
|
|
HashSet<String> strings = GenerateZfbCode.generateOldZfbCode(count);
|
|
|
|
|
|
+ String result2 = String.join(",", strings);
|
|
|
+
|
|
|
+ QueryWrapper sceneNumQW = QueryWrapper.create()
|
|
|
+ .where("code in (" + result2+" )");
|
|
|
+ List<TbSceneNum> sceneNums = tbSceneNumMapper.selectListByQuery(sceneNumQW);
|
|
|
+ List<String> sceneNumList = sceneNums.stream().map(TbSceneNum::getCode).collect(Collectors.toList());
|
|
|
+
|
|
|
+ QueryWrapper sceneQW = QueryWrapper.create()
|
|
|
+ .where("num in (" + result2+" )");
|
|
|
+ List<TbScene> scenes = tbSceneMapper.selectListByQuery(sceneQW);
|
|
|
+ List<String> sceneList = scenes.stream().map(TbScene::getNum).collect(Collectors.toList());
|
|
|
+
|
|
|
+ sceneNumList.addAll(sceneList);
|
|
|
+
|
|
|
List<TbSceneNum> numList = new ArrayList<>();
|
|
|
for (String code : strings) {
|
|
|
- if(collect.contains(code)){
|
|
|
- continue;
|
|
|
- }
|
|
|
- if(collect2.contains(code)){
|
|
|
+ if(sceneNumList.contains(code)){
|
|
|
continue;
|
|
|
}
|
|
|
TbSceneNum tbSceneNum = new TbSceneNum();
|
|
@@ -79,18 +87,24 @@ public class GenSceneNumService {
|
|
|
logger.info("新指房未使用场景码数量是:{},阈值:{}",tbSceneNumList.size(),count);
|
|
|
|
|
|
if(tbSceneNumList.size() <count){
|
|
|
- List<TbScene3dNumNew> dbCodes = tbScene3dNumNewMapper.selectAll();
|
|
|
- Set<String> collect = dbCodes.stream().map(TbScene3dNumNew::getCode).collect(Collectors.toSet());
|
|
|
- List<TbScenePro> dbCodes2 = tbSceneProMapper.selectAll();
|
|
|
- Set<String> collect2 = dbCodes2.stream().map(TbScenePro::getNum).collect(Collectors.toSet());
|
|
|
+ HashSet<String> strings = GenerateZfbCode.generateNewZfbCode(count);
|
|
|
+ String result2 = String.join(",", strings);
|
|
|
+
|
|
|
+ QueryWrapper sceneNumQW = QueryWrapper.create()
|
|
|
+ .where("code in (" + result2+" )");
|
|
|
+ List<TbScene3dNumNew> sceneNums = tbScene3dNumNewMapper.selectListByQuery(sceneNumQW);
|
|
|
+ List<String> sceneNumList = sceneNums.stream().map(TbScene3dNumNew::getCode).collect(Collectors.toList());
|
|
|
+
|
|
|
+ QueryWrapper sceneQW = QueryWrapper.create()
|
|
|
+ .where("num in (" + result2+" )");
|
|
|
+ List<TbScenePro> scenes = tbSceneProMapper.selectListByQuery(sceneQW);
|
|
|
+ List<String> sceneList = scenes.stream().map(TbScenePro::getNum).collect(Collectors.toList());
|
|
|
+
|
|
|
+ sceneNumList.addAll(sceneList);
|
|
|
|
|
|
- HashSet<String> strings = GenerateZfbCode.generateOldZfbCode(count);
|
|
|
List<TbScene3dNumNew> numNewList = new ArrayList<>();
|
|
|
for (String code : strings) {
|
|
|
- if(collect.contains(code)){
|
|
|
- continue;
|
|
|
- }
|
|
|
- if(collect2.contains(code)){
|
|
|
+ if(sceneNumList.contains(code)){
|
|
|
continue;
|
|
|
}
|
|
|
TbScene3dNumNew tbSceneNum = new TbScene3dNumNew();
|