From 4caf35c0152a2ac3f4d416384e9d8a2b19818363 Mon Sep 17 00:00:00 2001
From: wangmengzhao <1036088376@qq.com>
Date: 星期二, 05 十二月 2023 08:57:58 +0800
Subject: [PATCH] 添加接单超时标识和结单超时标识在iot_device_Order表里面，在对应的类中添加，完成安装单/维修单完成后用户对此单进行打分和评价20231204wmz
---
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
index 9f0bc90..0cbdb97 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
@@ -154,8 +154,15 @@
* @throws Exception
*/
@Override
- public int selectDeviceCount(int id) throws Exception {
- return deviceMapper.selectDeviceCount(id);
+ public AjaxResult selectDeviceCount(int id) throws Exception {
+ //鏍规嵁鐢ㄦ埛鐧诲綍鐨勮鑹茶韩浠芥煡璇㈡�昏澶囨暟锛堝彴锛�
+ int count = deviceMapper.selectDeviceCount(id);
+ //鏍规嵁鐧诲綍鐢ㄦ埛鐨勮鑹茶韩浠芥煡璇㈣澶囩殑浣跨敤浜烘暟
+ int total = deviceMapper.selectUserDeviceByCount(id);
+ AjaxResult ajax = new AjaxResult();
+ ajax.put("deviceCount", count);
+ ajax.put("userTotal", total);
+ return AjaxResult.success("鏌ヨ鎴愬姛", ajax);
}
/**
@@ -810,12 +817,12 @@
// 璁惧缂栧彿锛欴 + userId + 15浣嶉殢鏈哄瓧姣嶅拰鏁板瓧
SysUser user = getLoginUser().getUser();
String number = "D" + user.getUserId().toString() + toolService.getStringRandom(10);
-// int count = deviceMapper.getDeviceNumCount(number);
-// if (count == 0) {
-// return number;
-// } else {
-// generationDeviceNum();
-// }
+ int count = deviceMapper.getDeviceNumCount(number);
+ if (count == 0) {
+ return number;
+ } else {
+ generationDeviceNum();
+ }
return "";
}
--
Gitblit v1.8.0