From 47322f4748389e2f260e83c7d053089a70c9ed60 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 19 Jul 2023 13:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=A4=9A=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +- .../controller/UserController.java | 65 +------ .../AccesstoAddressMapper.java | 3 +- .../AccesstoAddressMapper.xml | 2 +- .../BusinessTypeMapper.java | 2 +- .../BusinessTypeMapper.xml | 2 +- .../CallBackLogMapper.java | 2 +- .../CallBackLogMapper.xml | 2 +- .../CompanyMapper.java | 2 +- .../CompanyMapper.xml | 2 +- .../ConstructionUnitMapper.java | 2 +- .../ConstructionUnitMapper.xml | 2 +- .../DepositoryMapper.java | 2 +- .../DepositoryMapper.xml | 2 +- .../DepositoryRecordMapper.java | 3 +- .../DepositoryRecordMapper.xml | 2 +- .../GroupMapper.java | 2 +- .../GroupMapper.xml | 2 +- .../MaterialMapper.java | 3 +- .../MaterialMapper.xml | 2 +- .../MaterialTypeMapper.java | 3 +- .../MaterialTypeMapper.xml | 2 +- .../NoticeMapper.java | 5 +- .../NoticeMapper.xml | 2 +- .../PlaceMapper.java | 2 +- .../PlaceMapper.xml | 2 +- .../QrCodeMapper.java | 2 +- .../QrCodeMapper.xml | 2 +- .../RoleMapper.java | 3 +- .../RoleMapper.xml | 2 +- .../SplitUnitMapper.java | 2 +- .../SplitUnitMapper.xml | 2 +- .../StockTakingMapper.java | 3 +- .../StockTakingMapper.xml | 2 +- .../TransferRecordMapper.java | 2 +- .../TransferRecordMapper.xml | 2 +- .../UserMapper.java | 3 +- .../UserMapper.xml | 2 +- .../mapper/standingBookMapper.xml | 143 -------------- .../service/UserService.java | 130 ------------- .../impl/AccessAddressServiceImpl.java | 2 +- .../service/impl/BusinessTypeServiceImpl.java | 2 +- .../service/impl/CallBackLogServiceImpl.java | 2 +- .../service/impl/CompanyServiceImpl.java | 4 +- .../impl/ConstructionUnitServiceImpl.java | 2 +- .../impl/DepositoryRecordServiceImpl.java | 4 +- .../service/impl/DepositoryServiceImpl.java | 2 +- .../service/impl/ExcelServiceImpl.java | 6 +- .../service/impl/GroupServiceImpl.java | 2 +- .../service/impl/MaterialServiceImpl.java | 2 +- .../service/impl/MaterialTypeServiceImpl.java | 3 +- .../service/impl/NoticeServiceImpl.java | 2 +- .../service/impl/PlaceServiceImpl.java | 6 +- .../service/impl/QyWxOperationService.java | 2 +- .../service/impl/RoleServiceImpl.java | 6 +- .../service/impl/SplitUnitServiceImpl.java | 2 +- .../service/impl/StockTakingServiceImpl.java | 2 +- .../service/impl/UserServiceImpl.java | 174 ------------------ src/main/resources/application-test.yml | 66 ++++--- 59 files changed, 104 insertions(+), 617 deletions(-) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/AccesstoAddressMapper.java (91%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/AccesstoAddressMapper.xml (97%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/BusinessTypeMapper.java (97%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/BusinessTypeMapper.xml (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/CallBackLogMapper.java (89%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/CallBackLogMapper.xml (93%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/CompanyMapper.java (96%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/CompanyMapper.xml (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/ConstructionUnitMapper.java (96%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/ConstructionUnitMapper.xml (97%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/DepositoryMapper.java (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/DepositoryMapper.xml (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/DepositoryRecordMapper.java (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/DepositoryRecordMapper.xml (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/GroupMapper.java (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/GroupMapper.xml (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/MaterialMapper.java (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/MaterialMapper.xml (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/MaterialTypeMapper.java (96%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/MaterialTypeMapper.xml (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/NoticeMapper.java (91%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/NoticeMapper.xml (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/PlaceMapper.java (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/PlaceMapper.xml (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/QrCodeMapper.java (96%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/QrCodeMapper.xml (97%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/RoleMapper.java (97%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/RoleMapper.xml (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/SplitUnitMapper.java (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/SplitUnitMapper.xml (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/StockTakingMapper.java (97%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/StockTakingMapper.xml (99%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/TransferRecordMapper.java (92%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/TransferRecordMapper.xml (98%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/UserMapper.java (96%) rename src/main/java/com/dreamchaser/depository_manage/{mapper => depository_mapper}/UserMapper.xml (99%) delete mode 100644 src/main/java/com/dreamchaser/depository_manage/mapper/standingBookMapper.xml delete mode 100644 src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java diff --git a/pom.xml b/pom.xml index 8d6c476b..11957ce1 100644 --- a/pom.xml +++ b/pom.xml @@ -48,11 +48,11 @@ 3.4.2 - - - - - + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.2.0 + ch.qos.logback diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java index e9998c07..b41939bc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java +++ b/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 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 map) { - return CrudUtil.insertHandle(roleService.UpdateRoleAndDepositoryById(map), 1); - } @PostMapping("/sys/userRole_editForIn") public RestResponse editUserRoleForIn(@RequestBody Map map) { return CrudUtil.insertHandle(roleService.UpdateRoleAndMaterialTypeById(map), 1); } - @PostMapping("/sys/user_detail") - public RestResponse updateUser(@RequestBody Map 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 map) { - return deleteHandle(userService.changeUserStateToDeleteById(ObjectFormatUtil.toInteger(map.get("id"))), 1); - } - - @DeleteMapping("/sys/users") - public RestResponse deleteUsers(@RequestBody Map map) { - if (map.containsKey("ids")) { - List ids = (List) 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 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); - } - /** * 获取验证码 * diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.java similarity index 91% rename from src/main/java/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.java index a343c700..9ae3c222 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.xml similarity index 97% rename from src/main/java/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.xml index b412adc9..97612ef9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/AccesstoAddressMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.java similarity index 97% rename from src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.java index ce89377f..2ea8c09c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.xml similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.xml index 14b77fbf..eb035a04 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CallBackLogMapper.java similarity index 89% rename from src/main/java/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/CallBackLogMapper.java index 3d65816d..ecb69d21 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CallBackLogMapper.xml similarity index 93% rename from src/main/java/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/CallBackLogMapper.xml index 7899d337..9bade72b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/CallBackLogMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CallBackLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/CompanyMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.java similarity index 96% rename from src/main/java/com/dreamchaser/depository_manage/mapper/CompanyMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.java index 241b740b..4c3186f0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/CompanyMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/CompanyMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.xml similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/CompanyMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.xml index 7d530af5..5ec1201a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/CompanyMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.java similarity index 96% rename from src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.java index afb50d28..20d6d131 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.xml similarity index 97% rename from src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.xml index cd2245f4..eb5df644 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java index 3e8694c0..c0102919 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.xml index a83543b6..af50c9f9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.java similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.java index 14d5dc37..03357558 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml index 47c284a3..cfb22ee0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.java similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.java index 3cbc5820..9f068878 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.xml index d12d182d..41f261b1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java index 3f89215d..61a6c341 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.xml index 2a96a382..150f8eff 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.java similarity index 96% rename from src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.java index a4daeb14..b26447eb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.xml similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.xml index c3f2c93d..9634bcd6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/NoticeMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.java similarity index 91% rename from src/main/java/com/dreamchaser/depository_manage/mapper/NoticeMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.java index ec11c783..cdb13670 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/NoticeMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/NoticeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.xml similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/NoticeMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.xml index 20d1b81b..6310ceb6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/NoticeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java index 42d5f8d6..41922800 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.xml index 9bab9ccb..92f2324a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.java similarity index 96% rename from src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.java index 124db19c..f3122082 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.xml similarity index 97% rename from src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.xml index ab0748e2..118538ab 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.java similarity index 97% rename from src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.java index 06b918b8..59392c2e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.xml index a716c617..f5a18d7b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.java similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.java index 9fbe5f4c..0db22ef2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.xml index 7fed807a..692f0f23 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.java similarity index 97% rename from src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.java index 98a8c8c7..93b60e05 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.xml index 404fa81b..b70f5c4e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.java similarity index 92% rename from src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.java index 894cff4d..f7a48a9a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.xml similarity index 98% rename from src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.xml index f1610c01..44679132 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/UserMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.java similarity index 96% rename from src/main/java/com/dreamchaser/depository_manage/mapper/UserMapper.java rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.java index 19c2ac21..6d2c5831 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/UserMapper.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/UserMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.xml similarity index 99% rename from src/main/java/com/dreamchaser/depository_manage/mapper/UserMapper.xml rename to src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.xml index 12fac73b..2b59b856 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/UserMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/standingBookMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/standingBookMapper.xml deleted file mode 100644 index 58511934..00000000 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/standingBookMapper.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - sb.id, sb.type, sb.quantity, sb.price, sb.material_name - - - - - - - - - - - - - - - INSERT INTO standing_book ( - id, type, quantity, price, material_name - ) VALUES ( - #{id}, - #{type}, - #{quantity}, - #{price}, - #{materialName} - ) - - - - - INSERT INTO standing_book ( - id, type, quantity, price, material_name - ) VALUES - - ( - #{item.id}, - #{item.type}, - #{item.quantity}, - #{item.price}, - #{item.materialName} - ) - - - - - - UPDATE standing_book - - - type = #{type}, - - - quantity = #{quantity}, - - - price = #{price}, - - - material_name = #{materialName} - - - WHERE id = #{id} - - - - - - UPDATE standing_book - - - type = #{item.type}, - - - quantity = #{item.quantity}, - - - price = #{item.price}, - - - material_name = #{item.materialName} - - - WHERE id = #{item.id} - - - - - - DELETE FROM standing_book WHERE id = #{id} - - - - - DELETE FROM standing_book WHERE id IN - - #{id} - - - \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/service/UserService.java b/src/main/java/com/dreamchaser/depository_manage/service/UserService.java index 1e19115b..2f93fae2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/UserService.java +++ b/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 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 map); - - /** - * 根据条件查询符合条件的用户集合 - * @param map 参数map - * @return 符合条件的用户集合 - */ - List findUserPsByCondition(Map map); - - /** - * 查询所有的审核人 - * @return 所有审核人对象 - */ - List findReviewers(); - - /** - * 根据仓库id查询对应的仓管员 - * @param depositoryId 仓库id - * @return 用户名称 - */ - List findUsersByDepositoryId(Integer depositoryId); - - /** - * 根据参数插入一条用户信息 - * @param map 参数map - * @return 受影响的行数 - */ - Integer insertUser(Map map); - - /** - * 更新用户信息 - * @param map 参数map - * @return 受影响的行数 - */ - Integer updateUser(Map map); - - /** - * 更新用户非敏感信息（一般用户自己的修改） - * @param map 参数map - * @return 受影响的行数 - */ - Integer updateUserNoSensitive(Map map); - - /** - * 根据id删除用户 - * @param id 用户id - * @return 受影响的行数 - */ - Integer deleteUserById(Integer id); - /** - * 根据id批量删除数据 - * @param ids 用户id的集合 - * @return 受影响的行数 - */ - Integer deleteUserByIds(List 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 id); - - - /** - * 根据id进行密码修改 - * @param - * @param - * @return 受影响行数 - */ - Integer updateUserPasswordById(Map map); - - - - /** - * 根据用户编号获取仓库名称 - * @param id - * @return - */ - String FindDepositoryByUserId(Integer id); - - } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/AccessAddressServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/AccessAddressServiceImpl.java index 3acbf6e5..cab94975 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/AccessAddressServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java index e1394fa8..43768682 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/CallBackLogServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/CallBackLogServiceImpl.java index cfab7a4c..9c947512 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/CallBackLogServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java index 97c91179..ba977cc5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java index bd5d586a..af54c63f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index abe5af63..a1fac04f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/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.*; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java index ceeed0d0..b5680a60 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index 6e490699..3feeba31 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/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.*; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index c52a1c67..88aeed7a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index 7e934dd6..ed1bde49 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java index 19be7cfa..33c7d3dc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java +++ b/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.*; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java index 19cf0cb7..abcd6299 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java index a1dc8898..2ccb3752 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index 76a10430..d417a1a3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java index 35c601d2..e36dd0dd 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java index c98af4cb..8c7bb3d3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java index 1ca8984a..0f760fb0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java deleted file mode 100644 index 3af0a3a0..00000000 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java +++ /dev/null @@ -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 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 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 map) { - return userMapper.findUserByCondition(map); - } - - /** - * 根据条件查询符合条件的用户集合 - * @param map 参数map - * @return 符合条件的用户集合 - */ - @Override - public List findUserPsByCondition(Map 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 list=userMapper.findUsersByCondition(map); - return pack(list); - } - - @Override - public List findReviewers() { - return userMapper.findUsersByCondition(REVIVER_MAP); - } - - @Override - public List findUsersByDepositoryId(Integer depositoryId) { - Map map=new HashMap<>(1); - map.put("depositoryId",depositoryId); - return userMapper.findUsersByCondition(map); - } - - @Override - public Integer insertUser(Map map) { - return userMapper.insertUser(map); - } - - @Override - public Integer updateUser(Map map) { - return userMapper.updateUser(map); - } - - @Override - public Integer updateUserNoSensitive(Map map) { - return userMapper.updateUserNoSensitive(map); - } - - @Override - public Integer deleteUserById(Integer id) { - return userMapper.deleteUserById(id); - } - - @Override - public Integer deleteUserByIds(List ids) { - return userMapper.deleteUserByIds(ids); - } - - private List pack(List list){ - List 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 ids) { - return userMapper.changeUserStateToDeleteByIds(ids); - } - - /** - * 根据id进行密码修改 - * @return 受影响行数 - */ - @Override - public Integer updateUserPasswordById(Map map) { - return userMapper.updateUserPasswordById(map); - } - - - /** - * 根据用户id查询具体仓库名称 - * @param id - * @return - */ - @Override - public String FindDepositoryByUserId(Integer id) { - return userMapper.FindDepositoryByUserId(id); - } - - - -} diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 0e237658..9caeeda9 100644 --- a/src/main/resources/application-test.yml +++ b/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 \ No newline at end of file