Merge branch 'master' of https://gitlink.org.cn/xuos/xiuos_IoT

xiuosiot-backend/pom.xml

@@ -12,7 +12,7 @@
     <artifactId>xiuos</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>xiuos</name>
-    <description>Demo project for Spring Boot</description>
+    <description>xiuosiot</description>
     <properties>
         <java.version>1.8</java.version>
     </properties>
@@ -123,11 +123,18 @@
         </dependency>
         <!-- okhttps -->
         <dependency>
-            <groupId>cn.zhxu</groupId>
+            <groupId>com.ejlchina</groupId>
             <artifactId>okhttps-fastjson</artifactId>
-            <version>4.0.1</version>
+            <version>3.5.3</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.squareup.okio</groupId>
+            <artifactId>okio</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
@@ -163,6 +170,7 @@
             <scope>test</scope>
         </dependency>
 
+
     </dependencies>
 
 

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<FzDeviceInfo> 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<FzDeviceInfo> 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<FzDeviceInfo> fzDeviceInfos = fzDeviceInfoService.selectAll();

xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/FzDeviceInfoMapper.java

@@ -26,4 +26,10 @@ public interface FzDeviceInfoMapper {
 
     @Select("select * from fz_device_info where fz_device_type =#{type}")
     List<FzDeviceInfo> selectByType(@Param("type") String type);
+
+    @Select("select * from fz_device_info where fz_device_status =#{status}")
+    List<FzDeviceInfo> selectByStatus(@Param("status") String status);
+
+    @Select("select * from fz_device_info where fz_device_user =#{user}")
+    List<FzDeviceInfo> selectByUser(@Param("user") String user);
 }

xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java

@@ -11,5 +11,7 @@ public interface FzDeviceInfoService {
     int addDevice(FzDeviceInfo fzDeviceInfo);
     int updateDevice(FzDeviceInfo fzDeviceInfo);
     int deleteDevice(String deviceNo);
+    List<FzDeviceInfo> selectByStatus(String status);
+    List<FzDeviceInfo> selectByUser(String user);
 
 }

xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java

@@ -40,4 +40,14 @@ public class FzDeviceInfoServiceImpl implements FzDeviceInfoService {
     public int deleteDevice(String deviceNo) {
         return fzDeviceInfoMapper.deleteByPrimaryKey(deviceNo);
     }
+
+    @Override
+    public List<FzDeviceInfo> selectByStatus(String status) {
+        return fzDeviceInfoMapper.selectByStatus(status);
+    }
+
+    @Override
+    public List<FzDeviceInfo> selectByUser(String user) {
+        return fzDeviceInfoMapper.selectByUser(user);
+    }
 }

xiuosiot-backend/src/main/java/com/aiit/xiuos/socket/GZJCWebSocketServer.java

@@ -10,7 +10,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-@ServerEndpoint(value = "/websocket/haier/{clientId}")
+@ServerEndpoint(value = "/websocket/gzjc/{clientId}")
 @Component
 @Slf4j
 public class GZJCWebSocketServer {