From 9030279e27a0d496af301cc1405c163843cae327 Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 16 May 2023 13:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/doc/wms.xls | Bin 293376 -> 301056 bytes .../service/role/impl/SysRoleServiceImpl.java | 1 + .../wms/sch/task/core/task/TaskListType.java | 1 + .../sch/task/core/task/TaskServiceImpl.java | 34 +++++ .../wms/sch/task/core/task/core/BaseTask.java | 1 + .../sch/task/core/task/core/BaseTaskDto.java | 11 ++ .../sch/task/core/task/core/TaskApplyDto.java | 1 + .../task/core/task/core/TaskApplyType.java | 28 ++++ .../wms/sch/task/core/task/core/TaskDto.java | 11 ++ .../task/core/task/core/TaskInterface.java | 1 + .../task/core/task/core/TaskOperateType.java | 1 + .../sch/task/core/task/core/TaskStatus.java | 1 + .../sch/task/core/task/tasks/HNMLTask.java | 1 + .../impl/SchBaseTaskconfigServiceImpl.java | 16 ++- .../src/main/resources/application.yml | 120 ---------------- .../main/resources/config/application-dev.yml | 6 +- .../src/views/wms/pdm/workerorder/index.vue | 44 +++--- nladmin-ui/src/views/wms/sch/group/index.vue | 129 +++++++++--------- nladmin-ui/src/views/wms/sch/point/index.vue | 4 +- nladmin-ui/src/views/wms/sch/region/index.vue | 10 +- .../src/views/wms/sch/task/config/index.vue | 124 ++++++++--------- 21 files changed, 258 insertions(+), 287 deletions(-) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskServiceImpl.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTaskDto.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyType.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskDto.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java delete mode 100644 nladmin-system/nlsso-server/src/main/resources/application.yml diff --git a/nladmin-system/doc/wms.xls b/nladmin-system/doc/wms.xls index 92b30e99e2ff647c9f2b304296421ab692b91f54..e3b6c797f04df40b8f2993a72a36cc0858266b26 100644 GIT binary patch delta 24401 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 DI7^>= delta 18049 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 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index 70edee8..086c4d6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -65,6 +65,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl //判断角色名字是否存在 SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName())); if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); + String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java new file mode 100644 index 0000000..ddb160b --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java @@ -0,0 +1 @@ +package org.nl.wms.sch.task.core.task; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskServiceImpl.java new file mode 100644 index 0000000..9f2c900 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskServiceImpl.java @@ -0,0 +1,34 @@ +package org.nl.wms.sch.task.core.task; + +import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.exception.BadRequestException; + +/** + * @author ldjun + * @version 1.0 + * @date 2023年05月08日 13:59 + * @desc desc + */ +public class TaskServiceImpl { + String create(JSONObject param) throws BadRequestException { + + + return null; + } + + public void beforeToCreate(JSONObject param) throws BadRequestException { + String point_code = param.getString("point_code"); + Assert.notEmpty(point_code, "点位编码为空!"); + //1、查找点位 + //2、校验点位是否启用 + //3、校验点位是否自动 + //4、任务类型 + + + } + + public void createAfter(JSONObject param) throws BadRequestException { + + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java new file mode 100644 index 0000000..b2fc7e8 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java @@ -0,0 +1 @@ +package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTaskDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTaskDto.java new file mode 100644 index 0000000..3d0242a --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTaskDto.java @@ -0,0 +1,11 @@ +package org.nl.wms.sch.task.core.task.core; + +/** + * @author ldjun + * @version 1.0 + * @date 2023年05月08日 13:35 + * @desc desc + */ +public class BaseTaskDto { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java new file mode 100644 index 0000000..b2fc7e8 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java @@ -0,0 +1 @@ +package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyType.java new file mode 100644 index 0000000..b74b402 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyType.java @@ -0,0 +1,28 @@ +package org.nl.wms.sch.task.core.task.core; + +/** + * @author ldjun + * @version 1.0 + * @date 2023年05月08日 10:27 + * @desc desc + */ + +public enum TaskApplyType { + SEND_MATERIAL(1, "送料", "送料"), + SEND_EMPTY(2, "送空载具", "送空载具"), + CALL_MATERIAL(3, "叫料", "叫料"), + CALL_EMPTY(4, "叫空载具", "叫空载具"); + + TaskApplyType(int code, String name, String desc) { + this.code = code; + this.name = name; + this.desc = desc; + } + + // 操作设备类型编码 + private int code; + // 操作设备类型名字 + private String name; + //操作设备类型类型 + private String desc; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskDto.java new file mode 100644 index 0000000..7986223 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskDto.java @@ -0,0 +1,11 @@ +package org.nl.wms.sch.task.core.task.core; + +/** + * @author ldjun + * @version 1.0 + * @date 2023年05月08日 13:41 + * @desc desc + */ +public class TaskDto { + private String task_code; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java new file mode 100644 index 0000000..b2fc7e8 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java @@ -0,0 +1 @@ +package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java new file mode 100644 index 0000000..b2fc7e8 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java @@ -0,0 +1 @@ +package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java new file mode 100644 index 0000000..b2fc7e8 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java @@ -0,0 +1 @@ +package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java new file mode 100644 index 0000000..192e479 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java @@ -0,0 +1 @@ +package org.nl.wms.sch.task.core.task.tasks; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java index 64d0ed0..0050f4f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.sch.task.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -21,10 +22,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-05-15 + **/ @Slf4j @Service public class SchBaseTaskconfigServiceImpl extends ServiceImpl implements ISchBaseTaskconfigService { @@ -33,7 +34,7 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); schBaseTaskconfigMapper.selectPage(pages, lam); @@ -42,11 +43,14 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl().eq(SchBaseTaskconfig::getConfig_code, entity.getConfig_code())); + if (ObjectUtil.isNotEmpty(schBaseTaskconfig)) + throw new BadRequestException("任务配置【" + entity.getConfig_code() + "】已存在!"); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - entity.setConfig_code(IdUtil.getSnowflake(1, 1).nextIdStr()); entity.setCreate_id(currentUserId); entity.setCreate_name(nickName); entity.setCreate_time(now); diff --git a/nladmin-system/nlsso-server/src/main/resources/application.yml b/nladmin-system/nlsso-server/src/main/resources/application.yml deleted file mode 100644 index df46a2c..0000000 --- a/nladmin-system/nlsso-server/src/main/resources/application.yml +++ /dev/null @@ -1,120 +0,0 @@ -# 端口 -server: - port: 9000 - -# Sa-Token 配置 -sa-token: - # ------- SSO-模式一相关配置 (非模式一不需要配置) - -# 配置 Cookie 作用域 - -# ------- SSO-模式二相关配置 - sso: - # Ticket有效期 (单位: 秒)，默认五分钟 - ticket-timeout: 300 - # 所有允许的授权回调地址比较重要 - allow-url: "*" - # 是否打开单点注销功能 - is-slo: true - # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开） -# # 是否打开模式三 - isHttp: true -# # 接口调用秘钥（用于SSO模式三的单点注销功能） - secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor - token-name: EL-ADMIN-TOEKN -# # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明） -# -spring: - #配置 Jpa - jpa: - hibernate: - ddl-auto: none - open-in-view: true - properties: - hibernate: - dialect: org.hibernate.dialect.MySQL5InnoDBDialect - enable_lazy_load_no_trans: true - # 数据源 - datasource: - druid: - db-type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - username: ${DB_USER:root} - password: ${DB_PWD:P@ssw0rd} - # username: ${DB_USER:root} - # password: ${DB_PWD:root} - # 初始连接数 - initial-size: 5 - # 最小连接数 - min-idle: 15 - # 最大连接数 - max-active: 30 - # 是否自动回收超时连接 - remove-abandoned: true - # 超时时间(以秒数为单位) - remove-abandoned-timeout: 180 - # 获取连接超时时间 - max-wait: 300 - # 连接有效性检测时间 - time-between-eviction-runs-millis: 60000 - # 连接在池中最小生存的时间 - min-evictable-idle-time-millis: 300000 - # 连接在池中最大生存的时间 - max-evictable-idle-time-millis: 900000 - # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除 - test-while-idle: true - # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个 - test-on-borrow: true - # 是否在归还到池中前进行检验 - test-on-return: false - # 检测连接是否有效 - validation-query: select 1 - # 配置监控统计 -# webStatFilter: -# enabled: true -# stat-view-servlet: -# enabled: true -# url-pattern: /druid/* -# reset-enable: false -# filter: -# stat: -# enabled: true -# # 记录慢SQL -# log-slow-sql: true -# slow-sql-millis: 1000 -# merge-sql: true -# wall: -# config: -# multi-statement-allow: true - - # Redis配置 （SSO模式一和模式二使用Redis来同步会话） - redis: - # Redis数据库索引（默认为0） - database: 1 - # Redis服务器地址 - host: 47.96.133.178 - # Redis服务器连接端口 - port: 6479 - # Redis服务器连接密码（默认为空） - password: 942464Yy - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池最大连接数 - max-active: 200 - # 连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms - # 连接池中的最大空闲连接 - max-idle: 10 - # 连接池中的最小空闲连接 - min-idle: 0 - -forest: - # 关闭 forest 请求日志打印 - log-enabled: false - - - diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 7e2d7ef..28b29e5 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -7,10 +7,10 @@ spring: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:nl-sso-server}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} -# password: ${DB_PWD:Root.123456} - password: ${DB_PWD:12356} + password: ${DB_PWD:P@ssw0rd} +# password: ${DB_PWD:P@ssw0rd} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 5dfdd47..fcbb41c 100644 --- a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -13,61 +13,61 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - +
@@ -94,7 +94,7 @@ - + diff --git a/nladmin-ui/src/views/wms/sch/group/index.vue b/nladmin-ui/src/views/wms/sch/group/index.vue index 3a33bca..675d060 100644 --- a/nladmin-ui/src/views/wms/sch/group/index.vue +++ b/nladmin-ui/src/views/wms/sch/group/index.vue @@ -5,73 +5,74 @@ - - + + - + - - - - - + + + - + - + - + - + - + - + - + - + - - + + - + - - - - + + - - - - + + - + - + - - + + - - + + - - + + +
@@ -82,33 +83,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +