From c0d555bcd9ff0e8fa35e5a8636bc4c05743dc1e9 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 14 Jun 2024 11:36:32 +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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..e601fe8 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,8 @@
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.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 +10,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>
@@ -112,4 +108,10 @@
SgDeviceDO sgDeviceDO = sgDeviceService.getById(id);
return R.data(sgDeviceDO);
}
+
+ @GetMapping(value = "/getDeviceList")
+ public R queryPageList(@RequestParam(name="programId",required=true) String programId) {
+ List<SgDeviceDO> page = sgDeviceService.getDeviceList(programId);
+ return R.data(page);
+ }
}
--
Gitblit v1.9.3