修改4-27日脚本记录bug

PAS/src/main/java/cn/cslg/pas/common/model/vo/ProjectImportVO.java

@@ -12,4 +12,5 @@ public class ProjectImportVO extends BaseVO {
     @Schema(description = "专利号")
     private String patentNo;
     private List<Integer> createIds;
+    private Integer tenantId;
 }

PAS/src/main/java/cn/cslg/pas/controller/ProjectImportController.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.model.PersonnelVO;
 import cn.cslg.pas.common.model.vo.ProjectImportPatentVO;
 import cn.cslg.pas.common.model.vo.ProjectImportVO;
 import cn.cslg.pas.common.model.vo.TaskParams;
@@ -90,10 +91,12 @@ public class ProjectImportController {
     public String importData(String url, ProjectImportVO params) {
         Integer userId = loginUtils.getId();
         String tempId = cacheUtils.getUserImportId(userId);
+        PersonnelVO personnelVO = cacheUtils.getLoginUserPersonnel(userId);
+
         if (StringUtils.isNotEmpty(tempId)) {
             return Response.error("有导入任务在进行中");
         }
-        Integer importId = projectImportService.add(userId, url);
+        Integer importId = projectImportService.add(userId, url,personnelVO.getTenantId());
         projectService.importData(url, params, userId, importId);
         cacheUtils.setUserImportId(userId, importId);
         return Response.success(importId);

PAS/src/main/java/cn/cslg/pas/domain/ProjectImport.java

@@ -57,5 +57,7 @@ public class ProjectImport extends BaseEntity<ProjectImport> {
      *
      */
     private String oldName;
+    @TableField(value = "tenant_id")
+    private Integer tenantId;
 
 }

PAS/src/main/java/cn/cslg/pas/service/ProjectImportService.java

@@ -1,13 +1,12 @@
 package cn.cslg.pas.service;
 
+import cn.cslg.pas.common.model.PersonnelVO;
 import cn.cslg.pas.common.model.QueryPatentVO;
 import cn.cslg.pas.common.model.dto.ProductPatentDTO;
 import cn.cslg.pas.common.model.vo.ProjectImportVO;
 import cn.cslg.pas.common.model.vo.ProjectVO;
-import cn.cslg.pas.common.utils.DateUtils;
-import cn.cslg.pas.common.utils.FileUtils;
-import cn.cslg.pas.common.utils.Response;
-import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.*;
 import cn.cslg.pas.mapper.PatentMapper;
 import cn.cslg.pas.mapper.ProjectImportMapper;
@@ -43,6 +42,8 @@ public class ProjectImportService extends ServiceImpl<ProjectImportMapper, Proje
     private final PatentMapper patentMapper;
     private final ProjectPatentLinkService projectPatentLinkService;
     private final RequestService requestService;
+    private final CacheUtils cacheUtils;
+    private final LoginUtils loginUtils;
 
     public IPage<ProjectImport> getPageList(ProjectImportVO params) throws IOException {
         //当查询使用发起人名称时
@@ -56,6 +57,8 @@ public class ProjectImportService extends ServiceImpl<ProjectImportMapper, Proje
                 params.setCreateIds(Collections.singletonList(-1));
             }
         }
+        PersonnelVO personnelVO =cacheUtils.getLoginUserPersonnel(loginUtils.getId());
+        params.setTenantId(personnelVO.getTenantId());
         IPage<ProjectImport> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
         this.setDataList(pageList.getRecords());
         return pageList;
@@ -72,7 +75,7 @@ public class ProjectImportService extends ServiceImpl<ProjectImportMapper, Proje
         return Response.success(true);
     }
 
-    public Integer add(Integer userId, String url) {
+    public Integer add(Integer userId, String url,Integer tenantId) {
         File file = new File(fileUtils.getSystemPath(url));
         ProjectImport projectImport = new ProjectImport();
         projectImport.setCreateBy(userId);
@@ -80,6 +83,7 @@ public class ProjectImportService extends ServiceImpl<ProjectImportMapper, Proje
         projectImport.setUrl(url);
         projectImport.setFileSize(FileUtil.size(file));
         projectImport.setFileName(file.getName());
+        projectImport.setTenantId(tenantId);
         projectImport.insert();
         return projectImport.getId();
     }

PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

@@ -115,7 +115,14 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         queryWrapper.last("limit 1");
         return this.getOne(queryWrapper);
     }
-
+    public Project getProjectByName(String name,Integer loginId) {
+        LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginId);
+        queryWrapper.eq(Project::getName, name);
+        queryWrapper.eq(Project::getTenantId, personnelVO.getTenantId());
+        queryWrapper.last("limit 1");
+        return this.getOne(queryWrapper);
+    }
     public IPage<Project> getPageList(ProjectVO params) throws IOException {
         List<Integer> projectIds = new ArrayList<Integer>() {{
             add(-1);
@@ -393,7 +400,18 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         }
         return tempName;
     }
-
+    public String getImportProjectName(String name,Integer userId) {
+        String tempName = name + "(1)";
+        Project project1 = this.getProjectByName(name,userId);
+        if (project1 == null) {
+            return name;
+        }
+        Project project2 = this.getProjectByName(tempName,userId);
+        if (project2 != null) {
+            tempName = this.getImportProjectName(tempName,userId);
+        }
+        return tempName;
+    }
     public Integer importProject(Integer projectId, String json, Integer userId) throws IOException {
         if ((projectId == null || projectId.equals(0)) && StringUtils.isEmpty(json)) {
             return 0;
@@ -403,17 +421,8 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         }
         Project temp = this.getById(projectId);
         Project data = JsonUtils.jsonToPojo(json, Project.class);
-        String res = requestService.getClientByName(Objects.requireNonNull(data).getClientName());
-        ClientDTO client = JSONObject.parseObject(res, ClientDTO.class);
-        Integer clientId = 0;
-        if (client == null) {
-            client.setName(data.getClientName());
-            String res2 = requestService.addClient(client);
-
-            JSONObject jsonObject = JSONObject.parseObject(res2);
-            clientId = Integer.parseInt(jsonObject.get("data").toString());
-        } else {
-            clientId = client.getId();
+        if (data.getClientId() != null) {
+            temp.setClientId(data.getClientId());
         }
         if (temp == null) {
             temp = new Project();
@@ -421,9 +430,9 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         String projectName = temp.getName();
         BeanUtils.copyProperties(data, temp);
         if (projectName == null || !projectName.equals(data.getName())) {
-            temp.setName(this.getImportProjectName(temp.getName()));
+            temp.setName(this.getImportProjectName(temp.getName(),userId));
         }
-        temp.setClientId(clientId);
+
         if (projectId == null || projectId.equals(0)) {
             temp.setCreateBy(userId);
             temp.setCreateTime(DateUtils.getDateTime());

PAS/src/main/resources/mapper/ProjectImportMapper.xml

@@ -13,6 +13,10 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="params.tenantId !=null ">
+                and a.tenant_id =#{params.tenantId}
+
+            </if>
         </where>
         order by a.create_time desc
     </select>