增加个人用户功能

digital-module-system/digital-manager/src/main/java/com/trs/digital/module/manager/controller/admin/search/controller/AdvSearchController.java

@@ -115,6 +115,20 @@ public class AdvSearchController {
         return CommonResult.success(searchService.select(reqVO));
     }
 
+    /**
+     * 用户级
+     * @param reqVO
+     * @return
+     */
+    @CrossOrigin
+    @Operation(summary = "检索")
+    @PreAuthorize("@ss.hasPermission('adv/search:ftp3')")
+    @RequestMapping("/ftp3")
+    public CommonResult<PageResult<Map<String, Object>>> ftp3(@RequestBody AdvSearchReqVO reqVO) {
+        reqVO.setMetaId(3l);
+        return CommonResult.success(searchService.select(reqVO));
+    }
+
     @CrossOrigin
     @Operation(summary = "检索")
     @PermitAll

digital-module-system/digital-manager/src/main/java/com/trs/digital/module/manager/controller/admin/search/service/SearchService.java

@@ -126,7 +126,7 @@ public class SearchService {
         searchParams.setColorColumns("doc_title,doc_content,doc_abstract,doc_keywords,doc_content_translate");
 //        searchParams.setColorColumns("doc_content");
 //        searchParams.setColorColumns("doc_abstract");
-        if(reqVO.getType()==3){
+        if(reqVO.getType()!=null&&reqVO.getType()==3){
             searchParams.setReadColumns("doc_title");
         }else{
             DigSearchLogDO searchLogDO = new DigSearchLogDO();
@@ -162,17 +162,22 @@ public class SearchService {
         if(user!=null){
             username = user.getUsername();
         }
-        if(StringUtils.isNotBlank(username)){
-            condition = "("+condition+" NOT (sourcename#LIST:user))";
-            condition+= " OR ("+condition_temp+" AND (username:"+username+"))";
+        if(reqVO.getMetaId()==3){
+            condition+= " AND ("+condition_temp+" AND (username:"+username+"))";
+        }else{
+            if(StringUtils.isNotBlank(username)){
+                condition = "("+condition+" NOT (sourcename#LIST:user))";
+                condition+= " OR ("+condition_temp+" AND (username:"+username+"))";
+            }
         }
 
-
         log.info(String.format("where：%s", condition));
 //        log.info(String.format("sort：%s", sort));
         String tablename = "";
         if(reqVO.getMetaId()==1){
             tablename = "system.dig_ftp;system.dig_ftp02;system.dig_oracle;system.dig_user";
+        }else if(reqVO.getMetaId()==3){
+            tablename = "system.dig_user";
         }else{
             tablename = "system.dig_ftp;system.dig_oracle;system.dig_user";
         }
@@ -243,7 +248,7 @@ public class SearchService {
         param1.setFieldName("doc_title");
 //        param1.setFieldName("file_name");
         fieldDOList.add(param1);
-        if(type!=3){
+        if(type!=null&&type!=3){
             TableFieldDO param2 = new TableFieldDO();
             param2.setFieldName("doc_content");
             fieldDOList.add(param2);
@@ -275,7 +280,7 @@ public class SearchService {
 
     public String condition(AdvSearchReqVO reqVO, List<TableFieldDO> searchList) {
         String condition = buildCondition(reqVO, searchList);
-        if(reqVO.getCondition() == 1){//条件检索
+        if(reqVO.getCondition()!=null&&reqVO.getCondition() == 1){//条件检索
             String navCondition = buildNavCondition(reqVO.getNavigation());
             if (StringUtils.isNotBlank(navCondition)) {
                 if (StringUtils.isNotBlank(condition)) {
@@ -333,7 +338,7 @@ public class SearchService {
     private String buildCondition(AdvSearchReqVO reqVO, List<TableFieldDO> searchList) {
         StringBuffer sb = new StringBuffer();
         //快速检索
-        if (reqVO.getType() == 1||reqVO.getType() == 3||(reqVO.getType() == 2&&reqVO.getAdvValue().length==1&&"".equals(reqVO.getAdvValue()[0] ))) {
+        if (reqVO.getType()!=null&&(reqVO.getType() == 1||reqVO.getType() == 3||(reqVO.getType() == 2&&reqVO.getAdvValue().length==1&&"".equals(reqVO.getAdvValue()[0] )))) {
             if (StringUtils.isNotBlank(reqVO.getKeyword())) {
                 sb.append("(");
                 int i = 0;
@@ -347,7 +352,7 @@ public class SearchService {
                 sb.append(")");
             } else {
             }
-        } else if (reqVO.getType() == 2) {//高级检索
+        } else if (reqVO.getType()!=null&&reqVO.getType() == 2) {//高级检索
 /*            if (StringUtils.isNotBlank(reqVO.getKeyword())) {
                 sb.append("(");
                 int i = 0;

digital-ui-250219/src/api/manager/digsearch/index.js

@@ -70,6 +70,14 @@ export function getSearchPageJUEM(data) {
   })
 }
 
+export function getSearchPageUSER(data) {
+  return request({
+    url: '/adv/search/ftp3',
+    method: 'post',
+    data: data
+  })
+}
+
 // 下载
 // export function getDownload(data) {
 //   return request({

digital-ui-250219/src/views/search/analysis.vue

@@ -545,6 +545,9 @@ export default {
     },
     hasFtp2Perm() {
       return this.$store.getters.permissions.includes("adv/search:ftp2");
+    },
+    hasFtp3Perm() {
+      return this.$store.getters.permissions.includes("adv/search:ftp3");
     }
   },
   created() {

digital-ui-250219/src/views/search/collection.vue

@@ -347,6 +347,16 @@ export default {
     },
     hasFtp2Perm() {
       return this.$store.getters.permissions.includes("adv/search:ftp2");
+    },
+    hasFtp3Perm() {
+      return this.$store.getters.permissions.includes("adv/search:ftp3");
+    },
+    isAdmin() {
+      // 根据您的实际管理员权限标识来调整
+      // 检查权限标识
+      const hasAdminPermission = this.$store.getters.roles.includes("super_admin") ||
+        this.$store.getters.roles.includes("common");
+      return hasAdminPermission ;
     }
   },
   methods: {
@@ -410,9 +420,17 @@ export default {
       // 发送请求到后端
       try {
         // 检查是否有“adv/search:ftp2”权限
-        const res = this.hasFtp2Perm
+/*        const res = this.hasFtp2Perm
           ? await searchPageApi.collectionList(searchParams)
-          : await searchPageApi.collectionList(searchParams);
+          : await searchPageApi.collectionList(searchParams);*/
+        let res = null;
+        if(this.hasFtp3Perm && !this.isAdmin){
+          res = await searchPageApi.getSearchPageUSER(searchParams);
+        }else{
+          res = this.hasFtp2Perm
+            ? await searchPageApi.getSearchPageJUEM(searchParams)
+            : await searchPageApi.getSearchPageJM(searchParams);
+        }
         this.results = res.data.list; // 假设返回的数据包含 results
         this.totalResultsCount = res.data.total;
         this.loading = false;
@@ -527,7 +545,7 @@ export default {
       this.currentPage = 1;
       this.performSearch();
     },
-    //查看原文路径 
+    //查看原文路径
     open(file_path) {
         this.$notify.closeAll();
         this.$notify({
@@ -658,9 +676,17 @@ export default {
         pageSize: 10
     };
     try {
-        const res = this.hasFtp2Perm
+/*        const res = this.hasFtp2Perm
         ? await searchPageApi.getSearchPageJUEM(searchParamsV)
-        : await searchPageApi.getSearchPageJM(searchParamsV)
+        : await searchPageApi.getSearchPageJM(searchParamsV)*/
+      let res = null;
+      if(this.hasFtp3Perm){
+        res = await searchPageApi.getSearchPageUSER(searchParamsV);
+      }else{
+        res = this.hasFtp2Perm
+          ? await searchPageApi.getSearchPageJUEM(searchParamsV)
+          : await searchPageApi.getSearchPageJM(searchParamsV);
+      }
         this.tjListsData = res.data.list;
         console.log(tjListsData);
     } catch (error) {
@@ -898,7 +924,7 @@ export default {
         type: 'success'
       });
     },
-    
+
     // 取消收藏
     unCollectOne(uid,docid){
       this.userid = this.$store.state.user.id;
@@ -957,7 +983,7 @@ export default {
         alert('请勾选内容！');
       }
 
-      
+
 
 
     },
@@ -990,7 +1016,7 @@ export default {
               searchParams = searchParams +',' + this.results[i].docid  ;
             }
           }
-          searchParams = searchParams.replace(/^,+/,"").replace(/,+$/,""); 
+          searchParams = searchParams.replace(/^,+/,"").replace(/,+$/,"");
           console.log('searchParams='+searchParams);
           var param = {"userid":this.$store.state.user.id,"docid":searchParams};
           const res = await searchPageApi.exportDigFtpSourceExcel(param);
@@ -1010,7 +1036,7 @@ export default {
       } finally {
         this.exportLoading = false;
       }
-      
+
     },
         // 获取时间戳
     getTimestamp() {
@@ -1063,7 +1089,7 @@ export default {
     this.performSearch();
 
     this.nickname = this.$store.state.user.nickname;
-    
+
   }
 };
 

digital-ui-250219/src/views/search/index.vue

@@ -1181,6 +1181,16 @@ export default {
     },
     hasFtp2Perm() {
       return this.$store.getters.permissions.includes("adv/search:ftp2");
+    },
+    hasFtp3Perm() {
+      return this.$store.getters.permissions.includes("adv/search:ftp3");
+    },
+    isAdmin() {
+      // 根据您的实际管理员权限标识来调整
+      // 检查权限标识
+      const hasAdminPermission = this.$store.getters.roles.includes("super_admin") ||
+        this.$store.getters.roles.includes("common");
+      return hasAdminPermission ;
     }
   },
   methods: {
@@ -1469,9 +1479,14 @@ export default {
       // 发送请求到后端
       try {
         // 检查是否有“adv/search:ftp2”权限
-        const res = this.hasFtp2Perm
-          ? await searchPageApi.getSearchPageJUEM(searchParams)
-          : await searchPageApi.getSearchPageJM(searchParams);
+        let res = null;
+        if(this.hasFtp3Perm && !this.isAdmin){
+          res = await searchPageApi.getSearchPageUSER(searchParams);
+        }else{
+          res = this.hasFtp2Perm
+            ? await searchPageApi.getSearchPageJUEM(searchParams)
+            : await searchPageApi.getSearchPageJM(searchParams);
+        }
         this.results = res.data.list; // 假设返回的数据包含 results
         if (res.data.correctData != null) {
           this.correctData = res.data.correctData;
@@ -2097,9 +2112,14 @@ export default {
       // 发送请求到后端
       try {
         // 检查是否有“adv/search:ftp2”权限
-        const res = this.hasFtp2Perm
-          ? await searchPageApi.getSearchPageJUEM(searchParams)
-          : await searchPageApi.getSearchPageJM(searchParams);
+        let res = null;
+        if(this.hasFtp3Perm && !this.isAdmin){
+          res = await searchPageApi.getSearchPageUSER(searchParams);
+        }else{
+          res = this.hasFtp2Perm
+            ? await searchPageApi.getSearchPageJUEM(searchParams)
+            : await searchPageApi.getSearchPageJM(searchParams);
+        }
         this.results = res.data.list; // 假设返回的数据包含 results
         if (res.data.correctData != null) {
           this.correctData = res.data.correctData;
@@ -2206,9 +2226,14 @@ export default {
       // 发送请求到后端
       try {
         // 检查是否有“adv/search:ftp2”权限
-        const res = this.hasFtp2Perm
-          ? await searchPageApi.getSearchPageJUEM(searchParams)
-          : await searchPageApi.getSearchPageJM(searchParams);
+        let res = null;
+        if(this.hasFtp3Perm && !this.isAdmin){
+          res = await searchPageApi.getSearchPageUSER(searchParams);
+        }else{
+          res = this.hasFtp2Perm
+            ? await searchPageApi.getSearchPageJUEM(searchParams)
+            : await searchPageApi.getSearchPageJM(searchParams);
+        }
         this.results = res.data.list; // 假设返回的数据包含 results
         this.totalResultsCount = res.data.total;
         if (res.data.correctData != null) {
@@ -2267,9 +2292,14 @@ export default {
       // 发送请求到后端
       try {
         // 检查是否有“adv/search:ftp2”权限
-        const res = this.hasFtp2Perm
-          ? await searchPageApi.getSearchPageJUEM(searchParams)
-          : await searchPageApi.getSearchPageJM(searchParams);
+        let res = null;
+        if(this.hasFtp3Perm && !this.isAdmin){
+          res = await searchPageApi.getSearchPageUSER(searchParams);
+        }else{
+          res = this.hasFtp2Perm
+            ? await searchPageApi.getSearchPageJUEM(searchParams)
+            : await searchPageApi.getSearchPageJM(searchParams);
+        }
         this.results = res.data.list; // 假设返回的数据包含 results
         this.totalResultsCount = res.data.total;
         if (res.data.correctData != null) {
@@ -2396,9 +2426,17 @@ export default {
         pageSize: 5
       };
       try {
-        const res = this.hasFtp2Perm
+/*        const res = this.hasFtp2Perm
           ? await searchPageApi.getSearchPageJUEM(searchParamsV)
-          : await searchPageApi.getSearchPageJM(searchParamsV)
+          : await searchPageApi.getSearchPageJM(searchParamsV)*/
+        let res = null;
+        if(this.hasFtp3Perm){
+          res = await searchPageApi.getSearchPageUSER(searchParamsV);
+        }else{
+          res = this.hasFtp2Perm
+            ? await searchPageApi.getSearchPageJUEM(searchParamsV)
+            : await searchPageApi.getSearchPageJM(searchParamsV);
+        }
         this.tjListsData = res.data.list;
         console.log(this.tjListsData);
       } catch (error) {

digital-ui-250219/src/views/search/myItems.vue

@@ -305,7 +305,7 @@ export default {
           language: [],
           doc_lable: [],
           file_year:[],
-          batch_no: [] 
+          batch_no: []
         },
         sort:{
           // RELEVANCE:'desc'
@@ -329,7 +329,7 @@ export default {
       itemsPerPage: 10,          // 每页显示条目数
       detailData:'',//详情页内容
       downloadShow: true,
-      
+
        // 区间日期
       pickerOptions: {
           shortcuts: [{
@@ -362,7 +362,7 @@ export default {
       // value2: [new Date(), new Date()],
     };
   },
-  
+
 
   computed: {
     /*paginatedResults() {
@@ -381,6 +381,16 @@ export default {
     hasFtp2Perm() {
       return this.$store.getters.permissions.includes("adv/search:ftp2");
     },
+    hasFtp3Perm() {
+      return this.$store.getters.permissions.includes("adv/search:ftp3");
+    },
+    isAdmin() {
+      // 根据您的实际管理员权限标识来调整
+      // 检查权限标识
+      const hasAdminPermission = this.$store.getters.roles.includes("super_admin") ||
+        this.$store.getters.roles.includes("common");
+      return hasAdminPermission ;
+    },
     hasDaibanAdmin() {
       return this.$store.getters.roles.includes("jd_daiban_admin");
       // return Array.isArray(this.$store.getters.roles) && this.$store.getters.roles.includes("jd_daiban_admin");
@@ -481,7 +491,7 @@ export default {
           batch_no: this.queryParams.navigation.batch_no,
           doc_lable: this.queryParams.navigation.doc_lable
         },
-        
+
       };
       // 发送请求到后端
       try {
@@ -565,16 +575,24 @@ export default {
         // console.log('2')
         // console.log(searchParams.starttime);
         // console.log(searchParams.endtime);
-        // var dqDate = new Date(); 
+        // var dqDate = new Date();
         // if (searchParams.starttime == dqDate ){
         //   console.log(dqDate);
         //     searchParams.starttime = this.getTodayStartTime();
         //     searchParams.endtime = this.getTodayEndTime();
         //   }
 
-        const res = this.hasFtp2Perm
+/*        const res = this.hasFtp2Perm
           ? await searchPageApi.getSearchPageJUEM(searchParams)
-          : await searchPageApi.getSearchPageJM(searchParams);
+          : await searchPageApi.getSearchPageJM(searchParams);*/
+        let res = null;
+        if(this.hasFtp3Perm&&!this.isAdmin){
+          res = await searchPageApi.getSearchPageUSER(searchParams);
+        }else{
+          res = this.hasFtp2Perm
+            ? await searchPageApi.getSearchPageJUEM(searchParams)
+            : await searchPageApi.getSearchPageJM(searchParams);
+        }
         // console.log('res1='+res.data.list);
         this.results = res.data.list; // 假设返回的数据包含 results
         this.totalResultsCount = res.data.total;
@@ -637,7 +655,7 @@ export default {
     //     this.loading = false;
     //   }
     // },
-    //查看原文路径 
+    //查看原文路径
     open(file_path) {
         this.$notify.closeAll();
         this.$notify({
@@ -657,7 +675,7 @@ export default {
         this.activeIndex = 3;
       }
     },
-    
+
     goToPage(page) {
       if (page > 0 && page <= this.totalPages) {
         this.currentPage = page;
@@ -837,7 +855,7 @@ export default {
               searchParams = searchParams +',' + this.results[i].docid  ;
             }
           }
-          searchParams = searchParams.replace(/^,+/,"").replace(/,+$/,""); 
+          searchParams = searchParams.replace(/^,+/,"").replace(/,+$/,"");
           console.log('searchParams='+searchParams);
           var param = {"userid":this.$store.state.user.id,"docid":searchParams};
           const res = await searchPageApi.exportExcelDaiBan(param);
@@ -857,7 +875,7 @@ export default {
       } finally {
         this.exportLoading = false;
       }
-      
+
     },
     // 获取时间戳
     getTimestamp() {
@@ -912,7 +930,7 @@ export default {
     this.performSearch();
 
     this.nickname = this.$store.state.user.nickname;
-    
+
   }
 };