实现多库功能

pom.xml

@@ -48,11 +48,11 @@
             <version>3.4.2</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
-<!--            <version>3.2.0</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.2.0</version>
+        </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>

src/main/java/com/dreamchaser/depository_manage/controller/UserController.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.entity.AccesstoAddress;
 import com.dreamchaser.depository_manage.entity.Depository;
-import com.dreamchaser.depository_manage.entity.User;
 import com.dreamchaser.depository_manage.entity.UserByPort;
 import com.dreamchaser.depository_manage.exception.MyException;
 import com.dreamchaser.depository_manage.pojo.*;
@@ -14,7 +13,6 @@ import com.dreamchaser.depository_manage.security.pool.RedisPool;
 import com.dreamchaser.depository_manage.service.AccessAddressService;
 import com.dreamchaser.depository_manage.service.DepositoryService;
 import com.dreamchaser.depository_manage.service.RoleService;
-import com.dreamchaser.depository_manage.service.UserService;
 import com.dreamchaser.depository_manage.utils.*;
 import org.apache.http.protocol.HTTP;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +35,7 @@ import static com.dreamchaser.depository_manage.utils.CrudUtil.deleteHandle;
  */
 @RestController
 public class UserController {
-    @Autowired
-    private UserService userService;
-    @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
+
     @Autowired
     private RoleService roleService;
 
@@ -121,11 +117,6 @@ public class UserController {
     }
 
 
-    @GetMapping("/sys/users")
-    public RestResponse findUsers(@RequestParam Map<String, Object> map) {
-        return new RestResponse(userService.findUserPsByCondition(map), userService.findCount(), 200);
-    }
-
     /**
      * 获取人员列表
      *
@@ -279,44 +270,13 @@ public class UserController {
         }
     }
 
-    @PostMapping("/sys/userRole_edit")
-    public RestResponse editUserRole(@RequestBody Map<String, Object> map) {
-        return CrudUtil.insertHandle(roleService.UpdateRoleAndDepositoryById(map), 1);
-    }
 
     @PostMapping("/sys/userRole_editForIn")
     public RestResponse editUserRoleForIn(@RequestBody Map<String, Object> map) {
         return CrudUtil.insertHandle(roleService.UpdateRoleAndMaterialTypeById(map), 1);
     }
 
-    @PostMapping("/sys/user_detail")
-    public RestResponse updateUser(@RequestBody Map<String, Object> map) {
-        if (map.containsKey("pwd") && map.get("pwd") != "") {
-            //对密码进行加密
-            map.put("pwd", Md5.crypt(String.valueOf(map.get("pwd"))));
-        }
-        if (map.containsKey("state")) {
-            map.put("state", 1);
-        } else {
-            map.put("state", 2);
-        }
-        return CrudUtil.insertHandle(userService.updateUser(map), 1);
-    }
 
-    @DeleteMapping("/sys/user")
-    public RestResponse deleteUser(@RequestBody Map<String, Object> map) {
-        return deleteHandle(userService.changeUserStateToDeleteById(ObjectFormatUtil.toInteger(map.get("id"))), 1);
-    }
-
-    @DeleteMapping("/sys/users")
-    public RestResponse deleteUsers(@RequestBody Map<String, Object> map) {
-        if (map.containsKey("ids")) {
-            List<Integer> ids = (List<Integer>) map.get("ids");
-            return CrudUtil.deleteHandle(userService.changeUserStateToDeleteByIds(ids), ids.size());
-        } else {
-            return CrudUtil.ID_MISS_RESPONSE;
-        }
-    }
 
     /**
      * 根据主键删除管理仓库权限
@@ -365,29 +325,6 @@ public class UserController {
         }
     }
 
-
-    /**
-     * 修改用户密码
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping("/edit_password")
-    public RestResponse editPassword(@RequestBody Map<String, Object> map) {
-        User userByEmail = null;
-        if (map.containsKey("email")) {
-            userByEmail = userService.findUserById((String) map.get("email"));
-        }
-        String old_pwd = Md5.crypt(String.valueOf(map.get("old_password")));
-        if (!old_pwd.equals(userByEmail.getPwd())) {
-            return new RestResponse("", 402, new StatusInfo("修改失败", "旧密码输入错误"));
-        }
-        String new_password = Md5.crypt(String.valueOf(map.get("new_password")));
-        map.put("new_password", new_password);
-        map.put("id", userByEmail.getId());
-        return CrudUtil.insertHandle(userService.updateUserPasswordById(map), 1);
-    }
-
     /**
      * 获取验证码
      *

src/main/java/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.java

@@ -1,7 +1,6 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.AccesstoAddress;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- depository -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.AccesstoAddressMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.AccesstoAddressMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="accesstoAddress" type="com.dreamchaser.depository_manage.entity.AccesstoAddress">

src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.BusinessType;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.dreamchaser.depository_manage.mapper.BusinessTypeMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.BusinessTypeMapper">
     <resultMap id="BusinessTypeMap" type="com.dreamchaser.depository_manage.entity.BusinessType">
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="typeName" column="typeName" jdbcType="VARCHAR"/>

src/main/java/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/CallBackLogMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 
 import com.dreamchaser.depository_manage.entity.CallBackLog;

src/main/java/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/CallBackLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- depository -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.CallBackLogMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.CallBackLogMapper">
     <resultMap id="callBackMap" type="com.dreamchaser.depository_manage.entity.CallBackLog">
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="msg_signature" property="msg_signature" jdbcType="VARCHAR" />

src/main/java/com/dreamchaser/depository_manage/mapper/CompanyMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.Company;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/dreamchaser/depository_manage/mapper/CompanyMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- depository -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.CompanyMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.CompanyMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="companyMap" type="com.dreamchaser.depository_manage.entity.Company">

src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.ConstructionUnit;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.xml

@@ -1,7 +1,7 @@
 <?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="com.dreamchaser.depository_manage.mapper.ConstructionUnitMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.ConstructionUnitMapper">
     <resultMap id="constructionUnitMap" type="com.dreamchaser.depository_manage.entity.ConstructionUnit">
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.Depository;
 import com.dreamchaser.depository_manage.pojo.InventoryByDname;

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- depository -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.DepositoryMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.DepositoryMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="depositoryMap" type="com.dreamchaser.depository_manage.entity.Depository">

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.java

@@ -1,9 +1,8 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- 仓库调度记录(depository_record) -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.DepositoryRecordMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.DepositoryRecordMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="simpleDepositoryRecordMap" type="com.dreamchaser.depository_manage.entity.SimpleDepositoryRecord">

src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.Group;
 import com.dreamchaser.depository_manage.entity.GroupInfo;

src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.dreamchaser.depository_manage.mapper.GroupMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.GroupMapper">
 
     <!-- 字段映射 (用于视图)-->
     <resultMap id="groupInfoMap" type="com.dreamchaser.depository_manage.entity.GroupInfo">

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java

@@ -1,7 +1,6 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.*;
-import com.dreamchaser.depository_manage.pojo.InventoryP;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.xml

@@ -3,7 +3,7 @@
 
 
 <!-- 产品信息记录（库存）(material) -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.MaterialMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.MaterialMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="materialMap" type="com.dreamchaser.depository_manage.entity.Material">

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.java

@@ -1,6 +1,5 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
-import com.dreamchaser.depository_manage.entity.Material;
 import com.dreamchaser.depository_manage.entity.MaterialType;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- material_type -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.MaterialTypeMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.MaterialTypeMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="materialTypeMap" type="com.dreamchaser.depository_manage.entity.MaterialType">

src/main/java/com/dreamchaser/depository_manage/mapper/NoticeMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.java

@@ -1,10 +1,7 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.Notice;
-import com.dreamchaser.depository_manage.entity.UserByPort;
-import com.dreamchaser.depository_manage.pojo.NoticeP;
 import org.apache.ibatis.annotations.Mapper;
-import org.aspectj.weaver.ast.Not;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/com/dreamchaser/depository_manage/mapper/NoticeMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- notice -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.NoticeMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.NoticeMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="noticeMap" type="com.dreamchaser.depository_manage.entity.Notice">

src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.MaterialAndPlace;
 import com.dreamchaser.depository_manage.entity.Place;

src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- notice -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.PlaceMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.PlaceMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="placeMap" type="com.dreamchaser.depository_manage.entity.Place">

src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.PidOrDidAndCode;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- 产品信息记录（库存）(material) -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.QrCodeMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.QrCodeMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
 
 <!--    条形码与物料对应-->

src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.java

@@ -1,6 +1,5 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
-import com.dreamchaser.depository_manage.entity.Role;
 import com.dreamchaser.depository_manage.pojo.RoleAndDepository;
 import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- user -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.RoleMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.RoleMapper">
     <!-- 字段映射（权限） -->
 
     <!--    权限映射-->

src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.SplitInfo;
 import com.dreamchaser.depository_manage.entity.SplitInventory;

src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- user -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.SplitUnitMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.SplitUnitMapper">
     <!-- 字段映射（权限） -->
 
 <!--    权限映射-->

src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.java

@@ -1,9 +1,8 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 
 import com.dreamchaser.depository_manage.entity.StockTaking;
 import com.dreamchaser.depository_manage.entity.StockTakingChild;
-import com.dreamchaser.depository_manage.pojo.StockTakingChildP;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- notice -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.StockTakingMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.StockTakingMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="StockTakingMap" type="com.dreamchaser.depository_manage.entity.StockTaking">

src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.java

@@ -1,4 +1,4 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.TransferRecord;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- transfer_record -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.TransferRecordMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.TransferRecordMapper">
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="transferRecordMap" type="com.dreamchaser.depository_manage.entity.TransferRecord">

src/main/java/com/dreamchaser/depository_manage/mapper/UserMapper.java → src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.java

@@ -1,7 +1,6 @@
-package com.dreamchaser.depository_manage.mapper;
+package com.dreamchaser.depository_manage.depository_mapper;
 
 import com.dreamchaser.depository_manage.entity.User;
-import com.dreamchaser.depository_manage.pojo.SimpleUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dreamchaser/depository_manage/mapper/UserMapper.xml → src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- user -->
-<mapper namespace="com.dreamchaser.depository_manage.mapper.UserMapper">
+<mapper namespace="com.dreamchaser.depository_manage.depository_mapper.UserMapper">
     <!-- 字段映射 -->
     <resultMap id="userMap" type="com.dreamchaser.depository_manage.entity.User">
         <id column="id" property="id" jdbcType="INTEGER" />

src/main/java/com/dreamchaser/depository_manage/mapper/standingBookMapper.xml

@@ -1,143 +0,0 @@
-<?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">
-
-<!-- standing_book -->
-<mapper namespace="mysql.standingBook">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
-    <!-- 字段映射 -->
-    <resultMap id="standingBookMap" type="StandingBook">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="type" property="type" jdbcType="INTEGER" />
-        <result column="quantity" property="quantity" jdbcType="INTEGER" />
-        <result column="price" property="price" jdbcType="INTEGER" />
-        <result column="material_name" property="materialName" jdbcType="VARCHAR" />
-    </resultMap>
-    <!-- This code was generated by TableGo tools, mark 1 end. -->
-    
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        sb.id, sb.type, sb.quantity, sb.price, sb.material_name
-    </sql>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-    
-    <!-- 查询所有数据 -->
-    <select id="findStandingBookAll" resultMap="standingBookMap">
-        SELECT
-        <include refid="allColumns" />
-        FROM standing_book sb
-    </select>
-    
-    <!-- 根据条件参数查询数据列表 -->
-    <select id="findStandingBookByCondition" resultMap="standingBookMap" parameterType="map">
-        SELECT
-        <include refid="allColumns" />
-        FROM standing_book sb WHERE 1 = 1
-        <if test="type != null">
-            AND sb.type = #{type}
-        </if>
-        <if test="quantity != null">
-            AND sb.quantity = #{quantity}
-        </if>
-        <if test="price != null">
-            AND sb.price = #{price}
-        </if>
-        <if test="materialName != null and materialName != ''">
-            AND sb.material_name LIKE CONCAT('%', #{materialName}, '%')
-        </if>
-    </select>
-    
-    <!-- 根据主键查询数据 -->
-    <select id="findStandingBookByIds" resultMap="standingBookMap" parameterType="list">
-        SELECT
-        <include refid="allColumns" />
-        FROM standing_book sb WHERE sb.id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-    
-    <!-- 插入数据 -->
-    <insert id="insertStandingBook" parameterType="map">
-        INSERT INTO standing_book (
-            id, type, quantity, price, material_name
-        ) VALUES (
-            #{id},
-            #{type},
-            #{quantity},
-            #{price},
-            #{materialName}
-        )
-    </insert>
-    
-    <!-- 批量插入数据 -->
-    <insert id="insertStandingBooks" parameterType="list">
-        INSERT INTO standing_book (
-            id, type, quantity, price, material_name
-        ) VALUES
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-                #{item.id},
-                #{item.type},
-                #{item.quantity},
-                #{item.price},
-                #{item.materialName}
-            )
-        </foreach>
-    </insert>
-    
-    <!-- 修改数据 -->
-    <update id="updateStandingBook" parameterType="map">
-        UPDATE standing_book
-        <set>
-            <if test="type != null">
-                type = #{type},
-            </if>
-            <if test="quantity != null">
-                quantity = #{quantity},
-            </if>
-            <if test="price != null">
-                price = #{price},
-            </if>
-            <if test="materialName != null">
-                material_name = #{materialName}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-    
-    <!-- 批量修改数据 -->
-    <update id="updateStandingBooks" parameterType="list">
-        <foreach collection="list" index="index" item="item" separator=";">
-            UPDATE standing_book
-            <set>
-                <if test="item.type != null">
-                    type = #{item.type},
-                </if>
-                <if test="item.quantity != null">
-                    quantity = #{item.quantity},
-                </if>
-                <if test="item.price != null">
-                    price = #{item.price},
-                </if>
-                <if test="item.materialName != null">
-                    material_name = #{item.materialName}
-                </if>
-            </set>
-            WHERE id = #{item.id}
-        </foreach>
-    </update>
-    
-    <!-- 根据主键删除数据 -->
-    <delete id="deleteStandingBookById" parameterType="int">
-        DELETE FROM standing_book WHERE id = #{id}
-    </delete>
-    
-    <!-- 根据主键批量删除数据 -->
-    <delete id="deleteStandingBookByIds" parameterType="list">
-        DELETE FROM standing_book WHERE id IN
-        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

src/main/java/com/dreamchaser/depository_manage/service/UserService.java

@@ -9,137 +9,7 @@ import java.util.Map;
 
 /**
  * user的service层
- * @author Dreamchaser
  */
 public interface UserService {
-    /**
-     * 查询user表的所有数据的行数
-     * @return 行数
-     */
-    Integer findCount();
-
-    /**
-     * 查询user表的符合条件数据的行数
-     * @param map 参数map
-     * @return 符合条件数据的行数
-     */
-    Integer findCountByCondition(Map<String,Object> map);
-
-    /**
-     * 根据主键查询用户
-     * @param id 用户id
-     * @return 用户信息
-     */
-    UserP findUserPById(Integer id);
-    /**
-     * 根据邮箱获取User对象
-     * @param id 邮箱
-     * @return user对象
-     */
-    User findUserById(String id);
-
-    /**
-     * 根据条查询User对象
-     * @param map 参数map
-     * @return user对象
-     */
-    User findUserByCondition(Map<String,Object> map);
-
-    /**
-     * 根据条件查询符合条件的用户集合
-     * @param map 参数map
-     * @return 符合条件的用户集合
-     */
-    List<UserP> findUserPsByCondition(Map<String,Object> map);
-
-    /**
-     * 查询所有的审核人
-     * @return 所有审核人对象
-     */
-    List<User> findReviewers();
-
-    /**
-     * 根据仓库id查询对应的仓管员
-     * @param depositoryId 仓库id
-     * @return 用户名称
-     */
-    List<User> findUsersByDepositoryId(Integer depositoryId);
-
-    /**
-     * 根据参数插入一条用户信息
-     * @param map 参数map
-     * @return 受影响的行数
-     */
-    Integer insertUser(Map<String,Object> map);
-
-    /**
-     * 更新用户信息
-     * @param map 参数map
-     * @return 受影响的行数
-     */
-    Integer updateUser(Map<String,Object> map);
-
-    /**
-     * 更新用户非敏感信息（一般用户自己的修改）
-     * @param map 参数map
-     * @return 受影响的行数
-     */
-    Integer updateUserNoSensitive(Map<String,Object> map);
-
-    /**
-     * 根据id删除用户
-     * @param id 用户id
-     * @return 受影响的行数
-     */
-    Integer deleteUserById(Integer id);
-    /**
-     * 根据id批量删除数据
-     * @param ids 用户id的集合
-     * @return 受影响的行数
-     */
-    Integer deleteUserByIds(List<Integer> ids);
-
-    /**
-     * 根据拥有的user对象包装成前端常用的UserP对象
-     * @param user user对象
-     * @return UserP对象
-     */
-    UserP singlePack(User user);
-
-
-    /**
-     * 根据id将用户状态改为删除
-     * @param id
-     * @return 受影响的行数
-     */
-    Integer changeUserStateToDeleteById(Integer id);
-
-
-    /**
-     * 根据id批量将用户状态改为删除
-     * @param id
-     * @return 受影响的行数
-     */
-    Integer changeUserStateToDeleteByIds(List<Integer> id);
-
-
-    /**
-     * 根据id进行密码修改
-     * @param
-     * @param
-     * @return 受影响行数
-     */
-    Integer updateUserPasswordById(Map<String,Object> map);
-
-
-
-    /**
-     * 根据用户编号获取仓库名称
-     * @param id
-     * @return
-     */
-    String FindDepositoryByUserId(Integer id);
-
-
 
 }

src/main/java/com/dreamchaser/depository_manage/service/impl/AccessAddressServiceImpl.java

@@ -1,7 +1,7 @@
 package com.dreamchaser.depository_manage.service.impl;
 
 import com.dreamchaser.depository_manage.entity.AccesstoAddress;
-import com.dreamchaser.depository_manage.mapper.AccesstoAddressMapper;
+import com.dreamchaser.depository_manage.depository_mapper.AccesstoAddressMapper;
 import com.dreamchaser.depository_manage.service.AccessAddressService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java

@@ -1,7 +1,7 @@
 package com.dreamchaser.depository_manage.service.impl;
 
 import com.dreamchaser.depository_manage.entity.BusinessType;
-import com.dreamchaser.depository_manage.mapper.BusinessTypeMapper;
+import com.dreamchaser.depository_manage.depository_mapper.BusinessTypeMapper;
 import com.dreamchaser.depository_manage.service.BusinessTypeService;
 import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dreamchaser/depository_manage/service/impl/CallBackLogServiceImpl.java

@@ -1,7 +1,7 @@
 package com.dreamchaser.depository_manage.service.impl;
 
 import com.dreamchaser.depository_manage.entity.CallBackLog;
-import com.dreamchaser.depository_manage.mapper.CallBackLogMapper;
+import com.dreamchaser.depository_manage.depository_mapper.CallBackLogMapper;
 import com.dreamchaser.depository_manage.service.CallBackLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java

@@ -6,8 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.config.QyWxConfig;
 import com.dreamchaser.depository_manage.entity.*;
-import com.dreamchaser.depository_manage.mapper.CompanyMapper;
-import com.dreamchaser.depository_manage.mapper.ConstructionUnitMapper;
+import com.dreamchaser.depository_manage.depository_mapper.CompanyMapper;
+import com.dreamchaser.depository_manage.depository_mapper.ConstructionUnitMapper;
 import com.dreamchaser.depository_manage.service.CompanyService;
 import com.dreamchaser.depository_manage.utils.HttpUtils;
 import org.apache.http.protocol.HTTP;

src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java

@@ -1,7 +1,7 @@
 package com.dreamchaser.depository_manage.service.impl;
 
 import com.dreamchaser.depository_manage.entity.ConstructionUnit;
-import com.dreamchaser.depository_manage.mapper.ConstructionUnitMapper;
+import com.dreamchaser.depository_manage.depository_mapper.ConstructionUnitMapper;
 import com.dreamchaser.depository_manage.service.ConstructionUnitService;
 import com.dreamchaser.depository_manage.utils.DateUtil;
 import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -1,6 +1,5 @@
 package com.dreamchaser.depository_manage.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
@@ -8,7 +7,7 @@ import com.dreamchaser.depository_manage.config.QyWxConfig;
 import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.entity.MaterialAndPlace;
 import com.dreamchaser.depository_manage.exception.MyException;
-import com.dreamchaser.depository_manage.mapper.*;
+import com.dreamchaser.depository_manage.depository_mapper.*;
 import com.dreamchaser.depository_manage.pojo.*;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver;
@@ -30,7 +29,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.sql.Time;
 import java.util.*;
 import java.util.concurrent.*;
 

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.entity.*;
-import com.dreamchaser.depository_manage.mapper.*;
+import com.dreamchaser.depository_manage.depository_mapper.*;
 import com.dreamchaser.depository_manage.pojo.InventoryByDname;
 import com.dreamchaser.depository_manage.pojo.InventoryByMTAndDepository;
 import com.dreamchaser.depository_manage.pojo.RoleAndDepository;

src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java

@@ -12,9 +12,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.controller.WebSocketController;
 import com.dreamchaser.depository_manage.entity.*;
-import com.dreamchaser.depository_manage.mapper.ConstructionUnitMapper;
-import com.dreamchaser.depository_manage.mapper.DepositoryRecordMapper;
-import com.dreamchaser.depository_manage.mapper.MaterialMapper;
+import com.dreamchaser.depository_manage.depository_mapper.ConstructionUnitMapper;
+import com.dreamchaser.depository_manage.depository_mapper.DepositoryRecordMapper;
+import com.dreamchaser.depository_manage.depository_mapper.MaterialMapper;
 import com.dreamchaser.depository_manage.security.pool.ExcelFileInfoPool;
 import com.dreamchaser.depository_manage.security.pool.HandlesOtherFunctionalThreadPool;
 import com.dreamchaser.depository_manage.service.*;

src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.exception.MyException;
-import com.dreamchaser.depository_manage.mapper.*;
+import com.dreamchaser.depository_manage.depository_mapper.*;
 import com.dreamchaser.depository_manage.pojo.*;
 import com.dreamchaser.depository_manage.security.pool.RedisPool;
 import com.dreamchaser.depository_manage.security.pool.SendQyWxMessageThreadPool;

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.entity.*;
-import com.dreamchaser.depository_manage.mapper.*;
+import com.dreamchaser.depository_manage.depository_mapper.*;
 import com.dreamchaser.depository_manage.pojo.InventoryP;
 import com.dreamchaser.depository_manage.pojo.MaterialAndPlaceForViewP;
 import com.dreamchaser.depository_manage.pojo.MaterialP;

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.entity.MaterialType;
-import com.dreamchaser.depository_manage.mapper.MaterialTypeMapper;
+import com.dreamchaser.depository_manage.depository_mapper.MaterialTypeMapper;
 import com.dreamchaser.depository_manage.security.pool.RedisPool;
 import com.dreamchaser.depository_manage.service.MaterialTypeService;
 import com.dreamchaser.depository_manage.utils.DateUtil;
@@ -13,7 +13,6 @@ import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.awt.*;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.*;

src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java

@@ -5,7 +5,7 @@ import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.config.QyWxConfig;
 import com.dreamchaser.depository_manage.entity.Notice;
 import com.dreamchaser.depository_manage.entity.UserByPort;
-import com.dreamchaser.depository_manage.mapper.NoticeMapper;
+import com.dreamchaser.depository_manage.depository_mapper.NoticeMapper;
 import com.dreamchaser.depository_manage.pojo.NoticeP;
 import com.dreamchaser.depository_manage.service.NoticeService;
 import com.dreamchaser.depository_manage.utils.DateUtil;

src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java

@@ -2,9 +2,9 @@ package com.dreamchaser.depository_manage.service.impl;
 
 import cn.hutool.core.lang.Snowflake;
 import com.dreamchaser.depository_manage.entity.*;
-import com.dreamchaser.depository_manage.mapper.MaterialMapper;
-import com.dreamchaser.depository_manage.mapper.PlaceMapper;
-import com.dreamchaser.depository_manage.mapper.QrCodeMapper;
+import com.dreamchaser.depository_manage.depository_mapper.MaterialMapper;
+import com.dreamchaser.depository_manage.depository_mapper.PlaceMapper;
+import com.dreamchaser.depository_manage.depository_mapper.QrCodeMapper;
 import com.dreamchaser.depository_manage.pojo.MaterialAndPlaceForViewP;
 import com.dreamchaser.depository_manage.pojo.PlaceP;
 import com.dreamchaser.depository_manage.service.DepositoryService;

src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java

@@ -9,7 +9,7 @@ import com.dreamchaser.depository_manage.config.QyWx_approval_template.*;
 import com.dreamchaser.depository_manage.config.QyWx_template_card.*;
 import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.exception.MyException;
-import com.dreamchaser.depository_manage.mapper.*;
+import com.dreamchaser.depository_manage.depository_mapper.*;
 import com.dreamchaser.depository_manage.pojo.RoleAndDepository;
 import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType;
 import com.dreamchaser.depository_manage.utils.DateUtil;

src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java

@@ -4,9 +4,9 @@ import com.dreamchaser.depository_manage.entity.Depository;
 import com.dreamchaser.depository_manage.entity.MaterialType;
 import com.dreamchaser.depository_manage.entity.UserByPort;
 import com.dreamchaser.depository_manage.exception.MyException;
-import com.dreamchaser.depository_manage.mapper.DepositoryMapper;
-import com.dreamchaser.depository_manage.mapper.MaterialTypeMapper;
-import com.dreamchaser.depository_manage.mapper.RoleMapper;
+import com.dreamchaser.depository_manage.depository_mapper.DepositoryMapper;
+import com.dreamchaser.depository_manage.depository_mapper.MaterialTypeMapper;
+import com.dreamchaser.depository_manage.depository_mapper.RoleMapper;
 import com.dreamchaser.depository_manage.pojo.RoleAndDepository;
 import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType;
 import com.dreamchaser.depository_manage.service.RoleService;

src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java

@@ -2,7 +2,7 @@ package com.dreamchaser.depository_manage.service.impl;
 
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.entity.*;
-import com.dreamchaser.depository_manage.mapper.*;
+import com.dreamchaser.depository_manage.depository_mapper.*;
 import com.dreamchaser.depository_manage.pojo.RoleAndDepository;
 import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType;
 import com.dreamchaser.depository_manage.pojo.SplitInfoP;

src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.exception.MyException;
-import com.dreamchaser.depository_manage.mapper.*;
+import com.dreamchaser.depository_manage.depository_mapper.*;
 import com.dreamchaser.depository_manage.pojo.*;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver;

src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java

@@ -1,174 +0,0 @@
-package com.dreamchaser.depository_manage.service.impl;
-
-import com.dreamchaser.depository_manage.entity.Role;
-import com.dreamchaser.depository_manage.entity.User;
-import com.dreamchaser.depository_manage.mapper.DepositoryMapper;
-import com.dreamchaser.depository_manage.mapper.UserMapper;
-import com.dreamchaser.depository_manage.pojo.UserP;
-import com.dreamchaser.depository_manage.service.UserService;
-import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.thymeleaf.expression.Ids;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class UserServiceImpl implements UserService {
-    static final Map<String,Object> REVIVER_MAP=new HashMap<>(1);
-    static {
-        REVIVER_MAP.put("authority","3");
-    }
-    @Autowired
-    UserMapper userMapper;
-    @Autowired
-    DepositoryMapper depositoryMapper;
-
-    @Override
-    public Integer findCount() {
-        return userMapper.findCount();
-    }
-
-    @Override
-    public Integer findCountByCondition(Map<String, Object> map) {
-        return userMapper.findCountByCondition(map);
-    }
-
-    @Override
-    public UserP findUserPById(Integer id) {
-        return singlePack(userMapper.findUserById(id));
-    }
-
-    @Override
-    public User findUserById(String id) {
-        return userMapper.findUserById(ObjectFormatUtil.toInteger(id));
-    }
-
-    @Override
-    public User findUserByCondition(Map<String, Object> map) {
-        return userMapper.findUserByCondition(map);
-    }
-
-    /**
-     * 根据条件查询符合条件的用户集合
-     * @param map 参数map
-     * @return 符合条件的用户集合
-     */
-    @Override
-    public List<UserP> findUserPsByCondition(Map<String, Object> map) {
-        Integer size = 8,page=1;
-        if (map.containsKey("size")){
-            size= ObjectFormatUtil.toInteger(map.get("size"));
-            map.put("size", size);
-        }
-        if (map.containsKey("page")){
-            page=ObjectFormatUtil.toInteger(map.get("page"));
-            map.put("begin",(page-1)*size);
-        }
-        List<User> list=userMapper.findUsersByCondition(map);
-        return pack(list);
-    }
-
-    @Override
-    public List<User> findReviewers() {
-        return userMapper.findUsersByCondition(REVIVER_MAP);
-    }
-
-    @Override
-    public List<User> findUsersByDepositoryId(Integer depositoryId) {
-        Map<String,Object> map=new HashMap<>(1);
-        map.put("depositoryId",depositoryId);
-        return userMapper.findUsersByCondition(map);
-    }
-
-    @Override
-    public Integer insertUser(Map<String, Object> map) {
-        return userMapper.insertUser(map);
-    }
-
-    @Override
-    public Integer updateUser(Map<String, Object> map) {
-        return userMapper.updateUser(map);
-    }
-
-    @Override
-    public Integer updateUserNoSensitive(Map<String, Object> map) {
-        return userMapper.updateUserNoSensitive(map);
-    }
-
-    @Override
-    public Integer deleteUserById(Integer id) {
-        return userMapper.deleteUserById(id);
-    }
-
-    @Override
-    public Integer deleteUserByIds(List<Integer> ids) {
-        return userMapper.deleteUserByIds(ids);
-    }
-
-    private List<UserP> pack(List<User> list){
-        List<UserP> result=new ArrayList<>(list.size());
-        for (User u:list){
-            result.add(singlePack(u));
-        }
-        return result;
-    }
-    @Override
-    public UserP singlePack(User user){
-        UserP userP=new UserP(user);
-        if (user.getDepositoryId()==-1){
-            userP.setDepositoryName("全部仓库");
-        }else {
-            userP.setDepositoryName(depositoryMapper.findDepositoryNameById(user.getDepositoryId()));
-        }
-        return userP;
-    }
-
-
-    /**
-     * 根据id将用户状态改为删除
-     * @param id
-     * @return 受影响的行数
-     */
-    @Override
-    public Integer changeUserStateToDeleteById(Integer id) {
-        return userMapper.changeUserStateToDeleteById(id);
-    }
-
-    /**
-     * 根据id批量将用户状态改为删除
-     * @param ids
-     * @return 受影响的行数
-     */
-    @Override
-    public Integer changeUserStateToDeleteByIds(List<Integer> ids) {
-        return userMapper.changeUserStateToDeleteByIds(ids);
-    }
-
-    /**
-     * 根据id进行密码修改
-     * @return 受影响行数
-     */
-    @Override
-    public Integer updateUserPasswordById(Map<String,Object> map) {
-        return userMapper.updateUserPasswordById(map);
-    }
-
-
-    /**
-     * 根据用户id查询具体仓库名称
-     * @param id
-     * @return
-     */
-    @Override
-    public String FindDepositoryByUserId(Integer id) {
-        return userMapper.FindDepositoryByUserId(id);
-    }
-
-
-
-}

src/main/resources/application-test.yml

@@ -14,36 +14,45 @@ spring:
       enabled: true
       max-file-size: 100MB       # 单个文件上传的最大上限
       max-request-size: 100MB    # 一次请求总大小上限
-
     ##数据库设置
   datasource:
-    username: root
-    password: root
-    url: jdbc:mysql://localhost:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-    initialSize: 5
-    minIdle: 5
-    maxActive: 10
-    maxWait: 60000
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: SELECT 1 FROM DUAL
-    useGlobalDataSourceStat: true
-    server:
-    port: 9090
-    testWhileIdle: true
-    testOnReturn: false
-    testOnBorrow: false
-    poolPreparedStatements: true
-    maxPoolPreparedStatementPerConnectionSize: 20
-    #配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
-    filters: stat, wall, log4j
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    #超时回收机制
-    removeAbandoned: true
-    removeAbandonedTimeout: 1800
-    logAbandoned: true
+      dynamic:
+        datasource:
+          master:
+            username: root
+            password: root
+            url: jdbc:mysql://127.0.0.1:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
+            driver-class-name: com.mysql.cj.jdbc.Driver
+            type: com.alibaba.druid.pool.DruidDataSource
+            initialSize: 5
+            minIdle: 5
+            maxActive: 10
+            maxWait: 60000
+            timeBetweenEvictionRunsMillis: 60000
+            minEvictableIdleTimeMillis: 300000
+            validationQuery: SELECT 1 FROM DUAL
+            useGlobalDataSourceStat: true
+            server:
+            port: 9090
+            testWhileIdle: true
+            testOnReturn: false
+            testOnBorrow: false
+            poolPreparedStatements: true
+            maxPoolPreparedStatementPerConnectionSize: 20
+            #配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
+            filters: stat, wall, log4j
+            connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+            #超时回收机制
+            removeAbandoned: true
+            removeAbandonedTimeout: 1800
+            logAbandoned: true
+          hr_new:
+            username: hr_new
+            password: AnknKiXiXaxNrw78
+            url: jdbc:mysql://172.20.2.87:3306/hr_new?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
+            driver-class-name: com.mysql.cj.jdbc.Driver
+            type: com.alibaba.druid.pool.DruidDataSource
+
   banner:
     location: banner.txt
   thymeleaf:
@@ -86,6 +95,7 @@ mybatis:
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:*_mapper/*Mapper.xml
 
 file:
   uploadPath: D:/upLoad