From 263c8ee4f6f8cbb1228a1d5c13258ea8d4309350 Mon Sep 17 00:00:00 2001
From: Administrator <test@dy.com>
Date: 星期四, 22 五月 2025 09:24:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-web-wechat/src/main/java/com/dy/pmsWechat/device/DeviceSv.java   |   72 ++++++++++++++++++++++++++++++++++++
 pms-parent/pms-web-wechat/src/main/java/com/dy/pmsWechat/device/DeviceCtrl.java |   27 +++++++++++++
 2 files changed, 99 insertions(+), 0 deletions(-)

diff --git a/pms-parent/pms-web-wechat/src/main/java/com/dy/pmsWechat/device/DeviceCtrl.java b/pms-parent/pms-web-wechat/src/main/java/com/dy/pmsWechat/device/DeviceCtrl.java
new file mode 100644
index 0000000..49b5b5d
--- /dev/null
+++ b/pms-parent/pms-web-wechat/src/main/java/com/dy/pmsWechat/device/DeviceCtrl.java
@@ -0,0 +1,27 @@
+package com.dy.pmsWechat.device;
+
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+@Slf4j
+@RestController
+@RequestMapping(path="device")
+public class DeviceCtrl {
+    private DeviceSv sv;
+    @Autowired
+    public void setSv(DeviceSv sv){
+        this.sv = sv;
+    }
+    @GetMapping(path = "getDeviceInfo")
+    public BaseResponse<Map<String, Object>> getDeviceInfo(String deviceNo) {
+        log.info("DeviceCtrl.getDeviceInfo():{}",deviceNo);
+        Map<String, Object> result = sv.getDeviceInfo(deviceNo);
+        return BaseResponseUtils.buildSuccess(result);
+    }
+}
diff --git a/pms-parent/pms-web-wechat/src/main/java/com/dy/pmsWechat/device/DeviceSv.java b/pms-parent/pms-web-wechat/src/main/java/com/dy/pmsWechat/device/DeviceSv.java
new file mode 100644
index 0000000..d29f095
--- /dev/null
+++ b/pms-parent/pms-web-wechat/src/main/java/com/dy/pmsWechat/device/DeviceSv.java
@@ -0,0 +1,72 @@
+package com.dy.pmsWechat.device;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.dy.pmsGlobal.daoSta.*;
+import com.dy.pmsGlobal.pojoSta.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeviceSv {
+    private StaDeviceLastMapper deviceLastDao;
+    private StaDeviceLifeMapper deviceLifeDao;
+    private StaWipSnExMapper wipSnExDao;
+    private StaDeviceProductionLogMapper deviceProductionLogDao;
+    private StaRepairInfoMapper repairInfoDao;
+
+    @Autowired
+    public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
+        this.deviceLastDao = deviceLastDao;
+    }
+
+    @Autowired
+    public void setDeviceLifeDao(StaDeviceLifeMapper deviceLifeDao) {
+        this.deviceLifeDao = deviceLifeDao;
+    }
+
+    @Autowired
+    public void setWipSnExDao(StaWipSnExMapper wipSnExDao) {
+        this.wipSnExDao = wipSnExDao;
+    }
+
+    @Autowired
+    public void setDeviceProductionLogDao(StaDeviceProductionLogMapper deviceProductionLogDao) {
+        this.deviceProductionLogDao = deviceProductionLogDao;
+    }
+
+    @Autowired
+    public void setRepairInfoDao(StaRepairInfoMapper repairInfoDao) {
+        this.repairInfoDao = repairInfoDao;
+    }
+    public Map<String, Object> getDeviceInfo(String deviceNo) {
+        if (StringUtils.isBlank(deviceNo)) {
+            return null;
+        }
+        // 鏌ヨ璁惧淇℃伅
+        StaDeviceLast deviceLast = deviceLastDao.selectByDeviceNo(deviceNo);
+        if (deviceLast == null) {
+            return null;
+        }
+        Map<String, Object> deviceInfo = new HashMap<>();
+        deviceInfo.put("deviceInfo", deviceLast);
+        //鏌ヨ璁惧鏃ュ織
+        List<StaDeviceProductionLog> log = deviceProductionLogDao.selectByDeviceNo(deviceNo);
+        deviceInfo.put("deviceLog", log);
+        // 鏌ヨ璁惧鐢熷懡鍛ㄦ湡
+        List<StaDeviceLife> deviceLife = deviceLifeDao.selectByDeviceNo(deviceNo);
+        deviceInfo.put("deviceLife", deviceLife);
+        // 鏌ヨ璁惧缁翠慨淇℃伅
+        List<StaRepairInfo> repairInfo = repairInfoDao.selectByDeviceNo(deviceNo);
+        deviceInfo.put("deviceRepair", repairInfo);
+        // 鏌ヨ璁惧闄勪欢淇℃伅
+        List<StaWipSnEx> wipSnEx = wipSnExDao.selectByDeviceNo(deviceNo);
+        deviceInfo.put("deviceAttach", wipSnEx);
+        return deviceInfo;
+    }
+}

--
Gitblit v1.8.0