diff --git a/xiuosiot-backend/pom.xml b/xiuosiot-backend/pom.xml
index d6e3eaa..115ecc9 100644
--- a/xiuosiot-backend/pom.xml
+++ b/xiuosiot-backend/pom.xml
@@ -123,11 +123,18 @@
- cn.zhxu
+ com.ejlchina
okhttps-fastjson
- 4.0.1
+ 3.5.3
+
+ com.squareup.okio
+ okio
+ 2.8.0
+
+
+
org.springframework.boot
spring-boot-starter-mail
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/controller/FzDeviceManageController.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/controller/FzDeviceManageController.java
index 929a5a5..d7a39b8 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/controller/FzDeviceManageController.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/controller/FzDeviceManageController.java
@@ -68,6 +68,30 @@ public class FzDeviceManageController {
}
+ @GetMapping("/selectByStatus")
+ public ResultRespons selectDeviceByStatus(@RequestParam("status") String status, HttpServletRequest request){
+ List fzDeviceInfos = fzDeviceInfoService.selectByStatus(status);
+ if(fzDeviceInfos!=null){
+ return new ResultRespons(Constant.SUCCESS_CODE,"查询设备成功!",fzDeviceInfos);
+ }else
+ {
+ return new ResultRespons(Constant.SUCCESS_CODE,"设备不存在!");
+ }
+
+ }
+
+ @GetMapping("/selectByUser")
+ public ResultRespons selectDeviceByUser(@RequestParam("user") String user, HttpServletRequest request){
+ List fzDeviceInfos= fzDeviceInfoService.selectByUser(user);
+ if(fzDeviceInfos!=null){
+ return new ResultRespons(Constant.SUCCESS_CODE,"查询设备成功!",fzDeviceInfos);
+ }else
+ {
+ return new ResultRespons(Constant.SUCCESS_CODE,"设备不存在!");
+ }
+
+ }
+
@GetMapping("/selectAll")
public ResultRespons selectDevice(){
List fzDeviceInfos = fzDeviceInfoService.selectAll();
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/FzDeviceInfoMapper.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/FzDeviceInfoMapper.java
index 61a6a53..d1b5f4c 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/FzDeviceInfoMapper.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/FzDeviceInfoMapper.java
@@ -29,4 +29,7 @@ public interface FzDeviceInfoMapper {
@Select("select * from fz_device_info where fz_device_status =#{status}")
List selectByStatus(@Param("status") String status);
+
+ @Select("select * from fz_device_info where fz_device_user =#{user}")
+ List selectByUser(@Param("user") String user);
}
\ No newline at end of file
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java
index 345f963..41c97a0 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java
@@ -12,5 +12,6 @@ public interface FzDeviceInfoService {
int updateDevice(FzDeviceInfo fzDeviceInfo);
int deleteDevice(String deviceNo);
List selectByStatus(String status);
+ List selectByUser(String user);
}
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java
index f060636..771ff96 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java
@@ -45,4 +45,9 @@ public class FzDeviceInfoServiceImpl implements FzDeviceInfoService {
public List selectByStatus(String status) {
return fzDeviceInfoMapper.selectByStatus(status);
}
+
+ @Override
+ public List selectByUser(String user) {
+ return fzDeviceInfoMapper.selectByUser(user);
+ }
}