From 8ff0210fff510b1c0659cd363312ebf768135188 Mon Sep 17 00:00:00 2001 From: zhang <2012681011@qq.com> Date: Wed, 18 Dec 2024 19:20:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E5=85=B4=E7=89=B9=E7=A7=91=E6=8B=89?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BeltConveyorDeviceDriver.java | 13 +---- .../conveyor/belt_conveyor/ItemProtocol.java | 7 +-- .../java/org/nl/acs/ext/xg/XgHttpUtil.java | 1 + .../service/dao/RoutePileLineEntity.java | 49 ++++++++++++++++ .../mapper/IRoutePileLineServiceMapper.java | 13 +++++ .../task/service/impl/TaskAgvServiceImpl.java | 56 +++++++++---------- .../quartz/task/AutoCreateAgvInst.java | 1 + .../resources/config/application-prod.yml | 4 +- .../classes/config/application-prod.yml | 4 +- .../org/nl/config/redis/RedisConvertImpl.java | 2 +- acs/nladmin-ui/package.json | 2 +- acs/nladmin-ui/src/views/acs/task/index.vue | 6 +- 12 files changed, 104 insertions(+), 54 deletions(-) create mode 100644 acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dao/RoutePileLineEntity.java create mode 100644 acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/IRoutePileLineServiceMapper.java diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index aa918ae1..46bc9524 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -229,21 +229,10 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements public void execute() { try { device_code = this.getDeviceCode(); - heartbeat = this.itemProtocol.getHeartbeat(); mode = this.itemProtocol.getMode(); - move = this.itemProtocol.getMove(); - action = this.itemProtocol.getAction(); - container_direction = this.itemProtocol.getContainer_direction(); - container_type = this.itemProtocol.getContainer_type(); - error = this.itemProtocol.getError(); - task = this.itemProtocol.getTask(); - to_command = this.itemProtocol.getTo_command(); - to_target = this.itemProtocol.getTotarget(); - to_task = this.itemProtocol.getTo_task(); - to_container_no = this.itemProtocol.getContainer_direction(); - if(move==1){ + if(mode==1){ taskAgvService.autoCreate(device_code); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java index ee829f29..04f1f829 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java @@ -167,16 +167,13 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); + list.add(new ItemDto(item_mode, "工作模式", "40001", Boolean.valueOf(true))); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发命令", "DB601.W1", Boolean.valueOf(true))); +// list.add(new ItemDto(item_to_command, "下发命令", "DB601.W1", Boolean.valueOf(true))); return list; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/xg/XgHttpUtil.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/xg/XgHttpUtil.java index 5623202a..d3ab532f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/xg/XgHttpUtil.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/xg/XgHttpUtil.java @@ -50,6 +50,7 @@ public class XgHttpUtil { return new UnifiedResponse<>(false, "未开启连接该系统！"); } try { + System.out.println(REQUEST_ADAPTER.getUrl()); String body = HttpRequest .post(REQUEST_ADAPTER.getUrl() + path) .setConnectionTimeout(10000) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dao/RoutePileLineEntity.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dao/RoutePileLineEntity.java new file mode 100644 index 00000000..3b9af402 --- /dev/null +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dao/RoutePileLineEntity.java @@ -0,0 +1,49 @@ +package org.nl.acs.route.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("acs_routepile_line") +public class RoutePileLineEntity implements Serializable { + + /** + * id + */ + private Integer id; + + /** + * 设备编码 + */ + private String device_code; + + /** + * 取货起点1 + */ + private String start_point_code; + + /** + * 放货点1 + */ + private String next_point_code; + + /** + * 取货起点2 + */ + private String start_point_code2; + + /** + * 放货点2 + */ + private String next_point_code2; + + + /** + * 创建时间 + */ + private String create_time; + + private String device_addr; +} diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/IRoutePileLineServiceMapper.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/IRoutePileLineServiceMapper.java new file mode 100644 index 00000000..9ab04dc1 --- /dev/null +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/IRoutePileLineServiceMapper.java @@ -0,0 +1,13 @@ +package org.nl.acs.route.service.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.nl.acs.route.service.dao.RouteLineEntity; +import org.nl.acs.route.service.dao.RoutePileLineEntity; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface IRoutePileLineServiceMapper extends BaseMapper { +} diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskAgvServiceImpl.java index 8ecc5ae7..4142f46b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskAgvServiceImpl.java @@ -15,8 +15,11 @@ import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionAgvService; import org.nl.acs.instruction.service.dto.QueryInstructionPo; +import org.nl.acs.instruction.service.mapper.IInstructionServiceMapper; import org.nl.acs.route.service.dao.RouteLineEntity; +import org.nl.acs.route.service.dao.RoutePileLineEntity; import org.nl.acs.route.service.mapper.IRouteLineServiceMapper; +import org.nl.acs.route.service.mapper.IRoutePileLineServiceMapper; import org.nl.acs.task.enums.TaskStatusEnum; import org.nl.acs.task.enums.TaskTypeEnum; import org.nl.acs.task.service.TaskAgvService; @@ -48,13 +51,17 @@ import java.util.Objects; public class TaskAgvServiceImpl implements TaskAgvService{ - @Autowired - private InstructionAgvService instructionService; +// @Autowired +// private InstructionAgvService instructionService; private final IRouteLineServiceMapper routeLineServiceDao; private final ITaskAgvServiceMapper taskAgvServiceDao; + private final IInstructionServiceMapper instructionService; + + private final IRoutePileLineServiceMapper routePileLineServiceMapper; + @Override public Map queryAll(QueryTaskPo po) { @@ -158,34 +165,27 @@ public class TaskAgvServiceImpl implements TaskAgvService{ dto.setStart_device_code(driverCode); dto.setUpdate_time(now); dto.setCreate_time(now); + dto.setVehicle_code(driverCode); dto.setTask_code(task_code); // entity.setRoute_plan_code(route_plan_code); dto.setTask_status("0"); dto.setCreate_type(TaskTypeEnum.Standard_AGV_Task.getCode()); dto.setPriority("1"); - dto.setStart_point_code("TE-01"); - dto.setNext_point_code("ZD-01"); - dto.setStart_point_code2("TE-01"); - dto.setNext_point_code2("ZD-02"); -// //判断起点终点设备类型 -// if (queryRouteLine(dto.getStart_point_code(), dto.getNext_point_code())) { -// throw new Exception(dto.getStart_point_code() + "->" + dto.getNext_point_code() + "起点路由不通!"); -// } -// //判断起点2终点2设备类型 -// if (queryRouteLine(dto.getStart_point_code2(), dto.getNext_point_code2())) { -// throw new Exception(dto.getStart_point_code2() + "->" + dto.getNext_point_code2() + "起点2路由不通!"); -// } + RoutePileLineEntity pileLineEntity=queryRouteLine(driverCode); + dto.setStart_point_code(pileLineEntity.getStart_point_code()); + dto.setNext_point_code(pileLineEntity.getNext_point_code()); + dto.setStart_point_code2(pileLineEntity.getStart_point_code2()); + dto.setNext_point_code2(pileLineEntity.getNext_point_code2()); TaskEntity entity=new TaskEntity(); BeanUtils.copyProperties(dto,entity); taskAgvServiceDao.insert(entity); } - private boolean queryRouteLine(String start_point, String next_point){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("device_code", start_point); - queryWrapper.eq("next_device_code", next_point); - List list=routeLineServiceDao.selectList(queryWrapper); - return list.isEmpty(); + private RoutePileLineEntity queryRouteLine(String device_code){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("device_code", device_code); + List list=routePileLineServiceMapper.selectList(queryWrapper); + return list.get(0); } @Override @@ -208,13 +208,13 @@ public class TaskAgvServiceImpl implements TaskAgvService{ @Override public void finish(String id) { - QueryInstructionPo po=new QueryInstructionPo(); - po.setTask_id(id); List statusList=new ArrayList<>(); statusList.add(InstructionStatusEnum.READY.getIndex()); statusList.add(InstructionStatusEnum.BUSY.getIndex()); - po.setInstructionAllStatus(statusList); - List list=instructionService.queryInstructionList(po); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("instruction_status",statusList); + queryWrapper.eq("task_id",id); + List list= instructionService.selectList(queryWrapper); if(!list.isEmpty()){ throw new BadRequestException("有指令未完成!"); } @@ -231,13 +231,13 @@ public class TaskAgvServiceImpl implements TaskAgvService{ @Override public void cancel(String id) throws Exception { - QueryInstructionPo po=new QueryInstructionPo(); - po.setTask_id(id); List statusList=new ArrayList<>(); statusList.add(InstructionStatusEnum.READY.getIndex()); statusList.add(InstructionStatusEnum.BUSY.getIndex()); - po.setInstructionAllStatus(statusList); - List list=instructionService.queryInstructionList(po); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("instruction_status",statusList); + queryWrapper.eq("task_id",id); + List list= instructionService.selectList(queryWrapper); if(!list.isEmpty()){ throw new BadRequestException("有指令未完成!"); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateAgvInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateAgvInst.java index f73b0c69..d6017564 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateAgvInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateAgvInst.java @@ -41,6 +41,7 @@ public class AutoCreateAgvInst { BeanUtils.copyProperties(taskEntity,instructionEntity); instructionEntity.setInstruction_type(taskEntity.getTask_type()); instructionEntity.setInstruction_id(IdUtil.simpleUUID()); + instructionEntity.setExecute_device_code(taskEntity.getStart_device_code()); String now = DateUtil.now(); instructionEntity.setCreate_time(now); instructionEntity.setCreate_by("auto"); diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml index 0e108155..c541ff6d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml @@ -1,12 +1,12 @@ server: - port: 8010 + port: 8011 #配置数据源 spring: datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.121}:${DB_PORT:3306}/${DB_NAME:yy_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3307}/${DB_NAME:tekela_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} password: ${DB_PWD:123456} # 初始连接数 diff --git a/acs/nladmin-system/nlsso-server/target/classes/config/application-prod.yml b/acs/nladmin-system/nlsso-server/target/classes/config/application-prod.yml index 0e108155..c541ff6d 100644 --- a/acs/nladmin-system/nlsso-server/target/classes/config/application-prod.yml +++ b/acs/nladmin-system/nlsso-server/target/classes/config/application-prod.yml @@ -1,12 +1,12 @@ server: - port: 8010 + port: 8011 #配置数据源 spring: datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.121}:${DB_PORT:3306}/${DB_NAME:yy_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3307}/${DB_NAME:tekela_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} password: ${DB_PWD:123456} # 初始连接数 diff --git a/acs/nladmin-system/nlsso-server/target/generated-sources/annotations/org/nl/config/redis/RedisConvertImpl.java b/acs/nladmin-system/nlsso-server/target/generated-sources/annotations/org/nl/config/redis/RedisConvertImpl.java index c50b4e05..3fe9ff46 100644 --- a/acs/nladmin-system/nlsso-server/target/generated-sources/annotations/org/nl/config/redis/RedisConvertImpl.java +++ b/acs/nladmin-system/nlsso-server/target/generated-sources/annotations/org/nl/config/redis/RedisConvertImpl.java @@ -4,7 +4,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-03T17:52:04+0800", + date = "2024-12-16T17:54:35+0800", comments = "version: 1.2.0.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" ) public class RedisConvertImpl implements RedisConvert { diff --git a/acs/nladmin-ui/package.json b/acs/nladmin-ui/package.json index 47079681..a4655cd4 100644 --- a/acs/nladmin-ui/package.json +++ b/acs/nladmin-ui/package.json @@ -7,7 +7,7 @@ "scripts": { "dev": "vue-cli-service serve", "dev2": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", - "build:prod": "vue-cli-service build", + "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src", diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue index fa25b512..00fdb7c0 100644 --- a/acs/nladmin-ui/src/views/acs/task/index.vue +++ b/acs/nladmin-ui/src/views/acs/task/index.vue @@ -484,12 +484,12 @@ - +