diff --git a/.flattened-pom.xml b/.flattened-pom.xml deleted file mode 100644 index ffd8b46..0000000 --- a/.flattened-pom.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - 4.0.0 - - top.continew - continew-starter - 2.9.0 - - top.wms - wms-admin - 3.6.0-SNAPSHOT - pom - 园区管理系统 - https://github.com/wms-org/wms-admin - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - - wms-webapi - wms-module-system - wms-plugin - wms-common - wms-extension - - - 3.6.0-SNAPSHOT - - - - - top.wms - wms-webapi - 3.6.0-SNAPSHOT - - - top.wms - wms-module-system - 3.6.0-SNAPSHOT - - - top.wms - wms-common - 3.6.0-SNAPSHOT - - - top.wms - wms-plugin-schedule - 3.6.0-SNAPSHOT - - - top.wms - wms-plugin-generator - 3.6.0-SNAPSHOT - - - - - - cn.hutool - hutool-all - - - org.projectlombok - lombok - true - - - org.mapstruct - mapstruct - 1.5.5.Final - - - org.mapstruct - mapstruct-processor - 1.5.5.Final - - - commons-fileupload - commons-fileupload - 1.4 - - - commons-io - commons-io - 2.8.0 - - - com.google.guava - guava - 29.0-jre - - - - - huawei-mirror - HuaweiCloud Mirror - https://mirrors.huaweicloud.com/repository/maven/ - - - ali-mirror - AliYun Mirror - https://maven.aliyun.com/repository/public/ - - - - - huawei-mirror - HuaweiCloud Mirror - https://mirrors.huaweicloud.com/repository/maven/ - - - ali-mirror - AliYun Mirror - https://maven.aliyun.com/repository/public/ - - - - - - maven-compiler-plugin - - -parameters - - - - maven-surefire-plugin - - true - - - - com.diffplug.spotless - spotless-maven-plugin - - - compile - - apply - - - - - - - - .style/p3c-codestyle.xml - - - .style/license-header - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - process-resources - - flatten - - - - flatten-clean - clean - - clean - - - - - true - resolveCiFriendliesOnly - - - - - - - sonar - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - - - verify - - sonar - - - - - - - - Charles7c_wms-admin - ${project.groupId}:${project.artifactId} - https://sonarcloud.io - charles7c - - - - diff --git a/wms-common/.flattened-pom.xml b/wms-common/.flattened-pom.xml deleted file mode 100644 index 5ac84e1..0000000 --- a/wms-common/.flattened-pom.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - 4.0.0 - - top.wms - wms-admin - 3.6.0-SNAPSHOT - - wms-common - 3.6.0-SNAPSHOT - 公共模块（存放公共工具类，公共配置等） - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - - - me.ahoo.cosid - cosid-spring-boot-starter - - - me.ahoo.cosid - cosid-spring-redis - - - org.dromara.sms4j - sms4j-spring-boot-starter - - - org.dromara.x-file-storage - x-file-storage-spring - 2.2.1 - - - com.amazonaws - aws-java-sdk-s3 - 1.12.780 - - - org.freemarker - freemarker - - - com.mysql - mysql-connector-j - - - top.continew - continew-starter-extension-crud-mp - - - top.continew - continew-starter-auth-satoken - - - spring-boot-starter-web - org.springframework.boot - - - - - top.continew - continew-starter-auth-justauth - - - top.continew - continew-starter-cache-jetcache - - - top.continew - continew-starter-extension-datapermission-mp - - - top.continew - continew-starter-messaging-websocket - - - spring-boot-starter-web - org.springframework.boot - - - - - top.continew - continew-starter-messaging-mail - - - top.continew - continew-starter-captcha-graphic - - - top.continew - continew-starter-captcha-behavior - - - top.continew - continew-starter-security-limiter - - - top.continew - continew-starter-security-crypto - - - top.continew - continew-starter-security-mask - - - top.continew - continew-starter-security-password - - - top.continew - continew-starter-json-jackson - - - org.springframework - spring-test - - - io.netty - netty-all - 4.1.100.Final - - - diff --git a/wms-extension/.flattened-pom.xml b/wms-extension/.flattened-pom.xml deleted file mode 100644 index c111612..0000000 --- a/wms-extension/.flattened-pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - top.wms - wms-admin - 3.6.0-SNAPSHOT - - wms-extension - 3.6.0-SNAPSHOT - pom - 扩展模块（存放其他扩展模块） - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - - wms-extension-schedule-server - - diff --git a/wms-extension/wms-extension-schedule-server/.flattened-pom.xml b/wms-extension/wms-extension-schedule-server/.flattened-pom.xml deleted file mode 100644 index 1235b0c..0000000 --- a/wms-extension/wms-extension-schedule-server/.flattened-pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - top.wms - wms-extension - 3.6.0-SNAPSHOT - - wms-extension-schedule-server - 3.6.0-SNAPSHOT - 任务调度服务端 - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - - 1.2.0 - - - - com.aizuda - snail-job-server-starter - ${snail-job.version} - - - org.liquibase - liquibase-core - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - diff --git a/wms-module-system/.flattened-pom.xml b/wms-module-system/.flattened-pom.xml deleted file mode 100644 index a4dcdca..0000000 --- a/wms-module-system/.flattened-pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - top.wms - wms-admin - 3.6.0-SNAPSHOT - - wms-module-system - 3.6.0-SNAPSHOT - 系统管理模块（存放系统管理相关业务功能，例如：部门管理、角色管理、用户管理等） - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - - - top.wms - wms-common - - - javax.annotation - javax.annotation-api - 1.3.2 - provided - - - diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderInfoDO.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderInfoDO.java index 884df5f..0128193 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderInfoDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderInfoDO.java @@ -2,7 +2,6 @@ package top.wms.admin.fullWorkOrder.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.common.model.entity.BaseDO; import java.io.Serial; import java.math.BigDecimal; diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java index bdf7b50..ab594a3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java @@ -61,7 +61,8 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl getFullWorkOrderInfos(Long fullWorkOrderId) { - List fullWorkOrderInfoDOS = fullWorkOrderInfoMapper.selectList(new QueryWrapper().eq("full_work_order_id", fullWorkOrderId)); + List fullWorkOrderInfoDOS = fullWorkOrderInfoMapper + .selectList(new QueryWrapper().eq("full_work_order_id", fullWorkOrderId)); return fullWorkOrderInfoDOS; } } \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index bd99c2e..518b83e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -485,8 +485,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl materialInfoDOS = batchImportRowReqs.stream() - .map(row -> { - MaterialInfoDO materialInfoDO = new MaterialInfoDO(); - materialInfoDO.setEncoding(row.getEncoding()); - materialInfoDO.setBatch(row.getBatch()); - materialInfoDO.setUpdateUser(UserContextHolder.getUserId()); - return materialInfoDO; - }) - .toList(); + List materialInfoDOS = batchImportRowReqs.stream().map(row -> { + MaterialInfoDO materialInfoDO = new MaterialInfoDO(); + materialInfoDO.setEncoding(row.getEncoding()); + materialInfoDO.setBatch(row.getBatch()); + materialInfoDO.setUpdateUser(UserContextHolder.getUserId()); + return materialInfoDO; + }).toList(); // 批量操作数据库集合 try { diff --git a/wms-module-system/src/main/java/top/wms/admin/materialType/service/impl/MaterialTypeServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/materialType/service/impl/MaterialTypeServiceImpl.java index c6f5e5f..0b4eed1 100644 --- a/wms-module-system/src/main/java/top/wms/admin/materialType/service/impl/MaterialTypeServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/materialType/service/impl/MaterialTypeServiceImpl.java @@ -103,7 +103,8 @@ public class MaterialTypeServiceImpl extends BaseServiceImpl typeName != null && !seenTypeName.add(typeName)); CheckUtils.throwIf(hasDuplicateTypeName, "存在重复品类名称,请检测数据"); - materialTypeImportResp.setDuplicateNameRows(countExistByField(validRowList, MaterialTypeImportRowReq::getTypeName, MaterialTypeDO::getTypeName, false)); + materialTypeImportResp + .setDuplicateNameRows(countExistByField(validRowList, MaterialTypeImportRowReq::getTypeName, MaterialTypeDO::getTypeName, false)); String importKey = UUID.fastUUID().toString(true); RedisUtils.set(CacheConstants.DATA_IMPORT_KEY + importKey, JSONUtil.toJsonStr(validRowList), Duration @@ -163,8 +164,7 @@ public class MaterialTypeServiceImpl extends BaseServiceImpllambdaQuery() - .in(dbField, fieldValues)); + return (int)this.count(Wrappers.lambdaQuery().in(dbField, fieldValues)); } private List filterImportData(List importRowList) { @@ -197,8 +197,7 @@ public class MaterialTypeServiceImpl extends BaseServiceImpl insertList, - List updateList) { + private void doImportMaterialType(List insertList, List updateList) { if (CollUtil.isNotEmpty(insertList)) { baseMapper.insertBatch(insertList); } diff --git a/wms-plugin/.flattened-pom.xml b/wms-plugin/.flattened-pom.xml deleted file mode 100644 index 0a79a48..0000000 --- a/wms-plugin/.flattened-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - top.wms - wms-admin - 3.6.0-SNAPSHOT - - wms-plugin - 3.6.0-SNAPSHOT - pom - 插件模块（存放代码生成、任务调度等扩展模块） - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - - - top.wms - wms-common - - - diff --git a/wms-plugin/wms-plugin-generator/.flattened-pom.xml b/wms-plugin/wms-plugin-generator/.flattened-pom.xml deleted file mode 100644 index f67648d..0000000 --- a/wms-plugin/wms-plugin-generator/.flattened-pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - 4.0.0 - - top.wms - wms-plugin - 3.6.0-SNAPSHOT - - wms-plugin-generator - 3.6.0-SNAPSHOT - 代码生成器插件 - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - diff --git a/wms-plugin/wms-plugin-schedule/.flattened-pom.xml b/wms-plugin/wms-plugin-schedule/.flattened-pom.xml deleted file mode 100644 index 6169b3e..0000000 --- a/wms-plugin/wms-plugin-schedule/.flattened-pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - top.wms - wms-plugin - 3.6.0-SNAPSHOT - - wms-plugin-schedule - 3.6.0-SNAPSHOT - 任务调度插件 - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - - - com.aizuda - snail-job-client-starter - - - com.aizuda - snail-job-client-retry-core - - - com.aizuda - snail-job-client-job-core - - - org.springframework - spring-webflux - - - io.projectreactor.netty - reactor-netty-http - - - diff --git a/wms-webapi/.flattened-pom.xml b/wms-webapi/.flattened-pom.xml deleted file mode 100644 index d31a8ab..0000000 --- a/wms-webapi/.flattened-pom.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - 4.0.0 - - top.wms - wms-admin - 3.6.0-SNAPSHOT - - wms-webapi - 3.6.0-SNAPSHOT - API 及打包部署模块 - - - GNU LESSER GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/lgpl.html - - - - config/ - lib/ - bin/ - top.wms.admin.WmsAdminApplication - - - - top.continew - continew-starter-log-interceptor - - - tlog-core - com.yomahub - - - tlog-webflux - com.yomahub - - - tlog-feign - com.yomahub - - - tlog-okhttp - com.yomahub - - - tlog-resttemplate - com.yomahub - - - tlog-xxljob - com.yomahub - - - - - top.wms - wms-module-system - - - top.wms - wms-plugin-schedule - - - top.wms - wms-plugin-generator - - - org.liquibase - liquibase-core - - - org.springframework.boot - spring-boot-starter-test - test - - - com.amazonaws - aws-java-sdk-s3 - 1.12.780 - - - com.fazecast - jSerialComm - 2.9.2 - - - jakarta.websocket - jakarta.websocket-api - 2.1.0 - - - com.hikvision - MvCameraControlWrapper - 1.0 - system - ${project.basedir}/Library/MvCameraControlWrapper.jar - - - com.sun.jna - jna - 1.0 - system - ${project.basedir}/src/main/resources/lib/jna.jar - - - com.fazecast - jSerialComm - 2.10.5 - - - - ${project.parent.name} - - - maven-jar-plugin - - - ${config-path} - db/ - templates/ - logback-spring.xml - - - - ${main-class} - ../${lib-path} - true - false - - - ../${config-path} - - - ${project.build.directory}/app/${bin-path} - - - - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/app/${lib-path} - - - - - - maven-resources-plugin - - - copy-resources - package - - copy-resources - - - - - src/main/resources/${config-path} - - - src/main/resources - - db/ - templates/ - logback-spring.xml - - - - ${project.build.directory}/app/${config-path} - - - - - - - diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java b/wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java index f1585a5..eeed8de 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java @@ -31,7 +31,6 @@ import java.util.List; @CrudRequestMapping(value = "/fullWorkOrder/fullWorkOrder", api = {Api.PAGE, Api.ADD, Api.DELETE, Api.EXPORT}) public class FullWorkOrderController extends BaseController { - @PostMapping("/saveInfo") public R saveFullWorkOrderDetail(@RequestBody List infos) { baseService.saveFullWorkOrderDetail(infos); diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java index 135ceb1..93894f0 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java @@ -10,10 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import top.continew.starter.web.model.R; import java.nio.charset.Charset; -import java.util.Random; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -54,9 +52,9 @@ public class AHDZCConnect { private ScheduledExecutorService executorService; // todo 模拟数据生成 -// private ScheduledFuture mockDataTask; -// private final AtomicBoolean isMockDataRunning = new AtomicBoolean(false); -// private final Random random = new Random(); + // private ScheduledFuture mockDataTask; + // private final AtomicBoolean isMockDataRunning = new AtomicBoolean(false); + // private final Random random = new Random(); /** * 初始化并启动电子秤服务 @@ -74,9 +72,9 @@ public class AHDZCConnect { ScaleService(); start(); -// todo 模拟数据生成 -// isMockDataRunning.set(true); -// startMockData(); + // todo 模拟数据生成 + // isMockDataRunning.set(true); + // startMockData(); return R.ok(); } @@ -337,8 +335,8 @@ public class AHDZCConnect { log.info("停止电子秤线程..."); log.info("========================================"); -// todo 模拟数据生成 -// stopMockData(); + // todo 模拟数据生成 + // stopMockData(); try { if (executorService != null && !executorService.isShutdown()) { @@ -360,32 +358,32 @@ public class AHDZCConnect { } // todo 模拟数据生成 -// private void startMockData() { -// if (executorService == null || executorService.isShutdown()) { -// log.warn("[模拟数据] 线程池未初始化或已关闭"); -// return; -// } -// -// mockDataTask = executorService.scheduleAtFixedRate(() -> { -// if (!isMockDataRunning.get()) { -// return; -// } -// -// try { -// ScaleWebSocketHandler.sendMessage(String.valueOf(random.nextInt(100) + 1)); -// log.debug("[模拟数据] 发送重量数据: 37.8"); -// } catch (Exception e) { -// log.error("[模拟数据] 发送异常: {}", e.getMessage()); -// } -// }, 0, 1, TimeUnit.SECONDS); -// } -// -// private void stopMockData() { -// if (mockDataTask != null && !mockDataTask.isCancelled()) { -// mockDataTask.cancel(false); -// mockDataTask = null; -// } -// isMockDataRunning.set(false); -// } + // private void startMockData() { + // if (executorService == null || executorService.isShutdown()) { + // log.warn("[模拟数据] 线程池未初始化或已关闭"); + // return; + // } + // + // mockDataTask = executorService.scheduleAtFixedRate(() -> { + // if (!isMockDataRunning.get()) { + // return; + // } + // + // try { + // ScaleWebSocketHandler.sendMessage(String.valueOf(random.nextInt(100) + 1)); + // log.debug("[模拟数据] 发送重量数据: 37.8"); + // } catch (Exception e) { + // log.error("[模拟数据] 发送异常: {}", e.getMessage()); + // } + // }, 0, 1, TimeUnit.SECONDS); + // } + // + // private void stopMockData() { + // if (mockDataTask != null && !mockDataTask.isCancelled()) { + // mockDataTask.cancel(false); + // mockDataTask = null; + // } + // isMockDataRunning.set(false); + // } } \ No newline at end of file diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/ys/NetCommon.java b/wms-webapi/src/main/java/top/wms/admin/controller/ys/NetCommon.java index 1002146..b2966bd 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/ys/NetCommon.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/ys/NetCommon.java @@ -1,7 +1,6 @@ package top.wms.admin.controller.ys; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import lombok.extern.slf4j.Slf4j; @@ -131,7 +130,7 @@ public class NetCommon { // 设置通道为1 ChannelID = 1; //定时任务 - String strPicPath = req.getPicPath(); + String strPicPath = ""; if (ObjectUtil.isNull(req)) { strPicPath = "E:\\img\\ys\\carousel"; // 创建保存目录 @@ -144,16 +143,17 @@ public class NetCommon { if (!picDir.exists()) { picDir.mkdir(); } + strPicPath = req.getPicPath(); } else { File picDir = new File("E:\\img\\ys\\fullWorkOrder"); if (!picDir.exists()) { picDir.mkdir(); } + strPicPath = req.getPicPath(); } // 使用NETDEV_CaptureNoPreview直接保存图片文件 boolean bRet = netdevsdk.NETDEV_CaptureNoPreview(lpUserID, ChannelID, 0, strPicPath, 1); - if (bRet) { return true; } else { diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java b/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java index 6aaf297..932dfaa 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java @@ -54,6 +54,7 @@ class BaseFun { } String loadSDKLibrary = loadLibrary + "NetDEVSDK"; + // String loadSDKLibrary = "D:\\wms\\wms-admin\\wms-webapi\\src\\main\\resources\\lib\\win64\\NetDEVSDK"; log.info("Load SDK Library: " + loadSDKLibrary); return loadSDKLibrary; } diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/ys/ysNetController.java b/wms-webapi/src/main/java/top/wms/admin/controller/ys/ysNetController.java index 4c717d9..04984e7 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/ys/ysNetController.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/ys/ysNetController.java @@ -106,7 +106,8 @@ public class ysNetController { boolean success = NetCommon.captureImage(req); if (success) { if (req.getType() == 1) { - return R.ok("http://localhost:6609/file/ys/" + req.getBatch() + "/" + req.getEncoding() + "_" + l + ".jpg"); + return R.ok("http://localhost:6609/file/ys/" + req.getBatch() + "/" + req + .getEncoding() + "_" + l + ".jpg"); } else { return R.ok("http://localhost:6609/file/ys/fullWorkOrder/" + l + ".jpg"); }