refactor: 统一分包格式

web/src/main/java/seecoder/devcloud/web/dao/InsertUpdateSqlProvider.java → web/src/main/java/seecoder/devcloud/web/dao/GeneralInsertUpdateSqlProvider.java

@@ -10,9 +10,11 @@ import java.util.stream.Collectors;
 /**
  * @author PuHong Weng
  * @date 2021/3/1
- * @description: 帮助快速写插入和更新的，注意 pojo类的字段要和数据库表对应, 用法示例见 UserMapper.class
+ * @description: 避免写繁琐的插入和更新的方法的，注意 pojo类的字段要和数据库表对应, 用法示例见 UserMapper.class
+ * 插入单个参数（除了ignoredCols以外的参数）时，mapper写方法就行，实例见 UserMapper.insert
+ * 插入多个参数（除了ignoredCols以外的参数）时，mapper方法参数要加@Param说明，实例见 GroupMemberMapper.insert
  */
-public class InsertUpdateSqlProvider {
+public class GeneralInsertUpdateSqlProvider {
 
     /**
      * @param obj 插入对象, 用来获取字段和表名

web/src/main/java/seecoder/devcloud/web/dataMapper/provider/TreeNodeProvider.java → web/src/main/java/seecoder/devcloud/web/dao/provider/TreeNodeProvider.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.web.dataMapper.provider;
+package seecoder.devcloud.web.dao.provider;
 
 import org.apache.ibatis.jdbc.SQL;
 import seecoder.devcloud.web.po.TreeNode;

web/src/main/java/seecoder/devcloud/web/dataMapper/TreeNodeMapper.java → web/src/main/java/seecoder/devcloud/web/dao/tree/TreeNodeMapper.java

@@ -1,10 +1,9 @@
-package seecoder.devcloud.web.dataMapper;
+package seecoder.devcloud.web.dao.tree;
 
 
 import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.type.EnumOrdinalTypeHandler;
 import org.springframework.stereotype.Repository;
-import seecoder.devcloud.web.dataMapper.provider.TreeNodeProvider;
+import seecoder.devcloud.web.dao.provider.TreeNodeProvider;
 import seecoder.devcloud.web.po.TreeNode;
 
 import java.util.List;

web/src/main/java/seecoder/devcloud/web/dao/user/GroupMapper.java

@@ -3,12 +3,8 @@ package seecoder.devcloud.web.dao.user;
 
 
 import org.apache.ibatis.annotations.*;
-import seecoder.devcloud.web.dao.InsertUpdateSqlProvider;
+import seecoder.devcloud.web.dao.GeneralInsertUpdateSqlProvider;
 import seecoder.devcloud.web.po.user.Group;
-import seecoder.devcloud.web.po.user.User;
-
-import java.awt.geom.GeneralPath;
-import java.util.List;
 
 /**
  * @author PuHong Weng
@@ -22,10 +18,10 @@ public interface GroupMapper {
     /**
      * id并非由此后端生成，而是gitlab创建后，将gitlab groupid填入
      */
-    @InsertProvider(type = InsertUpdateSqlProvider.class, method = "insert")
+    @InsertProvider(type = GeneralInsertUpdateSqlProvider.class, method = "insert")
     int insert(Group group,String... ignoredCols);
 
-    @UpdateProvider(type= InsertUpdateSqlProvider.class, method="updateById")
+    @UpdateProvider(type= GeneralInsertUpdateSqlProvider.class, method="updateById")
     int update(Group group);
 
     @Select("select * from `group` where id = #{id}")
@@ -35,7 +31,6 @@ public interface GroupMapper {
     Group findGroupByName(String name);
 
     @Select("select *, id as group_id from `group` where id = #{id}")
-
     @Result(column = "group_id", property = "members", many = @Many(select = "seecoder.devcloud.web.dao.user.GroupMemberMapper.selectUsersByGroupId"))
     Group findWithMembersById(Integer id);
 

web/src/main/java/seecoder/devcloud/web/dao/user/UserMapper.java

@@ -2,14 +2,9 @@ package seecoder.devcloud.web.dao.user;
 
 
 import org.apache.ibatis.annotations.*;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import seecoder.devcloud.web.dao.InsertUpdateSqlProvider;
+import seecoder.devcloud.web.dao.GeneralInsertUpdateSqlProvider;
 import seecoder.devcloud.web.po.user.User;
 
-import java.sql.Timestamp;
-import java.util.List;
-
 
 @Mapper
 public interface UserMapper {
@@ -17,10 +12,10 @@ public interface UserMapper {
 	/**
 	 * 这里的id是取自gitlab的用户id，所以不需要自增和回填
 	 */
-	@InsertProvider(type = InsertUpdateSqlProvider.class, method = "insert")
+	@InsertProvider(type = GeneralInsertUpdateSqlProvider.class, method = "insert")
 	int insert(User user,String... ignoredCols);
 
-	@UpdateProvider(type= InsertUpdateSqlProvider.class, method="updateById")
+	@UpdateProvider(type= GeneralInsertUpdateSqlProvider.class, method="updateById")
 	int updateById(User user);
 
 	@Delete("delete from user where id = #{id}")

web/src/main/java/seecoder/devcloud/web/service/impl/tree/TreeNodeServiceImpl.java

@@ -3,7 +3,7 @@ package seecoder.devcloud.web.service.impl.tree;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.web.dataMapper.TreeNodeMapper;
+import seecoder.devcloud.web.dao.tree.TreeNodeMapper;
 import seecoder.devcloud.web.po.TreeNode;
 import seecoder.devcloud.web.service.TreeNodeService;
 

web/src/test/java/seecoder/devcloud/web/dataMapper/TreeNodeMapperTest.java

@@ -5,8 +5,8 @@ import org.junit.runner.RunWith;
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import seecoder.devcloud.web.dao.tree.TreeNodeMapper;
 import seecoder.devcloud.web.enums.NodeStateEnum;
 import seecoder.devcloud.web.enums.NodeTypeEnum;
 import seecoder.devcloud.web.po.TreeNode;