1

src/main/java/com/fdkankan/manage_jp/entity/TmContractorNum.java

@@ -42,6 +42,9 @@ public class TmContractorNum implements Serializable {
     @TableField("num")
     private String num;
 
+    @TableField(exist = false)
+    private String title;
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

src/main/java/com/fdkankan/manage_jp/service/IScenePlusService.java

@@ -5,6 +5,9 @@ import com.fdkankan.manage_jp.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage_jp.entity.User;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 场景主表 服务类
@@ -24,4 +27,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
     void updatePayStatus(String num, String version, Integer sceneSource, Integer payStatus, CameraDetail cameraDetail, User user);
 
     void updateTitleByNum(String sceneNum, String sceneNewTitle);
+
+    HashMap<String, ScenePlus> getByNumList(List<String> numList);
 }

src/main/java/com/fdkankan/manage_jp/service/ISceneProService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage_jp.entity.User;
 import com.fdkankan.manage_jp.vo.request.SceneParam;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -34,4 +35,6 @@ public interface ISceneProService extends IService<ScenePro> {
     ScenePro copyScene(ScenePro scenePro);
 
     void updateTitleByNum(String sceneNum, String sceneNewTitle);
+
+    HashMap<String, ScenePro> getByNumList(List<String> numList);
 }

src/main/java/com/fdkankan/manage_jp/service/impl/ScenePlusServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
@@ -78,6 +79,19 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
+    public HashMap<String, ScenePlus> getByNumList(List<String> numList) {
+        HashMap<String, ScenePlus> map = new HashMap<>();
+        if(numList == null || numList.isEmpty()){
+            return map;
+        }
+        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(ScenePlus::getNum,numList);
+        List<ScenePlus> list = this.list(wrapper);
+        list.forEach(e -> map.put(e.getNum(),e));
+        return map;
+    }
+
+    @Override
     public void unbind(Long cameraId,Long userId) {
         LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(ScenePlus::getCameraId,cameraId);

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

@@ -173,6 +173,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
+    public HashMap<String, ScenePro> getByNumList(List<String> numList) {
+        HashMap<String, ScenePro> map = new HashMap<>();
+        if(numList == null || numList.isEmpty()){
+            return map;
+        }
+        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(ScenePro::getNum,numList);
+        wrapper.eq(ScenePro::getIsUpgrade,0);
+        List<ScenePro> list = this.list(wrapper);
+        list.forEach(e -> map.put(e.getNum(),e));
+        return map;
+    }
+
+    @Override
     public void addDownloadNum(String sceneNum) {
         if(StringUtils.isBlank(sceneNum)){
             throw new BusinessException(ResultCode.PARAM_ERROR);

src/main/java/com/fdkankan/manage_jp/service/impl/TmContractorServiceImpl.java

@@ -18,7 +18,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,6 +40,10 @@ public class TmContractorServiceImpl extends ServiceImpl<ITmContractorMapper, Tm
     IUserService userService;
     @Autowired
     ICompanyService companyService;
+    @Autowired
+    IScenePlusService scenePlusService;
+    @Autowired
+    ISceneProService sceneProService;
 
     @Override
     public Page<TmContractor> pageList(ContractorParam param) {
@@ -97,13 +103,13 @@ public class TmContractorServiceImpl extends ServiceImpl<ITmContractorMapper, Tm
 
     @Override
     public void unCollaborate(ContractorParam param, User user) {
-        if(param.getIds() == null || param.getIds().isEmpty()){
+        if(param.getContractorId() == null ||param.getDetailIds() == null || param.getDetailIds().isEmpty()){
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
-        tmContractorNumService.removeByIds(param.getIds());
-        List<TmContractorNum> contractorIds = tmContractorNumService.getByContractorIds(Arrays.asList(param.getId()));
+        tmContractorNumService.removeByIds(param.getDetailIds());
+        List<TmContractorNum> contractorIds = tmContractorNumService.getByContractorIds(Arrays.asList(param.getContractorId()));
         if(contractorIds.size() <=0){
-            this.removeById(param.getId());
+            this.removeById(param.getContractorId());
         }
     }
 
@@ -112,8 +118,22 @@ public class TmContractorServiceImpl extends ServiceImpl<ITmContractorMapper, Tm
         if(param.getId() == null){
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
+        List<TmContractorNum> contractorNumList = tmContractorNumService.getByContractorIds(Arrays.asList(param.getId()));
+        List<String> numList = contractorNumList.stream().map(TmContractorNum::getNum).collect(Collectors.toList());
+        HashMap<String,ScenePro> proMap = sceneProService.getByNumList(numList);
+        HashMap<String,ScenePlus> plusMap = scenePlusService.getByNumList(numList);
+        for (TmContractorNum tmContractorNum : contractorNumList) {
+            ScenePro scenePro = proMap.get(tmContractorNum.getNum());
+            ScenePlus scenePlus = plusMap.get(tmContractorNum.getNum());
+            if(scenePro != null){
+                tmContractorNum.setTitle(scenePro.getSceneName());
+            }
+            if(scenePlus != null){
+                tmContractorNum.setTitle(scenePlus.getTitle());
+            }
+        }
 
-        return tmContractorNumService.getByContractorIds(Arrays.asList(param.getId()));
+        return contractorNumList;
     }
 
     private TmContractor getByMainContractor(Long userId, Long userId2) {

src/main/java/com/fdkankan/manage_jp/vo/request/ContractorParam.java

@@ -11,7 +11,7 @@ public class ContractorParam extends RequestBase {
     private String contractorAccount;
 
     private List<String> numList;
-    private Integer id;
-    private List<Integer> ids;
+    private Integer contractorId;
+    private List<Integer> detailIds;
     private String userName;
 }