收藏接口用户ID修改

takai-admin/src/main/java/com/takai/web/controller/takaiai/TakaiAiController.java

@@ -440,13 +440,35 @@ public class TakaiAiController extends BaseController {
      *
      * @return
      */
+    @GetMapping("/application/list")
+    public AjaxResult applicationList() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(loginUser != null){
+            TakaiApplication vo = setFlagParams(loginUser.getUserId(), null, null, 3);
+            List<TakaiApplicationResult> appList = takaiAisService.getApplicationList(vo);
+            return success(appList);
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 管理后台应用列表
+     * @return
+     */
     @GetMapping("/application/list/{userId}")
-    public AjaxResult index(@PathVariable String userId) {
+    public AjaxResult adminApp(@PathVariable String userId) {
         TakaiApplication vo = setFlagParams(userId, null, null, 3);
         List<TakaiApplicationResult> appList = takaiAisService.getApplicationList(vo);
         return success(appList);
     }
 
+    @GetMapping("/role/list")
+    public AjaxResult roleApp() {
+        List<TakaiApplicationResult> appList = takaiAisService.selectRoleApp();
+        return success(appList);
+    }
+
     /**
      * 保存聊天记录
      *
@@ -607,7 +629,7 @@ public class TakaiAiController extends BaseController {
             SysDictData dictData = new SysDictData();
             dictData.setDictType("app_type");
             List<SysDictData> dictDataList = dictDataService.selectDictDataList(dictData);
-            List<Object> list = takaiAisService.searchAppTypeGroupList(dictDataList, String.valueOf(loginUser.getUserId()));
+            List<Object> list = takaiAisService.searchAppTypeGroupList(dictDataList, loginUser.getUserId());
             return success(list);
         }
         return null;
@@ -648,14 +670,18 @@ public class TakaiAiController extends BaseController {
 
     /**
      * 根据登录用户获取项目下的应用列表
-     * @param userId
      * @return
      */
-    @GetMapping("/project/app/{userId}")//@RequestBody TakaiPageParams params
-    public AjaxResult appFlag(@PathVariable String userId) {
+    @GetMapping("/project/app")//@RequestBody TakaiPageParams params
+    public AjaxResult appFlag() {
 //        TakaiApplication vo = setFlagParams(params.getUserId());
 //        vo.setApprover(params.getUserId());
-        return success(takaiAisService.selectAppByUserId(userId));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(loginUser != null){
+            return success(takaiAisService.selectAppByUserId(loginUser.getUserId()));
+        }else{
+            return success(null);
+        }
     }
 
     /**
@@ -676,7 +702,13 @@ public class TakaiAiController extends BaseController {
      */
     @PostMapping("/app/collect")
     public AjaxResult appCollect(@RequestBody AppCollect appCollect) {
-        return success(takaiAisService.insertAppCollect(appCollect));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(loginUser != null){
+            appCollect.setUserId(loginUser.getUserId());
+            return success(takaiAisService.insertAppCollect(appCollect));
+        }else {
+            return success(null);
+        }
     }
 
     /**
@@ -684,9 +716,14 @@ public class TakaiAiController extends BaseController {
      * @param appId
      * @return
      */
-    @DeleteMapping("/app/collect/{userId}/{appId}")
-    public AjaxResult appCollectDel(@PathVariable String userId, @PathVariable String appId) {
-        return success(takaiAisService.deleteAppCollect(userId, appId));
+    @DeleteMapping("/app/collect/{appId}")
+    public AjaxResult appCollectDel(@PathVariable String appId) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(loginUser != null){
+            return success(takaiAisService.deleteAppCollect(loginUser.getUserId(), appId));
+        }else{
+            return success(null);
+        }
     }
 
 

takai-ai/src/main/java/com/takai/ai/mapper/TakaiApplicationMapper.java

@@ -57,4 +57,6 @@ public interface TakaiApplicationMapper
 
     public List<TakaiApplicationResult> selectApplicationListByProjectType(String appId);
 
+    List<TakaiApplicationResult> selectRoleApp();
+
 }

takai-ai/src/main/java/com/takai/ai/service/ITakaiAiService.java

@@ -114,4 +114,6 @@ public interface ITakaiAiService
 
     int deleteAppCollect(String userId, String appId);
 
+    List<TakaiApplicationResult> selectRoleApp();
+
 }

takai-ai/src/main/java/com/takai/ai/service/impl/TakaiAiServiceImpl.java

@@ -1101,26 +1101,14 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
         List<Object> result =  new ArrayList();
         if (dictDataList!= null && dictDataList.size() > 0) {
             for (SysDictData dictData : dictDataList){
-                List<TakaiApplicationResult> list = null;
                 Map<String, Object> map = new HashMap();
                 TakaiApplication paramsVo = TakaiApplication.builder().approver(userId).flag("0").build();
                 if(dictData.getDictCode() == 41){
-                    paramsVo.setTypeId(Long.valueOf(42));
-                    list = takaiApplicationMapper.selectApplicationList(paramsVo);
-                    if(list != null && list.size() > 0){
-                        Map<String, Object> l = searchAppTypeGroupList(list, dictData, map);
-                        result.add(l);
-                    }
-                    list = null;
-                    paramsVo.setTypeId(Long.valueOf(43));
-                    list = takaiApplicationMapper.selectApplicationList(paramsVo);
-                    if (list != null && list.size() > 0){
-                        Map<String, Object> l2 = searchAppTypeGroupList(list, dictData, map);
-                        result.add(l2);
-                    }
+                    Map<String, Object> l = searchAppTypeGroupList(paramsVo, dictData);
+                    result.add(l);
                 }else{
                     paramsVo.setTypeId(Long.valueOf(dictData.getDictCode()));
-                    list = takaiApplicationMapper.selectApplicationList(paramsVo);
+                    List<TakaiApplicationResult> list = takaiApplicationMapper.selectApplicationList(paramsVo);
                     if(list != null && list.size() > 0){
                         List<Object> appInfoList = new ArrayList();
                         map.put("title", dictData.getDictLabel());
@@ -1136,54 +1124,43 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
                         result.add(map);
                     }
                 }
-//                if(list!= null && list.size() > 0){
-//                    if(dictData.getDictCode() == 41 ){ // 项目级应用
-//
-//                    }else{
-//                        List<Object> appInfoList = new ArrayList();
-//                        map.put("title", dictData.getDictLabel());
-//                        for (TakaiApplicationResult application : list){
-//                            Map<String, Object> infoMap = new HashMap();
-//                            infoMap.put("title", application.getName());
-//                            infoMap.put("appId", application.getAppId());
-//                            infoMap.put("showMenu", "false");
-//                            infoMap.put("chatMode", "LOCAL");
-//                            appInfoList.add(infoMap);
-//                        }
-//                        map.put("children", appInfoList);
-//                    }
-//                    result.add(map);
-//                }
             }
         }
         return result;
     }
 
-    private Map<String, Object> searchAppTypeGroupList(List<TakaiApplicationResult> list, SysDictData dictData, Map<String, Object> map) {
-        if (list!= null && list.size() > 0) {
+    private Map<String, Object> searchAppTypeGroupList(TakaiApplication paramsVo, SysDictData dictData) {
+        paramsVo.setTypeId(Long.valueOf(42));
+        List<TakaiApplicationResult> list1 = takaiApplicationMapper.selectApplicationList(paramsVo);
+        paramsVo.setTypeId(Long.valueOf(43));
+        List<TakaiApplicationResult> list2 = takaiApplicationMapper.selectApplicationList(paramsVo);
+        List<TakaiApplicationResult> list3 = new ArrayList();
+        list3.addAll(list1);
+        list3.addAll(list2);
+        Map<String, Object> map = new HashMap();
+        if (list3!= null && list3.size() > 0) {
             List<Object> l = new ArrayList<>();
             map.put("title", dictData.getDictLabel());
-            for (TakaiApplicationResult application : list){
+            // 分组
+            Map<String, List<TakaiApplicationResult>> map1 = list3.stream().collect(Collectors.groupingBy(TakaiApplicationResult::getTypeId));
+            for (Map.Entry<String, List<TakaiApplicationResult>> entry : map1.entrySet()) {
+                List<TakaiApplicationResult> mp = entry.getValue();
                 Map<String, Object> infoProjectMap = new HashMap();
-                List<TakaiApplicationResult> projectList = takaiApplicationMapper.selectApplicationListByProjectType(application.getAppId());
-                if(projectList != null && projectList.size() > 0){
-                    List<TakaiApplicationResult> uniqueAppList = projectList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TakaiApplicationResult :: getAppId))), ArrayList::new)); // 去重
-                    List<Object> projectInfoList = new ArrayList();
-                    for (TakaiApplicationResult project : uniqueAppList){
-                        SysDictData vo = sysDictDataMapper.selectDictDataById(Long.valueOf(project.getTypeId()));
-                        infoProjectMap.put("title", vo.getDictLabel());
-                        Map<String, Object> projectMap = new HashMap();
-                        projectMap.put("appId", project.getAppId());
-                        projectMap.put("showMenu", "false");
-                        projectMap.put("chatMode", "LOCAL");
-                        projectMap.put("title", project.getName());
-                        projectInfoList.add(projectMap);
-                    }
-                    infoProjectMap.put("children", projectInfoList);
-                    l.add(infoProjectMap);
+                List<Object> projectInfoList = new ArrayList();
+                for (TakaiApplicationResult application : mp){
+                    SysDictData vo = sysDictDataMapper.selectDictDataById(Long.valueOf(application.getTypeId()));
+                    infoProjectMap.put("title", vo.getDictLabel());
+                    Map<String, Object> projectMap = new HashMap();
+                    projectMap.put("appId", application.getAppId());
+                    projectMap.put("showMenu", "false");
+                    projectMap.put("chatMode", "LOCAL");
+                    projectMap.put("title", application.getName());
+                    projectInfoList.add(projectMap);
                 }
-                map.put("children", l);
+                infoProjectMap.put("children", projectInfoList);
+                l.add(infoProjectMap);
             }
+            map.put("children", l);
         }
         return map;
     }
@@ -1328,6 +1305,11 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
         return appCollectMapper.delAppCollect(userId, appId);
     }
 
+    @Override
+    public List<TakaiApplicationResult> selectRoleApp() {
+        return takaiApplicationMapper.selectRoleApp();
+    }
+
     private ApprovalNode getFirstApproverNode() {
         List<DocumentAuditConfig> list = documentAuditConfigMapper.selectDocumentAuditConfigListByBo(null);
         if(list != null && list.size() > 0) {

takai-ai/src/main/resources/mapper/takaiai/TakaiApplicationMapper.xml

@@ -336,4 +336,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  and (bm.type_id = 42 or bm.type_id = 43)
 	</select>
 
+	<select id="selectRoleApp"  resultMap="BmApplicationListResult">
+		SELECT DISTINCT
+			bm.appId,
+			bm. NAME,
+			bm.description,
+			bm.type_id,
+			bm.create_time
+		FROM
+			bm_application bm
+		where
+			bm. STATUS = '3'
+			OR bm. STATUS = ''
+			OR bm. STATUS IS NULL
+	</select>
+
 </mapper>

takai-common/src/main/java/com/takai/common/core/domain/entity/SysUser.java

@@ -122,7 +122,7 @@ public class SysUser extends BaseEntity
 
     public static boolean isAdmin(String userId)
     {
-        return userId != null && "1" == userId;
+        return userId != null && "1".equals(userId);
     }
 
     public Long getDeptId()