Sfoglia il codice sorgente

20230721-完善资源controller判断

iaun 3 anni fa
parent
commit
e1ee93941d

+ 22 - 3
src/main/java/cn/iaun/it/config/GlobalExceptionConfig.java

@@ -3,16 +3,23 @@ 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 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.SQLIntegrityConstraintViolationException;
 import java.sql.SQLSyntaxErrorException;
 
+import org.springframework.http.converter.HttpMessageNotReadableException;
+
 @RestControllerAdvice
 public class GlobalExceptionConfig {
+    private final static Logger log = LoggerFactory.getLogger(GlobalExceptionConfig.class);
+
     @ResponseBody
     @ExceptionHandler(WebException.class)
     public Result<?> handle(WebException e) {
@@ -21,14 +28,26 @@ public class GlobalExceptionConfig {
     }
 
     @ResponseBody
-    @ExceptionHandler({SQLSyntaxErrorException.class, NumberFormatException.class})
-    public Result<?> handleSqlSyntaxError() { // 统一处理SQL语句异常
+    @ExceptionHandler({SQLSyntaxErrorException.class, NumberFormatException.class, SQLIntegrityConstraintViolationException.class})
+    public Result<?> handleSqlSyntaxError(Exception e) { // 统一处理SQL语句异常
+        System.out.println(e.getMessage());
+        log.error(e.getMessage());
         return new Result<>(ResultCode.FAILED_PARAM_ERROR, null);
     }
 
     @ResponseBody
     @ExceptionHandler({MethodArgumentNotValidException.class, ConstraintViolationException.class})
-    public Result<?> handleParamError() {
+    public Result<?> handleParamError(Exception e) {
+        System.out.println(e.getMessage());
+        log.error(e.getMessage());
         return new Result<>(ResultCode.FAILED_PARAM_ERROR, null);
     }
+
+    @ResponseBody
+    @ExceptionHandler({HttpMessageNotReadableException.class})
+    public Result<?> handleJSONError(Exception e) {
+        System.out.println(e.getMessage());
+        log.error(e.getMessage());
+        return new Result<>(ResultCode.FAILED_PARAM_FORMAT, null);
+    }
 }

+ 22 - 13
src/main/java/cn/iaun/it/controller/ItResourceController.java

@@ -6,6 +6,8 @@ import cn.iaun.it.util.MyPage;
 import cn.iaun.it.util.Result;
 import cn.iaun.it.util.ResultCode;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -288,8 +290,15 @@ public class ItResourceController {
         return new Result<>(ResultCode.SUCCESS, itResourceService.getResourceValues(id));
     }
 
-    @PostMapping("/value/add")
-    public Result<?> addItResourceValue(@Validated @RequestBody List<ItResourceValue> itResourceValues) {
+    @PostMapping("/value/del/{i}")
+    public Result<?> delItResourceValue(@PathVariable String i) {
+        long id = Long.parseLong(i);
+        int result = itResourceService.delResourceValueByResourceId(id);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
+    }
+
+    @PostMapping("/value/set")
+    public Result<?> setItResourceValues(@RequestBody List<ItResourceValue> itResourceValues) {
         HashSet<Long> resourceSet = new HashSet<>();
         HashSet<Long> attributeSet = new HashSet<>();
         for (ItResourceValue itResourceValue : itResourceValues) {
@@ -298,6 +307,7 @@ public class ItResourceController {
             resourceSet.add(resourceId);
             attributeSet.add(attributeId);
         }
+
         int attributeCount = itResourceService.countResourceValueByAttributeIds(attributeSet);
         int resourceCount = itResourceService.countResourceValueByResourceIds(resourceSet);
         // 判断传入的ID是否在数据库存在(判断数量是否对上)
@@ -305,18 +315,17 @@ public class ItResourceController {
             return new Result<>(ResultCode.FAILED_PARAM_INVALID, null);
         }
 
-        return new Result<>(ResultCode.SUCCESS, itResourceService.addResourceValues(itResourceValues));
-    }
-
-    @PostMapping("/value/del/{i}")
-    public Result<?> delItResourceValue(@PathVariable String i) {
-        long id = Long.parseLong(i);
-        int result = itResourceService.delResourceValueByResourceId(id);
-        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
-    }
+        HashMap<Long, Long> dbAttributeIds = itResourceService.getGroupIdByAttributeId(attributeSet);
+        HashMap<Long, Long> dbResourceIds = itResourceService.getGroupIdByResourceId(resourceSet);
 
-    @PostMapping("/value/set")
-    public Result<?> setItResourceValues(@RequestBody List<ItResourceValue> itResourceValues) {
+        for (ItResourceValue itResourceValue : itResourceValues) {
+            Long resourceId = itResourceValue.getResourceId();
+            Long attributeId = itResourceValue.getAttributeId();
+            // 判断groupID是否相等
+            if (!dbAttributeIds.get(attributeId).equals(dbResourceIds.get(resourceId))) {
+                return new Result<>(ResultCode.FAILED_PARAM_INVALID, null);
+            }
+        }
         int result = itResourceService.setResourceValueById(itResourceValues);
         return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
     }

+ 5 - 0
src/main/java/cn/iaun/it/mapper/ItResourceAttributeMapper.java

@@ -1,9 +1,14 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItResourceAttribute;
+import cn.iaun.it.model.vo.resource.ItResourceGroupIdByAttributeIdVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Set;
+
 @Mapper
 public interface ItResourceAttributeMapper extends BaseMapper<ItResourceAttribute> {
+    List<ItResourceGroupIdByAttributeIdVo> selectGroupIdByAttributeId(Set<Long> attributeIds);
 }

+ 5 - 0
src/main/java/cn/iaun/it/mapper/ItResourceMapper.java

@@ -1,9 +1,14 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItResource;
+import cn.iaun.it.model.vo.resource.ItResourceGroupIdByResourceIdVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Set;
+
 @Mapper
 public interface ItResourceMapper extends BaseMapper<ItResource> {
+    List<ItResourceGroupIdByResourceIdVo> selectGroupIdByResourceId(Set<Long> resourceIds);
 }

+ 27 - 0
src/main/java/cn/iaun/it/model/vo/resource/ItResourceGroupIdByAttributeIdVo.java

@@ -0,0 +1,27 @@
+package cn.iaun.it.model.vo.resource;
+
+public class ItResourceGroupIdByAttributeIdVo {
+    private Long attributeId;
+    private Long groupId;
+
+    @Override
+    public String toString() {
+        return "ItResourceGroupIdByAttributeIdVo{" + "attributeId=" + attributeId + ", resourceId=" + groupId + '}';
+    }
+
+    public Long getAttributeId() {
+        return attributeId;
+    }
+
+    public void setAttributeId(Long attributeId) {
+        this.attributeId = attributeId;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+}

+ 30 - 0
src/main/java/cn/iaun/it/model/vo/resource/ItResourceGroupIdByResourceIdVo.java

@@ -0,0 +1,30 @@
+package cn.iaun.it.model.vo.resource;
+
+public class ItResourceGroupIdByResourceIdVo {
+    private Long resourceId;
+    private Long groupId;
+
+    @Override
+    public String toString() {
+        return "ItResourceGroupIdByResourceIdVo{" +
+                "resourceId=" + resourceId +
+                ", groupId=" + groupId +
+                '}';
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+}

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

@@ -3,6 +3,7 @@ package cn.iaun.it.service;
 import cn.iaun.it.model.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -55,4 +56,8 @@ public interface ItResourceService {
     int countResourceValueByAttributeIds(Set<Long> attributeIds);
 
     int countResourceValueByResourceIds(Set<Long> resourceIds);
+
+    HashMap<Long,Long> getGroupIdByAttributeId(Set<Long> attributeIds);
+
+    HashMap<Long,Long> getGroupIdByResourceId(Set<Long> resourceIds);
 }

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

@@ -2,12 +2,16 @@ package cn.iaun.it.service.impl;
 
 import cn.iaun.it.mapper.*;
 import cn.iaun.it.model.*;
+import cn.iaun.it.model.vo.resource.ItResourceGroupIdByAttributeIdVo;
+import cn.iaun.it.model.vo.resource.ItResourceGroupIdByResourceIdVo;
 import cn.iaun.it.service.ItResourceService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -135,8 +139,15 @@ public class ItResourceServiceImpl implements ItResourceService {
 
     @Override
     public int setResourceValueById(List<ItResourceValue> itResourceValues) {
+        List<ItResourceValue> itResourceValuesNoExist = new ArrayList<>();
         for (ItResourceValue itResourceValue : itResourceValues) {
-            itResourceValueMapper.updateResourceValueById(itResourceValue);
+            int count = itResourceValueMapper.updateResourceValueById(itResourceValue);
+            if (count == 0) {
+                itResourceValuesNoExist.add(itResourceValue);
+            }
+        }
+        if (itResourceValuesNoExist.size() != 0) {
+            itResourceValueMapper.insertManyResourceValue(itResourceValuesNoExist);
         }
         return 1;
     }
@@ -150,4 +161,24 @@ public class ItResourceServiceImpl implements ItResourceService {
     public int countResourceValueByResourceIds(Set<Long> list) {
         return itResourceValueMapper.countByResourceIds(list);
     }
+
+    @Override
+    public HashMap<Long, Long> getGroupIdByAttributeId(Set<Long> attributeIds) {
+        List<ItResourceGroupIdByAttributeIdVo> data = itResourceAttributeMapper.selectGroupIdByAttributeId(attributeIds);
+        HashMap<Long, Long> res = new HashMap<>();
+        for (ItResourceGroupIdByAttributeIdVo row : data) {
+            res.put(row.getAttributeId(), row.getGroupId());
+        }
+        return res;
+    }
+
+    @Override
+    public HashMap<Long, Long> getGroupIdByResourceId(Set<Long> resourceIds) {
+        List<ItResourceGroupIdByResourceIdVo> data = itResourceMapper.selectGroupIdByResourceId(resourceIds);
+        HashMap<Long, Long> res = new HashMap<>();
+        for (ItResourceGroupIdByResourceIdVo row : data) {
+            res.put(row.getResourceId(), row.getGroupId());
+        }
+        return res;
+    }
 }

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

@@ -5,6 +5,7 @@ public enum ResultCode {
     FAILED(0, "failed"),
     FAILED_PARAM_ERROR(1001, "参数错误!"),
     FAILED_PARAM_INVALID(1002, "参数无效!"), // 如ID不存在等
+    FAILED_PARAM_FORMAT(1003, "参数格式错误!"),
 
     /* 用户模块 1001XXX */
     USER_WRONG_USER_OR_PASSWORD(1001001, "用户名或密码错误"),

+ 13 - 0
src/main/resources/mapper/ItResourceAttributeMapper.xml

@@ -0,0 +1,13 @@
+<?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.iaun.it.mapper.ItResourceAttributeMapper">
+
+    <select id="selectGroupIdByAttributeId" resultType="cn.iaun.it.model.vo.resource.ItResourceGroupIdByAttributeIdVo">
+        select ra.attribute_id as attribute_id, ra.group_id as group_id
+        from it_resource_attribute ra
+        where
+        <foreach collection="attributeIds" item="item" open="ra.attribute_id IN(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+</mapper>

+ 14 - 0
src/main/resources/mapper/ItResourceMapper.xml

@@ -0,0 +1,14 @@
+<?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.iaun.it.mapper.ItResourceMapper">
+
+    <select id="selectGroupIdByResourceId"
+            resultType="cn.iaun.it.model.vo.resource.ItResourceGroupIdByResourceIdVo">
+        select r.resource_id as resourceId, r.group_id as groupId
+        from it_resource r
+        where
+        <foreach collection="resourceIds" item="item" open="r.resource_id IN(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+</mapper>

+ 23 - 4
src/test/java/cn/iaun/it/ResourceServiceTest.java

@@ -2,15 +2,13 @@ package cn.iaun.it;
 
 import cn.iaun.it.mapper.ItResourceValueMapper;
 import cn.iaun.it.model.ItResourceValue;
+import cn.iaun.it.model.vo.resource.ItResourceGroupIdByAttributeIdVo;
 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.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @SpringBootTest
 public class ResourceServiceTest {
@@ -47,4 +45,25 @@ public class ResourceServiceTest {
         System.out.println(itResourceValueMapper.countByAttributeIds(list));
         System.out.println(itResourceValueMapper.countByResourceIds(list));
     }
+
+    @Test
+    public void selectGroupIdByAttributeIdTest() {
+        Set<Long> attributeSet = new HashSet<>();
+        attributeSet.add(1L);
+        attributeSet.add(2L);
+        attributeSet.add(10L);
+        attributeSet.add(12L);
+        HashMap<Long, Long> dbAttributeIds = itResourceService.getGroupIdByAttributeId(attributeSet);
+        System.out.println(dbAttributeIds);
+    }
+    @Test
+    public void selectGroupIdByResourceIdTest() {
+        Set<Long> resourceSet = new HashSet<>();
+        resourceSet.add(1L);
+        resourceSet.add(2L);
+        resourceSet.add(10L);
+        resourceSet.add(12L);
+        HashMap<Long, Long> dbResourceIds = itResourceService.getGroupIdByResourceId(resourceSet);
+        System.out.println(dbResourceIds);
+    }
 }