Explorar o código

20230719(2)-完成部分资源controller

iaun %!s(int64=3) %!d(string=hai) anos
pai
achega
8ef309ff7d

+ 4 - 0
pom.xml

@@ -35,6 +35,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency><!-- redis -->
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>

+ 17 - 1
src/main/java/cn/iaun/it/config/GlobalExceptionConfig.java

@@ -3,16 +3,32 @@ package cn.iaun.it.config;
 import cn.iaun.it.util.ResultCode;
 import cn.iaun.it.util.WebException;
 import cn.iaun.it.util.Result;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+import javax.validation.ConstraintViolationException;
+import java.sql.SQLSyntaxErrorException;
+
 @RestControllerAdvice
 public class GlobalExceptionConfig {
     @ResponseBody
     @ExceptionHandler(WebException.class)
-    public Result<WebException> handle(WebException e) {
+    public Result<?> handle(WebException e) {
         ResultCode resultCode = e.getResultCode();
         return new Result<>(resultCode, null);
     }
+
+    @ResponseBody
+    @ExceptionHandler({SQLSyntaxErrorException.class, NumberFormatException.class})
+    public Result<?> handleSqlSyntaxError() { // 统一处理SQL语句异常
+        return new Result<>(ResultCode.FAILED_PARAM_ERROR, null);
+    }
+
+    @ResponseBody
+    @ExceptionHandler({MethodArgumentNotValidException.class, ConstraintViolationException.class})
+    public Result<?> handleParamError() {
+        return new Result<>(ResultCode.FAILED_PARAM_ERROR, null);
+    }
 }

+ 126 - 5
src/main/java/cn/iaun/it/controller/ItResourceController.java

@@ -1,11 +1,17 @@
 package cn.iaun.it.controller;
 
+import cn.iaun.it.model.ItResourceAttribute;
+import cn.iaun.it.model.ItResourceGroup;
 import cn.iaun.it.model.ItResourceType;
 import cn.iaun.it.service.ItResourceService;
 import cn.iaun.it.util.Result;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import cn.iaun.it.util.ResultCode;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @RestController
 @RequestMapping("/resource")
@@ -17,7 +23,122 @@ public class ItResourceController {
     }
 
     @GetMapping(value = "/type/get")
-    public Result<ItResourceType> getItResourceType() {
-        return null;
+    public Result<List<ItResourceType>> getItResourceTypes() {
+        return new Result<>(ResultCode.SUCCESS, itResourceService.getResourceType());
+    }
+
+    @PostMapping(value = "/type/add")
+    public Result<?> addItResourceType(@Validated @RequestBody ItResourceType itResourceType) {
+        itResourceType.setTypeId(null);
+        if (itResourceType.getParentTypeId() != null && itResourceType.getParentTypeId() != -1L) {
+            List<ItResourceType> itResourceTypes = itResourceService.getResourceType();
+            boolean exists = false;
+            for (ItResourceType type : itResourceTypes) {
+                if (type.getTypeId().equals(itResourceType.getParentTypeId())) {
+                    exists = true;
+                    break;
+                }
+            }
+            if (!exists) {
+                return new Result<>(ResultCode.FAILED_PARAM_INVALID, null);
+            }
+        }
+        int result = itResourceService.addResourceType(itResourceType);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
+    }
+
+    @PostMapping(value = "/type/del/{i}")
+    public Result<?> delItResourceType(@PathVariable String i) {
+        long id = Long.parseLong(i);
+        int result = itResourceService.delResourceType(id);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
+    }
+
+    @PostMapping(value = "/type/set")
+    public Result<?> setItResourceType(@Validated @RequestBody ItResourceType itResourceType) {
+        if (itResourceType.getParentTypeId() != null && itResourceType.getParentTypeId() != -1L) {
+            List<ItResourceType> itResourceTypes = itResourceService.getResourceType();
+            boolean exists = false;
+            for (ItResourceType type : itResourceTypes) {
+                if (type.getTypeId().equals(itResourceType.getParentTypeId())) {
+                    exists = true;
+                    break;
+                }
+            }
+            if (!exists) {
+                return new Result<>(ResultCode.FAILED_PARAM_INVALID, null);
+            }
+        }
+        int result = itResourceService.setResourceType(itResourceType);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
+    }
+
+    @GetMapping(value = "/group/get")
+    public Result<List<ItResourceGroup>> getItResourceGroups() {
+        return new Result<>(ResultCode.SUCCESS, itResourceService.getResourceGroup());
+    }
+
+    @PostMapping(value = "/group/add")
+    public Result<?> addItResourceGroup(@Validated @RequestBody ItResourceGroup itResourceGroup) {
+        itResourceGroup.setGroupId(null);
+        int result = itResourceService.addResourceGroup(itResourceGroup);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
+    }
+
+    @PostMapping(value = "/group/del/{i}")
+    public Result<?> delItResourceGroup(@PathVariable String i) {
+        long id = Long.parseLong(i);
+        int result = itResourceService.delResourceGroup(id);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
+    }
+
+    @PostMapping(value = "/group/set")
+    public Result<?> setItResourceGroup(@Validated @RequestBody ItResourceGroup itResourceGroup) {
+        int result = itResourceService.setResourceGroup(itResourceGroup);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
+    }
+
+    @PostMapping(value = "/attribute/get")
+    public Result<IPage<ItResourceAttribute>> getItResourceAttribute(@Validated @RequestBody ItResourceAttributePageData page) {
+        if (page.pageNo == null) {
+            page.pageNo = 1;
+        }
+        if (page.pageSize == null) {
+            page.pageSize = 20;
+        }
+
+        return new Result<>(ResultCode.SUCCESS,  itResourceService.getResourceAttribute(page.pageNo, page.pageSize, page.groupId));
     }
+
 }
+
+class ItResourceAttributePageData {
+    Integer pageNo;
+    Integer pageSize;
+    @NotNull
+    Long groupId;
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+}

+ 2 - 0
src/main/java/cn/iaun/it/mapper/ItResourceValueMapper.java

@@ -10,4 +10,6 @@ import java.util.List;
 public interface ItResourceValueMapper extends BaseMapper<ItResourceValue> {
     // 一次添加多条resource value
     int insertManyResourceValue(List<ItResourceValue> itResourceValue);
+
+    int updateResourceValueById(ItResourceValue itResourceValue);
 }

+ 2 - 1
src/main/java/cn/iaun/it/model/ItResource.java

@@ -1,9 +1,10 @@
 package cn.iaun.it.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 public class ItResource {
-    @TableId
+    @TableId(type = IdType.AUTO)
     private Long resourceId;
     private String resourceName;
     private Long typeId;

+ 6 - 1
src/main/java/cn/iaun/it/model/ItResourceAttribute.java

@@ -1,12 +1,17 @@
 package cn.iaun.it.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
+import javax.validation.constraints.NotBlank;
+
 public class ItResourceAttribute {
-    @TableId
+    @TableId(type = IdType.AUTO)
     private Long attributeId;
     private Long groupId;
+    @NotBlank
     private String attributeName;
+    @NotBlank
     private String displayName;
     private Integer attributeType;
     private Integer valueType;

+ 7 - 0
src/main/java/cn/iaun/it/model/ItResourceGroup.java

@@ -1,7 +1,14 @@
 package cn.iaun.it.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import javax.validation.constraints.NotBlank;
+
 public class ItResourceGroup {
+    @TableId(type = IdType.AUTO)
     private Long groupId;
+    @NotBlank
     private String groupName;
 
     @Override

+ 9 - 0
src/main/java/cn/iaun/it/model/ItResourceType.java

@@ -1,7 +1,16 @@
 package cn.iaun.it.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotBlank;
+
+@Validated
 public class ItResourceType {
+    @TableId(type = IdType.AUTO)
     private Long typeId;
+    @NotBlank
     private String typeName;
     private Long parentTypeId;
 

+ 4 - 0
src/main/java/cn/iaun/it/model/ItRole.java

@@ -1,6 +1,10 @@
 package cn.iaun.it.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 public class ItRole {
+    @TableId(type = IdType.AUTO)
     private Long roleId;
     private String name;
 

+ 4 - 0
src/main/java/cn/iaun/it/model/ItSys.java

@@ -1,6 +1,10 @@
 package cn.iaun.it.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 public class ItSys {
+    @TableId(type = IdType.AUTO)
     private Long sysId;
     private String name;
 

+ 0 - 5
src/main/java/cn/iaun/it/service/ItUserService.java

@@ -1,15 +1,10 @@
 package cn.iaun.it.service;
 
-import cn.iaun.it.model.ItUser;
 import cn.iaun.it.model.vo.user.ItUserInfoVo;
 import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 
-import java.util.List;
-
 
 public interface ItUserService {
-    List<ItUser> getAll();
-
     ItUserLoginInfoVo getTokenByUserAndPassword(String user, String password);
 
     ItUserInfoVo getUserInfoByUserId(Long userId);

+ 1 - 1
src/main/java/cn/iaun/it/service/impl/ItResourceServiceImpl.java

@@ -134,6 +134,6 @@ public class ItResourceServiceImpl implements ItResourceService {
 
     @Override
     public int setResourceValueById(ItResourceValue itResourceValue) {
-        return itResourceValueMapper.updateById(itResourceValue);
+        return itResourceValueMapper.updateResourceValueById(itResourceValue);
     }
 }

+ 0 - 6
src/main/java/cn/iaun/it/service/impl/ItUserServiceImpl.java

@@ -2,7 +2,6 @@ package cn.iaun.it.service.impl;
 
 import cn.iaun.it.mapper.ItRolePermissionMapper;
 import cn.iaun.it.mapper.ItUserMapper;
-import cn.iaun.it.model.ItUser;
 import cn.iaun.it.model.vo.permission.ItRoleSysPermissionVo;
 import cn.iaun.it.model.vo.user.ItUserInfoVo;
 import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
@@ -30,11 +29,6 @@ public class ItUserServiceImpl implements ItUserService {
         this.redisUtil = redisUtil;
     }
 
-    @Override
-    public List<ItUser> getAll() {
-        return itUserMapper.selectList(null);
-    }
-
     @Override
     public ItUserLoginInfoVo getTokenByUserAndPassword(String user, String password) {
         ItUserLoginInfoVo itUserLoginInfoVo = itUserMapper.selectItUserLoginInfo(user, password);

+ 32 - 0
src/main/java/cn/iaun/it/util/MyPage.java

@@ -0,0 +1,32 @@
+package cn.iaun.it.util;
+
+
+public class MyPage<T> {
+    Integer pageNo;
+    Integer pageSize;
+    T data;
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}

+ 3 - 1
src/main/java/cn/iaun/it/util/ResultCode.java

@@ -3,13 +3,15 @@ package cn.iaun.it.util;
 public enum ResultCode {
     SUCCESS(1, "成功"),
     FAILED(-1, "失败"),
+    FAILED_PARAM_ERROR(-1001, "参数错误!"),
+    FAILED_PARAM_INVALID(-1002, "参数无效!"), // 如ID不存在等
 
     /* 用户模块 1001XXX */
     USER_WRONG_USER_OR_PASSWORD(1001001, "用户名或密码错误"),
     USER_INVALID_TOKEN(1001002, "您尚未登录或登录已失效,请重新登录"),
 
     /* 权限控制 1002XXX */
-    PERM_NO_PERMISSION(1002001, "拒绝访问");
+    PERM_NO_PERMISSION(1002001, "拒绝访问,您未拥有访问权限");
     private final Integer code;
     private final String message;
 

+ 3 - 3
src/main/resources/application.yml

@@ -24,6 +24,6 @@ logging:
     cn.iaun.it.mapper: trace
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/*Mapper.xml
-  global-config:
-    db-config:
-      update-strategy: ignored
+#  global-config:
+#    db-config:
+#      update-strategy: ignored

+ 6 - 0
src/main/resources/mapper/ItResourceValueMapper.xml

@@ -9,4 +9,10 @@
             (#{item.resourceId}, #{item.attributeId}, #{item.attributeValue})
         </foreach>
     </insert>
+    <update id="updateResourceValueById" parameterType="cn.iaun.it.model.ItResourceValue">
+        update it_resource_value
+        set attribute_value = #{attributeValue}
+        where attribute_id = #{attributeId}
+          and resource_id = #{resourceId}
+    </update>
 </mapper>

+ 42 - 0
src/test/java/cn/iaun/it/ResourceServiceTest.java

@@ -0,0 +1,42 @@
+package cn.iaun.it;
+
+import cn.iaun.it.model.ItResourceValue;
+import cn.iaun.it.service.ItResourceService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SpringBootTest
+public class ResourceServiceTest {
+    @Autowired
+    private ItResourceService itResourceService;
+
+    @Test
+    public void setResourceValueByIdTest() {
+        ItResourceValue itResourceValue = new ItResourceValue();
+        itResourceValue.setResourceId(4L);
+        itResourceValue.setAttributeId(13L);
+        itResourceValue.setAttributeValue("HUAWEI");
+        itResourceService.setResourceValueById(itResourceValue);
+    }
+
+    @Test
+    public void addResourceValuesTest() {
+        ItResourceValue itResourceValue = new ItResourceValue();
+        itResourceValue.setResourceId(4L);
+
+        itResourceValue.setAttributeId(6L);
+        itResourceValue.setAttributeValue("48");
+        List<ItResourceValue> list = new ArrayList<>();
+        list.add(itResourceValue);
+        itResourceService.addResourceValues(list);
+    }
+
+    @Test
+    public void delResourceValueByResourceIdTest() {
+        itResourceService.delResourceValueByResourceId(4L);
+    }
+}