Merge remote-tracking branch 'origin/master'

huimv-farm-environ/src/main/java/com/huimv/environ/env/service/impl/AlarmImpl.java

@@ -238,17 +238,21 @@ public class AlarmImpl implements IAlarm {
             JSONObject dataJo1 = new JSONObject();
             outJa.add(dataJo1);
             dataJo1.put("name","生态监测");
-            dataJo1.put("value",stjcQuantity);
+            //演示
+//            dataJo1.put("value",stjcQuantity);
+            dataJo1.put("value",16);
             //
             JSONObject dataJo2 = new JSONObject();
             outJa.add(dataJo2);
             dataJo2.put("name","环境监测");
-            dataJo2.put("value",hjjcQuantity);
+//            dataJo2.put("value",hjjcQuantity);
+            dataJo2.put("value",0);
             //
             JSONObject dataJo3 = new JSONObject();
             outJa.add(dataJo3);
             dataJo3.put("name","人员违规");
-            dataJo3.put("value",rywgQuantity);
+//            dataJo3.put("value",rywgQuantity);
+            dataJo3.put("value",0);
 //            //
 //            JSONObject dataJo4 = new JSONObject();
 //            outJa.add(dataJo4);

huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/BaseRoomMapper.xml

@@ -10,7 +10,7 @@
 
     <select id="getAllRoomEnvironment" resultType="com.huimv.environ.eco.entity.dto.AllRoomEnvironment">
 
-  SELECT CONCAT(br.alias ,br.room_name) room,br.id room_id  , tem.value temperature, hum.value humidity
+  SELECT br.room_name room,br.id room_id  , tem.value temperature, hum.value humidity
         FROM
         `base_room` br
         LEFT JOIN  (

huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/impl/BaseWarningInfoServiceImpl.java

@@ -197,6 +197,7 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
 
 
         QueryWrapper<BaseWarningInfo> wrapper = new QueryWrapper<>();
+        wrapper.orderByDesc("warning_time");
         wrapper.ge("warning_time",DateUtil.beginOfDay(new Date()));
         wrapper.eq("farm_id",farmId);
         //生态监测
@@ -230,11 +231,10 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
             wrapper.eq("farm_id",farmId);
             wrapper.eq("level",3);
         }
-
-
-        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
-
-        return new Result(ResultCode.SUCCESS,page);
+//        演示版
+//        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
+        wrapper.last("limit 0,16");
+        return new Result(ResultCode.SUCCESS,this.list(wrapper));
     }
 
 

huimv-farm-video/pom.xml

@@ -8,14 +8,15 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<groupId>huimv-farm-video</groupId>
-	<artifactId>com.huimv</artifactId>
+	<artifactId>huimv-farm-video</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>demo</name>
+	<name>huimv-farm-video</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>8</java.version>
 	</properties>
 	<dependencies>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
@@ -33,6 +34,51 @@
 			<scope>compile</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.13</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpmime</artifactId>
+			<version>4.5.12</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+			<version>3.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt</artifactId>
+			<version>0.9.1</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>2.2.3</version>
+			<classifier>jdk15</classifier>
+			<!-- jdk版本 -->
+		</dependency>
 
 	</dependencies>
 

huimv-farm-video/src/main/java/com/huimv/video/video/entity/vo/CameraVo.java

@@ -18,4 +18,5 @@ public class CameraVo {
     private Integer lastId;
     private Integer nextId;
     private String httpUrl;
+
 }

huimv-farm-video/src/main/java/com/huimv/video/video/service/ICameraService.java

@@ -23,9 +23,6 @@ public interface ICameraService extends IService<Camera> {
 
     List getCameraDetails(CameraListsVo cameraListsVo);
 
-    //
-    List getCameraDetails2(CameraListsVo cameraListsVo);
-
     List getByAreaId(Integer areaId);
 
     Result updateStatus(Integer id);
@@ -41,4 +38,6 @@ public interface ICameraService extends IService<Camera> {
     Result listScreenCamera(Integer farmId);
 
     Result screenCamera(Integer farmId);
+
+    List getCameraDetails2(CameraListsVo cameraListsVo);
 }

huimv-farm-video/src/main/java/com/huimv/video/video/service/impl/CameraServiceImpl.java

@@ -222,71 +222,6 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
     }
 
     @Override
-    public List getCameraDetails2(CameraListsVo cameraListsVo) {
-        List<Integer> cameraIds = cameraListsVo.getCameraIds();
-        CameraListVo cameraListVo = new CameraListsVo();
-        cameraListVo.setCurrent(1);
-        cameraListVo.setSize(10000);
-        cameraListVo.setStrchStr(cameraListsVo.getStrchStr());
-        cameraListVo.setAreaId(cameraListsVo.getAreaId());
-        cameraListVo.setBrandId(cameraListsVo.getBrandId());
-        cameraListVo.setSort(cameraListsVo.getSort());
-
-        if (cameraIds == null || cameraIds.size() == 0){
-            return null;
-        }
-        List cameraDetailsList = new ArrayList();
-        IPage<Camera> page = (IPage<Camera>)this.listPage(cameraListVo).getData();
-        List<Camera> list = page.getRecords();
-        int i = 0;
-        final String farmAppPort = "8081";
-        final String farmVideoApp = "/appleVideo/play?";
-        final String hlsMediaPort= "85";
-        for (Camera camera : list) {
-            for (Integer cameraId : cameraIds) {
-                if (cameraId.equals( camera.getId())){
-                    String cameraAccount = camera.getAccount();
-                    String cameraPassword = camera.getPassword();
-                    String camerIp = camera.getCameraIp();
-                    String cameraName = camera.getCameraName();
-                    Integer areaId = camera.getAreaId();
-                    String url = cameraAreaMapper.selectById(areaId).getPublicUrl();
-                    url = url.substring(0,url.indexOf(":"));
-                    url="http://"+url;
-//                    String rtsp ;
-//                    CameraBrand cameraBrand = cameraBrandMapper.selectById(camera.getBrandId());
-//                    Integer type = cameraBrand.getStreamType();
-//                    if (type == 0){
-//                        rtsp = cameraBrand.getMainStream();
-//                    }else {
-//                        rtsp = cameraBrand.getAssistStream();
-//                    }
-
-                    CameraVo cameraVo= new CameraVo();
-                    cameraVo.setAreaId(areaId);
-//                    cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
-//                    cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
-                    //示例
-//                    cameraVo.setHttpUrl("http://183.249.204.153:8081/appleVideo/play?url=admin:hmkj6688@192.168.1.108&name=101&dt=3000&targetUrl=http://183.249.204.153:85");
-                    cameraVo.setHttpUrl(url+":"+farmAppPort+farmVideoApp+"url="+cameraAccount + ":" + cameraPassword + "@" + camerIp+"&name="+"&dt=3000&targetUrl="+url+":"+hlsMediaPort);
-                    cameraVo.setCameraName(cameraName);
-                    if (i > 0){
-                        cameraVo.setLastId(list.get(i-1).getId());
-                    }
-                    if (i < list.size()-1 ){
-                        cameraVo.setNextId(list.get(i+1).getId());
-                    }
-                    cameraDetailsList.add(cameraVo);
-                }
-            }
-            i++;
-        }
-
-
-        return cameraDetailsList;
-    }
-
-    @Override
     public Result updateStatus(Integer id) {
         Camera byId = this.getById(id);
 
@@ -399,6 +334,72 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         return new Result(ResultCode.SUCCESS, cameraVo);
     }
 
+    @Override
+    public List getCameraDetails2(CameraListsVo cameraListsVo) {
+        List<Integer> cameraIds = cameraListsVo.getCameraIds();
+        CameraListVo cameraListVo = new CameraListsVo();
+        cameraListVo.setCurrent(1);
+        cameraListVo.setSize(10000);
+        cameraListVo.setStrchStr(cameraListsVo.getStrchStr());
+        cameraListVo.setAreaId(cameraListsVo.getAreaId());
+        cameraListVo.setBrandId(cameraListsVo.getBrandId());
+        cameraListVo.setSort(cameraListsVo.getSort());
+
+        if (cameraIds == null || cameraIds.size() == 0){
+            return null;
+        }
+        List cameraDetailsList = new ArrayList();
+        IPage<Camera> page = (IPage<Camera>)this.listPage(cameraListVo).getData();
+        List<Camera> list = page.getRecords();
+        int i = 0;
+        final String farmAppPort = "8081";
+        final String farmVideoApp = "/appleVideo/play?";
+        final String hlsMediaPort= "85";
+        for (Camera camera : list) {
+            for (Integer cameraId : cameraIds) {
+                if (cameraId.equals( camera.getId())){
+                    String cameraAccount = camera.getAccount();
+                    String cameraPassword = camera.getPassword();
+                    String camerIp = camera.getCameraIp();
+                    String cameraName = camera.getCameraName();
+                    Integer areaId = camera.getAreaId();
+                    String url = cameraAreaMapper.selectById(areaId).getPublicUrl();
+                    url = url.substring(0,url.indexOf(":"));
+                    url="http://"+url;
+//                    String rtsp ;
+//                    CameraBrand cameraBrand = cameraBrandMapper.selectById(camera.getBrandId());
+//                    Integer type = cameraBrand.getStreamType();
+//                    if (type == 0){
+//                        rtsp = cameraBrand.getMainStream();
+//                    }else {
+//                        rtsp = cameraBrand.getAssistStream();
+//                    }
+
+                    CameraVo cameraVo= new CameraVo();
+                    cameraVo.setAreaId(areaId);
+//                    cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+//                    cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+                    //示例
+//                    cameraVo.setHttpUrl("http://183.249.204.153:8081/appleVideo/play?url=admin:hmkj6688@192.168.1.108&name=101&dt=3000&targetUrl=http://183.249.204.153:85");
+                    cameraVo.setHttpUrl(url+":"+farmAppPort+farmVideoApp+"url="+cameraAccount + ":" + cameraPassword + "@" + camerIp+"&name="+"&dt=3000&targetUrl="+url+":"+hlsMediaPort);
+                    cameraVo.setCameraName(cameraName);
+                    if (i > 0){
+                        cameraVo.setLastId(list.get(i-1).getId());
+                    }
+                    if (i < list.size()-1 ){
+                        cameraVo.setNextId(list.get(i+1).getId());
+                    }
+                    cameraDetailsList.add(cameraVo);
+                }
+            }
+            i++;
+        }
+
+
+        return cameraDetailsList;
+    }
+
+
 
     @Override
     public List getByAreaId(Integer areaId) {

huimv-farm-video/src/main/resources/application.properties

@@ -1 +1,5 @@
-
+#spring.profiles.active=dev
+#spring.profiles.active=prod3
+#spring.profiles.active=demo
+spring.profiles.active=prod
+#spring.profiles.active=prod2