no message

src/main/java/com/chenyang/nse/bussiness/controller/core/TdataSourceController.java

 package com.chenyang.nse.bussiness.controller.core;
 
+import com.chenyang.nse.bussiness.entity.vo.dataproject.TCoreProjectDatasourceVO;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -15,6 +16,7 @@ import com.chenyang.nse.bussiness.entity.vo.dataproject.DatasystemProjectdatasou
 import com.chenyang.nse.bussiness.service.core.DataSystemService;
 import com.chenyang.nse.bussiness.service.core.TdataProjectService;
 import com.chenyang.nse.bussiness.tools.string.AesTool;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -93,8 +95,8 @@ public class TdataSourceController {
     public Response<DatasystemProjectdatasourceVO> queryDataSystemDetail(@RequestBody DatasystemProjectdatasourceVO vo) {
         List<DatasystemProjectdatasourceVO> list = this.tdataProjectService.queryDataSystemByProjectIdAndDataSystemId(vo.getProject_id(), vo.getDatasystemid());
         if (list != null && list.size() > 0) {
-         String password = AesTool.decrypt(((DatasystemProjectdatasourceVO)list.get(0)).getPassword(), "ghca");
-         ((DatasystemProjectdatasourceVO)list.get(0)).setPassword(password);
+            String password = AesTool.decrypt(((DatasystemProjectdatasourceVO) list.get(0)).getPassword(), "ghca");
+            ((DatasystemProjectdatasourceVO) list.get(0)).setPassword(password);
             return RespHelper.<DatasystemProjectdatasourceVO>successResp(list.get(0));
         } else {
             return RespHelper.<DatasystemProjectdatasourceVO>errResp(ErrCode.DATA_NOT_FOUND);
@@ -127,7 +129,7 @@ public class TdataSourceController {
     @RequestMapping({"/selectProDataSource"})
     public Response<List<ComboboxVO>> selectProDataSource(@RequestBody Map<String, String> map, HttpServletRequest request, HttpServletResponse response, Model model) {
         List<ComboboxVO> list = new ArrayList();
-      String systemstyle = (String)map.get("systemstyle");
+        String systemstyle = (String) map.get("systemstyle");
         if ("1".equals(systemstyle)) {
             list = this.tdataProjectService.selectProDataSource("1");
         } else if ("2".equals(systemstyle)) {
@@ -192,7 +194,7 @@ public class TdataSourceController {
     public Response<List<DatasystemProjectdatasourceVO>> queryByEditSort(@RequestBody Map<String, Object> map) throws JsonMappingException, JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         String jsonInfo = objectMapper.writeValueAsString(map.get("loginUser"));
-      LoginUser loginUser = (LoginUser)objectMapper.readValue(jsonInfo, LoginUser.class);
+        LoginUser loginUser = (LoginUser) objectMapper.readValue(jsonInfo, LoginUser.class);
         String dbtype = map.get("dbtype").toString();
         String flag = map.get("flag").toString();
         String projectId = map.get("projectId").toString();
@@ -200,12 +202,12 @@ public class TdataSourceController {
         String gid = loginUser.getTsysGroup() == null ? "" : loginUser.getTsysGroup().getId();
         List<String> param = new ArrayList<>();
         param.add(uid);
-      if (StringUtils.isNotEmpty(gid)){
+        if (StringUtils.isNotEmpty(gid)) {
             param.add(gid);
         }
         String userid = "";
         if (!"1".equals(uid)) {
-         userid = param.stream().collect(Collectors.joining("','","('","')"));
+            userid = param.stream().collect(Collectors.joining("','", "('", "')"));
         }
 
         List<DatasystemProjectdatasourceVO> list = this.tdataProjectService.queryByEditSort(dbtype, flag, userid);
@@ -219,31 +221,42 @@ public class TdataSourceController {
             list.add(datasystemProjectdatasourceVO);
         }
 
-//      int p = list.size();
+        int p = list.size();
 
         if (!StringUtils.isEmpty(projectId)) {
-         list = list.stream().filter(item-> this.dataSystemService.checkUsedByProject(item.getTid(), projectId)).collect(Collectors.toList());
-         return RespHelper.<List<DatasystemProjectdatasourceVO>>successResp(list, list.size());
+            //项目，则把已经选中的数据源过滤掉
+            List<TCoreProjectDatasourceVO> source = this.tdataProjectService.queryDatasourceList(projectId);
+            List<String> sourceIdList = new ArrayList<>();
+            for (int i = source.size() - 1; i >= 0; i--) {
+                Map map1 = (Map) source.get(i);
+                sourceIdList.add((String) map1.get("id"));
+            }
+
+            for (int i = 0; i < p; ++i) {
+                Map map1 = (Map) list.get(i);
+                String tid = (String) map1.get("tid");
+                if (sourceIdList.contains(tid)) {
+                    list.remove(i);
+                    --p;
+                    --i;
+                }
+            }
         }
-//      for(int i = 0; i < p; ++i) {
-//         Map map1 = (Map)list.get(i);
-//         String id = (String)map1.get("tid");
-//         if (null != id && !"".equals(id) && this.dataSystemService.checkUsedByProject(id, projectId)) {
-//            list.remove(i);
-//            --p;
-//            --i;
-//         }
-//      }
 
         return RespHelper.<List<DatasystemProjectdatasourceVO>>successResp(list, list.size());
     }
 
+    public boolean isMatch(List<String> sourceIdList, DatasystemProjectdatasourceVO vo) {
+        String id = (String) ((Map<?, ?>) vo).get("tid");
+        return sourceIdList.contains(id);
+    }
+
     @ResponseBody
     @RequestMapping({"/queryAll"})
     public Response<List<DatasystemProjectdatasourceVO>> queryAll(@RequestBody Map<String, Object> map) throws JsonMappingException, JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         String jsonInfo = objectMapper.writeValueAsString(map.get("loginUser"));
-      LoginUser loginUser = (LoginUser)objectMapper.readValue(jsonInfo, LoginUser.class);
+        LoginUser loginUser = (LoginUser) objectMapper.readValue(jsonInfo, LoginUser.class);
         String dbtype = map.get("dbtype").toString();
         String flag = map.get("flag").toString();
         String uid = loginUser.getTsysUser().getId();
@@ -262,7 +275,7 @@ public class TdataSourceController {
     public Response<String> saveAllProDataSource(@RequestBody Map<String, Object> map) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         String jsonInfo = objectMapper.writeValueAsString(map.get("loginUser"));
-      LoginUser loginUser = (LoginUser)objectMapper.readValue(jsonInfo, LoginUser.class);
+        LoginUser loginUser = (LoginUser) objectMapper.readValue(jsonInfo, LoginUser.class);
         String dbtype = map.get("dbtype").toString();
         String flag = map.get("flag").toString();
         String projectid = map.get("projectid").toString();
@@ -282,7 +295,7 @@ public class TdataSourceController {
     public Response<String> deleteAllProDataSource(@RequestBody Map<String, Object> map) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         String jsonInfo = objectMapper.writeValueAsString(map.get("loginUser"));
-      LoginUser loginUser = (LoginUser)objectMapper.readValue(jsonInfo, LoginUser.class);
+        LoginUser loginUser = (LoginUser) objectMapper.readValue(jsonInfo, LoginUser.class);
         String dbtype = map.get("dbtype").toString();
         String flag = map.get("flag").toString();
         String projectid = map.get("projectid").toString();
@@ -300,7 +313,7 @@ public class TdataSourceController {
     @ResponseBody
     @RequestMapping({"/isChooseAll"})
     public String isChooseAll(String dbtype, String flag, String projectid, String searchval, HttpServletRequest request, HttpServletResponse response, Model model) {
-      LoginUser loginUser = (LoginUser)request.getSession().getAttribute("loginUser");
+        LoginUser loginUser = (LoginUser) request.getSession().getAttribute("loginUser");
         String uid = loginUser.getTsysUser().getId();
         String gid = loginUser.getTsysGroup().getId();
         String userid = "";

src/main/java/com/chenyang/nse/bussiness/service/core/TdataProjectService.java

@@ -16,6 +16,8 @@ import com.chenyang.nse.bussiness.entity.vo.ComboboxVO;
 import com.chenyang.nse.bussiness.entity.vo.DataProjectVO;
 import com.chenyang.nse.bussiness.entity.vo.dataproject.DatasystemProjectdatasourceVO;
 import com.chenyang.nse.bussiness.entity.vo.dataproject.TCoreDataProjectVO;
+import com.chenyang.nse.bussiness.entity.vo.dataproject.TCoreProjectDatasourceVO;
+
 import java.util.List;
 import java.util.Map;
 
@@ -28,6 +30,8 @@ public interface TdataProjectService {
 
    List<DatasystemProjectdatasourceVO> queryDatasourceById(String projectid);
 
+   List<TCoreProjectDatasourceVO> queryDatasourceList(String projectid);
+
    List<DatasystemProjectdatasourceVO> queryDatasystemByProId(String projectid);
 
    void saveDataProject(TCoreDataProject obj);

src/main/java/com/chenyang/nse/bussiness/service/core/impl/TdataProjectServiceImpl.java

@@ -64,6 +64,7 @@ import com.chenyang.nse.bussiness.entity.vo.ComboboxVO;
 import com.chenyang.nse.bussiness.entity.vo.DataProjectVO;
 import com.chenyang.nse.bussiness.entity.vo.dataproject.DatasystemProjectdatasourceVO;
 import com.chenyang.nse.bussiness.entity.vo.dataproject.TCoreDataProjectVO;
+import com.chenyang.nse.bussiness.entity.vo.dataproject.TCoreProjectDatasourceVO;
 import com.chenyang.nse.bussiness.jar.db.TCoreClientInfo;
 import com.chenyang.nse.bussiness.jar.db.TCoreClientInfoDao;
 import com.chenyang.nse.bussiness.jar.db.TCoreClientIpControlledDao;
@@ -82,6 +83,7 @@ import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.MatchMode;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.hibernate.transform.Transformers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -991,6 +993,10 @@ public class TdataProjectServiceImpl implements TdataProjectService {
       return list;
    }
 
+   public List<TCoreProjectDatasourceVO> queryDatasourceList(String projectid) {
+      return this.tCoreProjectDatasourceDao.queryDatasourceList(projectid);
+   }
+
    public void addDataProject(TCoreDataProject projectObj, List<TCoreProjectDatasource> dataSourceIdList, List<TCoreProjectFindrule> areaAndRuleList, List<TCoreDatasourceSchema> schemalist) {
       projectObj.setId(UUID.randomUUID().toString());