From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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 2727d24..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,12 +1,9 @@
package cn.gistack.sm.sg.controller;
-import cn.gistack.sm.patrol.entity.PatrolInfo;
import cn.gistack.sm.sg.DO.SgDeviceDO;
-import cn.gistack.sm.sg.DO.SgProjectInfoDO;
-import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
+import cn.gistack.sm.sg.DO.SgGxStepDO;
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import cn.gistack.sm.sg.service.SgDeviceService;
-import cn.gistack.sm.sg.service.SgProjectInfoService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import org.springblade.core.boot.ctrl.BladeController;
@@ -14,12 +11,12 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -56,7 +53,7 @@
sgDeviceDO.setCreateTime(now);
}
sgDeviceDO.setUpdateTime(now);
- return R.data(sgDeviceService.save(sgDeviceDO));
+ return R.data(sgDeviceService.saveById(sgDeviceDO));
}
/**
@@ -106,10 +103,22 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查记录-通过id查询", notes="子设备-通过id查询")
+ @ApiOperation(value="子设备-通过id查询", notes="子设备-通过id查询")
@GetMapping(value = "/queryById")
public R queryById(@RequestParam(name="id",required=true) String id) {
- SgDeviceDO sgDeviceDO = sgDeviceService.getById(id);
+ SgDeviceDO sgDeviceDO = sgDeviceService.getSgDeviceById(id);
return R.data(sgDeviceDO);
}
+
+ @GetMapping(value = "/getDeviceList")
+ 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