feat 项目标识相关接口

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/dto/tenant/SysProjectDto.java

@@ -25,11 +25,18 @@ public class SysProjectDto extends PagePO {
     private Long id;
 
     /**
-     * 项目名
+     * 项目名中文
      */
     @NonNull
-    @TableField(value = "project_name")
-    private String projectName;
+    @TableField(value = "project_name_cn")
+    private String projectNameCn;
+
+    /**
+     * 项目名英文
+     */
+    @NonNull
+    @TableField(value = "project_name_en")
+    private String projectNameEn;
 
     /**
      * 公钥

edu-travel-remote/edu-travel-remote-tenant/src/main/java/edu/travel/remote/feign/mode/vo/tenant/SysProjectVo.java

@@ -14,21 +14,21 @@ public class SysProjectVo extends BaseEntity {
     /**
      * 项目id
      */
-    private Long id;
+    private String id;
 
     /**
-     * 项目名
+     * 项目名中文
      */
-    private String projectName;
+    private String projectNameCn;
 
     /**
-     * 公钥
+     * 项目名英文
      */
-    private String publicKey;
+    private String projectNameEn;
 
     /**
-     * 密钥
+     * 公钥
      */
-    private String privateKey;
+    private String publicKey;
 
 }

edu-travel-service/edu-travel-service-tenement/pom.xml

@@ -130,6 +130,11 @@
         </dependency>
         <dependency>
             <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
             <artifactId>edu-travel-common-cache</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/entity/SysProject.java

@@ -12,6 +12,7 @@ import edu.travel.entity.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Data
 @AllArgsConstructor
@@ -25,10 +26,16 @@ public class SysProject  extends BaseEntity implements Serializable {
     private Long id;
 
     /**
-     * 项目名
+     * 项目名中文
      */
-    @TableField(value = "project_name")
-    private String projectName;
+    @TableField(value = "project_name_cn")
+    private String projectNameCn;
+
+    /**
+     * 项目名英文
+     */
+    @TableField(value = "project_name_en")
+    private String projectNameEn;
 
     /**
      * 公钥

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/service/impl/SysProjectServiceImpl.java

@@ -1,9 +1,11 @@
 package edu.travel.tenant.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import edu.travel.RSAUtill;
 import edu.travel.remote.feign.mode.dto.tenant.SysProjectDto;
 import edu.travel.remote.feign.mode.vo.tenant.SysProjectVo;
 import org.modelmapper.internal.util.Assert;
@@ -14,14 +16,23 @@ import edu.travel.tenant.mapper.SysProjectMapper;
 import edu.travel.tenant.service.SysProjectService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Map;
+
 @Service
 public class SysProjectServiceImpl extends ServiceImpl<SysProjectMapper, SysProject> implements SysProjectService{
 
     @Override
     @Transactional
     public SysProjectVo saveProject(SysProjectDto sysProjectDto) {
-        Assert.isTrue(ObjectUtil.isNotEmpty(sysProjectDto.getProjectName()),"项目名不能为空");
+        Assert.isTrue(ObjectUtil.isNotEmpty(sysProjectDto.getProjectNameCn()),"项目名不能为空");
+        Assert.isTrue(ObjectUtil.isNotEmpty(sysProjectDto.getProjectNameEn()),"项目名不能为空");
+
         SysProject sysProject = BeanUtil.copyProperties(sysProjectDto, SysProject.class);
+        sysProject.setProject(new Snowflake(1, 1).nextIdStr());
+
+        Map<String, String> keyPair = RSAUtill.generateKeyPair();
+        sysProject.setPublicKey(keyPair.get("publicKey"));
+        sysProject.setPrivateKey(keyPair.get("privateKey"));
         this.save(sysProject);
         return BeanUtil.copyProperties(sysProject, SysProjectVo.class);
     }

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/web/SysProjectController.java

@@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 /**
-* (sys_project)表控制层
+* 项目标识接相关接口（前缀 tenant）
 *
 * @author xxxxx
 */
@@ -44,6 +44,11 @@ public class SysProjectController extends BaseController<SysProject> implements
       return RPCBaseResponse.success("保存成功",sysProjectVo);
     }
 
+    /**
+     * 分页查询项目标识
+     * @param sysProjectDto
+     * @return
+     */
     @GetMapping("/getProjectPageList")
 //    @PreAuthorize("hasRole('超级管理员')")
     public RPCBaseResponse<Page<SysProjectVo>> getProjectPageList(SysProjectDto sysProjectDto) {

edu-travel-service/edu-travel-service-tenement/src/main/resources/mapper/SysProjectMapper.xml

@@ -5,7 +5,8 @@
     <!--@mbg.generated-->
     <!--@Table sys_project-->
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="project_name" jdbcType="VARCHAR" property="projectName" />
+    <result column="project_name_cn" jdbcType="VARCHAR" property="projectNameCn" />
+    <result column="project_name_en" jdbcType="VARCHAR" property="projectNameEn" />
     <result column="public_key" jdbcType="VARCHAR" property="publicKey" />
     <result column="private_key" jdbcType="VARCHAR" property="privateKey" />
     <result column="project" jdbcType="VARCHAR" property="project" />
@@ -17,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, project_name, public_key, private_key, project, delete_flag, create_user_id, 
+    id, project_name_cn,project_name_en, public_key, private_key, project, delete_flag, create_user_id,
     create_time, update_user_id, update_time
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-upload/src/main/java/edu/travel/upload/web/UploadController.java

@@ -2,6 +2,7 @@ package edu.travel.upload.web;
 
 import com.alibaba.fastjson.JSON;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.obs.services.ObsClient;
 import com.obs.services.model.*;
 import edu.travel.remote.upload.UploadRemoteController;
@@ -46,6 +47,8 @@ public class UploadController extends BaseController<EduFile> implements UploadR
     private ObsClient obsClient;
     @Autowired
     private ObsProperties obsProperties;
+//    @Autowired
+//    private SysProjectService projectService;
     Logger logger = LoggerFactory.getLogger(UploadController.class);
 
     @Override
@@ -224,4 +227,15 @@ public class UploadController extends BaseController<EduFile> implements UploadR
         BeanUtils.copyProperties(eduFileRPCBaseResponse, eduFileVoRPCBaseResponse);
         return eduFileVoRPCBaseResponse;
     }
+
+//    /**
+//     * 获取开心中文腾讯会议下载链接
+//     */
+//    @Override
+//    public RPCBaseResponse<String> getTencentMeetingDownloadUrl() {
+//
+//        eduFileService.getOne(new LambdaQueryWrapper<EduFile>().eq(EduFile.getProject(),"开心中文腾讯会议"))
+//        return RPCBaseResponse.success(url);
+//    }
+
 }