2022-10-08 10:00:00 分析系统提交代码

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

@@ -118,7 +118,7 @@ public class OAuth2Service {
      * @author 沈永艺
      */
     public String verifyCode() throws Exception {
-        String resBody = requestService.getverifyCodeFromPCS();
+        String resBody = requestService.getVerifyCodeFromPCS();
         JSONObject jsonObject = JSONObject.parseObject(resBody);
         JSONObject data = (JSONObject) jsonObject.get("data");
         Object captcha = data.get("captcha");

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

@@ -27,7 +27,6 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -127,7 +126,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         try {
             //获取所属部门对应信息
 
-            String jsonObject =  requestService.getDepartmentFromPCS(dataList);
+            String jsonObject = requestService.getDepartmentFromPCS(dataList);
             JSONArray jsonArray1 = JSON.parseArray(jsonObject);
             List<ProjectVO.Department> departmentList = jsonArray1.toJavaList(ProjectVO.Department.class);
             for (Project project : dataList) {
@@ -203,7 +202,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     }
 
     public List<Project> getAllProjectByMySelf() {
-//使用专题库查询的权限查询，因为要使用专题库的权限，因此查询语句格式需要和专题库查询的格式统一，所以手写了查询语句
+        //使用专题库查询的权限查询，因为要使用专题库的权限，因此查询语句格式需要和专题库查询的格式统一，所以手写了查询语句
         securityUtils.startDataScope("/workspace/project/check");
         List<Project> projectList = baseMapper.getListForCount();
         this.setDataList(projectList);

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

@@ -25,13 +25,14 @@ public class RequestService {
     private final ApiUtils apiUtils;
     public static final MediaType JSON1 = MediaType.parse("application/json; charset=utf-8");
     private final ProjectService projectService;
-    private  final  ClientService clientService;
-     //从权限系统查询专题库负责人信息
+    private final ClientService clientService;
+
+    //从权限系统查询专题库负责人信息
     public String getDepartmentFromPCS(List<Project> dataList) throws IOException {
         //获取专题库负责人对应信息
         Map<String, Object> map1 = new HashMap<>();
         map1.put("departmentId", dataList.stream().map(Project::getDepartmentId).filter(Objects::nonNull).collect(Collectors.toList()));
-     return  apiUtils.invokeApi(new JSONObject(map1), "/permission/api/system/getDepartmentById", "post", "data");
+        return apiUtils.invokeApi(new JSONObject(map1), "/permission/api/system/getDepartmentById", "post", "data");
     }
 
     //从权限系统获取专题库负责人对应信息
@@ -40,14 +41,15 @@ public class RequestService {
         map1.put("personnelId", dataList.stream().map(Project::getPersonnelId).collect(Collectors.toList()));
         return apiUtils.invokeApi(new JSONObject(map1), "/permission/api/system/getPersonnelById", "post", "data");
     }
+
     //从权限系统获取验证码
-    public String getverifyCodeFromPCS() throws IOException {
+    public String getVerifyCodeFromPCS() throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
                 .url(url + "/permission/api/admin/verifyCode")
                 .get()
                 .build();
-       return okHttpClient.newCall(request).execute().body().string();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
 
     //从权限系统登录
@@ -64,26 +66,27 @@ public class RequestService {
                 .url(url + "/permission/api/admin/login")
                 .post(a)
                 .build();
-        return  okHttpClient.newCall(request).execute().body().string();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+
     //从权限系统获得租户信息
     public String getTenantMessageFromPCS(UserVO params) throws IOException {
         //查询数据规则
-        //设定formdata类型参数
+        //设定formData类型参数
         Project project = projectService.getProjectById(params.getProjectId());
         int tentId = project.getTenantId();
         List<Client> clients = clientService.getClientBytenant(tentId);
         List<String> tenantNames = new ArrayList<>();
-        clients.forEach(item->{ tenantNames.add(item.getName());});
+        clients.forEach(item -> tenantNames.add(item.getName()));
         String names = JSON.toJSONString(tenantNames);
-        String name ="";
-        name = params.getName()==null? name:params.getName();
+        String name = "";
+        name = params.getName() == null ? name : params.getName();
         RequestBody requestBody = new FormBody.Builder()
-                .add("tenantId", tentId+"" )
-                .add("tenantNames",names)
-                .add("tenantName",name)
-                .add("current",params.getCurrent().toString())
-                .add("size",params.getSize().toString())
+                .add("tenantId", tentId + "")
+                .add("tenantNames", names)
+                .add("tenantName", name)
+                .add("current", params.getCurrent().toString())
+                .add("size", params.getSize().toString())
                 .build();
         //建立连接
         OkHttpClient okHttpClient = new OkHttpClient();
@@ -95,20 +98,18 @@ public class RequestService {
         //获得请求返回
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
-    //从权限系统获得租户信息
+
+    //从权限系统获得人员信息
     public String getPersonnelMessageFromPCS(UserVO params) throws IOException {
         //查询数据规则
-        //设定formdata类型参数
-        List<Client> clients = clientService.getClientBytenant(params.getTenantId());
-        List<String> tenantNames = new ArrayList<>();
-        clients.forEach(item->{ tenantNames.add(item.getName());});
-        String name ="";
-        name = params.getName()==null? name:params.getName();
+        //设定formData类型参数
+        String name = "";
+        name = params.getName() == null ? name : params.getName();
         RequestBody requestBody = new FormBody.Builder()
-                .add("tenantId", params.getTenantId()+"" )
-                .add("personnelName",name)
-                .add("current",params.getCurrent().toString())
-                .add("size",params.getSize().toString())
+                .add("tenantId", params.getTenantId() + "")
+                .add("personnelName", name)
+                .add("current", params.getCurrent().toString())
+                .add("size", params.getSize().toString())
                 .build();
         //建立连接
         OkHttpClient okHttpClient = new OkHttpClient();
@@ -118,8 +119,6 @@ public class RequestService {
                 .addHeader("Cookie", LoginUtils.getToken())
                 .build();
         //获得请求返回
-        String resBody = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
-
-        return resBody;
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
 }

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

@@ -1,40 +1,22 @@
 package cn.cslg.pas.service;
 
-import cn.cslg.pas.common.model.BaseEntity;
-import cn.cslg.pas.common.model.vo.TenantVo;
-import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
-import cn.cslg.pas.domain.Client;
-import cn.cslg.pas.domain.Department;
 import cn.cslg.pas.common.model.vo.UserVO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.Response;
-import cn.cslg.pas.common.utils.StringUtils;
-import cn.cslg.pas.domain.Project;
 import cn.cslg.pas.domain.User;
 import cn.cslg.pas.mapper.UserMapper;
 import cn.hutool.crypto.SecureUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
-import okhttp3.FormBody;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,11 +31,7 @@ import java.util.stream.Collectors;
 public class UserService extends ServiceImpl<UserMapper, User> {
 
     private final CacheUtils cacheUtils;
-    private final ProjectService projectService;
-    private  final  ClientService clientService;
-    private  final  RequestService requestService;
-    @Value("${authorUrl}")
-    private String url;
+    private final RequestService requestService;
 
     public User getByUsername(String username) {
         return this.getOne(Wrappers.<User>lambdaQuery().eq(User::getUsername, username));
@@ -78,18 +56,14 @@ public class UserService extends ServiceImpl<UserMapper, User> {
     }
 
     public String getPageList(UserVO params) throws IOException {
-        String resBody = requestService.getTenantMessageFromPCS(params);
-return resBody;
-
+        return requestService.getTenantMessageFromPCS(params);
     }
+
     public String getPersonnelList(UserVO params) throws IOException {
-        String resBody =requestService.getPersonnelMessageFromPCS(params);
-        return resBody;
+        return requestService.getPersonnelMessageFromPCS(params);
     }
 
 
-
-
     public String add(User user) {
         User temp = this.getByUsername(user.getUsername());
         if (temp != null) {