jfpt-BladeX.git

			@@ -647,7 +647,7 @@
			</update>

			<update id="updateVaddress">
			update sys_alarm SET vaddress=#{vaddress},uids=#{uids} where id=#{jid}
			update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
			</update>

			<update id="updateAaddress">

			@@ -35,7 +35,6 @@
			import org.springblade.core.tool.utils.Func;
			import org.springblade.core.tool.utils.StringPool;
			import org.springblade.jfpt.attendance.excel.AttendanceExcel;
			import org.springblade.jfpt.attendance.util.PointMapUtil;
			import org.springblade.jfpt.attendance.wrapper.AttendanceWrapper;
			import org.springblade.jfpt.enclosure.entity.Enclosure;
			import org.springblade.jfpt.enclosure.service.IEnclosureService;

			@@ -413,6 +413,8 @@
			dept.deviceName,
			dept.deviceNumber,
			dept.deviceType,
			dept.serialNumber,
			dept.channelNumber,
			dept.ownership,
			dept.ownerId,
			dept.devicestate,

			@@ -1,5 +1,6 @@
			package org.springblade.jfpt.nettyServer;

			import com.alibaba.fastjson.JSONObject;
			import io.netty.buffer.ByteBuf;
			import io.netty.buffer.Unpooled;
			import io.netty.channel.Channel;
			@@ -17,6 +18,7 @@
			import org.springblade.jfpt.message.service.IMessageService;
			import org.springblade.jfpt.operation.service.IOperationService;
			import org.springblade.jfpt.operation.vo.OperationVO;
			import org.springblade.jfpt.parcel.util.HttpClientUtils;
			import org.springblade.jfpt.webscoket.service.IPushMsgService;
			import org.springblade.system.user.entity.User;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -24,10 +26,7 @@

			import javax.annotation.PostConstruct;
			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.*;
			import java.util.concurrent.ConcurrentHashMap;

			@Component
			@@ -1705,6 +1704,23 @@

			//通过websocket给前端接警员发送信息
			serverHandler.pushMsgService.pushMsg(alarm.getAlarmId(), alarm.getId().toString());

			Map<String, String> map = new HashMap<>();
			map.put("deviceCode", (String) list.get(0).get("serialNumber"));
			map.put("chl", (String) list.get(0).get("channelNumber"));

			//请求视频播放地址
			String params = HttpClientUtils.doGet("https://web.byisf.com:18000/GetPlayUrl", map);

			Map<String, Object> data = (Map<String, Object>) JSONObject.parse(params);
			Map<String, Object> datas = (Map<String, Object>) JSONObject.parse(data.get("data").toString());
			String m3u8 = datas.get("m3u8").toString();

			Map<String, String> rmap = new HashMap<>();
			rmap.put("url", m3u8);

			//请求视频录制
			String rvideo = HttpClientUtils.doPost("https://web.byisf.com/api/blade-jfpts/rvideo/rVoids", rmap);
			}

			outData.add("LEOK#@");

			@@ -22,7 +22,6 @@
			<module>blade-system</module>
			<module>blade-user</module>
			<module>blade-jfpts</module>
			<module>blade-onenetstudio</module>
			</modules>

			<dependencies>

	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/controller/AttendanceController.java	1 ●●●●● patch \| view \| raw \| blame \| history
	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java	24 ●●●●● patch \| view \| raw \| blame \| history
	blade-service/pom.xml	1 ●●●●● patch \| view \| raw \| blame \| history