From a249695911e6e6b3e318dd4dd14812994e2eb3a9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 06 八月 2024 09:52:56 +0800
Subject: [PATCH] 工单绑定设备编号
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 6 +++---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 4 ++--
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java | 4 ++--
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 6 +++---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 18 ++++++++++++------
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 8 ++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 4 ++--
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 4 ++--
8 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
index b286248..d895863 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
@@ -34,9 +34,9 @@
@TableField("error_type")
private String errorType;
- @ApiModelProperty("鐐逛綅")
- @TableField("point_id")
- private Integer pointId;
+ @ApiModelProperty("璁惧缂栧彿")
+ @TableField("serial_number")
+ private String serialNumber;
@ApiModelProperty("宸ュ崟鏉ユ簮")
@TableField("source")
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
index 90e7327..156a6c0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -39,8 +39,8 @@
private String source;
@NotNull(message = "鐐逛綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鐐逛綅")
- private Integer pointId;
+ @ApiModelProperty("璁惧缂栧彿")
+ private Integer serialNumber;
@NotNull(message = "鏁呴殰绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鏁呴殰绫诲瀷")
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index 55d2059..40b2af9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -34,13 +34,13 @@
private Integer unitId;
private String unitName;
- /** 宸ュ崟鏉ユ簮 */
+ /** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
private String source;
/**
- * 鐐逛綅
+ * 璁惧缂栧彿
*/
- private Integer pointId;
+ private String serialNumber;
private String pointTag;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index 3382741..9c480e8 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -21,6 +21,14 @@
public interface WorkOrderService extends IService<WorkOrder> {
/**
+ * 绯荤粺鍐呴儴鐨勬坊鍔�
+ *
+ * @param workOrder
+ * @return
+ */
+ Result innerAdd(WorkOrder workOrder);
+
+ /**
* 娣诲姞
* @param form
* @return
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
index c449935..62ec7f9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -90,11 +90,11 @@
/**
* 鎵归噺鍚屾鐘舵��
*
- * @param pointIds 鐐逛綅id
+ * @param serialNumberList 璁惧缂栧彿
* @param recovery 鐘舵��
* @return 鏁伴噺
*/
- boolean updateRecovery(List<Integer> pointIds, int recovery);
+ boolean updateRecovery(List<String> serialNumberList, int recovery);
/**
* 棣栭〉鍒版湡棰勮
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 60d3cb8..3555f70 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -73,6 +73,12 @@
@Autowired
private RedisCache redisCache;
+ @Override
+ public Result innerAdd(WorkOrder workOrder) {
+
+ return null;
+ }
+
/**
* 娣诲姞
* @param form
@@ -132,7 +138,7 @@
notifyService.save(notify);
// 鍚屾鐐逛綅鐘舵��
if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
- ywPointService.updateRecovery(Collections.singletonList(workOrder.getPointId()), 0);
+ ywPointService.updateRecovery(Arrays.asList(workOrder.getSerialNumber()), 0);
}
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -299,7 +305,7 @@
// 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
- .select(WorkOrder::getId, WorkOrder::getPointId)
+ .select(WorkOrder::getSerialNumber, WorkOrder::getSerialNumber)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
.eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
.eq(WorkOrder::getErrorType, data.getErrorType())
@@ -308,7 +314,7 @@
.last("limit " + data.getFastNumLimit())
.list();
List<Integer> ids = list.stream().map(WorkOrder::getId).toList();
- List<Integer> pointIds = list.stream().map(WorkOrder::getPointId).toList();
+ List<String> serialNumberList = list.stream().map(WorkOrder::getSerialNumber).toList();
if (ids.isEmpty()) { return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�"); }
if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
@@ -319,7 +325,7 @@
.update();
addDistributeRecord(ids, WorkOrderDistributeWayEnum.FAST_DISTRIBUTE);
// 鍚屾鐐逛綅鐘舵��
- ywPointService.updateRecovery(pointIds, 1);
+ ywPointService.updateRecovery(serialNumberList, 1);
return Result.ok("鎴愬姛涓嬪彂" + ids.size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
@@ -352,8 +358,8 @@
.update();
addDistributeRecord(query.getIds(), distributeWayEnum);
// 鍚屾鐐逛綅鐘舵��
- List<Integer> pointIds = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getPointId).in(WorkOrder::getId, query.getIds()).list().stream().map(WorkOrder::getPointId).toList();
- ywPointService.updateRecovery(pointIds, 1);
+ List<String> serialNumberList = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getSerialNumber).in(WorkOrder::getId, query.getIds()).list().stream().map(WorkOrder::getSerialNumber).toList();
+ ywPointService.updateRecovery(serialNumberList, 1);
return Result.ok("鎴愬姛涓嬪彂" + query.getIds().size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index ccc6ffb..b8f6cfd 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -209,9 +209,9 @@
}
@Override
- public boolean updateRecovery(List<Integer> pointIds, int recovery) {
+ public boolean updateRecovery(List<String> serialNumberList, int recovery) {
return new LambdaUpdateChainWrapper<>(baseMapper)
- .in(YwPoint::getId, pointIds)
+ .in(YwPoint::getSerialNumber, serialNumberList)
.set(YwPoint::getRecovery, recovery)
.set(recovery == 0, YwPoint::getRecoveryTime, DateUtils.getNowDate())
.update();
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 59c1e98..fa34221 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -54,7 +54,7 @@
t_work_order wo
LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
- INNER JOIN t_yw_point yp ON yp.id = wo.point_id AND yp.deleted = 0
+ INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_id = wo.id AND odr.deleted = 0
LEFT JOIN sys_user su ON su.user_id = odr.user_id
WHERE
@@ -75,7 +75,7 @@
yp.point_tag
FROM
t_work_order wo
- INNER JOIN t_yw_point yp ON yp.id = wo.point_id AND yp.deleted = 0
+ INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
INNER JOIN t_work_order_distribute_record wod ON wod.work_order_id = wo.id
WHERE
wo.status = 'DISTRIBUTED' AND wo.deleted = 0
--
Gitblit v1.8.0