From 58473c78c6215b3054f3b93297f430e78eede8f2 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Sat, 28 Jan 2023 19:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceServiceImpl.java | 8 ++ .../service/impl/InstructionServiceImpl.java | 9 ++- .../instruction/service/wql/QINST_QUERY.wql | 81 ++++++++++--------- .../task/service/impl/TaskServiceImpl.java | 6 +- .../src/views/acs/device/protocol/index.vue | 5 +- .../src/views/acs/instruction/index.vue | 20 ++--- 6 files changed, 77 insertions(+), 52 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 28097f060..b85787054 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -55,6 +55,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.*; +import java.util.stream.Collectors; /** * @author ldjun @@ -104,6 +105,13 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial param.put("opc_id", whereJson.get("opc_id")); } JSONObject json = WQL.getWO("Qdevice_query_002").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); + JSONArray jsonArray = json.getJSONArray("content"); + List objects = jsonArray.toJavaList(Object.class); + Integer currentPageNumber = page.getPageNumber() + 1; + Integer pageMaxSize = page.getPageSize(); + List protocolList = objects.stream().skip((currentPageNumber - 1) * pageMaxSize).limit(pageMaxSize).collect(Collectors.toList()); + json.put("content",protocolList); + json.put("totalElements",jsonArray.size()); return json; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 1cb72140a..620dfd0a2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -53,6 +53,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * @author ldjun @@ -122,8 +123,14 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu map.put("is_over", is_over); } - + Integer currentPageNumber = page.getPageNumber() + 1; + Integer pageMaxSize = page.getPageSize(); final JSONObject jo = WQL.getWO("QINST_QUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), ""); + JSONArray jsonArray = jo.getJSONArray("content"); + List instructions = jsonArray.toJavaList(Instruction.class); + List instDtoList = instructions.stream().skip((currentPageNumber - 1) * pageMaxSize).limit(pageMaxSize).collect(Collectors.toList()); + jo.put("content",instDtoList); + jo.put("totalElements",jsonArray.size()); return jo; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql index 170478f47..5c2df482e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql @@ -45,46 +45,47 @@ ########################################## # 3、业务主过程 # ########################################## - IF 输入.flag = "1" - PAGEQUERY - SELECT - * - FROM - acs_instruction inst - WHERE - is_delete =0 - OPTION 输入.is_over = "1" - inst.instruction_status >= 2 - ENDOPTION - OPTION 输入.is_over <> "1" - inst.instruction_status < 2 - ENDOPTION - OPTION 输入.task_code <> "" - ( - inst.instruction_code = 输入.code - OR - inst.task_code = 输入.code - ) - ENDOPTION - OPTION 输入.status <> "" - inst.instruction_status = 输入.status - ENDOPTION - OPTION 输入.vehicle_code <> "" - inst.vehicle_code = 输入.vehicle_code - ENDOPTION - OPTION 输入.material_type <> "" - inst.material = 输入.material_type - ENDOPTION - OPTION 输入.point_code <> "" - ( - inst.start_point_code = 输入.point_code - OR - inst.next_point_code = 输入.point_code - ) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF + + IF 输入.flag = "1" + PAGEQUERY + SELECT + * + FROM + acs_instruction inst + WHERE + is_delete =0 + OPTION 输入.is_over = "1" + inst.instruction_status >= 2 + ENDOPTION + OPTION 输入.is_over <> "1" + inst.instruction_status < 2 + ENDOPTION + OPTION 输入.task_code <> "" + ( + inst.instruction_code = 输入.code + OR + inst.task_code = 输入.code + ) + ENDOPTION + OPTION 输入.status <> "" + inst.instruction_status = 输入.status + ENDOPTION + OPTION 输入.vehicle_code <> "" + inst.vehicle_code = 输入.vehicle_code + ENDOPTION + OPTION 输入.material_type <> "" + inst.material = 输入.material_type + ENDOPTION + OPTION 输入.point_code <> "" + ( + inst.start_point_code = 输入.point_code + OR + inst.next_point_code = 输入.point_code + ) + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF IF 输入.flag = "2" PAGEQUERY diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 7e5c0883c..3b139577b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -55,6 +55,7 @@ import java.io.IOException; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * @author ldjun @@ -175,8 +176,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } taskList.add(task); } + Integer currentPageNumber = page.getPageNumber() + 1; + Integer pageMaxSize = page.getPageSize(); + List taskDtoList = taskList.stream().skip((currentPageNumber - 1) * pageMaxSize).limit(pageMaxSize).collect(Collectors.toList()); JSONObject jo = new JSONObject(); - jo.put("content", taskList); + jo.put("content", taskDtoList); jo.put("totalElements", taskList.size()); return jo; } diff --git a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue index 62837873b..ea861d1d5 100644 --- a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue +++ b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue @@ -113,6 +113,8 @@ + + @@ -125,10 +127,11 @@ import { get } from '@/api/system/dictDetail' import { selectOpcList } from '@/api/acs/device/opc' import { download } from '@/api/data' import { downloadFile } from '@/utils' +import pagination from '@crud/Pagination' export default { name: 'Protocol', - components: { crudOperation, rrOperation }, + components: { crudOperation, rrOperation, pagination }, mixins: [presenter(), header(), crud()], cruds() { return CRUD({ diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue index 7d5c0ed88..2b2ef30b4 100644 --- a/acs/nladmin-ui/src/views/acs/instruction/index.vue +++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue @@ -110,7 +110,7 @@ - + @@ -133,13 +133,13 @@ - - - - - - - + + + + + + + @@ -169,6 +169,7 @@ + @@ -178,6 +179,7 @@ import crudInstruction from '@/api/acs/instruction/instruction' import CRUD, { presenter, header, form, crud } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import { getDicts } from '@/api/system/dict' +import pagination from '@crud/Pagination' const defaultForm = { instruction_id: null, @@ -218,7 +220,7 @@ const defaultForm = { export default { dicts: ['task_status'], name: 'Instruction', - components: { crudOperation }, + components: { crudOperation, pagination }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({