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

去掉任务事务注解

Browse Source
This commit is contained in:
ludj
2023-04-17 11:18:04 +08:00
parent b4d9d48170
commit 7d8cb55911
12 changed files with 79 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ import org.nl.wms.sch.manage.*;
import org.nl.wms.sch.task.call.empty.HLCallEmptyTask;
import org.nl.wms.sch.task.call.empty.YZCallEmptyTask;
import org.nl.wms.sch.task.call.material.FJCallMaterialTask;
import org.nl.wms.sch.task.call.material.SZCallMaterialTask;
import org.nl.wms.sch.task.send.empty.FJSendEmptyTask;
import org.nl.wms.sch.task.send.material.HLSendMaterialTask;
import org.nl.wms.sch.task.send.material.SZSendMaterialTask;
@@ -184,6 +183,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Transactional(rollbackFor = Exception.class)
public JSONObject apply(JSONObject param) {
String point_code = param.getString("device_code");
String type = param.getString("type");
if (StrUtil.isBlank(type)) {
throw new BadRequestException("任务类型不能为空！");
}
if (StrUtil.isBlank(point_code)) {
throw new BadRequestException("点位不能为空！");
}
@@ -204,11 +207,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
TaskUtils.isLocked(point);
String type = param.getString("type");
if (StrUtil.isBlank(type)) {
throw new BadRequestException("任务类型不能为空！");
}
Region region = Region.get(point.getString("region_code"));
JSONObject method_param = new JSONObject();

12
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/HLCallEmptyTask.java
View File

@@ -37,7 +37,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point");
@@ -67,7 +67,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
return task.getString("task_id");
}
@Transactional(rollbackFor = Exception.class)
@Override
public void findStartPoint() {
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -102,7 +102,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void forceFinish(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -112,7 +112,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
this.finishTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void cancel(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -122,7 +122,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
this.cancelTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.CANCELLED.value());
@@ -160,7 +160,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.FINISHED.value());

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java
View File

@@ -24,7 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
@Component
public class YZCallEmptyTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
@Override
public void updateTaskStatus(JSONObject task, String status) {
if (TaskStatus.EXECUTING.value().equals(status)) {
@@ -38,7 +38,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point");
@@ -73,7 +73,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
return task.getString("task_id");
}
@Transactional(rollbackFor = Exception.class)
@Override
public void findStartPoint() {
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -112,7 +112,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void forceFinish(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -122,7 +122,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
this.finishTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void cancel(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -132,7 +132,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
this.cancelTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.CANCELLED.value());
@@ -170,7 +170,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.FINISHED.value());

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/FJCallMaterialTask.java
View File

@@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
@Component
public class FJCallMaterialTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
@Override
public void updateTaskStatus(JSONObject task, String status) {
if (TaskStatus.EXECUTING.value().equals(status)) {
@@ -36,7 +36,7 @@ public class FJCallMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point");
@@ -67,7 +67,7 @@ public class FJCallMaterialTask extends AbstractAcsTask {
return task.getString("task_id");
}
@Transactional(rollbackFor = Exception.class)
@Override
public void findStartPoint() {
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -100,7 +100,7 @@ public class FJCallMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void forceFinish(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -110,7 +110,7 @@ public class FJCallMaterialTask extends AbstractAcsTask {
this.finishTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void cancel(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -120,7 +120,7 @@ public class FJCallMaterialTask extends AbstractAcsTask {
this.cancelTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.CANCELLED.value());
@@ -158,7 +158,7 @@ public class FJCallMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.FINISHED.value());

16
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java
View File

@@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
@Component
public class SZCallMaterialTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
@Override
public void autoCreate() {
JSONArray points = WQL.getWO("CALL_MATERIAL_TASK").addParam("flag", "2").process().getResultJSONArray(0);
@@ -39,7 +39,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void updateTaskStatus(JSONObject task, String status) {
if (TaskStatus.EXECUTING.value().equals(status)) {
@@ -53,7 +53,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point");
@@ -83,7 +83,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
return task.getString("task_id");
}
@Transactional(rollbackFor = Exception.class)
@Override
public void findStartPoint() {
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -117,7 +117,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void forceFinish(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -127,7 +127,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
this.finishTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void cancel(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -137,7 +137,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
this.cancelTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.CANCELLED.value());
@@ -175,7 +175,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.FINISHED.value());

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/empty/FJSendEmptyTask.java
View File

@@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
@Component
public class FJSendEmptyTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
@Override
public void updateTaskStatus(JSONObject task, String status) {
if (TaskStatus.EXECUTING.value().equals(status)) {
@@ -35,7 +35,7 @@ public class FJSendEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point");
@@ -66,7 +66,7 @@ public class FJSendEmptyTask extends AbstractAcsTask {
return task.getString("task_id");
}
@Transactional(rollbackFor = Exception.class)
@Override
public void findNextPoint() {
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -97,7 +97,7 @@ public class FJSendEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void forceFinish(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -107,7 +107,7 @@ public class FJSendEmptyTask extends AbstractAcsTask {
this.finishTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void cancel(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -117,7 +117,7 @@ public class FJSendEmptyTask extends AbstractAcsTask {
this.cancelTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.CANCELLED.value());
@@ -154,7 +154,7 @@ public class FJSendEmptyTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.FINISHED.value());

11
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java
View File

@@ -39,7 +39,6 @@ public class HLSendMaterialTask extends AbstractAcsTask {
}
@Override
@Transactional
public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point");
@@ -74,7 +73,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
return task.getString("task_id");
}
@Transactional(rollbackFor = Exception.class)
@Override
public void findNextPoint() {
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -105,7 +104,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void forceFinish(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -115,7 +114,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
this.finishTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void cancel(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -125,7 +124,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
this.cancelTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.CANCELLED.value());
@@ -162,7 +161,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.FINISHED.value());

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java
View File

@@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
@Component
public class SZSendMaterialTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
@Override
public void updateTaskStatus(JSONObject task, String status) {
if (TaskStatus.EXECUTING.value().equals(status)) {
@@ -35,7 +35,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point");
@@ -66,7 +66,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
return task.getString("task_id");
}
@Transactional(rollbackFor = Exception.class)
@Override
public void findNextPoint() {
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -97,7 +97,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void forceFinish(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -107,7 +107,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
this.finishTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void cancel(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -117,7 +117,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
this.cancelTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.CANCELLED.value());
@@ -154,7 +154,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.FINISHED.value());

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java
View File

@@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
@Component
public class YZSendMaterialTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
@Override
public void updateTaskStatus(JSONObject task, String status) {
if (TaskStatus.EXECUTING.value().equals(status)) {
@@ -36,7 +36,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point");
@@ -68,7 +68,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
return task.getString("task_id");
}
@Transactional(rollbackFor = Exception.class)
@Override
public void findNextPoint() {
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
@@ -102,7 +102,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void forceFinish(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -112,7 +112,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
this.finishTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void cancel(String task_id) {
JSONObject task = WQLObject.getWQLObject("sch_base_task").query("task_id = " + task_id).uniqueResult(0);
@@ -122,7 +122,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
this.cancelTask(task, OperationType.MANUAL);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.CANCELLED.value());
@@ -159,7 +159,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
}
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(JSONObject task, OperationType operation_type) {
if (task.getIntValue("task_status") < Integer.parseInt(TaskStatus.FINISHED.value())) {
task.put("task_status", TaskStatus.FINISHED.value());

4
lms/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -6,9 +6,9 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lnsh_lms3}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lnsh_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:123456}
password: ${DB_PWD:P@ssw0rd}
# 初始连接数
initial-size: 5
# 最小连接数