From 0da1f34e1419d91ff26927b14f9fc7828dc28d9f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 09:44:28 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusList.jsx | 4 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 2
zy-acs-flow/src/i18n/en.js | 2
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 4 +-
zy-acs-flow/src/page/bus/BusEdit.jsx | 4 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 2
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java | 40 +-------------------
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java | 2
zy-acs-flow/src/i18n/zh.js | 2
zy-acs-flow/src/page/bus/BusPanel.jsx | 6 +-
zy-acs-flow/src/page/bus/BusCreate.jsx | 16 +-------
zy-acs-flow/src/page/bus/index.jsx | 2
12 files changed, 19 insertions(+), 67 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 8ff0453..268ac31 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -421,7 +421,7 @@
},
bus: {
uuid: "uuid",
- seqNum: "seq num",
+ busNo: "bus no",
startTime: "start time",
endTime: "end time",
busSts: "bus status",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index d26aace..f22f268 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -420,7 +420,7 @@
},
bus: {
uuid: "缂栧彿",
- seqNum: "鎬荤嚎缂栧彿",
+ busNo: "鎬绘壒鍙�",
startTime: "寮�濮嬫椂闂�",
endTime: "缁撴潫鏃堕棿",
busSts: "鎬荤嚎鐘舵��",
diff --git a/zy-acs-flow/src/page/bus/BusCreate.jsx b/zy-acs-flow/src/page/bus/BusCreate.jsx
index a17c55c..1dc547e 100644
--- a/zy-acs-flow/src/page/bus/BusCreate.jsx
+++ b/zy-acs-flow/src/page/bus/BusCreate.jsx
@@ -94,21 +94,9 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.bus.seqNum"
- source="seqNum"
+ label="table.field.bus.busNo"
+ source="busNo"
parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <DateInput
- label="table.field.bus.startTime"
- source="startTime"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <DateInput
- label="table.field.bus.endTime"
- source="endTime"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
diff --git a/zy-acs-flow/src/page/bus/BusEdit.jsx b/zy-acs-flow/src/page/bus/BusEdit.jsx
index 4977dbe..b6c818c 100644
--- a/zy-acs-flow/src/page/bus/BusEdit.jsx
+++ b/zy-acs-flow/src/page/bus/BusEdit.jsx
@@ -73,8 +73,8 @@
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.bus.seqNum"
- source="seqNum"
+ label="table.field.bus.busNo"
+ source="busNo"
parse={v => v}
/>
</Stack>
diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx
index 215e0c4..fbe829d 100644
--- a/zy-acs-flow/src/page/bus/BusList.jsx
+++ b/zy-acs-flow/src/page/bus/BusList.jsx
@@ -63,7 +63,7 @@
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="uuid" label="table.field.bus.uuid" />,
- <TextInput source="seqNum" label="table.field.bus.seqNum" />,
+ <TextInput source="busNo" label="table.field.bus.busNo" />,
<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">
@@ -123,7 +123,7 @@
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.bus.uuid" />
- <TextField source="seqNum" label="table.field.bus.seqNum" />
+ <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}>
diff --git a/zy-acs-flow/src/page/bus/BusPanel.jsx b/zy-acs-flow/src/page/bus/BusPanel.jsx
index d24532f..5f62e82 100644
--- a/zy-acs-flow/src/page/bus/BusPanel.jsx
+++ b/zy-acs-flow/src/page/bus/BusPanel.jsx
@@ -23,7 +23,7 @@
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
- {Common.camelToPascalWithSpaces(translate('table.field.bus.seqNum'))}: {record.seqNum}
+ {Common.camelToPascalWithSpaces(translate('table.field.bus.busNo'))}: {record.seqNum}
</Typography>
{/* inherit, primary, secondary, textPrimary, textSecondary, error */}
<Typography variant="h6" gutterBottom align="right" >
@@ -48,8 +48,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.bus.seqNum"
- property={record.seqNum}
+ title="table.field.bus.busNo"
+ property={record.busNo}
/>
</Grid>
<Grid item xs={6}>
diff --git a/zy-acs-flow/src/page/bus/index.jsx b/zy-acs-flow/src/page/bus/index.jsx
index 246dcfb..e47c558 100644
--- a/zy-acs-flow/src/page/bus/index.jsx
+++ b/zy-acs-flow/src/page/bus/index.jsx
@@ -13,6 +13,6 @@
edit: BusEdit,
show: ShowGuesser,
recordRepresentation: (record) => {
- return `${record.seqNum}`
+ return `${record.busNo}`
}
};
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 371d75b..fa70bef 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -110,7 +110,7 @@
Date now = new Date();
Bus bus = new Bus();
bus.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- bus.setSeqNum(batch);
+ bus.setBusNo(batch);
bus.setStartTime(now);
bus.setBusSts(BusStsType.RECEIVE.val());
bus.setMemo(memo);
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 5d3f8b5..94c0b6f 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
@@ -94,10 +94,10 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<Bus> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(Bus::getSeqNum, condition);
+ wrapper.like(Bus::getBusNo, condition);
}
busService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getSeqNum()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getBusNo()))
);
return R.ok().add(vos);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
index 60b8eaf..0c1467b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
@@ -201,7 +201,7 @@
BusService service = SpringUtils.getBean(BusService.class);
Bus bus = service.getById(this.busId);
if (!Cools.isEmpty(bus)){
- return String.valueOf(bus.getUuid());
+ return String.valueOf(bus.getBusNo());
}
return null;
}
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 3860492..18a75a7 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
@@ -34,8 +34,8 @@
/**
* 浠诲姟缂栧彿
*/
- @ApiModelProperty(value= "浠诲姟缂栧彿")
- private String seqNum;
+ @ApiModelProperty(value= "鎬绘壒鍙�")
+ private String busNo;
/**
* 寮�濮嬫椂闂�
@@ -108,42 +108,6 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
-
- public Bus() {}
-
- public Bus(String uuid,String seqNum,Date startTime,Date endTime,Long busSts,String phase,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.seqNum = seqNum;
- this.startTime = startTime;
- this.endTime = endTime;
- this.busSts = busSts;
- this.phase = phase;
- this.status = status;
- this.deleted = deleted;
- this.tenantId = tenantId;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// Bus bus = new Bus(
-// null, // 缂栧彿
-// null, // 浠诲姟缂栧彿
-// null, // 寮�濮嬫椂闂�
-// null, // 缁撴潫鏃堕棿
-// null, // 杩涘害
-// null, // 鐜妭
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
public String getBusSts$(){
BusStsService service = SpringUtils.getBean(BusStsService.class);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
index 4c8df17..a765540 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -273,7 +273,7 @@
BusService service = SpringUtils.getBean(BusService.class);
Bus bus = service.getById(this.busId);
if (!Cools.isEmpty(bus)){
- return String.valueOf(bus.getUuid());
+ return String.valueOf(bus.getBusNo());
}
return null;
}
--
Gitblit v1.9.1