From d0504eb777a7ea15037acf871f92bac2ac7d9f47 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:18:23 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java | 2
zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java | 4
zy-acs-cv/pom.xml | 191 ++++++++++++++++++++++++-----------------------
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/DevpServiceImpl.java | 2
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java | 2
zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java | 2
zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java | 4
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java | 4
zy-acs-cv/src/main/resources/application.yml | 16 ++--
zy-acs-cv/src/main/resources/mapper/JobMapper.xml | 2
zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java | 10 +-
11 files changed, 121 insertions(+), 118 deletions(-)
diff --git a/zy-acs-cv/pom.xml b/zy-acs-cv/pom.xml
index 6363354..aa2683c 100644
--- a/zy-acs-cv/pom.xml
+++ b/zy-acs-cv/pom.xml
@@ -13,12 +13,13 @@
<packaging>war</packaging>
<properties>
- <java.version>1.8</java.version>
+ <java.version>17</java.version>
<cool.version>3.4.0</cool.version>
<mysql-driver.version>5.1.47</mysql-driver.version>
<mybatis-plus.version>2.3.2</mybatis-plus.version>
<fastjson.version>1.2.58</fastjson.version>
<springfox.version>2.7.0</springfox.version>
+ <plc4x.version>0.12.0</plc4x.version>
</properties>
<dependencies>
@@ -45,11 +46,11 @@
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-driver.version}</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.microsoft.sqlserver</groupId>-->
-<!-- <artifactId>mssql-jdbc</artifactId>-->
-<!-- <version>8.2.2.jre8</version>-->
-<!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.microsoft.sqlserver</groupId>-->
+ <!-- <artifactId>mssql-jdbc</artifactId>-->
+ <!-- <version>8.2.2.jre8</version>-->
+ <!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
@@ -95,84 +96,86 @@
<version>3.10.0</version>
</dependency>
+
+
<!-- led sdk -->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>5m3</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>0.5.0</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>5m3message</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>0.5.0</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/bx05.message-0.5.0-SNAPSHOT.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>5m3doc</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>0.5.0</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT-javadoc.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>rxtx</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>2.1.7</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/rxtx-2.1.7.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>simple-xml</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>2.7.1</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/simple-xml-2.7.1.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>stax</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>1.2.0</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/stax-1.2.0.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>stax-api</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>1.0.1</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/stax-api-1.0.1.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>uia-comm</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>0.5.1</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/uia-comm-0.5.1.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>uia-message</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>0.6.0</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/uia-message-0.6.0.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>uia-utils</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>0.2.0</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/uia-utils-0.2.0.jar</systemPath>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>com.wcs.led</groupId>-->
-<!-- <artifactId>xpp3</artifactId>-->
-<!-- <scope>system</scope>-->
-<!-- <version>1.1.3.3</version>-->
-<!-- <systemPath>${project.basedir}/src/main/resources/lib/xpp3-1.1.3.3.jar</systemPath>-->
-<!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>5m3</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>0.5.0</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>5m3message</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>0.5.0</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/bx05.message-0.5.0-SNAPSHOT.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>5m3doc</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>0.5.0</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT-javadoc.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>rxtx</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>2.1.7</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/rxtx-2.1.7.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>simple-xml</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>2.7.1</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/simple-xml-2.7.1.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>stax</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>1.2.0</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/stax-1.2.0.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>stax-api</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>1.0.1</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/stax-api-1.0.1.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>uia-comm</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>0.5.1</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/uia-comm-0.5.1.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>uia-message</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>0.6.0</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/uia-message-0.6.0.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>uia-utils</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>0.2.0</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/uia-utils-0.2.0.jar</systemPath>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.wcs.led</groupId>-->
+ <!-- <artifactId>xpp3</artifactId>-->
+ <!-- <scope>system</scope>-->
+ <!-- <version>1.1.3.3</version>-->
+ <!-- <systemPath>${project.basedir}/src/main/resources/lib/xpp3-1.1.3.3.jar</systemPath>-->
+ <!-- </dependency>-->
</dependencies>
<build>
@@ -186,17 +189,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
-<!-- <configuration>-->
-<!-- <webResources>-->
-<!-- <resource>-->
-<!-- <directory>src/main/resources/lib</directory>-->
-<!-- <targetPath>WEB-INF/lib/</targetPath>-->
-<!-- <includes>-->
-<!-- <include>**/*.jar</include>-->
-<!-- </includes>-->
-<!-- </resource>-->
-<!-- </webResources>-->
-<!-- </configuration>-->
+ <!-- <configuration>-->
+ <!-- <webResources>-->
+ <!-- <resource>-->
+ <!-- <directory>src/main/resources/lib</directory>-->
+ <!-- <targetPath>WEB-INF/lib/</targetPath>-->
+ <!-- <includes>-->
+ <!-- <include>**/*.jar</include>-->
+ <!-- </includes>-->
+ <!-- </resource>-->
+ <!-- </webResources>-->
+ <!-- </configuration>-->
</plugin>
</plugins>
</build>
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java b/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
index daa2c42..3038859 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
@@ -33,7 +33,7 @@
//@Scheduled(cron = "0 0 2 * * ?")
@Scheduled(cron = "*/5 * * * * ?")
public void autoToLog() {
- List<Job> jobs = jobMapper.listJobByJobStsAndDay(ConveyorStateType.CLEARSIGNAL.getStatus(),1);
+ List<Job> jobs = jobMapper.listJobByJobStsAndDay(ConveyorStateType.CLEARSIGNAL.getStatus(), 1);
for (Job job : jobs) {
jobService.saveJobLog(job);
}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/DevpServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/DevpServiceImpl.java
index 1d97e5b..a28e1ce 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/DevpServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/DevpServiceImpl.java
@@ -19,7 +19,7 @@
if (de != null) {
de.setSqlData(devp);
baseMapper.updateById(de);
- }else {
+ } else {
baseMapper.insert(devp);
}
}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java
index 0be56be..6f54c22 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/JobServiceImpl.java
@@ -42,7 +42,7 @@
@Override
public Job getJobByBarcode(String barcode, Integer jobSts) {
- return baseMapper.getJobByBarcodeAndJobSts(barcode,jobSts);
+ return baseMapper.getJobByBarcodeAndJobSts(barcode, jobSts);
}
@Override
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
index 85bfb20..2fc9d8b 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
@@ -76,7 +76,7 @@
}
public static void main(String[] args) {
- String s= "{\"msg\":\"Success\",\"code\":200,\"data\":{\"locNo\":\"A102400201\",\"batchNo\":\"TK2603104428\",\"taskNo\":\"TK2603104428\"}}";
+ String s = "{\"msg\":\"Success\",\"code\":200,\"data\":{\"locNo\":\"A102400201\",\"batchNo\":\"TK2603104428\",\"taskNo\":\"TK2603104428\"}}";
//System.out.println(JSON.parseObject(s).getString("data"));
ApplyInRepsonseDto applyInRepsonseDto = JSONObject.parseObject(JSON.parseObject(s).getString("data"), ApplyInRepsonseDto.class);
System.out.println(applyInRepsonseDto);
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
index 4b15263..3f485aa 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
@@ -13,8 +13,8 @@
@Service("wrkLastnoService")
public class WrkLastnoServiceImpl extends ServiceImpl<WrkLastnoMapper, WrkLastno> implements WrkLastnoService {
-@Autowired
-private JobService jobService;
+ @Autowired
+ private JobService jobService;
/**
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
index 50f8376..be1b27e 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
@@ -85,7 +85,7 @@
}
// 9991鏄┖鏉匡紝9992鏄弧鏉�
if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
- Job job = jobService.getJobByBarcode(barcode ,ConveyorStateType.INBOUND.getStatus());
+ Job job = jobService.getJobByBarcode(barcode, ConveyorStateType.INBOUND.getStatus());
// 鐢宠鍏ュ簱
if (job == null || (job != null && job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus())) {
ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
@@ -94,11 +94,11 @@
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(inSta.getTargetSta());
if (MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(TaskType.WRITE, staProtocol))) {
- if (!jobService.insert(initJob(locOfWms, barcode, workNo,inSta.getTargetSta() + ""))) {
+ if (!jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
}
log.info("鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
- }else {
+ } else {
log.info("涓嬪彂澶辫触锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
}
} else {
@@ -116,8 +116,8 @@
}
- private Job initJob(ApplyInRepsonseDto locOfWms, String barcode,Integer workNo, String staNo) {
- Job job = new Job();
+ private Job initJob(ApplyInRepsonseDto locOfWms, String barcode, Integer workNo, String staNo) {
+ Job job = new Job();
job.setLoc(locOfWms.getLocNo());
job.setTaskNo(locOfWms.getTaskNo());
job.setBatchNo(locOfWms.getBatchNo());
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java
index e7c32c1..e3ca358 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java
@@ -55,12 +55,12 @@
return;
}
StaProtocol staProtocol5 = devpThread.getStation().get(1005);
- if (staProtocol5.isLoading()){
+ if (staProtocol5.isLoading()) {
log.info("1005鏈夌墿锛岀瓑鏃犵墿涔嬪悗鎵嶅叆搴�");
return;
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
- Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.OUTBOUND.getStatus());
+ Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), ConveyorStateType.OUTBOUND.getStatus());
if (jobByWorkNo != null && jobByWorkNo.getJobSts() == ConveyorStateType.OUTBOUND.getStatus()) {
staProtocol.setWorkNo(9992);
staProtocol.setStaNo(1005);
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
index 81d9c40..327d415 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java
@@ -73,8 +73,8 @@
continue;
}
if (staProtocol.isAutoing()) {
- Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.INBOUND.getStatus());
- if (job != null ) {
+ Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), ConveyorStateType.INBOUND.getStatus());
+ if (job != null) {
if (ctuMainService.sendTask(process(job))) {
job.setJobSts(ConveyorStateType.SENDTASK.getStatus());
job.setRcsTime(new Date());
diff --git a/zy-acs-cv/src/main/resources/application.yml b/zy-acs-cv/src/main/resources/application.yml
index a4c1088..a67863c 100644
--- a/zy-acs-cv/src/main/resources/application.yml
+++ b/zy-acs-cv/src/main/resources/application.yml
@@ -35,18 +35,18 @@
mark: 10
max-retries: 3
retry-delay: 800
-# - type: FAKEUSER
-# mark: 20
-# max-retries: 2
-# retry-delay: 800
+ # - type: FAKEUSER
+ # mark: 20
+ # max-retries: 2
+ # retry-delay: 800
- type: APPLYLOC
mark: 30
max-retries: 2
retry-delay: 2000
-# - type: INBOUND
-# mark: 40
-# max-retries: 3
-# retry-delay: 500
+ # - type: INBOUND
+ # mark: 40
+ # max-retries: 3
+ # retry-delay: 500
- type: CLEARSIGNAL
mark: 50
max-retries: 2
diff --git a/zy-acs-cv/src/main/resources/mapper/JobMapper.xml b/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
index 4ba70b7..97ba60a 100644
--- a/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
+++ b/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
@@ -84,6 +84,6 @@
select *
from cv_job
where job_sts = #{jobSts}
- and DATEDIFF(NOW(),create_time ) > #{day}
+ and DATEDIFF(NOW(), create_time) > #{day}
</select>
</mapper>
--
Gitblit v1.9.1