From ee149a96e00136d428d9c92504d42123735c7e3b Mon Sep 17 00:00:00 2001 From: psh Date: Tue, 11 Jun 2024 15:00:45 +0800 Subject: [PATCH] fix --- .../agv/server/impl/ZheDaAgvServiceImpl.java | 13 +++ .../nl/quartz/task/QueryZDAgvTaskStatus.java | 12 --- .../src/main/resources/config/application.yml | 2 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../task/tasks/mapper/PointMapper.java | 2 + .../task/tasks/mapper/PointMapper.xml | 5 + .../task_manage/task/tasks/tbx/TBXQKTask.java | 1 + .../resources/config/application-prod.yml | 98 ++++++++++--------- .../src/main/resources/config/application.yml | 2 +- 9 files changed, 74 insertions(+), 63 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index f1cc6d3..d858be2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position.Empty import org.nl.acs.device_driver.basedriver.hailiang_smart_plc_test.HailiangSmartplcTestDeviceDriver; import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver; import org.nl.acs.device_driver.basedriver.paint_conveyor.PaintConveyorDeviceDriver; +import org.nl.acs.device_driver.tianneng.site.SiteDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; @@ -31,6 +32,8 @@ import org.nl.system.service.param.ISysParamService; import org.nl.config.SpringContextHolder; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + @Slf4j @Service @RequiredArgsConstructor @@ -38,6 +41,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { private final ISysParamService paramService; private final InstructionService instructionService; private final DeviceService deviceService; + private final DeviceAppService deviceAppService; @LokiLog(type = LokiLogType.AGV) @Override public HttpResponse sendAgvInstToAgv(Instruction inst) throws Exception { @@ -225,6 +229,15 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { .timeout(20000)//超时，毫秒 .execute(); log.info("下发agv任务请求反馈:{}", result2); + String startPoint=inst.getStart_point_code(); + Device start_device = deviceAppService.findDeviceByCode(startPoint); + if (start_device.getDeviceDriver() instanceof SiteDeviceDriver) { + SiteDeviceDriver siteDeviceDriver=(SiteDeviceDriver)start_device.getDeviceDriver(); + if(siteDeviceDriver.getMode()!=10) { + siteDeviceDriver.writing(10); + siteDeviceDriver.writing(10); + } + } } } //放货的进入前等待和离开等待 diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java index 0d6aa8f..71f13bc 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java @@ -31,9 +31,6 @@ public class QueryZDAgvTaskStatus { @Autowired ZheDaAgvService agvService; - @Resource - private DeviceAppService deviceAppService; - public void run() throws Exception { try { @@ -76,15 +73,6 @@ public class QueryZDAgvTaskStatus { } } else if ("FINISHED".equals(status)) { if (inst != null){ - String startPoint=inst.getStart_point_code(); - Device device = deviceAppService.findDeviceByCode(startPoint); - if (device.getDeviceDriver() instanceof SiteDeviceDriver) { - SiteDeviceDriver siteDeviceDriver=(SiteDeviceDriver)device.getDeviceDriver(); - if(siteDeviceDriver.getMode()!=10) { - siteDeviceDriver.writing(10); - siteDeviceDriver.writing(10); - } - } inst.setInstruction_status("2"); instructionService.finish(inst); } diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml index ac11b14..2d1a89c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 126f9ac..ed08115 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -189,7 +189,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { break; case 2: //实时反馈点位状态,空架输送线全部点位 - pointMapper.updatePointStatus(device_code,state); + pointMapper.updatePointQty(device_code,state); break; default: break; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java index 6c3d260..ef1a72e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java @@ -17,6 +17,8 @@ public interface PointMapper { void updatePointStatus(String device_code,String state); + void updatePointQty(String device_code,String qty); + void updateVehicleType(String device_code,String vehicle_type); void updatePointType(String device_code,String point_type); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml index de6e64d..7992f18 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml @@ -25,6 +25,11 @@ where point_code like CONCAT('%', #{device_code}, '%') + + update sch_base_point set vehicle_qty = #{state} + where point_code like CONCAT('%', #{device_code}, '%') + + update sch_base_point set vehicle_type = #{vehicle_type} where point_code like CONCAT('%', #{device_code}, '%') diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXQKTask.java index fcdc6ff..1bf1b6d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXQKTask.java @@ -136,6 +136,7 @@ public class TBXQKTask extends AbstractTask { .or() .eq(SchBasePoint::getIng_task_code, "")) .eq(SchBasePoint::getBlock_num, "1") + .eq(SchBasePoint::getVehicle_qty, "1") .eq(SchBasePoint::getIs_used, true); List schBasePoints = pointService.list(lam); return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null; diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml index 3bf0425..9e5a7a1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml @@ -1,22 +1,26 @@ server: - port: 8011 + port: 8010 #配置数据源 spring: datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:101.37.151.193}:${DB_PORT:53306}/${DB_NAME:xftn_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME: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:P@ssW0rd123} + password: ${DB_PWD:123456} + # password: ${DB_PWD:P@ssw0rd} # 初始连接数 initial-size: 5 # 最小连接数 min-idle: 15 # 最大连接数 - max-active: 60 + max-active: 30 + # 超时时间(以秒数为单位) + remove-abandoned-timeout: 180 # 获取连接超时时间 - max-wait: 5000 + max-wait: 3000 # 连接有效性检测时间 time-between-eviction-runs-millis: 60000 # 连接在池中最小生存的时间 @@ -36,11 +40,8 @@ spring: enabled: true stat-view-servlet: enabled: true - # 控制台管理用户名和密码 url-pattern: /druid/* reset-enable: false - login-username: admin - login-password: 123456 filter: stat: enabled: true @@ -53,12 +54,11 @@ spring: multi-statement-allow: true redis: #数据库索引 - database: ${REDIS_DB:15} - host: ${REDIS_HOST:127.0.0.1} + database: ${REDIS_DB:5} + host: ${REDIS_HOST:10.44.101.19} port: ${REDIS_PORT:6379} password: ${REDIS_PWD:} - #连接超时时间 - timeout: 5000 + # 登录相关配置 login: # 登录缓存 @@ -77,48 +77,23 @@ login: heigth: 36 # 内容长度 length: 2 - # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可 + # 字体名称，为空则使用默认字体 font-name: # 字体大小 font-size: 25 -#jwt -jwt: - header: Authorization - # 令牌前缀 - token-start-with: Bearer - # 必须使用最少88位的Base64对该令牌进行编码 - base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI= - # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html - token-validity-in-seconds: 7200000 - # 在线用户key - online-key: online-token- - # 验证码 - code-key: code-key- - # token 续期检查时间范围（默认30分钟，单位默认毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期 - detect: 1800000 - # 续期时间范围，默认 1小时，这里单位毫秒 - renew: 3600000 +#是否允许生成代码，生产环境设置为false +generator: + enabled: true + +#是否开启 swagger-ui +swagger: + enabled: true # IP 本地解析 ip: local-parsing: true -#是否允许生成代码，生产环境设置为false -generator: - enabled: false - -#如果生产环境要开启swagger，需要配置请求地址 -#springfox: -# documentation: -# swagger: -# v2: -# host: # 接口域名或外网ip - -#是否开启 swagger-ui -swagger: - enabled: false - # 文件存储路径 file: mac: @@ -135,7 +110,7 @@ file: avatarMaxSize: 5 logging: file: - path: /app/jar/logs + path: C:\log\wms config: classpath:logback-spring.xml # Sa-Token配置 @@ -157,5 +132,32 @@ sa-token: jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq # token 前缀 token-prefix: Bearer - is-read-cookie: false - is-read-body: false + sso: + # Ticket有效期 (单位: 秒)，默认五分钟 + ticket-timeout: 300 + # 所有允许的授权回调地址 + allow-url: "*" + # 是否打开单点注销功能 + is-slo: true + + # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开） + # 是否打开模式三 + isHttp: true + # 接口调用秘钥（用于SSO模式三的单点注销功能） + secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor + # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明） + is-read-cookie: true + is-print: false + # 未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口 + token-session-check-login: false + alone-redis: + # Redis数据库索引（默认为0） + database: 5 + # Redis服务器地址 + host: 10.44.101.19 + # Redis服务器连接端口 + port: 6379 + # Redis服务器连接密码（默认为空） + password: + # 连接超时时间 + timeout: 10s diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 413c719..e6955d8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: