root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pom文件更新

Browse Source
This commit is contained in:
ludj
2023-02-13 20:50:05 +08:00
parent 9a2250c314
commit 5527d8fa35
4 changed files with 137 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
acs/nladmin-system/pom.xml
View File

@@ -20,7 +20,6 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<log4jdbc.version>1.16</log4jdbc.version> <log4jdbc.version>1.16</log4jdbc.version>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.9.2</swagger.version>
<fastjson.version>1.2.70</fastjson.version>
<druid.version>1.1.22</druid.version> <druid.version>1.1.22</druid.version>
<commons-pool2.version>2.5.0</commons-pool2.version> <commons-pool2.version>2.5.0</commons-pool2.version>
<mapstruct.version>1.3.1.Final</mapstruct.version> <mapstruct.version>1.3.1.Final</mapstruct.version>
@@ -34,11 +33,11 @@
<dependencies> <dependencies>
<dependency> <!--<dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>1.50</version> <version>1.50</version>
</dependency> </dependency>-->
<!--导出CSV相关--> <!--导出CSV相关-->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@@ -65,21 +64,21 @@
<artifactId>poi-ooxml-schemas</artifactId> <artifactId>poi-ooxml-schemas</artifactId>
<version>4.1.2</version> <version>4.1.2</version>
</dependency> </dependency>
<dependency> <!--<dependency>
<groupId>org.openscada.jinterop</groupId> <groupId>org.openscada.jinterop</groupId>
<artifactId>org.openscada.jinterop.core</artifactId> <artifactId>org.openscada.jinterop.core</artifactId>
<version>2.1.8</version> <version>2.1.8</version>
</dependency> </dependency>-->
<dependency> <!--<dependency>
<groupId>org.openscada.jinterop</groupId> <groupId>org.openscada.jinterop</groupId>
<artifactId>org.openscada.jinterop.deps</artifactId> <artifactId>org.openscada.jinterop.deps</artifactId>
<version>1.5.0</version> <version>1.5.0</version>
</dependency> </dependency>-->
<dependency> <!-- <dependency>
<groupId>org.openscada.utgard</groupId> <groupId>org.openscada.utgard</groupId>
<artifactId>org.openscada.opc.dcom</artifactId> <artifactId>org.openscada.opc.dcom</artifactId>
<version>1.5.0</version> <version>1.5.0</version>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>org.openscada.utgard</groupId> <groupId>org.openscada.utgard</groupId>
<artifactId>org.openscada.opc.lib</artifactId> <artifactId>org.openscada.opc.lib</artifactId>
@@ -103,11 +102,11 @@
<version>1.8.0</version> <version>1.8.0</version>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<version>1.9.2</version> <version>1.9.2</version>
</dependency> </dependency>-->
<!--接口限流--> <!--接口限流-->
<dependency> <dependency>
@@ -116,11 +115,11 @@
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava --> <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency> <!--<dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>29.0-jre</version> <version>29.0-jre</version>
</dependency> </dependency>-->
<!--模板引擎--> <!--模板引擎-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -231,6 +230,12 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<artifactId>objenesis</artifactId>
<groupId>org.objenesis</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--Spring boot 安全框架--> <!--Spring boot 安全框架-->
@@ -296,6 +301,10 @@
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId> <artifactId>swagger-models</artifactId>
</exclusion> </exclusion>
<exclusion>
<artifactId>mapstruct</artifactId>
<groupId>org.mapstruct</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@@ -362,13 +371,6 @@
<version>2.12.0</version> <version>2.12.0</version>
</dependency> </dependency>
<!-- fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!--mapStruct依赖--> <!--mapStruct依赖-->
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mapstruct</groupId>
@@ -453,6 +455,9 @@
<includes> <includes>
<include>**/*.*</include> <include>**/*.*</include>
</includes> </includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource> </resource>
<resource> <resource>

16
lms/nladmin-system/pom.xml
View File

@@ -45,22 +45,6 @@
<version>6.1.4</version> <version>6.1.4</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.elasticsearch.client</groupId>-->
<!-- <artifactId>elasticsearch-rest-high-level-client</artifactId>-->
<!-- <version>7.6.1</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.elasticsearch.client</groupId>-->
<!-- <artifactId>elasticsearch-rest-client</artifactId>-->
<!-- <version>7.6.1</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.elasticsearch</groupId>-->
<!-- <artifactId>elasticsearch</artifactId>-->
<!-- <version>7.6.1</version>-->
<!-- </dependency>-->
<!-- logback appender日志--> <!-- logback appender日志-->
<dependency> <dependency>
<groupId>com.internetitem</groupId> <groupId>com.internetitem</groupId>

44
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -69,7 +69,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
*/ */
@Override @Override
public Map<String, Object> receiveTaskStatusAcs(String string) { public Map<String, Object> receiveTaskStatusAcs(String string) {
log.info("receiveTaskStatusAcs请求参数：--------------------------------------"+string); log.info("receiveTaskStatusAcs请求参数：--------------------------------------" + string);
JSONArray array = JSONArray.parseArray(string); JSONArray array = JSONArray.parseArray(string);
//返回处理失败的任务 //返回处理失败的任务
JSONArray errArr = new JSONArray(); JSONArray errArr = new JSONArray();
@@ -484,7 +484,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public JSONObject deviceApply(JSONObject whereJson) { public JSONObject deviceApply(JSONObject whereJson) {
log.info("deviceApply请求参数：---------------------------------------------"+whereJson.toString()); log.info("deviceApply请求参数：---------------------------------------------" + whereJson.toString());
String vehicle_code = whereJson.getString("vehicle_code"); String vehicle_code = whereJson.getString("vehicle_code");
String weight = whereJson.getString("weight"); String weight = whereJson.getString("weight");
String type = whereJson.getString("type"); String type = whereJson.getString("type");
@@ -547,13 +547,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
data.put("box_width", box_width); data.put("box_width", box_width);
data.put("box_high", box_high); data.put("box_high", box_high);
data.put("bundle_times", 2); data.put("bundle_times", 2);
result.put("data",data); result.put("data", data);
} else if (type.equals("3")) { } else if (type.equals("3")) {
//烘箱出箱任务 //烘箱出箱任务
String device_code = whereJson.getString("device_code"); String device_code = whereJson.getString("device_code");
JSONObject bake_jo = new JSONObject(); JSONObject bake_jo = new JSONObject();
bake_jo.put("point_code",device_code); bake_jo.put("point_code", device_code);
bake_jo.put("option","2"); bake_jo.put("option", "2");
new BakingServiceImpl().ovenInAndOut(bake_jo); new BakingServiceImpl().ovenInAndOut(bake_jo);
} else { } else {
throw new BadRequestException("请输入正确的任务类型!"); throw new BadRequestException("请输入正确的任务类型!");
@@ -563,7 +563,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public JSONObject process(JSONObject whereJson) { public JSONObject process(JSONObject whereJson) {
log.info("process请求参数：---------------------------------------------"+whereJson.toString()); log.info("process请求参数：---------------------------------------------" + whereJson.toString());
String vehicle_code = whereJson.getString("vehicle_code"); String vehicle_code = whereJson.getString("vehicle_code");
String ext_task_id = whereJson.getString("ext_task_id"); String ext_task_id = whereJson.getString("ext_task_id");
String srcLocation = whereJson.getString("srcLocation"); String srcLocation = whereJson.getString("srcLocation");
@@ -630,20 +630,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public JSONObject shipDeviceUpdate(JSONObject whereJson) { public JSONObject shipDeviceUpdate(JSONObject whereJson) {
log.info("shipDeviceUpdate请求参数：---------------------------------------------"+whereJson.toString()); log.info("shipDeviceUpdate请求参数：---------------------------------------------" + whereJson.toString());
String device_code = whereJson.getString("device_code"); String device_code = whereJson.getString("device_code");
if (StrUtil.isEmpty(device_code)){ if (StrUtil.isEmpty(device_code)) {
throw new BadRequestException("输入的设备号不能为空！"); throw new BadRequestException("输入的设备号不能为空！");
} }
//查询该设备对应的输送线点位 //查询该设备对应的输送线点位
JSONObject deliver_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '"+device_code+"'").uniqueResult(0); JSONObject deliver_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '" + device_code + "'").uniqueResult(0);
if (deliver_jo != null){ if (deliver_jo != null) {
String qzzno = deliver_jo.getString("qzzno"); String qzzno = deliver_jo.getString("qzzno");
if (ObjectUtil.isNotEmpty(deliver_jo)){ if (ObjectUtil.isNotEmpty(deliver_jo)) {
deliver_jo.put("point_status","01"); deliver_jo.put("point_status", "01");
deliver_jo.put("qzzno",""); deliver_jo.put("qzzno", "");
deliver_jo.put("vehicle_code",""); deliver_jo.put("vehicle_code", "");
WQLObject.getWQLObject("st_ivt_deliverypointivt").update(deliver_jo); WQLObject.getWQLObject("st_ivt_deliverypointivt").update(deliver_jo);
//如果为靠近分切机一端的输送点，判断远离端是否需要进行横移 //如果为靠近分切机一端的输送点，判断远离端是否需要进行横移
@@ -657,18 +657,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.addParam("point_code", device_code) .addParam("point_code", device_code)
.addParam("product_area", product_area) .addParam("product_area", product_area)
.addParam("sort_seq", sort_seq) .addParam("sort_seq", sort_seq)
.addParam("find_type","1") .addParam("find_type", "1")
.addParam("flag", "17").process().uniqueResult(0); .addParam("flag", "17").process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(right_point) && !right_point.getString("point_status").equals("01")) { if (ObjectUtil.isNotEmpty(right_point) && !right_point.getString("point_status").equals("01")) {
//创建载具横移任务 //创建载具横移任务
String translate_code1 = right_point.getString("point_code"); String translate_code1 = right_point.getString("point_code");
String translate_code2 = device_code; String translate_code2 = device_code;
JSONObject tran_jo = new JSONObject(); JSONObject tran_jo = new JSONObject();
tran_jo.put("point_code1",translate_code1); tran_jo.put("point_code1", translate_code1);
tran_jo.put("point_code2",translate_code2); tran_jo.put("point_code2", translate_code2);
tran_jo.put("vehicle_code",right_point.getString("qzzno")); tran_jo.put("vehicle_code", right_point.getString("qzzno"));
tran_jo.put("vehicle_code2",right_point.getString("vehicle_code")); tran_jo.put("vehicle_code2", right_point.getString("vehicle_code"));
tran_jo.put("task_type","010406"); tran_jo.put("task_type", "010406");
cutConveyorTask.createTask(tran_jo); cutConveyorTask.createTask(tran_jo);
} }
} }
@@ -682,7 +682,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public void initialize(JSONObject param) { public void initialize(JSONObject param) {
{
{ {
int j_size = param.getInteger("j"); // 排 int j_size = param.getInteger("j"); // 排
int k_size = param.getInteger("k"); // 列 int k_size = param.getInteger("k"); // 列
@@ -755,7 +754,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
max_no++; max_no++;
//插入点位 //插入点位
JSONObject structMap = new JSONObject(); JSONObject structMap = new JSONObject();
structMap.put("point_id", IdUtil.getSnowflake(1,1).nextId()); structMap.put("point_id", IdUtil.getSnowflake(1, 1).nextId());
structMap.put("point_code", jo.getString("struct_code")); structMap.put("point_code", jo.getString("struct_code"));
structMap.put("point_name", jo.getString("struct_name")); structMap.put("point_name", jo.getString("struct_name"));
structMap.put("region_id", "1582991348217286656"); structMap.put("region_id", "1582991348217286656");
@@ -781,5 +780,4 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} }
} }
} }
}
} }

8
lms/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -178,13 +178,7 @@ sa-token:
is-log: false is-log: false
jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
# token 前缀 # token 前缀
token-prefix: token-prefix: Bearer
cookie: cookie:
# 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
domain: domain:
loki:
url: http://localhost:3100/loki/api/v1
systemName: lms
es:
index: lms_log_prod