From a3b023b9152b711c3ce19711a88f1ced520b16d2 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 10:48:18 +0800
Subject: [PATCH] app接口
---
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/depl/mapper/DeplMapper.xml | 2 +-
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/mapper/EquipmentMapper.xml | 5 +++++
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/controller/EquipmentController.java | 4 ++++
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/mapper/EquipmentMapper.java | 1 +
8 files changed, 26 insertions(+), 2 deletions(-)
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;
+
+
+
}
--
Gitblit v1.9.3