From 4fe1a741d807b55f7fc14aed85e232b9d7972425 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 13:28:44 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusList.jsx | 25 ++++++++++++++++++-------
zy-acs-flow/src/i18n/en.js | 1 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 10 +++++++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 1 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java | 4 ++++
zy-acs-flow/src/i18n/zh.js | 1 +
6 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index b439440..95e18fd 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -427,6 +427,7 @@
busSts: "bus status",
phase: "phase",
taskList: "task list",
+ tasksNum: "number of tasks",
},
task: {
uuid: "uuid",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 1328989..dd728a4 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -426,6 +426,7 @@
busSts: "鎬荤嚎鐘舵��",
phase: "杩涘害",
taskList: "浠诲姟鍒楄〃",
+ tasksNum: "浠诲姟鏁伴噺",
},
task: {
uuid: "缂栧彿",
diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx
index c6b7c70..b84793c 100644
--- a/zy-acs-flow/src/page/bus/BusList.jsx
+++ b/zy-acs-flow/src/page/bus/BusList.jsx
@@ -50,7 +50,17 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
+ '& .column-busNo': {
+ minWidth: '18em',
+ },
+ '& .column-tasksNum': {
+ maxWidth: '6em',
+ },
+ '& .column-memo': {
+ maxWidth: '12em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
},
'& .opt': {
width: 200
@@ -62,11 +72,11 @@
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <TextInput source="uuid" label="table.field.bus.uuid" />,
- <TextInput source="busNo" label="table.field.bus.busNo" />,
+ // <TextInput source="uuid" label="table.field.bus.uuid" />,
+ <TextInput source="busNo" label="table.field.bus.busNo" alwaysOn resettable />,
<DateInput source="startTime" label="table.field.bus.startTime" />,
<DateInput source="endTime" label="table.field.bus.endTime" />,
- <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts">
+ <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts" alwaysOn>
<AutocompleteInput label="table.field.bus.busSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<TextInput source="phase" label="table.field.bus.phase" />,
@@ -119,16 +129,17 @@
rowClick={(id, resource, record) => false}
expand={() => <BusPanel />}
expandSingle={true}
- omit={['id', 'uuid', 'phase', 'updateBy', 'createTime', 'createBy']}
+ omit={['id', 'uuid', 'phase', 'updateBy', 'updateTime', 'createTime', 'createBy']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.bus.uuid" />
<TextField source="busNo" label="table.field.bus.busNo" />
- <DateField source="startTime" label="table.field.bus.startTime" showTime />
- <DateField source="endTime" label="table.field.bus.endTime" showTime />
<ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
+ <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} />
+ <DateField source="startTime" label="table.field.bus.startTime" showTime />
+ <DateField source="endTime" label="table.field.bus.endTime" showTime />
<TextField source="phase" label="table.field.bus.phase" sortable={false} />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
index 24f9ba0..a2cf33c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -116,6 +116,7 @@
}
if (finish) {
bus.setBusSts(BusStsType.FINISH.val());
+ bus.setEndTime(new Date());
bus.setUpdateTime(new Date());
if (!busService.updateById(bus)) {
log.error("Bus [{}] 鏇存柊澶辫触 锛侊紒锛�", bus.getUuid());
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
index 50856dd..84e9973 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
@@ -11,9 +11,11 @@
import com.zy.acs.manager.manager.controller.param.BusCreateParam;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
+import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.StaService;
+import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,13 +36,19 @@
private StaService staService;
@Autowired
private LocService locService;
+ @Autowired
+ private TaskService taskService;
@PreAuthorize("hasAuthority('manager:bus:list')")
@PostMapping("/bus/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
- return R.ok().add(busService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Bus, BaseParam> page = busService.page(pageParam, pageParam.buildWrapper(true));
+ for (Bus record : page.getRecords()) {
+ record.setTasksNum(taskService.count(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId())));
+ }
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:bus:list')")
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java
index 18a75a7..b811289 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java
@@ -1,6 +1,7 @@
package com.zy.acs.manager.manager.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.acs.framework.common.Cools;
@@ -109,6 +110,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField(exist = false)
+ private int tasksNum;
+
public String getBusSts$(){
BusStsService service = SpringUtils.getBean(BusStsService.class);
BusSts busSts = service.getById(this.busSts);
--
Gitblit v1.9.1