From f142d48409503dfd6b11d7d414c0ee7ffa85eed5 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 28 Aug 2024 14:28:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
index 3367d4f..ac8b603 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sg.controller;
import cn.gistack.sm.sg.DO.SgDeviceDO;
+import cn.gistack.sm.sg.DO.SgGxStepDO;
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import cn.gistack.sm.sg.service.SgDeviceService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,7 +53,7 @@
sgDeviceDO.setCreateTime(now);
}
sgDeviceDO.setUpdateTime(now);
- return R.data(sgDeviceService.save(sgDeviceDO));
+ return R.data(sgDeviceService.saveById(sgDeviceDO));
}
/**
@@ -110,8 +111,14 @@
}
@GetMapping(value = "/getDeviceList")
- public R queryPageList(@RequestParam(name="programId",required=true) String programId) {
+ public R getDeviceList(@RequestParam(name="programId",required=true) String programId) {
List<SgDeviceDO> page = sgDeviceService.getDeviceList(programId);
return R.data(page);
}
+
+ @GetMapping(value = "/getStepList")
+ public R queryStepList(@RequestParam(name="deviceId",required=true) String deviceId) {
+ List<SgGxStepDO> page = sgDeviceService.queryStepList(deviceId);
+ return R.data(page);
+ }
}
--
Gitblit v1.9.3