From 58d92eba8c87fdc91abd928d1b5d3da5a9ef52e8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jan 2021 16:29:19 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java | 2 ++
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml | 10 +++++++++-
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 19 ++++++++++++++++++-
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java | 1 +
src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java | 5 +++++
5 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
index 8a0438e..9b707ee 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -207,7 +207,10 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入equipment")
- public R update(@Valid @RequestBody EquipmentVOS equipment) {
+ public R update(@Valid @RequestBody EquipmentVOS equipment, 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");
Date day = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
equipment.setStime(df.format(day));
@@ -216,6 +219,20 @@
}
/**
+ * 修改
+ */
+ @PostMapping("/updateClinent")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入equipment")
+ public R updateClinent(EquipmentVO equipment, 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");
+ equipmentService.updateClinent(equipment);
+ return R.success("修改成功");
+ }
+
+ /**
* 新增或修改
*/
@PostMapping("/submit")
diff --git a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
index 066df9b..9b63acd 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
@@ -38,6 +38,7 @@
void s(Equipment equipment);
void updateOne(Equipment equipment);
+ void updateClinent(Equipment equipment);
void updataType(String arr);
void updataTypeC(String arr);
/**
diff --git a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
index 7c2f1a2..8d8b297 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -94,7 +94,8 @@
<select id="lazyList" resultMap="deptVOResultMap">
SELECT dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
dept.ownerId,dept.devicestate,dept.stime,
- ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.serialNumber,dept.stype,dept.channelNumber,dept.pay,dept.expireTime,dept.heartbeat,
+ ST_ASTEXT(dept.coordinate) as
+ coordinate,dept.dtype,dept.serialNumber,dept.stype,dept.channelNumber,dept.pay,dept.expireTime,dept.heartbeat,
dept.parent_id,FORMAT(dept.jd,6) as jd,FORMAT(dept.wd,6) as wd,dept.street as
streeName,u.yname,d.addvnm,dept.addvcd,
(
@@ -135,6 +136,13 @@
coordinate=POINT(#{jd},#{wd}),parent_id=#{parentId},jd=#{jd},wd=#{wd},addvcd=#{addvnm},street=#{streeName},dtype=#{dtype} where id=#{id}
</update>
+ <update id="updateClinent" parameterType="org.springblade.modules.equipment.entity.Equipment">
+ update sys_equipment SET deviceName=#{deviceName},deviceNumber=#{deviceNumber},deviceType=#{deviceType},
+ ownership=#{ownership},devicestate=#{devicestate},stime=#{stime},
+ addvcd=#{addvcd},street=#{street},dtype=#{dtype},pay=#{pay},expireTime=#{expireTime},heartbeat=#{heartbeat} where id=#{id}
+ </update>
+
+
<update id="updataType">
update sys_equipment SET devicestate = 1 where id in (${arr})
</update>
diff --git a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
index a6df8ca..13201eb 100644
--- a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
+++ b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -45,6 +45,8 @@
void updateOne(Equipment equipment);
+ void updateClinent(Equipment equipment);
+
void s(Equipment equipment);
void updataType(String arr);
diff --git a/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java b/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
index 354992f..d9bf002 100644
--- a/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
@@ -64,6 +64,11 @@
}
@Override
+ public void updateClinent(Equipment equipment) {
+ baseMapper.updateClinent(equipment);
+ }
+
+ @Override
public void s(Equipment equipment) {
baseMapper.s(equipment);
}
--
Gitblit v1.9.3