From 0b9ceeec9c387b1499486468779b5c67bec00113 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 23 Apr 2021 16:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 5 +++--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/mapper/DeplMapper.xml | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 5 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 4 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java | 7 +++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java | 2 ++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 4 ++--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/entity/Depl.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 5 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 1 +
14 files changed, 35 insertions(+), 9 deletions(-)
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 fd8a530..45102d2 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
@@ -469,7 +469,7 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz());
+ alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr());
alarmService.updatePoliceStatus(operation.getRid(),"0");
operationService.save(operation);
return R.success("修改成功");
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index 26193f7..edbf62d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -60,7 +60,7 @@
*/
List<AlarmVO> selectListSe(String beginTime, String endTime);
void s(Alarm alarm);
- void updateJtype(String id, String jtype, String bz);
+ void updateJtype(String id, String jtype, String bz,String securityArr);
void updatePoliceStatus(String id, String status);
void updateOne(Alarm alarm);
void updateVaddress(String vaddress,String uids ,String jid);
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 3322410..6e8e13e 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
@@ -180,7 +180,7 @@
<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.bz,
+ a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
@@ -189,6 +189,7 @@
e.twoId,
e.threeId,
e.deptId,
+ e.street as place,
e.channelNumber from sys_alarm a
LEFT JOIN
sys_equipment e on e.deviceNumber=a.deviceNumber
@@ -397,7 +398,7 @@
<update id="updateJtype">
- update sys_alarm SET jtype=#{jtype},bz=#{bz} where id=#{id}
+ update sys_alarm SET jtype=#{jtype},bz=#{bz},securityArr =#{securityArr} where id=#{id}
</update>
<update id="updatePoliceStatus">
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
index f79900d..91f1a58 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -53,7 +53,7 @@
void updateOne(Alarm alarm);
List<Map<String, Object>> selectScount(String time);
List<AlarmVO> selectListSe(String beginTime, String endTime);
- void updateJtype(String id, String jtype, String bz);
+ void updateJtype(String id, String jtype, String bz,String securityArr);
void updateVaddress(String vaddress,String uids,String jid);
void updatePoliceStatus(String id, String status);
void updateAaddress(String aaddress,String jid);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index d4d8113..0ec8c89 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -97,8 +97,8 @@
}
@Override
- public void updateJtype(String id,String jtype,String bz) {
- baseMapper.updateJtype(id,jtype,bz);
+ public void updateJtype(String id,String jtype,String bz,String securityArr) {
+ baseMapper.updateJtype(id,jtype,bz,securityArr);
}
@Override
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/entity/Depl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/entity/Depl.java
index ad64030..3e86e85 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/entity/Depl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/entity/Depl.java
@@ -57,7 +57,7 @@
* 电话
*/
@ApiModelProperty(value = "电话")
- private String call;
+ private String calls;
/**
* 图片地址
*/
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/mapper/DeplMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/mapper/DeplMapper.xml
index 621e85a..4daef98 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/mapper/DeplMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/mapper/DeplMapper.xml
@@ -7,7 +7,7 @@
<id column="id" property="id"/>
<result column="deviceNumber" property="devicenumber"/>
<result column="contacts" property="contacts"/>
- <result column="call" property="call"/>
+ <result column="call" property="calls"/>
<result column="paddress" property="paddress"/>
<result column="deploymentTime" property="deploymenttime"/>
<result column="deviceName" property="devicename"/>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index fe8f7c3..f12bb88 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -369,6 +369,10 @@
// catalogService.updateCatalog(deviceName,deviceNumber,pId);
// }
+ if (equipment.getPaddress() != null && !equipment.getPaddress().equals("")) {
+ equipmentService.saveImg(equipment);
+ }
+
System.out.println(equipment.getDeptId());
return R.status(equipmentService.saveOrUpdate(equipment));
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
index 9e81a8c..ed26d04 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -41,6 +41,7 @@
void s(Equipment equipment);
void updateOne(Equipment equipment);
+ void saveImg(EquipmentVO equipment);
void updataType(String arr);
void updataTypeC(String arr);
/**
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 17aa189..943b8c7 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -217,6 +217,11 @@
INSERT INTO sys_equipment (deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,coordinate,parent_id,jd,wd,addvcd,street,dtype) VALUES (#{deviceName},#{deviceNumber},#{deviceType},#{ownership},#{yname},#{devicestate},#{stime},POINT(#{jd},#{wd}),#{parentId},#{jd},#{wd},#{addvcd},#{streeName},#{dtype})
</insert>
+ <!--新增-->
+ <insert id="saveImg" parameterType="org.springblade.jfpt.equipment.entity.Equipment">
+ INSERT INTO sys_depl (deviceName,deviceNumber,contacts,calls,paddress,deploymentTime) VALUES (#{deviceName},#{deviceNumber},#{contacts},#{call},#{paddress},#{deploymentTime})
+ </insert>
+
<select id="tree" resultMap="treeNodeResultMap">
select id, parent_id, deviceName as title, id as "value", id as "key" from sys_equipment
</select>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
index 5079be6..e3255b8 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
@@ -52,6 +52,8 @@
void updateOne(Equipment equipment);
+ void saveImg(EquipmentVO equipment);
+
void s(Equipment equipment);
void updataType(String arr);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index f1514b0..da93309 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -93,6 +93,11 @@
}
@Override
+ public void saveImg(EquipmentVO equipment) {
+ baseMapper.saveImg(equipment);
+ }
+
+ @Override
public void s(Equipment equipment) {
baseMapper.s(equipment);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
index 588eff6..f6dfea9 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
@@ -43,4 +43,11 @@
//设备是否处于报警状态
String jtype;
+ String contacts;
+ String call;
+ String paddress;
+ String deploymentTime;
+
+
+
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java
index 1ed2a4c..cae2629 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java
@@ -36,5 +36,6 @@
private String jtype;
private String rid;
private String bz;
+ private String securityArr;
}
--
Gitblit v1.9.3