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

更新分页

Browse Source
This commit is contained in:
gengby
2023-01-28 19:51:31 +08:00
parent 33ac8957fb
commit 58473c78c6
6 changed files with 77 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -55,6 +55,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* @author ldjun * @author ldjun
@@ -104,6 +105,13 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
param.put("opc_id", whereJson.get("opc_id")); param.put("opc_id", whereJson.get("opc_id"));
} }
JSONObject json = WQL.getWO("Qdevice_query_002").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); JSONObject json = WQL.getWO("Qdevice_query_002").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
JSONArray jsonArray = json.getJSONArray("content");
List<Object> objects = jsonArray.toJavaList(Object.class);
Integer currentPageNumber = page.getPageNumber() + 1;
Integer pageMaxSize = page.getPageSize();
List<Object> protocolList = objects.stream().skip((currentPageNumber - 1) * pageMaxSize).limit(pageMaxSize).collect(Collectors.toList());
json.put("content",protocolList);
json.put("totalElements",jsonArray.size());
return json; return json;
} }

9
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -53,6 +53,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors;
/** /**
* @author ldjun * @author ldjun
@@ -122,8 +123,14 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
map.put("is_over", is_over); 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), ""); final JSONObject jo = WQL.getWO("QINST_QUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
JSONArray jsonArray = jo.getJSONArray("content");
List<Instruction> instructions = jsonArray.toJavaList(Instruction.class);
List<Instruction> instDtoList = instructions.stream().skip((currentPageNumber - 1) * pageMaxSize).limit(pageMaxSize).collect(Collectors.toList());
jo.put("content",instDtoList);
jo.put("totalElements",jsonArray.size());
return jo; return jo;
} }

81
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql
View File

@@ -45,46 +45,47 @@
########################################## ##########################################
# 3、业务主过程 # # 3、业务主过程 #
########################################## ##########################################
IF 输入.flag = "1"
PAGEQUERY IF 输入.flag = "1"
SELECT PAGEQUERY
* SELECT
FROM *
acs_instruction inst FROM
WHERE acs_instruction inst
is_delete =0 WHERE
OPTION 输入.is_over = "1" is_delete =0
inst.instruction_status >= 2 OPTION 输入.is_over = "1"
ENDOPTION inst.instruction_status >= 2
OPTION 输入.is_over <> "1" ENDOPTION
inst.instruction_status < 2 OPTION 输入.is_over <> "1"
ENDOPTION inst.instruction_status < 2
OPTION 输入.task_code <> "" ENDOPTION
( OPTION 输入.task_code <> ""
inst.instruction_code = 输入.code (
OR inst.instruction_code = 输入.code
inst.task_code = 输入.code OR
) inst.task_code = 输入.code
ENDOPTION )
OPTION 输入.status <> "" ENDOPTION
inst.instruction_status = 输入.status OPTION 输入.status <> ""
ENDOPTION inst.instruction_status = 输入.status
OPTION 输入.vehicle_code <> "" ENDOPTION
inst.vehicle_code = 输入.vehicle_code OPTION 输入.vehicle_code <> ""
ENDOPTION inst.vehicle_code = 输入.vehicle_code
OPTION 输入.material_type <> "" ENDOPTION
inst.material = 输入.material_type OPTION 输入.material_type <> ""
ENDOPTION inst.material = 输入.material_type
OPTION 输入.point_code <> "" ENDOPTION
( OPTION 输入.point_code <> ""
inst.start_point_code = 输入.point_code (
OR inst.start_point_code = 输入.point_code
inst.next_point_code = 输入.point_code OR
) inst.next_point_code = 输入.point_code
ENDOPTION )
ENDSELECT ENDOPTION
ENDPAGEQUERY ENDSELECT
ENDIF ENDPAGEQUERY
ENDIF
IF 输入.flag = "2" IF 输入.flag = "2"
PAGEQUERY PAGEQUERY

6
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -55,6 +55,7 @@ import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors;
/** /**
* @author ldjun * @author ldjun
@@ -175,8 +176,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
taskList.add(task); taskList.add(task);
} }
Integer currentPageNumber = page.getPageNumber() + 1;
Integer pageMaxSize = page.getPageSize();
List<TaskDto> taskDtoList = taskList.stream().skip((currentPageNumber - 1) * pageMaxSize).limit(pageMaxSize).collect(Collectors.toList());
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("content", taskList); jo.put("content", taskDtoList);
jo.put("totalElements", taskList.size()); jo.put("totalElements", taskList.size());
return jo; return jo;
} }

5
acs/nladmin-ui/src/views/acs/device/protocol/index.vue
View File

@@ -113,6 +113,8 @@
<el-table-column prop="opc_code" label="OpcServer" /> <el-table-column prop="opc_code" label="OpcServer" />
<el-table-column prop="plc_code" label="OpcPlc" /> <el-table-column prop="plc_code" label="OpcPlc" />
</el-table> </el-table>
<!--分页组件-->
<pagination />
</div> </div>
</div> </div>
</template> </template>
@@ -125,10 +127,11 @@ import { get } from '@/api/system/dictDetail'
import { selectOpcList } from '@/api/acs/device/opc' import { selectOpcList } from '@/api/acs/device/opc'
import { download } from '@/api/data' import { download } from '@/api/data'
import { downloadFile } from '@/utils' import { downloadFile } from '@/utils'
import pagination from '@crud/Pagination'
export default { export default {
name: 'Protocol', name: 'Protocol',
components: { crudOperation, rrOperation }, components: { crudOperation, rrOperation, pagination },
mixins: [presenter(), header(), crud()], mixins: [presenter(), header(), crud()],
cruds() { cruds() {
return CRUD({ return CRUD({

20
acs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -110,7 +110,7 @@
<el-table-column v-if="false" prop="instruction_id" label="指令标识" /> <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
<el-table-column prop="instruction_code" label="指令编号" /> <el-table-column prop="instruction_code" label="指令编号" />
<el-table-column prop="instruction_type" label="指令类型" /> <el-table-column prop="instruction_type" label="指令类型" />
<!-- <el-table-column prop="link_num" label="关联编号" />--> <!-- <el-table-column prop="link_num" label="关联编号" />-->
<el-table-column prop="task_code" label="任务号" /> <el-table-column prop="task_code" label="任务号" />
<el-table-column prop="vehicle_code" label="载具号" /> <el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="instruction_status" label="指令状态"> <el-table-column prop="instruction_status" label="指令状态">
@@ -133,13 +133,13 @@
<el-table-column prop="start_point_code2" label="取货点2" /> <el-table-column prop="start_point_code2" label="取货点2" />
<el-table-column prop="next_point_code2" label="放货点2" /> <el-table-column prop="next_point_code2" label="放货点2" />
<el-table-column prop="carno" label="车号" /> <el-table-column prop="carno" label="车号" />
<!-- <el-table-column prop="compound_inst" label="复合指令">--> <!-- <el-table-column prop="compound_inst" label="复合指令">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.compound_inst==='0' ">否</span>--> <!-- <span v-if="scope.row.compound_inst==='0' ">否</span>-->
<!-- <span v-if="scope.row.compound_inst==='1' ">是</span>--> <!-- <span v-if="scope.row.compound_inst==='1' ">是</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="compound_inst_data" width="200" label="复合路线" />--> <!-- <el-table-column prop="compound_inst_data" width="200" label="复合路线" />-->
<el-table-column prop="matarial" label="物料" /> <el-table-column prop="matarial" label="物料" />
<el-table-column prop="quantity" label="数量" /> <el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="描述" /> <el-table-column prop="remark" label="描述" />
@@ -169,6 +169,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination />
</div> </div>
</div> </div>
</template> </template>
@@ -178,6 +179,7 @@ import crudInstruction from '@/api/acs/instruction/instruction'
import CRUD, { presenter, header, form, crud } from '@crud/crud' import CRUD, { presenter, header, form, crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import { getDicts } from '@/api/system/dict' import { getDicts } from '@/api/system/dict'
import pagination from '@crud/Pagination'
const defaultForm = { const defaultForm = {
instruction_id: null, instruction_id: null,
@@ -218,7 +220,7 @@ const defaultForm = {
export default { export default {
dicts: ['task_status'], dicts: ['task_status'],
name: 'Instruction', name: 'Instruction',
components: { crudOperation }, components: { crudOperation, pagination },
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {
return CRUD({ return CRUD({