From b5074aef0d43572d60264d1cc5c070956090285f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 26 Jan 2021 15:54:14 +0800
Subject: [PATCH] 初版
---
blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 46 +++++++----
blade-gateway/src/main/resources/bootstrap.yml | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java | 3
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 10 ++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java | 170 +++++++++++++++++++++++-------------------
7 files changed, 137 insertions(+), 98 deletions(-)
diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
index 05f6665..1fed399 100644
--- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
+++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
@@ -41,7 +41,7 @@
/**
* nacos dev 地址
*/
- String NACOS_DEV_ADDR = "192.168.0.105:8848";
+ String NACOS_DEV_ADDR = "localhost:8848";
/**
* nacos prod 地址
diff --git a/blade-gateway/src/main/resources/bootstrap.yml b/blade-gateway/src/main/resources/bootstrap.yml
index 4f77e44..503f923 100644
--- a/blade-gateway/src/main/resources/bootstrap.yml
+++ b/blade-gateway/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
server:
- port: 80
+ port: 82
spring:
cloud:
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 30024f0..ea74c75 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -119,6 +119,16 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入alarm")
public R submit(@Valid @RequestBody Alarm alarm) {
+
+ if (alarm.getCzTime() != null && alarm.getCzTime().equals("")){
+ alarm.setCzTime(null);
+ }
+ if (alarm.getJjTime() != null && alarm.getJjTime().equals("")){
+ alarm.setJjTime(null);
+ }
+ if (alarm.getAlarmTime() != null && alarm.getAlarmTime().equals("")){
+ alarm.setAlarmTime(null);
+ }
return R.status(alarmService.saveOrUpdate(alarm));
}
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 4230d99..0cb876b 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
@@ -42,108 +42,124 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 接警类型
- */
- @ApiModelProperty(value = "接警类型")
- @TableField("alarmType")
+ * 接警类型
+ */
+ @ApiModelProperty(value = "接警类型")
+ @TableField("alarmType")
private String alarmType;
/**
- * 接警人姓名
- */
- @ApiModelProperty(value = "接警人姓名")
- @TableField("alarmPeople")
+ * 接警人姓名
+ */
+ @ApiModelProperty(value = "接警人姓名")
+ @TableField("alarmPeople")
private String alarmPeople;
/**
- * 接警时间
- */
- @ApiModelProperty(value = "接警时间")
- @TableField("alarmTime")
+ * 报警时间
+ */
+ @ApiModelProperty(value = "报警时间")
+ @TableField("alarmTime")
private String alarmTime;
/**
- * 报警人
- */
- @ApiModelProperty(value = "报警人")
- @TableField("galarmPeople")
+ * 接警时间
+ */
+ @ApiModelProperty(value = "接警时间")
+ @TableField("jjTime")
+ private String jjTime;
+ /**
+ * 报警人
+ */
+ @ApiModelProperty(value = "报警人")
+ @TableField("galarmPeople")
private String galarmPeople;
/**
- * 性别(0:男1：女)
- */
- @ApiModelProperty(value = "性别(0:男1：女)")
- private String sex;
+ * 性别(0:男1：女)
+ */
+ @ApiModelProperty(value = "性别(0:男1：女)")
+ private String sex;
/**
- * 联系电话
- */
- @ApiModelProperty(value = "联系电话")
- @TableField("phoneNumber")
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ @TableField("phoneNumber")
private String phoneNumber;
/**
- * 事发地址
- */
- @ApiModelProperty(value = "事发地址")
- private String place;
+ * 事发地址
+ */
+ @ApiModelProperty(value = "事发地址")
+ private String place;
/**
- * 报警内容
- */
- @ApiModelProperty(value = "报警内容")
- private String content;
+ * 报警内容
+ */
+ @ApiModelProperty(value = "报警内容")
+ private String content;
/**
- * 警情类别
- */
- @ApiModelProperty(value = "警情类别")
- @TableField("waringType")
+ * 警情类别
+ */
+ @ApiModelProperty(value = "警情类别")
+ @TableField("waringType")
private String waringType;
/**
- * 设备编号
- */
- @ApiModelProperty(value = "设备编号")
- @TableField("deviceNumber")
+ * 设备编号
+ */
+ @ApiModelProperty(value = "设备编号")
+ @TableField("deviceNumber")
private String deviceNumber;
/**
- * AOI区域编码
- */
- @ApiModelProperty(value = "AOI区域编码")
- private String region;
+ * AOI区域编码
+ */
+ @ApiModelProperty(value = "AOI区域编码")
+ private String region;
/**
- * 行政区编码
- */
- @ApiModelProperty(value = "行政区编码")
- private String addvcd;
+ * 行政区编码
+ */
+ @ApiModelProperty(value = "行政区编码")
+ private String district;
/**
- * 行政区编码
- */
- @ApiModelProperty(value = "接警人ID")
- @TableField("alarmId")
+ * 省份编码
+ */
+ @ApiModelProperty(value = "省份")
+ private String province;
+ /**
+ * 行政区编码
+ */
+ @ApiModelProperty(value = "地市")
+ private String city;
+ /**
+ * 地市编码
+ */
+ @ApiModelProperty(value = "接警人ID")
+ @TableField("alarmId")
private String alarmId;
/**
- * 警情级别
- */
- @ApiModelProperty(value = "警情级别")
- private String level;
+ * 警情级别
+ */
+ @ApiModelProperty(value = "警情级别")
+ private String level;
/**
- * 空间坐标
- */
- @ApiModelProperty(value = "空间坐标")
- private String coordinate;
+ * 空间坐标
+ */
+// @ApiModelProperty(value = "空间坐标")
+// private String coordinate;
/**
- * 经度
- */
- @ApiModelProperty(value = "经度")
- private String jd;
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String jd;
/**
- * 纬度
- */
- @ApiModelProperty(value = "纬度")
- private String wd;
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String wd;
/**
- * 是否生成警单(0:否 1：是)
- */
- @ApiModelProperty(value = "是否生成警单(0:否 1：是)")
- private String jtype;
- private String rname;
- @ApiModelProperty(value = "时间")
- @TableField("czTime")
- private String czTime;
- private String bz;
+ * 是否生成警单(0:否 1：是)
+ */
+ @ApiModelProperty(value = "是否生成警单(0:否 1：是)")
+ private String jtype;
+ private String rname;
+ @ApiModelProperty(value = "时间")
+ @TableField("czTime")
+ private String czTime;
+ private String bz;
}
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 20d5502..511673d 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
@@ -16,7 +16,7 @@
<result column="waringType" property="waringType"/>
<result column="deviceNumber" property="deviceNumber"/>
<result column="region" property="region"/>
- <result column="addvcd" property="addvcd"/>
+ <result column="district" property="district"/>
<result column="alarmId" property="alarmId"/>
<result column="level" property="level"/>
<result column="coordinate" property="coordinate"/>
@@ -34,21 +34,33 @@
<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.addvcd, a.alarmId,a.LEVEL,ST_ASTEXT (a.coordinate) AS coordinate,jd,wd,a.jtype,a.rname from sys_alarm a where 1=1
+ a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,jd,wd,a.jtype,a.rname,a.jjTime,a.province,a.city from sys_alarm a where 1=1
<if test="alarm.jtype!=null">
and a.jtype like concat('%',#{alarm.jtype},'%')
</if>
<if test="alarm.galarmPeople!=null">
and a.galarmPeople like concat('%',#{alarm.galarmPeople},'%')
</if>
- <if test="alarm.addvcd!=null">
- and a.addvcd like concat('%',#{alarm.addvcd},'%')
+ <if test="alarm.district!=null">
+ and a.district like concat('%',#{alarm.district},'%')
+ </if>
+ <if test="alarm.province!=null">
+ and a.province like concat('%',#{alarm.province},'%')
+ </if>
+ <if test="alarm.city!=null">
+ and a.city like concat('%',#{alarm.city},'%')
</if>
<if test="alarm.level!=null">
and a.level like concat('%',#{alarm.level},'%')
</if>
<if test="alarm.waringType!=null">
and a.waringType like concat('%',#{alarm.waringType},'%')
+ </if>
+ <if test="alarm.beginTime!=null and alarm.beginTime!=''">
+ and a.alarmTime>=#{alarm.beginTime}
+ </if>
+ <if test="alarm.endTime!=null and alarm.endTime!=''">
+ and a.alarmTime<=#{alarm.endTime}
</if>
</select>
@@ -66,7 +78,7 @@
a.waringType,
a.deviceNumber,
a.region,
- a.addvcd,
+ a.district,
a.alarmId,
a.czTime,
a.bz,
@@ -81,12 +93,12 @@
e.stype,
e.channelNumber
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
+ sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
<if test="jtype!=null and jtype!=''">
and a.jtype=#{jtype}
</if>
- <if test="addvcd!=null and addvcd!=''">
- and a.addvcd=#{addvcd}
+ <if test="district!=null and district!=''">
+ and a.district=#{district}
</if>
<if test="waringType!=null and waringType!=''">
and a.waringType=#{waringType}
@@ -116,7 +128,7 @@
a.waringType,
a.deviceNumber,
a.region,
- a.addvcd,
+ a.district,
a.alarmId,
a.rname,
a.LEVEL,
@@ -126,7 +138,7 @@
a.jtype,
d.addvnm
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd where 1=1
+ sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district where 1=1
<if test="id!=null and id!=''">
and a.id=#{id}
</if>
@@ -147,7 +159,7 @@
a.waringType,
a.deviceNumber,
a.region,
- a.addvcd,
+ a.district,
a.alarmId,
a.rname,
a.LEVEL,
@@ -160,7 +172,7 @@
e.stype,
e.channelNumber
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
+ sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
<if test="id!=null and id!=''">
and a.id >#{id}
</if>
@@ -173,14 +185,14 @@
<!--新增-->
<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,addvcd,alarmId,level,rname,coordinate,jd,wd,jtype) VALUES
- (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{addvcd},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype})
+ region,district,alarmId,level,rname,coordinate,jd,wd,jtype) VALUES
+ (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype})
</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},addvcd=#{addvcd},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},coordinate=POINT(#{jd},#{wd}),jtype=#{jtype} where id=#{id}
+ 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} where id=#{id}
</update>
@@ -203,7 +215,7 @@
a.waringType,
a.deviceNumber,
a.region,
- a.addvcd,
+ a.district,
a.alarmId,
a.LEVEL,
ST_ASTEXT (a.coordinate ) AS coordinate,
@@ -216,7 +228,7 @@
e.stype,
e.channelNumber
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where
+ sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where
DATE_FORMAT(alarmTime,'%Y-%m-%d') >=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') <=#{endTime} ORDER BY alarmTime desc
</select>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
index cea55be..ccbfd1f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
@@ -36,5 +36,6 @@
private String serialNumber;
private String stype;
private String channelNumber;
-
+ private String beginTime;
+ private String endTime;
}
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 1ccb1e2..cba500c 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
@@ -136,7 +136,7 @@
alarm.setAlarmTime(df.format(day));
alarm.setPlace((String) list.get(0).get("streeName"));//事发地址
alarm.setDeviceNumber((String) list.get(0).get("deviceNumber"));//设备编号
- alarm.setAddvcd((String) list.get(0).get("addvcd"));//行政区编码
+ alarm.setDistrict((String) list.get(0).get("district"));//行政区编码
alarm.setJd((String) list.get(0).get("jd"));//经度
alarm.setWd((String) list.get(0).get("wd"));//纬度
alarm.setJtype("0");
--
Gitblit v1.9.3