Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -1179,4 +1179,10 @@ update onl_cgform_field set is_query = '1', is_read_only = '1' where id = '09fa6
 -- 配置表，增加问题知识库预览图片配置 2022-09-27 已同步生产环境
 INSERT INTO `laws_weilai`.`sys_config` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name`) VALUES ('4', 'admin', '2022-09-28 14:35:30', NULL, NULL, 'A01', 'http://grp.nioint.com/', 'domianWebImgURL');
 
+--问题知识库，增加字段 发布状态 2022-10-13 未同步生产环境
+ALTER TABLE `laws_weilai`.`problem_knowledge_base`
+    ADD COLUMN `release_status` varchar(50) NULL COMMENT '发布状态' AFTER `release_time`;
+
+--处理问题知识库数据，发布人，发布时间，发布状态数据sql  2022-10-13 未同步生产环境
+update problem_knowledge_base pkd set pkd.release_status = 'Have released',pkd.release_time = pkd.create_time,pkd.release_user_id = (select su.id from sys_user su where su.username = pkd.create_by)
 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java

@@ -0,0 +1,62 @@
+package com.jero.modules.system.enums;
+
+public enum RoleEnum {
+    ADMIN_ID("R&H Manager","R&H Manager","manager","1534020391015444481",2),
+    MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3),
+    COUNTRU_CARD_MANAGE("countryCard管理员","countryCardManage","countryCardManage","1564916346120916993",4),
+    ;
+
+    String name;
+    String enName;
+    String value;
+    String id;
+    Integer order;
+
+    RoleEnum(String name, String enName, String value, String id, Integer order) {
+        this.name = name;
+        this.enName = enName;
+        this.value = value;
+        this.id = id;
+        this.order = order;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java

@@ -270,4 +270,10 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	List<SysRole> queryUserRoleListInfoByUserId(String userId);
+
+	/**
+	 * 验证当前登录用户是否是超级管理员。
+	 * @return
+	 */
+	boolean isAdministrator();
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -17,6 +17,7 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.entity.*;
 import com.jero.modules.system.enums.PPSyncEnum;
+import com.jero.modules.system.enums.RoleEnum;
 import com.jero.modules.system.mapper.*;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.ISysUserService;
@@ -24,6 +25,7 @@ import com.jero.modules.system.vo.SysUserDepVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
@@ -586,4 +588,30 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		}
 		return result;
 	}
+
+	/**
+	 * 验证当前登录用户是否是超级管理员
+	 * @return
+	 */
+	@Override
+	public boolean isAdministrator() {
+		boolean result = false;
+		RoleEnum administrator = RoleEnum.MANAGER_ID;
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<SysUserRole> userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, currentUser.getId())); // 查询用户所有角色
+		if(CollectionUtils.isNotEmpty(userRoleList)){
+			List<SysUserRole> userRoles = userRoleList.stream().filter(userRole -> {
+				boolean flag = false;
+				if(StringUtils.equals(userRole.getRoleId(),administrator.getId())){
+					flag = true;
+				}
+				return flag;
+			}).collect(Collectors.toList());
+
+			if(CollectionUtils.isNotEmpty(userRoles)){
+				result = true;
+			}
+		}
+		return result;
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java

@@ -1,6 +1,7 @@
 package com.jero.modules.problemKnowledgeBase.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -156,7 +157,7 @@ public class ProblemKnowledgeBaseEO implements Serializable {
     /**发布日期*/
     @Excel(name = "发布日期", width = 15)
     @ApiModelProperty(value = "发布日期")
-    private java.lang.String releaseTime;
+    private Date releaseTime;
 
     /**点赞总数量*/
     @TableField(exist = false)
@@ -195,4 +196,9 @@ public class ProblemKnowledgeBaseEO implements Serializable {
     /**附件展示数组*/
     @TableField(exist = false)
     private List<OSSFile> accessoryFileNameList;
+
+    /**发布状态*/
+    @Excel(name = "发布状态", width = 15)
+    @ApiModelProperty(value = "发布状态")
+    private String releaseStatus;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java

@@ -24,6 +24,7 @@ import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.problemKnowledgeBase.entity.*;
 import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum;
 import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum;
+import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum;
 import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum;
 import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.*;
@@ -114,17 +115,19 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
         Date now = new Date();
         problemKnowledgeBaseEO.setCreateTime(now);
         problemKnowledgeBaseEO.setUpdateTime(now);
-        save(problemKnowledgeBaseEO);
 
         //如果该条问题知识库的展示权限为私密，则创建权限表数据
         if(StringUtils.equals(problemKnowledgeBaseEO.getShowPermissions(), ShowPermissionsEnum.PRIVACY.getValue())){
 			this.batchInsertProblemKnowledgeBaseUserEO(problemKnowledgeBaseEO);
 		}
-        /*else {
+		//如果是已发布，将数据更新到es中。
-        	//如果展示权限是公开，则把该数据插入到搜索中心中。
+		if(StringUtils.equals(problemKnowledgeBaseEO.getReleaseStatus(), ReleaseStatusEnum.HAVE_RELEASED.getValue())){
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			problemKnowledgeBaseEO.setReleaseUserId(currentUser.getId());
+			problemKnowledgeBaseEO.setReleaseTime(now);
 			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
-		}*/
+		}
-		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+		save(problemKnowledgeBaseEO);
     }
 
 	/**
@@ -435,15 +438,23 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
     public void editById(ProblemKnowledgeBaseEO problemKnowledgeBaseEO) {
     	Date now = new Date();
         problemKnowledgeBaseEO.setUpdateTime(now);
-    	saveOrUpdate(problemKnowledgeBaseEO);
 
 		//如果该条问题知识库的展示权限为私密，则创建权限表数据
 		if(StringUtils.equals(problemKnowledgeBaseEO.getShowPermissions(), ShowPermissionsEnum.PRIVACY.getValue())){
 			this.batchInsertProblemKnowledgeBaseUserEO(problemKnowledgeBaseEO);
-			//this.deleteElasticsearchData(problemKnowledgeBaseEO.getId());
 		}
 
-		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+		//如果是已发布，将数据更新到es中。
+		if(StringUtils.equals(problemKnowledgeBaseEO.getReleaseStatus(), ReleaseStatusEnum.HAVE_RELEASED.getValue())){
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			problemKnowledgeBaseEO.setReleaseUserId(currentUser.getId());
+			problemKnowledgeBaseEO.setReleaseTime(now);
+			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+		}else if(StringUtils.equals(problemKnowledgeBaseEO.getReleaseStatus(), ReleaseStatusEnum.DRAFT.getValue())){
+			//如果是草稿，将es中的数据删掉。
+			this.deleteElasticsearchData(problemKnowledgeBaseEO.getId());
+		}
+		saveOrUpdate(problemKnowledgeBaseEO);
     }
 
 	/**
@@ -750,26 +761,32 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 	@Override
 	public void createQueryPermission(QueryWrapper<ProblemKnowledgeBaseEO> queryWrapper,ProblemKnowledgeBaseEO problemKnowledgeBaseEO) {
 		/**
-		 * 查询权限
+		 *  2022-10-13增加权限，超级管理员可以看到所有的问题知识库数据。
-		 * 		公开：所有人都可以看到。
-		 * 		私密：只有配置了的权限用户可以看到。
 		 */
-		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		boolean administrator = this.sysUserService.isAdministrator();
-    	QueryWrapper<ProblemKnowledgeBaseUserEO> userPermissionQueryWrapper = new QueryWrapper<>();
+		if(!administrator){
-		userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentUser.getId());
+			/**
-		List<ProblemKnowledgeBaseUserEO> problemKnowledgeBaseUserEOList = problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper);
+			 * 查询权限
+			 * 		公开：所有人都可以看到。
+			 * 		私密：只有配置了的权限用户可以看到。
+			 */
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			QueryWrapper<ProblemKnowledgeBaseUserEO> userPermissionQueryWrapper = new QueryWrapper<>();
+			userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentUser.getId());
+			List<ProblemKnowledgeBaseUserEO> problemKnowledgeBaseUserEOList = problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper);
 
-		List<String> problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList());
+			List<String> problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList());
 
-		queryWrapper.lambda().and(query -> {
+			queryWrapper.lambda().and(query -> {
-			query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue());
+				query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue());
 				if(CollectionUtils.isNotEmpty(problemKnowledgeBaseIdList)){
 					query.or(o -> {
 						o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue());
 						o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList);
 					});
 				}
-		});
+			});
+		}
 
 		String searchStr = problemKnowledgeBaseEO.getSearchStr();
 		if(StringUtils.isNotEmpty(searchStr)){

jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue

@@ -60,7 +60,7 @@
                 <span style="cursor: pointer"
                       @click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
               </div>
-              <div class="detail-content-header-content-rightOne">
+              <div class="detail-content-header-content-rightOne" :title="$t('comparisonDifferenceComment')">
                 {{$t('comparisonDifferenceComment')}}
               </div>
               <div class="detail-content-header-content-right" v-if="!isDisplay">
@@ -494,6 +494,7 @@
       .operator-text-text {
         cursor: pointer;
         margin-right: 53px;
+        max-width: 138px;
         font-size: 14px;
         font-weight: 400;
         color: #040B29;

jero-web/src/views/documentTools/documentComparison/index.vue

@@ -42,11 +42,11 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="initiatingProcessClick" class="operator-text">
+      <div @click="initiatingProcessClick" v-has="'documentComparison:Initiate'" class="operator-text">
         <a-icon type="apartment"/>
         {{$t('initiateComparison')}}
       </div>
-      <div @click="BatchDelete" class="operator-text">
+      <div @click="BatchDelete" v-has="'documentComparison:batchDelete'" class="operator-text">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
@@ -67,15 +67,15 @@
         <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
            <a class="text-operation"
-              v-if="record.createBy == userInfoQuery.username"
+              v-if="record.createBy == userInfoQuery.username || administrators"
               @click="subscribe(record)">
             {{!record.releaseState || record.releaseState == 'draft' ? $t('release') :$t('withdraw')}}
            </a>
           <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
              @click="edit(record)">{{$t('edit')}}</a>
           <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
         <span slot="serialNumberRight" :title="text" slot-scope="text,record">
@@ -132,6 +132,7 @@
         pageNo: 1,
         queryParam: {},
         userInfoQuery: {},
+        administrators:false,
         selectedRowKeysRecord: [],
         columns: [
           {
@@ -233,6 +234,14 @@
         this.queryParam = { ...this.queryParam }
       }
       this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
       this.getList()
     },
     methods: {

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -59,15 +59,15 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="uploadClick" class="operator-text">
+      <div @click="uploadClick" v-has="'documentTranslation:upload'" class="operator-text">
         <a-icon type="cloud-upload"/>
         {{$t('upload1')}}
       </div>
-      <div @click="RetrieveFilesClick" class="operator-text">
+      <div @click="RetrieveFilesClick" v-has="'documentTranslation:retrieval'" class="operator-text">
         <a-icon type="database"/>
         {{$t('RetrieveFiles')}}
       </div>
-      <div @click="BatchDelete" class="operator-text">
+      <div @click="BatchDelete" v-has="'documentTranslation:batchDeletion'" class="operator-text">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
@@ -86,18 +86,22 @@
       >
         <!--         -->
         <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
+          <a class="text-operation"
+             v-has="'documentTranslation:view'"
+             @click="viewClick(record)">{{$t('view')}}</a>
           <!--          <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>-->
            <a class="text-operation"
-              v-if="record.createBy == userInfoQuery.username"
+              v-if="record.createBy == userInfoQuery.username || administrators"
               @click="subscribe(record)">
             {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}}
            </a>
           <a class="text-operation"
+             v-has="'documentTranslation:download'"
              v-if="record.translationResult == 'Translation done'"
              @click="downloadData(record)">{{$t('download')}}</a>
           <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
+             v-has="'documentTranslation:delete'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseCondition == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
         <span slot="standardTitle" slot-scope="text,record" :title="text">
@@ -158,6 +162,7 @@
         queryParam: {},
         userInfoQuery: {},
         selectedRowKeysRecord: [],
+        administrators:false,
         columns: [
           {
             title: this.$t('standard'),
@@ -233,6 +238,14 @@
       }
       this.getList()
       this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -8,11 +8,14 @@
               :url="url"/>
     </div>
     <div class="table-operator">
-      <div @click="handleCompare" class="operator-text">
+      <div @click="handleCompare" v-has="'regulatoryEarlyWarning:push'"
+           class="operator-text">
         <a-icon type="rocket" :rotate="45"/>
         {{$t('Push')}}
       </div>
-      <div @click="handleExport" class="operator-text">
+      <div @click="handleExport"
+           v-has="'regulatoryEarlyWarning:export'"
+           class="operator-text">
         <a-icon type="export" :rotate="-90"/>
         {{$t('export')}}
       </div>