5/16

PCS/src/main/java/cn/cslg/permission/common/model/dto/ClientDTO.java

@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class ClientDTO extends BaseVO {
+    /**
+     * 客户名称
+     */
     private String name;
+    /**
+     * 租户id
+     */
     private Integer tenantId;
 }

PCS/src/main/java/cn/cslg/permission/common/utils/ResponseEnum.java

@@ -1,7 +1,5 @@
 package cn.cslg.permission.common.utils;
 
-import cn.cslg.permission.domain.Tenant;
-
 public enum ResponseEnum {
 
     SUCCESS(200, "请求成功"),

PCS/src/main/java/cn/cslg/permission/controller/ClientController.java

@@ -72,8 +72,8 @@ public class ClientController {
     }
 
     @GetMapping("/getByName")
-    @Operation(summary = "根据客户Id获得客户")
-    public Client getByName(String  name) {
+    @Operation(summary = "根据客户名称获得客户")
+    public Client getByName(String name) {
         return clientService.getByName(name);
     }
 

PCS/src/main/java/cn/cslg/permission/domain/Client.java

@@ -21,7 +21,7 @@ import lombok.Data;
 public class Client extends BaseEntity<Client> {
 
     /**
-     * 委托方名称
+     * 客户名称
      */
     @TableField("NAME")
     private String name;

PCS/src/main/java/cn/cslg/permission/service/ClientService.java

@@ -100,22 +100,21 @@ public class ClientService extends ServiceImpl<ClientMapper, Client> {
     public String add(Client client) {
         PersonnelVO personnel = cacheUtils.getLoginUser(loginUtils.getId());
         //判断客户是否新增过
-        LambdaQueryWrapper<Client> wrapper =new LambdaQueryWrapper<>();
-        wrapper.eq(Client::getName,client.getName());
-        List<Client> clients =this.list(wrapper);
-        if(clients.size()>0){
-            client =clients.get(0);
-        }
-        else {
+        LambdaQueryWrapper<Client> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Client::getName, client.getName());
+        List<Client> clients = this.list(wrapper);
+        if (clients.size() > 0) {
+            client = clients.get(0);
+        } else {
             client.setCreateUser(loginUtils.getId());
             client.setStatus(1);
             client.insert();
         }
         Integer tenantId = personnel.getTenantId();
-    Integer   flag =  assoTenantClientService.addTenantClient(client.getId(), tenantId);
-    if(flag<0){
-        return Response.error("客户已存在");
-    }
+        Integer flag = assoTenantClientService.addTenantClient(client.getId(), tenantId);
+        if (flag < 0) {
+            return Response.error("客户已存在");
+        }
         return Response.success(client.getId());
     }
 

PCS/src/main/java/cn/cslg/permission/service/DataService.java

@@ -115,15 +115,15 @@ public class DataService extends ServiceImpl<DataMapper, Data> {
             return rules;
         }
 
-        if (dataIds.contains(0)&&dataIds.size()==1) {
-            LambdaQueryWrapper<Function> wrapper =new LambdaQueryWrapper<>();
-            wrapper.eq(Function::getFunctionPath,functionId);
-            Function function =functionService.getOne(wrapper);
-            if(function.getDefaultRule()!=null){
+        if (dataIds.contains(0) && dataIds.size() == 1) {
+            LambdaQueryWrapper<Function> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(Function::getFunctionPath, functionId);
+            Function function = functionService.getOne(wrapper);
+            if (function.getDefaultRule() != null) {
                 rules.add(function.getDefaultRule());
+            } else {
+                rules.add("0");
             }
-            else {
-            rules.add("0");}
             return rules;
         }
 

PCS/src/main/java/cn/cslg/permission/service/FunctionService.java

@@ -81,33 +81,6 @@ public class FunctionService extends ServiceImpl<FunctionMapper, Function> {
 
     @Transactional(rollbackFor = Exception.class)
     public void deleteFunction(FunctionVO functionVO) {
-//        try {
-//            LambdaQueryWrapper<AssoTenantFunction> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-//            lambdaQueryWrapper.eq(AssoTenantFunction::getFunctionId, functionVO.getId());
-//            List<AssoTenantFunction> tenantFunctionList = tenantFunctionService.list(lambdaQueryWrapper);
-//
-//            if (tenantFunctionList.size() > 0) {
-//                return Response.error("该功能仍有使用者,无法删除");
-//            } else {
-//                List<Function> lst = functionMapper.getFunctionInPathByIdWithoutType(functionVO.getId());
-//                if (lst.size() > 0) {
-//                    this.removeByIds(lst.stream().map(Function::getId).collect(Collectors.toList()));
-//                    tenantFunctionService.delete(null, null, lst.stream().map(Function::getId).collect(Collectors.toList()));
-//                    roleFunctionDataService.delete(null, null, lst.stream().map(Function::getId).collect(Collectors.toList()), null);
-//                } else {
-//                    Function function = new Function();
-//                    function.setId(functionVO.getId());
-//                    function.deleteById();
-//
-//                    tenantFunctionService.delete(null, functionVO.getId(), null);
-//                    roleFunctionDataService.delete(null, functionVO.getId(), null, null);
-//                }
-//            }
-//        } catch (Exception e) {
-//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//            e.printStackTrace();
-//        }
-//        return Response.success(true);
         log.info("开始处理【删除功能】的业务，参数为：{}", functionVO);
         try {
             Integer functionId = functionVO.getId();

PCS/src/main/resources/mapper/ClientMapper.xml

@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.permission.mapper.ClientMapper">
-  <select id="getClientPageList" resultType="cn.cslg.permission.domain.Client" parameterType="cn.cslg.permission.common.model.dto.ClientDTO">
- select * from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
-<where>
-    <if test="params.tenantId!=null">
-        and b.TENANT_ID =#{params.tenantId}
-    </if>
-    <if test="params.name!=null">
-        and a.NAME like concat('%', #{params.name}, '%')
-    </if>
-</where>
-  </select>
+    <select id="getClientPageList" resultType="cn.cslg.permission.domain.Client"
+            parameterType="cn.cslg.permission.common.model.dto.ClientDTO">
+        select * from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
+        <where>
+            <if test="params.tenantId!=null">
+                and b.TENANT_ID =#{params.tenantId}
+            </if>
+            <if test="params.name!=null">
+                and a.NAME like concat('%', #{params.name}, '%')
+            </if>
+        </where>
+    </select>
 
-    <select id="getNoTenantClients" resultType="cn.cslg.permission.domain.Client" parameterType="cn.cslg.permission.common.model.dto.ClientDTO">
-        select  * from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
+    <select id="getNoTenantClients" resultType="cn.cslg.permission.domain.Client"
+            parameterType="cn.cslg.permission.common.model.dto.ClientDTO">
+        select * from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
         <where>
-                a.TENANT_ID is null
+            a.TENANT_ID is null
         </where>
     </select>
     <select id="queryList" resultType="cn.cslg.permission.domain.Client" parameterType="java.lang.Integer">
-        select  * from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
+        select * from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
         <where>
             b.TENANT_ID =#{params}
         </where>
     </select>
 
     <select id="queryTenantClients" resultType="java.lang.Integer" parameterType="java.lang.Integer">
-        select  a.TENANT_ID from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
+        select a.TENANT_ID from CLIENT a left join ASSOCIATE_TENANT_CLIENT b on a.ID=b.CLIENT_ID
         <where>
             b.TENANT_ID =#{params}
-and a.TENANT_ID is not null
+            and a.TENANT_ID is not null
         </where>
     </select>
 </mapper>