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

Version 1.3

Browse Source
This commit is contained in:
张江玮
2022-11-16 16:08:08 +08:00
parent 84166aa570
commit 9a9947e9b2
16 changed files with 144 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java
View File

@@ -639,6 +639,7 @@ public class HFHandServiceImpl implements HFHandService {
instdto.setStart_device_code(taskjo.getString("start_device_code"));
instdto.setNext_device_code(taskjo.getString("next_device_code"));
instdto.setInstruction_status("0");
instdto.setIs_delete("0");
InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
WQLObject instwo = WQLObject.getWQLObject("acs_instruction");
JSONObject instcheckjson = instwo.query(" instruction_status <2 and next_point_code= '" + next_point_code + "'" + " and start_point_code = '" + start_point_code + "'" + " and task_id = '" + task_id + "'").uniqueResult(0);

21
acs/nladmin-system/src/main/java/org/nl/hand/amb/wql/QJN_QUERY001.wql
View File

@@ -172,18 +172,17 @@
LEFT JOIN sys_dict_detail dtl3 ON dtl3.VALUE = inst.send_status
AND dtl3.NAME = 'send_status'
WHERE
inst.is_delete = '0'
AND inst.instruction_status <> '2'
AND inst.instruction_status < '2'
inst.is_delete = '0'
AND inst.instruction_status < '2'
OPTION 输入.key <> ""
inst.instruction_code like 输入.key
ENDOPTION
OPTION 输入.start_point <> ""
inst.start_point_code like 输入.start_point
ENDOPTION
OPTION 输入.next_point <> ""
inst.next_point_code like 输入.next_point
ENDOPTION
inst.instruction_code like 输入.key
ENDOPTION
OPTION 输入.start_point <> ""
inst.start_point_code like 输入.start_point
ENDOPTION
OPTION 输入.next_point <> ""
inst.next_point_code like 输入.next_point
ENDOPTION
ORDER BY
inst.create_time DESC
ENDSELECT

1
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
View File

@@ -115,6 +115,7 @@ public class AutoCreateInst {
instdto.setInstruction_status("0");
instdto.setExecute_device_code(start_point_code);
instdto.setVehicle_type(vehicleType);
instdto.setIs_delete("0");
try {
instructionService.create(instdto);
} catch (Exception e) {

2
acs/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -52,7 +52,7 @@ spring:
multi-statement-allow: true
redis:
#数据库索引
database: ${REDIS_DB:15}
database: ${REDIS_DB:0}
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:}