From a76c7657f5ebb6df50a8e0ae6b9b1cf6782b28c3 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 29 Jul 2025 15:29:07 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/gateway/dto/InteracteDto.java | 3 +- .../nl/gateway/service/GateWayService.java | 44 -------- .../service/impl/StructattrServiceImpl.java | 5 +- .../impl/base/AlleyAveRuleHandler.java | 103 ------------------ .../views/wms/basedata/structattr/index.vue | 17 ++- 5 files changed, 16 insertions(+), 156 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/dto/InteracteDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/dto/InteracteDto.java index 32faf4e..efbf8a9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/dto/InteracteDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/dto/InteracteDto.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -/* +/** * @author ZZQ * @Date 2024/5/29 16:26 */ @@ -17,6 +17,7 @@ public class InteracteDto { private String service; private String type; + private String system; private String ip; private String request_time; private String trace_id; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/GateWayService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/GateWayService.java index 8b4fcc8..8e3ad2e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/GateWayService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/GateWayService.java @@ -1,20 +1,12 @@ package org.nl.gateway.service; -import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.RedissonUtils; import org.nl.gateway.dto.InteracteDto; -import org.nl.gateway.service.impl.GateWayServiceImpl; -import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseTaskService; -import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; /** * 网关执行接口层 @@ -24,11 +16,6 @@ import java.util.concurrent.atomic.AtomicReference; */ @Service public class GateWayService { - - @Autowired - private GateWayServiceImpl gateWayServiceImpl; - @Autowired - private ISchBasePointService iSchBasePointService; @Autowired private ISchBaseTaskService iSchBaseTaskService; @@ -38,42 +25,11 @@ public class GateWayService { //处理日志相关 JSONObject result = new JSONObject(); String service = param.getService(); - String type = param.getType(); - //根据服务拆分不同的业务 - if ("InStorage".equals(service)) { - RedissonUtils.lock(() -> { - String taskCode = gateWayServiceImpl.applyTask(param.getService(), type, jsonObject, param); - result.put("taskCode", taskCode); - }, param.getService() + param.getType(), null); - } if ("Task".equals(service)) { iSchBaseTaskService.operation(jsonObject); } if ("DeviceInfo".equals(service)) { - } - if ("Device".equals(service)) { - Assert.noNullElements(new Object[]{jsonObject.getString("devicePoint"), jsonObject.getString("status")}, "请求参数不能为空"); - if (!"1207".equals(jsonObject.getString("devicePoint")) && !"1210".equals(jsonObject.getString("devicePoint"))) { - throw new BadRequestException("您输入的拣选位不存在，请输入1207或1210拣选位!"); - } - RedissonUtils.lock(() -> { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(SchBasePoint::getIs_used, "0".equals(jsonObject.getString("status")) ? 0 : 1); - iSchBasePointService.update(updateWrapper); - }, param.getService() + param.getType(), null); - } - if ("ErrorInfo".equals(service)) { - Assert.noNullElements(new Object[]{type, jsonObject.getString("msg")}, "请求参数不能为空"); - String msg = jsonObject.getString("msg").trim(); - //iSchBasePointService.sendErrorMsg(type,null, msg); - } - if ("ErrorTask".equals(service)) { - AtomicReference reference = new AtomicReference<>(new JSONObject()); - RedissonUtils.lock(() -> { - // reference.set(iSchBaseTaskService.errorTask(jsonObject, param.getType())); - }, param.getService() + param.getType(), null); - return reference.get(); } return result; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index 2a98aba..7f59d40 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -97,7 +97,7 @@ public class StructattrServiceImpl extends ServiceImpl { return subList; } - // public static void main(String[] args) { - // List list = new ArrayList<>(); - // for (int i =0;i<10;i++){ - // Structattr structattr = new Structattr(); - // structattr.setRow_num(new Random().nextInt(2)+1); - // structattr.setCol_num(new Random().nextInt(10)+1); - // structattr.setLayer_num(new Random().nextInt(2)+1); - // list.add(structattr); - // } - // System.out.println(list); - // ArrayList of = ListOf.of("x", "z","y"); - // list.sort((o1, o2) -> { - // Integer rowNum1 = o1.getRow_num(); - // Integer colNum1 = o1.getCol_num(); - // Integer layerNum1 = o1.getLayer_num(); - // Integer rowNum2 = o2.getRow_num(); - // Integer colNum2 = o2.getCol_num(); - // Integer layerNum2 = o2.getLayer_num(); - // HashMap of1 = MapOf.of("x", rowNum1, "y", colNum1, "z", layerNum1); - // HashMap of2 = MapOf.of("x", rowNum2, "y", colNum2, "z", layerNum2); - // for (String sort : of) { - // Integer in1 = of1.get(sort); - // Integer in2 = of2.get(sort); - // if (in1 > in2){ - // return 1; - // } - // if (in1 < in2){ - // return -1; - // } - // } - // return 0; - // }); - // System.out.println(list.toString()); - // } - - /** - * 入库策略 - * - * @param attrList ：仓位集合 - * @param jsonParam：materialId ：物料标识（此方法只根据物料进行匹配） - * @return List ：仓位集合 - */ - // private List inHandler(List attrList, PmFormData jsonParam) { - // // in查询条件处理 - // List blockNumIn = attrList.stream() - // .map(Structattr::getBlock_num) - // .distinct() - // .collect(Collectors.toList()); - // // 查询相同巷道货位相同物料 - // List blockAttrList = null; - // iStructattrService.getByQuery(new StructattrQuery()); - // // 如果为空说明这些巷道都没有相同物料的巷道，则返回所有仓位 - // if (ObjectUtil.isEmpty(blockAttrList)) { - // return attrList; - // } - // // 计算每个巷道的相同物料 - // Map> collectMap = blockAttrList.stream() - // .collect(Collectors.groupingBy(Structattr::getBlock_num)); - // // 巷道 - // int blockNum = blockAttrList.get(0).getBlock_num().intValue(); - // // 集合数量 - // int size = blockAttrList.size(); - // for (Integer num : collectMap.keySet()) { - // int min = Math.min(size, collectMap.get(num).size()); - // if (size > min) { - // // 返回最小的巷道 - // blockNum = num.intValue(); - // size = min; - // } - // } - // // 匹配相同巷道的集合并返回 - // int finalBlockNum = blockNum; - // return attrList.stream() - // .filter(row -> row.getBlock_num().intValue() == finalBlockNum) - // .collect(Collectors.toList()); - // } - - /** - * 出库策略 - 查询物料最多的巷道 - * - * @param attrList： 仓位物料 - * @return 巷道 - */ - // private int getMaxMaterial(List attrList) { - // // 根据巷道分组 - // Map> collectMap = attrList.stream() - // .collect(Collectors.groupingBy(Structattr::getBlock_num)); - // // 找最大物料巷道 - // // 巷道 - // int blockNum = attrList.get(0).getBlock_num().intValue(); - // // 集合数量 - // int size = 0; - // for (Integer num : collectMap.keySet()) { - // int max = Math.max(size, collectMap.get(num).size()); - // if (size < max) { - // // 返回最大的巷道 - // blockNum = num.intValue(); - // size = max; - // } - // } - // return blockNum; - // } - } diff --git a/lms/nladmin-ui/src/views/wms/basedata/structattr/index.vue b/lms/nladmin-ui/src/views/wms/basedata/structattr/index.vue index 87a4d1f..e91ab53 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/structattr/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/structattr/index.vue @@ -36,7 +36,7 @@ - + + + +