From a67506723c8c8e6f0d223b864eaa69423a2710a8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 11 Mar 2021 16:48:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml                       |   17 
 blade-auth/pom.xml                                                                                              |   12 
 blade-service/blade-jfpts/pom.xml                                                                               |    4 
 blade-ops/blade-resource/src/main/resources/application-dev.yml                                                 |    7 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml             |   10 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java                     | 1521 +++++++++++++++++++++++++++++++++
 blade-service/blade-jfpts/src/main/resources/application.properties                                             |   12 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java            |    6 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java                   |  399 +++++++++
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/JacksonUtil.java                       |  186 ++++
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java                  |   25 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java         |  172 +++
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java                         |   23 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java                         |  127 ++
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java    |   25 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java |    6 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java                            |    1 
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java            |   54 +
 18 files changed, 2,567 insertions(+), 40 deletions(-)

diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index 4c5d45a..a40883f 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -82,12 +82,12 @@
             <artifactId>easy-captcha</artifactId>
         </dependency>
         <!-- 链路追踪、服务监控 -->
-        <!--<dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-trace</artifactId>
-        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>blade-starter-trace</artifactId>-->
+<!--        </dependency>-->
         <!-- 解决Java11无法运行的问题 -->
-        <!--<dependency>
+        <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.2.11</version>
@@ -106,7 +106,7 @@
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>
             <version>1.1.1</version>
-        </dependency>-->
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/blade-ops/blade-resource/src/main/resources/application-dev.yml b/blade-ops/blade-resource/src/main/resources/application-dev.yml
index 97f23c8..0eeee3a 100644
--- a/blade-ops/blade-resource/src/main/resources/application-dev.yml
+++ b/blade-ops/blade-resource/src/main/resources/application-dev.yml
@@ -4,3 +4,10 @@
     url: ${blade.datasource.dev.url}
     username: ${blade.datasource.dev.username}
     password: ${blade.datasource.dev.password}
+oss:
+  enabled: true
+  name: minio
+  tenant-mode: true
+  endpoint: http://36.134.81.48:9000
+  access-key: adminminio
+  secret-key: adminminio
diff --git a/blade-service/blade-jfpts/pom.xml b/blade-service/blade-jfpts/pom.xml
index a3de633..b8415e3 100644
--- a/blade-service/blade-jfpts/pom.xml
+++ b/blade-service/blade-jfpts/pom.xml
@@ -54,6 +54,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-oss-minio</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-oss-qiniu</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
index 0cb876b..dc1ab8f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
@@ -160,6 +160,7 @@
 	@TableField("czTime")
 	private String czTime;
 	private String bz;
+	private int cid;
 
 
 }
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 4ae99bd..50831aa 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -30,12 +30,13 @@
         <result column="czTime" property="czTime"/>
         <result column="bz" property="bz"/>
         <result column="name" property="name"/>
+        <result column="cid" property="cid"/>
     </resultMap>
 
 
     <select id="selectAlarmPage" resultMap="alarmResultMap">
         select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
-        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,
+        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
         e.serialNumber,
         e.stype,
         e.channelNumber from sys_alarm a
@@ -78,7 +79,7 @@
 
     <select id="listAll" resultMap="alarmResultMap">
        select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
-        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city
+        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid
          from sys_alarm a
     </select>
 
@@ -104,6 +105,7 @@
         a.jd,
         a.wd,
         a.jtype,
+        a.cid,
         a.rname,
         jfpth.blade_region.name as addvnm,
         e.serialNumber,
@@ -131,7 +133,7 @@
 
     <select id="getLimit" resultMap="alarmResultMap">
        select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
-        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city from sys_alarm a ORDER BY id DESC LIMIT 1
+        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid from sys_alarm a ORDER BY id DESC LIMIT 1
     </select>
 
     <select id="selectInfo" resultMap="alarmResultMap">
@@ -154,6 +156,7 @@
         a.alarmId,
         a.rname,
         a.LEVEL,
+        a.cid,
         a.jd,
         a.wd,
         a.jtype,
@@ -184,6 +187,7 @@
         a.alarmId,
         a.rname,
         a.LEVEL,
+        a.cid,
         a.jd,
         a.wd,
         a.jtype,
@@ -205,17 +209,17 @@
     <!--新增-->
     <insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
        INSERT INTO sys_alarm (alarmType,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
-       region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city) VALUES
+       region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city,cid) VALUES
         (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
         #{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),
-        #{jd},#{wd},#{jtype},#{province},#{city})
+        #{jd},#{wd},#{jtype},#{province},#{city},#{cid})
     </insert>
 
     <update id="updateOne" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
     update sys_alarm SET alarmType=#{alarmType},alarmPeople=#{alarmPeople},alarmTime=#{alarmTime},
     galarmPeople=#{galarmPeople},sex=#{sex},phoneNumber=#{phoneNumber},place=#{place},
     content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},district=#{district},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},
-    coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},province=#{province},city=#{city} where id=#{id}
+    coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},province=#{province},city=#{city},cid=#{cid} where id=#{id}
 </update>
 
 
@@ -242,6 +246,7 @@
         a.alarmId,
         a.LEVEL,
         a.jd,
+        a.cid,
         a.wd,
         a.jtype,
         a.rname,
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java
index 968f435..b4df899 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java
@@ -39,4 +39,10 @@
 	 * @return
 	 */
     List<Map<String, Integer>> selWeekDayAnimalStatis();
+
+	/**
+	 * 获取体温数据统计  --本月
+	 * @return
+	 */
+    List<Map<String, Object>> getAnimalStatisMonth();
 }
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
index f9fbe43..802fa01 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
@@ -20,6 +20,16 @@
             YEARWEEK(date_format(create_time,'%Y-%m-%d')) = YEARWEEK(now()) and `status`=0
     </select>
 
+    <!--获取本月的体温统计数据-->
+    <select id="getAnimalStatisMonth" resultType="java.util.HashMap">
+        SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
+            date_format(create_time,'%Y%m') = date_format(now(),'%Y%m') and `status`=1
+        UNION
+        SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
+            date_format(create_time,'%Y%m') = date_format(now(),'%Y%m') and `status`=0
+    </select>
+
+    <!--查询体温数据的分页数据-->
     <select id="selectAnimalHeatPageList" resultType="org.springblade.jfpt.animalheat.entity.BladeAnimalHeat">
         SELECT * FROM blade_animal_heat
         <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!=''">
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
index 1920bd8..c0dcd31 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
@@ -81,7 +81,7 @@
 			bladeAnimalHeat.setStatus(compare1>0 ?0:1);
 		}
 		String person_rects = data.get("person_rect").toString();
-		bladeAnimalHeat.setPersonRect(person_rects.substring(2,person_rects.length()-2));
+		bladeAnimalHeat.setPersonRect(person_rects.substring(1,person_rects.length()-1));
 		bladeAnimalHeat.setCreateTime(now());
 		//7.插入数据
 		int idata = baseMapper.insert(bladeAnimalHeat);
@@ -104,6 +104,10 @@
 			if (animalHeatVo.getStatus()==1){
 				return baseMapper.getAnimalStatisWeek();
 			}
+			//查询本月的统计数据
+			if (animalHeatVo.getStatus()==2){
+				return baseMapper.getAnimalStatisMonth();
+			}
 		}
 		return null;
 	}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
index 57798d5..34cdd9f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -26,7 +26,7 @@
 @Component
 public class ServerHandler extends ChannelInboundHandlerAdapter {
 
-	private  String reg_LA ="LA[d]{8}[d|A-F]{12}[d|A-F]{8}[d|A-Z]{2}[d|A-F]{4}[x2A][d|A-F]{6}[#@]";
+	private String reg_LA = "LA[d]{8}[d|A-F]{12}[d|A-F]{8}[d|A-Z]{2}[d|A-F]{4}[x2A][d|A-F]{6}[#@]";
 	private String reg_LB = "LB[\\d|A-F]{12}[\\x2A].*[#@]";
 	private String reg_LB2 = "LB[\\d|A-F]{6}[\\x2A].*[#@]";
 	private String reg_LD = "LD[d]{8}[d|A-F]{12}:[A-Z]{4}[\\x2A].*[#@]";
@@ -55,12 +55,13 @@
 	public void init() {
 		serverHandler = this;
 	}
+
 	/**
 	 * 客户端与服务端创建连接的时候调用
 	 */
 	@Override
 	public void channelActive(ChannelHandlerContext ctx) throws Exception {
-		System.out.println("CTX:"+ctx.channel());
+		System.out.println("CTX:" + ctx.channel());
 		System.out.println("客户端与服务端连接开始...");
 //		ChannelId id = ctx.channel().id();
 //		String s = id.toString();
@@ -99,7 +100,7 @@
 	 */
 	@Override
 	public void channelRead(ChannelHandlerContext channelHandlerContext, Object info) throws Exception {
-		System.out.println("接收到了:"+info);
+		System.out.println("接收到了:" + info);
 		ByteBuf buf = (ByteBuf) info;
 		byte[] req = new byte[buf.readableBytes()];
 		buf.readBytes(req);
@@ -109,13 +110,13 @@
 		//获取字符串的长度
 		int length = content.length();
 		//当字符串长度大于200时,采集体温数据,小于则采集报警数据
-		if (length>200){
+		if (length > 200) {
 			//只有数据长度大于300时,采集体温数据  200-300 之间为心跳数据,当前不采集
-			if (length>250){
+			if (length > 250) {
 				//插入数据
 				serverHandler.animalHeatService.save(body);
 			}
-		}else {
+		} else {
 			String ChannelName = content.substring(10, 22);//设备编码
 			String sub = content.substring(23, 27);
 			ConcurrentHashMap<String, Channel> channelHashMap = ChannelMap.getChannelHashMap();
@@ -138,7 +139,11 @@
 			switch (content.substring(0, 2)) {
 				case "LA": {
 					String devId = content.substring(10, 22);
-					String fqbm = content.substring(24, 26);
+					//String fqbm = content.substring(24, 26);
+					String d = content.substring(26, 27);
+					int a = Integer.parseInt(d);
+					String num = content.substring(27, 29);
+					String fqbm = content.substring(29, 30);
 					List<Map<String, Object>> list = serverHandler.equipmentService.selectInfos(devId);
 					Alarm alarm = new Alarm();
 					alarm.setAlarmType("一键报警");
@@ -153,28 +158,1490 @@
 					alarm.setCity((String) list.get(0).get("city"));
 					alarm.setJd((String) list.get(0).get("jd"));//经度
 					alarm.setWd((String) list.get(0).get("wd"));//纬度
+					alarm.setCid(a);//警情代码
 					alarm.setJtype("0");
-					if (fqbm.equals("00")) {
-						alarm.setWaringType("旁路");
-
-					} else if (fqbm.equals("01")) {
-						alarm.setWaringType("火警");
-					} else if (fqbm.equals("02")) {
-						alarm.setWaringType("挟持");
-					} else if (fqbm.equals("03")) {
-						alarm.setWaringType("紧急");
-					} else if (fqbm.equals("04")) {
-						alarm.setWaringType("救护");
-					} else if (fqbm.equals("05")) {
-						alarm.setWaringType("内部");
-					} else if (fqbm.equals("06")) {
-						alarm.setWaringType("出入");
-					} else if (fqbm.equals("07")) {
-						alarm.setWaringType("周边");
-					} else {
-						alarm.setWaringType("防拆");
+					switch (num) {
+						case "00":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("未知");
+								alarm.setContent("未知");
+							} else {
+								alarm.setWaringType("中心调度");
+								alarm.setContent("指挥调度");
+							}
+							break;
+						case "10":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("紧急医疗");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("求救按钮");
+							} else {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("超时无报告");
+							}
+							break;
+						case "11":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("紧急火警");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("烟雾感应");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("明火燃烧");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("管道漏水");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("温度过高");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("压力阀");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("气体管道");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("高温火焰");
+							} else {
+								alarm.setWaringType("火警");
+								alarm.setContent("相邻报警");
+							}
+							break;
+						case "12":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("紧急按键");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("挟持报警");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("无声报警");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("有声报警");
+							} else {
+								alarm.setWaringType("视频输入报警");
+								alarm.setContent("联网报警摄像机输入端口报警");
+							}
+							break;
+						case "13":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("防盗警报");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("周界翻越");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("室内盗窃");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("24小时防盗");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("出/入防区");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("日/夜值守");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("室外报警");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("盗警");
+								alarm.setContent("防拆触发");
+							} else {
+								alarm.setWaringType("盗警");
+								alarm.setContent("相邻报警");
+							}
+							break;
+						case "14":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("普通报警");
+								alarm.setContent("一般报警");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("普通报警");
+								alarm.setContent("回路断开");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("普通报警");
+								alarm.setContent("回路短路");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("普通报警");
+								alarm.setContent("模块故障");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("普通报警");
+								alarm.setContent("探头防拆");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("普通报警");
+								alarm.setContent("模块防拆");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("普通报警");
+								alarm.setContent("无声报警");
+							}
+							break;
+						case "15":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("24小时监察报警");
+								alarm.setContent("24小时辅助");
+							}
+							else if (fqbm.equals("1")) {
+								alarm.setWaringType("25小时监察报警");
+								alarm.setContent("瓦斯侦测");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("26小时监察报警");
+								alarm.setContent("制冷失效");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("27小时监察报警");
+								alarm.setContent("温度下降");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("28小时监察报警");
+								alarm.setContent("水管泄漏");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("29小时监察报警");
+								alarm.setContent("高压阀失效");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("30小时监察报警");
+								alarm.setContent("工作故障");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("31小时监察报警");
+								alarm.setContent("低浓度瓦斯");
+							} else if (fqbm.equals("8")) {
+								alarm.setWaringType("32小时监察报警");
+								alarm.setContent("高温警报");
+							} else if (fqbm.equals("9")) {
+								alarm.setWaringType("33小时监察报警");
+								alarm.setContent("低温警报");
+							}
+							break;
+						case "16":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("34小时监察报警");
+								alarm.setContent("低压警报");
+							}
+							break;
+						case "17":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("交通");
+								alarm.setContent("交通事故");
+							}
+							break;
+						case "20":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("防火监察");
+								alarm.setContent("回路故障");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("防火监察");
+								alarm.setContent("水压过低");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("防火监察");
+								alarm.setContent("CO2偏低");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("防火监察");
+								alarm.setContent("Gate valve sensor");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("防火监察");
+								alarm.setContent("水位过低");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("防火监察");
+								alarm.setContent("水泵开启");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("防火监察");
+								alarm.setContent("水泵故障");
+							}
+							break;
+						case "30":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("系统故障");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("交流电故障");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("备电偏低");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("RAM校验错误");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("ROM校验错误");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("远程编程");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("主机设置更改");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("自检失败");
+							} else if (fqbm.equals("8")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("系统关闭");
+							} else if (fqbm.equals("9")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("备电故障");
+							}
+							break;
+						case "31":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("接地故障");
+							}
+							break;
+						case "32":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("警号/继电器输出故障");
+								alarm.setContent("警号/继电器故障");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("警号/继电器输出故障");
+								alarm.setContent("警号1故障");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("警号/继电器输出故障");
+								alarm.setContent("警号2故障");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("警号/继电器输出故障");
+								alarm.setContent("报警继电器故障");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("警号/继电器输出故障");
+								alarm.setContent("故障继电器故障");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("警号/继电器输出故障");
+								alarm.setContent("回动继电器禁止");
+							}
+							break;
+						case "33":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("系统周边");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("回路断开");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("回路短路");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("扩展模块故障");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("中继器故障");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("打印机缺纸");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("打印机故障");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("扩展模块无直流");
+							} else if (fqbm.equals("8")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("扩展模块低电压");
+							} else if (fqbm.equals("9")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("扩展模块复位");
+							}
+							break;
+						case "34":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("扩展模块防拆触发");
+							}
+							break;
+						case "35":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("通讯故障");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("电话线故障");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("电话接口2故障");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("通讯故障");
+								alarm.setContent("远距离无线通讯");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("通讯故障");
+								alarm.setContent("通讯失败");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("通讯故障");
+								alarm.setContent("无线设备监察失败");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("通讯故障");
+								alarm.setContent("中心巡检失败");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("通讯故障");
+								alarm.setContent("无线发射场强弱");
+							}
+							break;
+						case "37":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("回路故障");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("保护回路故障");
+								alarm.setContent("回路断开");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("保护回路故障");
+								alarm.setContent("回路短路");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("保护回路故障");
+								alarm.setContent("火警回路");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("保护回路故障");
+								alarm.setContent("逃生门报警");
+							}
+							break;
+						case "38":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("感应器故障");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("无线探头");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("可靠性测试失败");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("防拆开关触发");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("无线发射电压低");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("烟感敏感度过高");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("烟感敏感度过低");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("入侵防区灵敏度过高");
+							} else if (fqbm.equals("8")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("入侵防区灵敏度过低");
+							} else if (fqbm.equals("9")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("探头自检失败");
+							}
+							break;
+						case "40":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("开/关机");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("布/撤防");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("分区布/撤防");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("自动布/撤防");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("延时后布/撤防");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("延时布/撤防");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("取消");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("远程布/撤防");
+							} else if (fqbm.equals("8")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("立即布防");
+							} else if (fqbm.equals("9")) {
+								alarm.setWaringType("感应器故障");
+								alarm.setContent("钥匙开关布/撤防");
+							}
+							break;
+						case "41":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("远端遥控");
+								alarm.setContent("应答回电");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("远端遥控");
+								alarm.setContent("资料下载成功");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("远端遥控");
+								alarm.setContent("连接失败");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("远端遥控");
+								alarm.setContent("系统关机");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("远端遥控");
+								alarm.setContent("关闭拨号");
+							}
+							break;
+						case "42":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("门禁控制报告");
+								alarm.setContent("门禁访问失败");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("门禁控制报告");
+								alarm.setContent("门禁允许");
+							}
+							break;
+						case "44":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("留守布/撤防");
+							}
+							break;
+						case "45":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("旁路布/撤防");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("Early O/C");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("Late O/C");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("布/撤防失败");
+							} else if (fqbm.equals("5")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("自动布防失败");
+							} else if (fqbm.equals("6")) {
+								alarm.setWaringType("布撤防");
+								alarm.setContent("局部布/撤防");
+							} else if (fqbm.equals("7")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("退出错误");
+							} else if (fqbm.equals("8")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("User on Premises");
+							} else if (fqbm.equals("9")) {
+								alarm.setWaringType("特殊开关机");
+								alarm.setContent("Recent Close");
+							}
+							break;
+						case "52":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("警号/继电器输出禁止");
+								alarm.setContent("警号/继电器禁止");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("警号/继电器输出禁止");
+								alarm.setContent("警号1输出禁止");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("警号/继电器输出禁止");
+								alarm.setContent("警号2输出禁止");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("警号/继电器输出禁止");
+								alarm.setContent("报警继电器禁止");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("警号/继电器输出禁止");
+								alarm.setContent("故障继电器禁止");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("警号/继电器输出禁止");
+								alarm.setContent("回动继电器禁止");
+							}
+							break;
+						case "55":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("通讯禁止");
+								alarm.setContent("报号禁止");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("通讯禁止");
+								alarm.setContent("无线发射禁止");
+							}
+							break;
+						case "57":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("防区旁路");
+								alarm.setContent("防区旁路");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("防区旁路");
+								alarm.setContent("火警回路");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("旁路操作");
+								alarm.setContent("24小时防区旁路");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("旁路操作");
+								alarm.setContent("防盗防区");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("旁路操作");
+								alarm.setContent("局部旁路");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("旁路操作");
+								alarm.setContent("Swinger Bypass");
+							}
+							break;
+						case "60":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("主机重新上电");
+								alarm.setContent("时钟校准");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("手动触发");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("定期测试");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("周期性无线测试");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("火警回路");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("报告跟随");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("监听跟随");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("步行测试");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("OFF normal condition");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("视频传输");
+							}
+							break;
+						case "61":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("单点火警测试");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("单点未火警测试");
+							}
+							break;
+						case "62":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("事件缓存清除");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("事件缓存50%已满");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("事件缓存90%已满l");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("事件缓存已满");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("时间/日期调整");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("时间/日期丢失");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("进入编程模式");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("退出编程模式");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("24小时未读取事件缓存");
+							}
+							break;
+						case "63":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("管制时段改变");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("非管制时段改变");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("门禁管制时段改变");
+							}
+							break;
+						case "81":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("服务请求");
+								alarm.setContent("其它");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("服务请求");
+								alarm.setContent("购物");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("服务请求");
+								alarm.setContent("医疗");
+							}
+							else if (fqbm.equals("3")) {
+								alarm.setWaringType("服务请求");
+								alarm.setContent("家政");
+							}
+							else if (fqbm.equals("4")) {
+								alarm.setWaringType("服务请求");
+								alarm.setContent("金融");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("服务请求");
+								alarm.setContent("法律");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("服务请求");
+								alarm.setContent("保险");
+							}
+							break;
+						case "91":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("键盘/主机防区-通讯故障(转发)");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("1防区-通讯故障(转发)");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("2防区-通讯故障(转发)");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("3防区-通讯故障(转发)");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("火警");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("门磁防区-通讯故障(转发)");
+							}
+							break;
+						case "92":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("主机键盘-通讯故障(转发))");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("1防区-通讯故障(转发)");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("2防区-通讯故障(转发)");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("3防区-通讯故障(转发)");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("15防区-通讯故障(转发)");
+							}
+							break;
+						case "93":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("拆动");
+								alarm.setContent("主机防拆-通讯故障(转发)");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("1防区-通讯故障(转发)");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("2防区-通讯故障(转发)");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("3防区-通讯故障(转发)");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("窃盗");
+								alarm.setContent("15防区-通讯故障(转发)");
+							}
+							break;
+						case "94":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("主机键盘-通讯故障(转发)");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("1防区-通讯故障(转发)");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("2防区-通讯故障(转发)");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("3防区-通讯故障(转发)");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("医疗求助");
+								alarm.setContent("15防区-通讯故障(转发)");
+							}
+							break;
+						case "95":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("主机键盘-通讯故障(转发)");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("1防区-通讯故障(转发)");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("2防区-通讯故障(转发)");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("3防区-通讯故障(转发)");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("紧急求救");
+								alarm.setContent("防区-通讯故障(转发)");
+							}
+							break;
+						case "96":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("10防区-通讯故障(转发)");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("1防区-通讯故障(转发)");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("2防区-通讯故障(转发)");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("3防区-通讯故障(转发)");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("防区故障");
+								alarm.setContent("15防区-通讯故障(转发)");
+							}
+							break;
+						case "97":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("10防区-通讯故障(转发)");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("1防区-通讯故障(转发)");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("2防区-通讯故障(转发)");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("3防区-通讯故障(转发)");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("防区恢复");
+								alarm.setContent("15防区-通讯故障(转发)");
+							}
+							break;
+						case "98":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("主机编程被改动");
+								alarm.setContent("安装编程-通讯故障(转发)");
+							} else if (fqbm.equals("1")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							} else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							} else if (fqbm.equals("3")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							} else if (fqbm.equals("4")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("系统事件");
+								alarm.setContent("系统事件-通讯故障(转发)");
+							}
+							break;
+						case "99":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("系统故障-恢复");
+								alarm.setContent("电话线故障-通讯故障(转发)");
+							}
+							else if (fqbm.equals("1")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("交流电故障-通讯故障(转发)");
+							}
+							else if (fqbm.equals("2")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("备电偏低-通讯故障(转发)");
+							}
+							else if (fqbm.equals("3")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("警号/继电器故障-通讯故障(转发)");
+							}
+							else if (fqbm.equals("4")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("总线短路故障-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("电话线故障-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("系统故障-恢复");
+								alarm.setContent("备电故障恢复-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("系统故障-恢复");
+								alarm.setContent("交流电故障恢复-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("系统故障-恢复");
+								alarm.setContent("警号/继电器故障恢复-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("系统测试");
+								alarm.setContent("定期测试-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("系统故障-恢复");
+								alarm.setContent("电话线故障-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("系统故障-恢复");
+								alarm.setContent("回路短路故障恢复-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("系统故障-恢复");
+								alarm.setContent("无线监控恢复-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("系统故障");
+								alarm.setContent("无线监控故障-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("系统故障-恢复");
+								alarm.setContent("无线监控故障恢复-通讯故障(转发)");
+							}
+							break;
+						case "9B":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("快速布防-通讯故障(转发)");
+							}
+							else if (fqbm.equals("1")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("1用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("2")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("2用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("3")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("3用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("4")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("4用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("5用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("6用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("7用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("8用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("9用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("10用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("11用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("12用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("13用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("14用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("布防");
+								alarm.setContent("远程控制-通讯故障(转发)");
+							}
+							break;
+						case "9C":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("16用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("1")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("1用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("2")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("2用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("3")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("3用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("4")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("4用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("5用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("6用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("7用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("8用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("9用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("10用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("11用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("12用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("13用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("14用户-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("撤防");
+								alarm.setContent("远程控制-通讯故障(转发)");
+							}
+							break;
+						case "9D":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("故障");
+								alarm.setContent("总线开路-通讯故障(转发)");
+							}
+							break;
+						case "9E":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("1防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("2")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("2防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("3")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("3防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("4")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("警报故障");
+								alarm.setContent("15防区-通讯故障(转发)");
+							}
+							break;
+						case "9F":
+							if (fqbm.equals("0")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("系统-通讯故障(转发)");
+							}
+							else if (fqbm.equals("1")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("1防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("2")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("2防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("3")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("3防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("4")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("4防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("5")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("5防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("6")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("6防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("7")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("7防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("8")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("8防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("9")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("9防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("A")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("10防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("B")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("11防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("C")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("12防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("D")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("13防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("E")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("14防区-通讯故障(转发)");
+							}
+							else if (fqbm.equals("F")) {
+								alarm.setWaringType("警报恢复");
+								alarm.setContent("15防区-通讯故障(转发)");
+							}
+							break;
+						case "A0":
+							if (fqbm.equals("1")) {
+								alarm.setWaringType("视频故障");
+								alarm.setContent("视频遮挡");
+							}
+							else if (fqbm.equals("2")) {
+								alarm.setWaringType("视频故障");
+								alarm.setContent("视频丢失");
+							}
+							else if (fqbm.equals("3")) {
+								alarm.setWaringType("视频故障");
+								alarm.setContent("存储错误");
+							}
+							break;
 					}
-					alarm.setContent(alarm.getWaringType());
+
 					serverHandler.alarmService.s(alarm);
 					outData.add("LEOK#@");
 
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
new file mode 100644
index 0000000..3876ddb
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
@@ -0,0 +1,54 @@
+package org.springblade.jfpt.parcel.controller;
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
+import org.springblade.jfpt.parcel.service.ParcelService;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @title 包裹控制层
+ * @author arsn
+ * @time 2021-03-10
+ */
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("parcel/parcel")
+public class ParcelController {
+
+	private final ParcelService parcelService;
+
+	/**
+	 * 获取违禁包裹统计数据,远程调用接口
+	 * @param conditionVo 查询条件对象  状态码 0:本天    1:本周   2:本月
+	 * @param response 返回作用域
+	 * @return
+	 */
+	@GetMapping("/parcelKindStatis")
+	public R parcelKindStatis(ConditionVo conditionVo, HttpServletResponse response){
+		response.setHeader("Access-Control-Allow-Origin", "*");
+		response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+		response.setHeader("Access-Control-Allow-Credentials","true");
+		return R.data(parcelService.parcelKindStatis(conditionVo));
+	}
+
+	/**
+	 * 获取包裹统计数据,远程调用接口获取数据
+	 * @param conditionVo 查询条件对象  status 状态码 0:本天    1:本周   2:本月
+	 * @param response 返回作用域
+	 * @return
+	 */
+	@GetMapping("/getParcelStatis")
+	public R getParcelStatis(ConditionVo conditionVo, HttpServletResponse response){
+		response.setHeader("Access-Control-Allow-Origin", "*");
+		response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+		response.setHeader("Access-Control-Allow-Credentials","true");
+		return R.data(parcelService.getParcelStatis(conditionVo));
+	}
+
+
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java
new file mode 100644
index 0000000..73e005a
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java
@@ -0,0 +1,25 @@
+package org.springblade.jfpt.parcel.service;
+
+import org.springblade.jfpt.parcel.vo.ConditionVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 包裹服务接口层
+ */
+public interface ParcelService {
+	/**
+	 * 获取查询条件
+	 * @param conditionVo 查询条件对象
+	 * @return
+	 */
+	List<Map<String,Object>> parcelKindStatis(ConditionVo conditionVo);
+
+	/**
+	 * 获取包裹统计数据,远程调用接口获取数据
+	 * @param conditionVo 查询条件对象  status 状态码 0:本天    1:本周   2:本月
+	 * @return
+	 */
+    Object getParcelStatis(ConditionVo conditionVo);
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
new file mode 100644
index 0000000..8e68cb7
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -0,0 +1,172 @@
+package org.springblade.jfpt.parcel.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.common.utils.JacksonUtils;
+import org.springblade.jfpt.parcel.service.ParcelService;
+import org.springblade.jfpt.parcel.util.DateUtils;
+import org.springblade.jfpt.parcel.util.HttpClientUtils;
+import org.springblade.jfpt.parcel.util.JacksonUtil;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import springfox.documentation.spring.web.json.Json;
+
+import java.util.*;
+
+/**
+ * 包裹服务实现层
+ */
+@Service
+public class ParcelServiceImpl implements ParcelService {
+	@Value("${PARCEL_KEY}")
+	private String PARCEL_KEY;
+
+	@Value("${PARCEL_SECRET}")
+	private String PARCEL_SECRET;
+
+	@Value("${PARCEL_CONTRABAND_URL}")
+	private String PARCEL_CONTRABAND_URL;
+
+	@Value("${PARCEL_URL}")
+	private String PARCEL_URL;
+
+
+
+	/**
+	 * 获取查询条件
+	 * @param conditionVo 查询条件对象
+	 * @return
+	 */
+	@Override
+	public List<Map<String, Object>> parcelKindStatis(ConditionVo conditionVo) {
+		//1.判空
+		if (null!=conditionVo.getStatus()) {
+			//获取数据
+			List<Object> objectList = getParcelData(conditionVo,PARCEL_CONTRABAND_URL,PARCEL_KEY,PARCEL_SECRET);
+			//5.遍历,分别取出数据
+			for (Object object : objectList) {
+				Map<String, Object> objectMap = (Map<String, Object>) object;//取出list里面的值转为map
+				System.out.println("liMap.get(\"objCode\") = " + objectMap.get("objCode"));
+				System.out.println("liMap.get(\"objCode\") = " + objectMap.get("objCount"));
+				System.out.println("liMap.get(\"objCode\") = " + objectMap.get("dateStr"));
+				System.out.println("liMap.get(\"objCode\") = " + objectMap.get("objName"));
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * 获取包裹统计数据,远程调用接口获取数据
+	 * @param conditionVo 查询条件对象  status 状态码 0:本天    1:本周   2:本月
+	 * @return
+	 */
+	@Override
+	public Object getParcelStatis(ConditionVo conditionVo) {
+		List<Object> list = new ArrayList<>();//返回
+		//1.判空
+		if (null!=conditionVo.getStatus()){
+			//2.获取数据
+			List<Object> objectList = getParcelData(conditionVo,PARCEL_URL,PARCEL_KEY,PARCEL_SECRET);
+			System.out.println("objectList = " + objectList);
+			//3.创建时间集合,包裹集合数据
+			List<String> listTime = new ArrayList<>();
+			List<Map<String,Object>> parcelList = new ArrayList<>();
+			if (conditionVo.getStatus() == 1) {
+				//3.获取本周开始时间和结束时间的每一天数组
+				listTime = DateUtils.pastDay(DateUtils.getWeekEnd());
+				List<String> percelTimeList = new ArrayList<>();
+				for (Object object:objectList) {
+					//4.取出list里面的值转为map
+					Map<String, Object> objectMap = (Map<String, Object>) object;
+					//5.将远程时间数据存入集合
+					percelTimeList.add(objectMap.get("dateStr").toString());
+				}
+				for (String time:listTime) {
+					//6.创建map,用于存储包裹数据
+					HashMap<String, Object> hashMap = new HashMap<>();
+					//7.如果远程数据哪天数据没有,则为0
+					if (!percelTimeList.contains(time)){
+						hashMap.put("dateStr",time);
+						hashMap.put("checkCount",0);
+						hashMap.put("dangerCount",0);
+						parcelList.add(hashMap);
+					}else {
+						//8.遍历,分别取出数据
+						for (Object object : objectList) {
+							//9.取出list里面的值转为map
+							Map<String, Object> objectMap = (Map<String, Object>) object;
+							String dateStr = objectMap.get("dateStr").toString();  //安检时间
+							Integer checkCount = Integer.parseInt(objectMap.get("checkCount").toString()); //安检包裹数量
+							Integer dangerCount = Integer.parseInt(objectMap.get("dangerCount").toString()); //违禁包裹数量
+							//10.判断,存入数据
+							if (time.equals(dateStr)) {
+								Set<Map.Entry<String, Object>> entries = objectMap.entrySet();
+								for (Map.Entry<String, Object> m : entries) {
+									if (m.getKey().equals("checkCount")) {
+										hashMap.put("checkCount", checkCount);
+										hashMap.put("dateStr", dateStr);
+									}
+									if (m.getKey().equals("dangerCount")) {
+										hashMap.put("dangerCount", dangerCount);
+									}
+								}
+							}
+						}
+						//11.加入到集合中
+						parcelList.add(hashMap);
+					}
+				}
+			}
+			//12.封装数据
+			list.add(listTime);
+			list.add(parcelList);
+			//13.返回
+			return list;
+		}
+		return null;
+	}
+
+
+	/**
+	 * 数据请求处理
+	 * @param conditionVo  条件
+	 * @param url url
+	 * @param key 请求Key
+	 * @param secret 请求 secret
+	 * @return
+	 */
+	private List<Object> getParcelData(ConditionVo conditionVo, String url, String key, String secret) {
+		//1.创建map对象,用于存储请求接口的秘钥
+		Map<String, String> map = new HashMap<>();
+		String startDate = null;
+		String endDate = null;
+		//2.2查询本天的数据
+		if (conditionVo.getStatus() == 0) {
+			//3.获取本天开始时间和结束时间
+			startDate = DateUtils.getToday();
+			endDate = DateUtils.getToday();
+		}
+		//2.2查询本周内每天的数据
+		if (conditionVo.getStatus() == 1) {
+			//3.获取本周开始时间和结束时间
+			startDate = DateUtils.getWeekStart();
+			endDate = DateUtils.getWeekEnd();
+		}
+		//2.2查询本月的数据
+		if (conditionVo.getStatus() == 2) {
+			//3.获取本月开始时间和结束时间
+			startDate = DateUtils.getWeekStart();
+			endDate = DateUtils.getWeekEnd();
+		}
+		map.put("startDate", startDate);
+		map.put("endDate", endDate);
+		//4.远程调用数据
+		String params = HttpClientUtils.httpPost(url, key, secret, map);
+		//5.数据转换
+		Map<String, Object> data = (Map<String, Object>) JSONObject.parse(params);
+		return JSON.parseArray(data.get("result").toString());
+	}
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java
new file mode 100644
index 0000000..964b0d7
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java
@@ -0,0 +1,127 @@
+package org.springblade.jfpt.parcel.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 日期工具类
+ */
+public class DateUtils {
+
+	/**
+	 * 获取今天
+	 * @return String
+	 * */
+	public static String getToday(){
+		return new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+	}
+	/**
+	 * 获取昨天
+	 * @return String
+	 * */
+	public static String getYestoday(){
+		Calendar cal=Calendar.getInstance();
+		cal.add(Calendar.DATE,-1);
+		Date time=cal.getTime();
+		return new SimpleDateFormat("yyyy-MM-dd").format(time);
+	}
+	/**
+	 * 获取本月开始日期
+	 * @return String
+	 * **/
+	public static String getMonthStart(){
+		Calendar cal=Calendar.getInstance();
+		cal.add(Calendar.MONTH, 0);
+		cal.set(Calendar.DAY_OF_MONTH, 1);
+		Date time=cal.getTime();
+		return new SimpleDateFormat("yyyy-MM-dd").format(time);
+	}
+	/**
+	 * 获取本月最后一天
+	 * @return String
+	 * **/
+	public static String getMonthEnd(){
+		Calendar cal=Calendar.getInstance();
+		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+		Date time=cal.getTime();
+		return new SimpleDateFormat("yyyy-MM-dd").format(time);
+	}
+	/**
+	 * 获取本周的第一天
+	 * @return String
+	 * **/
+	public static String getWeekStart(){
+		Calendar cal=Calendar.getInstance();
+		cal.add(Calendar.WEEK_OF_MONTH, 0);
+		cal.set(Calendar.DAY_OF_WEEK, 2);
+		Date time=cal.getTime();
+		return new SimpleDateFormat("yyyy-MM-dd").format(time);
+	}
+	/**
+	 * 获取本周的最后一天
+	 * @return String
+	 * **/
+	public static String getWeekEnd(){
+		Calendar cal=Calendar.getInstance();
+		cal.set(Calendar.DAY_OF_WEEK, cal.getActualMaximum(Calendar.DAY_OF_WEEK));
+		cal.add(Calendar.DAY_OF_WEEK, 1);
+		Date time=cal.getTime();
+		return new SimpleDateFormat("yyyy-MM-dd").format(time);
+	}
+	/**
+	 * 获取本年的第一天
+	 * @return String
+	 * **/
+	public static String getYearStart(){
+		return new SimpleDateFormat("yyyy").format(new Date())+"-01-01";
+	}
+
+	/**
+	 * 获取本年的最后一天
+	 * @return String
+	 * **/
+	public static String getYearEnd(){
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.MONTH,calendar.getActualMaximum(Calendar.MONTH));
+		calendar.set(Calendar.DAY_OF_MONTH,calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+		Date currYearLast = calendar.getTime();
+		return new SimpleDateFormat("yyyy-MM-dd").format(currYearLast)+" 23:59:59";
+	}
+
+	/**
+	 * 获取过去7天内的日期数组
+	 * @return  日期数组
+	 */
+	public static ArrayList<String> pastDay(String time){
+		ArrayList<String> pastDaysList = new ArrayList<>();
+		try {
+			//我这里传来的时间是个string类型的,所以要先转为date类型的。
+			SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd");
+			Date date = sdf.parse(time);
+			for (int i = 6; i >= 0; i--) {
+				pastDaysList.add(getPastDate(i,date));
+			}
+		}catch (ParseException e){
+			e.printStackTrace();
+		}
+		return pastDaysList;
+	}
+
+	/**
+	 * 获取过去第几天的日期
+	 *
+	 * @param past
+	 * @return
+	 */
+	public static String getPastDate(int past,Date date) {
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(date);
+		calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - past);
+		Date today = calendar.getTime();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		return sdf.format(today);
+	}
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java
new file mode 100644
index 0000000..8b263ea
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java
@@ -0,0 +1,399 @@
+package org.springblade.jfpt.parcel.util;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.*;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.LaxRedirectStrategy;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+
+
+public class HttpClientUtils {
+    /**
+     * 执行有参GET请求
+     *
+     * @param url
+     * @param params
+     * @return
+     */
+    public static String doGet(String url, Map<String, String> params) {
+
+        //获取httpclient客户端
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+
+        String resultString = "";
+
+        CloseableHttpResponse response = null;
+
+        try {
+            URIBuilder builder = new URIBuilder(url);
+
+            if (null != params) {
+                for (String key : params.keySet()) {
+                    builder.setParameter(key, params.get(key));
+                }
+            }
+
+            HttpGet get = new HttpGet(builder.build());
+
+
+            response = httpclient.execute(get);
+
+            System.out.println(response.getStatusLine());
+
+            if (200 == response.getStatusLine().getStatusCode()) {
+                HttpEntity entity = response.getEntity();
+                System.out.println(entity.toString());
+                resultString = EntityUtils.toString(entity, "utf-8");
+                System.out.println(resultString.toString());
+            }
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+        } finally {
+            if (null != response) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != httpclient) {
+                try {
+                    httpclient.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return resultString;
+    }
+
+    /**
+     * 执行无参GET请求
+     *
+     * @param url
+     * @return
+     */
+    public static String doGet(String url) {
+        return doGet(url, null);
+    }
+
+    /**
+     * 执行有参POST请求
+     *
+     * @param url
+     * @param params
+     * @return
+     */
+    public static String doPost(String url, Map<String, String> params) {
+        /**
+         * 在4.0及以上httpclient版本中,post需要指定重定向的策略,如果不指定则按默认的重定向策略。
+         *
+         * 获取httpclient客户端
+         */
+        CloseableHttpClient httpclient = HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()).build();
+
+        String resultString = "";
+
+        CloseableHttpResponse response = null;
+
+        try {
+
+
+            HttpPost post = new HttpPost(url);
+
+            List<NameValuePair> paramaters = new ArrayList<>();
+
+            if (null != params) {
+                for (String key : params.keySet()) {
+                    paramaters.add(new BasicNameValuePair(key, params.get(key)));
+                }
+                // 构造一个form表单式的实体
+                UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(paramaters);
+                // 将请求实体设置到httpPost对象中
+                post.setEntity(formEntity);
+            }
+
+
+            /**
+             * HTTP/1.1 403 Forbidden
+             *   原因:
+             *      有些网站,设置了反爬虫机制
+             *   解决的办法:
+             *      设置请求头,伪装浏览器
+             */
+            post.addHeader("user-agent", "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36");
+
+            response = httpclient.execute(post);
+
+            System.out.println(response.getStatusLine());
+
+            if (200 == response.getStatusLine().getStatusCode()) {
+                HttpEntity entity = response.getEntity();
+                resultString = EntityUtils.toString(entity, "utf-8");
+            }
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+        } finally {
+            if (null != response) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != httpclient) {
+                try {
+                    httpclient.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return resultString;
+    }
+
+    public static String doPost(String url) {
+        return doPost(url, null);
+    }
+
+
+    public static void main(String[] args) {
+
+        Map<String, String> params = new HashMap<>();
+        params.put("scope", "project");
+        params.put("q", "数据库");
+//
+//		System.out.println(doGet("http://www.baidu.com/s",params));
+
+        /**
+         * 有一部分网站,禁止爬虫技术访问网站。
+         *
+         * 解决方案:
+         *    伪装浏览器
+         *    post.addHeader("user-agent", "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36");
+         */
+        System.out.println(doPost("http://www.oschina.net/search", params));
+    }
+
+	/**
+	 * post 请求 header 带 秘钥
+	 * @param url
+	 * @param appKey
+	 * @param appKeyValue
+	 * @param map
+	 * @return
+	 */
+    public static String httpPost(String url, String appKey, String appKeyValue, Map<String, String> map) {
+        // 返回body
+        String body = null;
+        // 获取连接客户端工具
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse httpResponse = null;
+        // 2、创建一个HttpPost请求
+        HttpPost post = new HttpPost(url);
+        // 5、设置header信息
+        /**header中通用属性*/
+//        post.setHeader("Accept", "*/*");
+//        post.setHeader("Accept-Encoding", "gzip, deflate");
+//        post.setHeader("Cache-Control", "no-cache");
+//        post.setHeader("Connection", "keep-alive");
+        post.setHeader("Content-Type", "application/json;charset=UTF-8");
+        /**业务参数*/
+        post.setHeader(appKey, appKeyValue);
+        // 设置参数
+        if (map != null) {
+            try {
+                StringEntity entity1 = new StringEntity(JSON.toJSONString(map), "UTF-8");
+                entity1.setContentEncoding("UTF-8");
+                entity1.setContentType("json/form-data");
+                post.setEntity(entity1);
+
+                // 7、执行post请求操作,并拿到结果
+                httpResponse = httpClient.execute(post);
+                // 获取结果实体
+                HttpEntity entity = httpResponse.getEntity();
+                if (entity != null) {
+                    // 按指定编码转换结果实体为String类型
+                    body = EntityUtils.toString(entity, "UTF-8");
+                }
+                try {
+                    httpResponse.close();
+                    httpClient.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return body;
+    }
+
+    public static SSLContext createIgnoreVerifySSL() throws KeyManagementException, NoSuchAlgorithmException, KeyStoreException {
+
+        SSLContext sc = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+
+            public boolean isTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+                return true;
+            }
+
+        }).build();
+
+        return sc;
+    }
+
+    //适用于post请求并传送form-data数据(同样适用于post的Raw类型的application-json格式)
+    public static String postParams(String url, String appKey, String appKeyValue, Map<String, String> map) {
+        SSLContext sslcontext = null;
+        try {
+            sslcontext = createIgnoreVerifySSL();
+        } catch (KeyManagementException e) {
+            e.printStackTrace();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (KeyStoreException e) {
+            e.printStackTrace();
+        }
+        // 设置协议http和https对应的处理socket链接工厂的对象
+        Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create()
+                .register("http", PlainConnectionSocketFactory.INSTANCE)
+                .register("https", new SSLConnectionSocketFactory(sslcontext))
+                .build();
+        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+
+        //创建自定义的httpclient对象
+        CloseableHttpClient client = HttpClients.custom().setConnectionManager(connManager).build();
+        HttpPost post = new HttpPost(url);
+        post.setHeader(appKey, appKeyValue);
+        CloseableHttpResponse res = null;
+        try {
+            List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+            Set<String> keySet = map.keySet();
+            for (String key : keySet) {
+                nvps.add(new BasicNameValuePair(key, map.get(key)));
+            }
+            post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
+            res = client.execute(post);
+            HttpEntity entity = res.getEntity();
+            return EntityUtils.toString(entity, "utf-8");
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                res.close();
+                client.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 向指定 URL 发送POST方法的请求
+     *
+     * @param url    发送请求的 URL
+     * @param params 请求的参数集合
+     * @return 远程资源的响应结果
+     */
+    @SuppressWarnings("unused")
+    public static String sendPost(String url, Map<String, String> params) {
+        OutputStreamWriter out = null;
+        BufferedReader in = null;
+        StringBuilder result = new StringBuilder();
+        try {
+            URL realUrl = new URL(url);
+            HttpURLConnection conn = (HttpURLConnection) realUrl.openConnection();
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // POST方法
+            conn.setRequestMethod("POST");
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            conn.connect();
+            // 获取URLConnection对象对应的输出流
+            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            // 发送请求参数
+            if (params != null) {
+                StringBuilder param = new StringBuilder();
+                for (Map.Entry<String, String> entry : params.entrySet()) {
+                    if (param.length() > 0) {
+                        param.append("&");
+                    }
+                    param.append(entry.getKey());
+                    param.append("=");
+                    param.append(entry.getValue());
+                    // System.out.println(entry.getKey()+":"+entry.getValue());
+                }
+                // System.out.println("param:"+param.toString());
+                out.write(param.toString());
+            }
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // 使用finally块来关闭输出流、输入流
+        finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+                if (in != null) {
+                    in.close();
+                }
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+        return result.toString();
+    }
+
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/JacksonUtil.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/JacksonUtil.java
new file mode 100644
index 0000000..a67b7ae
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/JacksonUtil.java
@@ -0,0 +1,186 @@
+package org.springblade.jfpt.parcel.util;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+public class JacksonUtil {
+	public static String parseString(String body, String field) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+			if (leaf != null) {
+				return leaf.asText();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static List<String> parseStringList(String body, String field) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+
+			if (leaf != null) {
+				return mapper.convertValue(leaf, new TypeReference<List<String>>() {
+				});
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static Double parseDouble(String body,String field){
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+			if (leaf != null) {
+				return leaf.asDouble();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static List<Double> parseDoubleList(String body, String field) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+
+			if (leaf != null) {
+				return mapper.convertValue(leaf, new TypeReference<List<Double>>() {
+				});
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static Integer parseInteger(String body, String field) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+			if (leaf != null) {
+				return leaf.asInt();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static List<Integer> parseIntegerList(String body, String field) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+
+			if (leaf != null) {
+				return mapper.convertValue(leaf, new TypeReference<List<Integer>>() {
+				});
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static Boolean parseBoolean(String body, String field) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+			if (leaf != null) {
+				return leaf.asBoolean();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static Short parseShort(String body, String field) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+			if (leaf != null) {
+				Integer value = leaf.asInt();
+				return value.shortValue();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static Byte parseByte(String body, String field) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			JsonNode leaf = node.get(field);
+			if (leaf != null) {
+				Integer value = leaf.asInt();
+				return value.byteValue();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static <T> T parseObject(String body, String field, Class<T> clazz) {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode node = null;
+		try {
+			node = mapper.readTree(body);
+			node = node.get(field);
+			return mapper.treeToValue(node, clazz);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static Object toNode(String json) {
+		if (json == null) {
+			return null;
+		}
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			JsonNode jsonNode = mapper.readTree(json);
+			return jsonNode;
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java
new file mode 100644
index 0000000..cc98f2b
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java
@@ -0,0 +1,23 @@
+package org.springblade.jfpt.parcel.vo;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ConditionVo implements Serializable {
+	/**
+	 * 开始时间
+	 */
+	private String startDate;
+	/**
+	 * 结束时间
+	 */
+	private String endDate;
+
+	/**
+	 * 状态码 0:本天    1:本周   2:本月
+	 */
+	private Integer status;
+}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
index b9c7a94..844f12b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
@@ -18,6 +18,8 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.minio.MinioClient;
+import io.minio.errors.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -38,11 +40,16 @@
 import org.springblade.jfpt.xlfeedback.wrapper.XlfeedbackWrapper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.xmlpull.v1.XmlPullParserException;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -232,4 +239,22 @@
 		return  R.data(link);
 
 	}
+
+	@PostMapping("put-objects")
+	public R put(@RequestParam MultipartFile file) throws InvalidPortException, InvalidEndpointException, IOException, XmlPullParserException, NoSuchAlgorithmException, InvalidKeyException, InvalidArgumentException, InternalException, NoResponseException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, RegionConflictException {
+		MinioClient minioClient = new MinioClient("http://36.134.81.48:9000","adminminio","adminminio");
+		if (!minioClient.bucketExists("jfpt")) {	//是否存在名为“test”的bucket
+			minioClient.makeBucket("jfpt");
+		}
+		String fileName = file.getOriginalFilename();
+		String newName ="upload/"+UUID.randomUUID().toString().replaceAll("-", "")
+			+ fileName.substring(fileName.lastIndexOf("."));
+		InputStream inputStream = file.getInputStream();	//获取file的inputStream
+		minioClient.putObject("jfpt", newName, inputStream, "application/octet-stream");//上传
+		inputStream.close();
+		String url = minioClient.getObjectUrl("jfpt", newName);	//文件访问路径
+		return R.data(url);
+	}
+
+
 }
diff --git a/blade-service/blade-jfpts/src/main/resources/application.properties b/blade-service/blade-jfpts/src/main/resources/application.properties
index 5c993ad..df4d6a4 100644
--- a/blade-service/blade-jfpts/src/main/resources/application.properties
+++ b/blade-service/blade-jfpts/src/main/resources/application.properties
@@ -1,2 +1,14 @@
+#ͼƬ���浽����·��
 picture.addUrl= http://36.134.81.48:9000/
 picture.pre= software/minio/data/jfpt/animalHeat/
+
+
+#�����ӿ���Կ��������
+PARCEL_KEY=X-AISP-T
+PARCEL_SECRET=A3_2f718467f64b82e7a3cb38bf77702c2a1615339643687
+
+#��ѯij�ڼ��Υ����Ʒͳ�� URL
+PARCEL_CONTRABAND_URL=http://113.105.119.25:90/backstage-temporary-api/machineStat/queryMachineDayContrabandStat
+
+#��ѯij�ڼ�İ���ͳ�� URL
+PARCEL_URL=http://113.105.119.25:90/backstage-temporary-api/machineStat/queryMachineDayStat

--
Gitblit v1.9.3