From 15c3373a01a1ba7c4afadb45d4b861bdb9145562 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 14 Mar 2021 13:59:06 +0800
Subject: [PATCH] 1.缴费
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/mapper/PositionMapper.xml | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 4 ++++
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 | 11 +++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 1 +
6 files changed, 23 insertions(+), 1 deletions(-)
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 dedb107..1bd3541 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
@@ -340,4 +340,15 @@
return R.data(list);
}
+ /**
+ * 修改
+ */
+ @PostMapping("/updateexpireTime")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入equipment")
+ public R updateexpireTime(String expireTime,String deviceNumber) {
+ equipmentService.updateexpireTime(expireTime,deviceNumber);
+ return R.success("修改成功");
+ }
+
}
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 aaf6ad2..1dd617b 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
@@ -66,4 +66,5 @@
EquipmentVOS selectInfo(Equipment equipment);
List<Map<String, Object>> selectInfos(String deviceNumber);
void updateChannel(String heartbeat, String deviceNumber);
+ void updateexpireTime(String expireTime, String deviceNumber);
}
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 f8a5b7f..6c62b41 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
@@ -254,4 +254,8 @@
update sys_equipment SET heartbeat=#{heartbeat} where deviceNumber=#{deviceNumber}
</update>
+ <update id="updateexpireTime">
+ update sys_equipment SET expireTime=#{expireTime} where deviceNumber=#{deviceNumber}
+ </update>
+
</mapper>
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 7cfbe7d..61384c1 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
@@ -80,4 +80,5 @@
* @return
*/
Integer selectEquipmentCount(Integer status);
+ void updateexpireTime(String expireTime, String deviceNumber);
}
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 75cfd12..b6a02e1 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
@@ -152,4 +152,9 @@
//返回数据
return equipmentCount;
}
+
+ @Override
+ public void updateexpireTime(String expireTime, String deviceNumber) {
+ baseMapper.updateexpireTime(expireTime,deviceNumber);
+ }
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/mapper/PositionMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/mapper/PositionMapper.xml
index 3b5baa4..7bf37fb 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/mapper/PositionMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/mapper/PositionMapper.xml
@@ -64,7 +64,7 @@
<select id="selectfj" resultType="java.util.HashMap">
SELECT
- snumber, `sname`,jd,wd(
+ snumber, `sname`,jd,wd,(
6371 * acos (
cos ( radians(wd) )
* cos( radians(#{wd}) )
--
Gitblit v1.9.3