仓管员改为可多个

hx-admin/src/main/resources/application-dev.yml

@@ -8,75 +8,75 @@ spring:
                 victoriatourist:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 common:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 oa:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 mes:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 wms:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 item:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 supply:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 base:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 iot:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 customer:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 purchase:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 account:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 sale:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 mail:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 kd100:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 ehsd:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 data:
                     url: jdbc:mysql://36.134.91.96:12333/yf_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 jxst:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
 
     # redis 配置
     redis:

hx-admin/src/main/resources/application-prod.yml

@@ -7,64 +7,64 @@ spring:
             datasource:
                 victoriatourist:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 common:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 oa:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 mes:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 wms:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 item:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 supply:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 base:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 iot:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 customer:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 purchase:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 account:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 sale:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 mail:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 kd100:
                     url: jdbc:mysql://192.168.0.238:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: hx_mysql_byteSailing_rds
-                    password: da~h2swYUI#aj134&y8K
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
 
     # redis 配置
     redis:

hx-admin/src/main/resources/application-test.yml

@@ -8,71 +8,71 @@ spring:
                 victoriatourist:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 common:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 oa:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 mes:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 wms:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 item:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 supply:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 base:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 iot:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 customer:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 purchase:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 account:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 sale:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 mail:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 kd100:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 ehsd:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
                 jxst:
                     url: jdbc:mysql://36.134.91.96:12333/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
-                    password: Fjhx@pwd123
+                    password: 5fWD*oa^nso@kmKa
 
     # redis 配置
     redis:

hx-wms/src/main/java/com/fjhx/wms/entity/warehouse/po/Warehouse.java

@@ -34,8 +34,8 @@ public class Warehouse extends BasePo {
     private String remark;
 
     /**
-     * 仓管员id
+     * 仓管员id 多个可逗号分隔
      */
-    private Long keeperId;
+    private String keeperId;
 
 }

hx-wms/src/main/java/com/fjhx/wms/service/warehouse/impl/WarehouseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.wms.service.warehouse.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.wms.entity.warehouse.dto.WarehouseDto;
@@ -13,8 +14,11 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -35,8 +39,32 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
         wrapper.like("w", Warehouse::getName, dto.getKeyword());
         wrapper.eq("w", Warehouse::getType, dto.getType());
         Page<WarehouseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        if (ObjectUtil.isEmpty(page)) {
+            return page;
+        }
         //赋值仓管员名称
-        UserUtil.assignmentNickName(page.getRecords(), Warehouse::getKeeperId, WarehouseVo::setKeeperName);
+        List<WarehouseVo> records = page.getRecords();
+        List<String> keeperStrIds = new ArrayList<>();
+        for (WarehouseVo record : records) {
+            keeperStrIds.addAll(Arrays.asList(record.getKeeperId().split(",")));
+        }
+        List<Long> keeperIds = keeperStrIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+        Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(keeperIds);
+        for (WarehouseVo record : records) {
+            List<String> nameList = new ArrayList<>();
+            List<String> kStrIds = Arrays.asList(record.getKeeperId().split(","));
+            List<Long> kids = kStrIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+            for (Long kid : kids) {
+                String nickName = nickNameMapByIds.get(kid);
+                if (ObjectUtil.isNotEmpty(nickName)) {
+                    nameList.add(nickName);
+                }
+            }
+            String names = nameList.stream().collect(Collectors.joining(","));
+            record.setKeeperName(names);
+        }
+
+//        UserUtil.assignmentNickName(page.getRecords(), Warehouse::getKeeperId, WarehouseVo::setKeeperName);
         return page;
     }
 
@@ -45,8 +73,20 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
         Warehouse Warehouse = this.getById(id);
         WarehouseVo result = BeanUtil.toBean(Warehouse, WarehouseVo.class);
         //赋值仓管员名称
-        Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(Arrays.asList(result.getKeeperId()));
-        result.setKeeperName(nickNameMapByIds.get(result.getKeeperId()));
+//        Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(Arrays.asList(result.getKeeperId()));
+//        result.setKeeperName(nickNameMapByIds.get(result.getKeeperId()));
+        List<String> nameList = new ArrayList<>();
+        List<String> kStrIds = Arrays.asList(result.getKeeperId().split(","));
+        List<Long> kids = kStrIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+        Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(kids);
+        for (Long kid : kids) {
+            String nickName = nickNameMapByIds.get(kid);
+            if (ObjectUtil.isNotEmpty(nickName)) {
+                nameList.add(nickName);
+            }
+        }
+        String names = nameList.stream().collect(Collectors.joining(","));
+        result.setKeeperName(names);
         return result;
     }