From 40c23616ca88b8d7224dbf3c6c8a12052f96389d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 10 Jan 2021 10:00:34 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java | 1 +
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml | 26 ++++++++++++++++++++++++++
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 2 +-
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, 34 insertions(+), 1 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 99220ce..337ac3f 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -111,7 +111,7 @@
strArrays += "'" + split[i] + "',";
}
String substring = strArrays.substring(0, strArrays.length() - 1);
- equipment.setDeviceNumber(substring);
+ equipment.setDeviceName(substring);
pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
}
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 cf429fa..a4d625f 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
@@ -60,4 +60,5 @@
*/
List<EquipmentVOS> selectList(String deviceType);
EquipmentVOS selectInfo(Equipment equipment);
+ List<Map<String, Object>> selectInfos(String deviceNumber);
}
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 6ba36bf..272b381 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -175,4 +175,30 @@
</if>
</select>
+ <select id="selectInfos" resultType="java.util.HashMap">
+ 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.parent_id,
+ dept.jd,
+ dept.wd,
+ dept.street AS streeName,
+ u.yname,
+ d.addvnm,
+ dept.addvcd
+FROM
+ sys_equipment dept
+ LEFT JOIN sys_suser u ON u.ynumber = dept.ownerId
+ LEFT JOIN sys_district d ON d.addvcds = dept.addvcd
+ LEFT JOIN sys_street s ON s.id = dept.street WHERE dept.deviceNumber=#{deviceNumber}
+ </select>
+
</mapper>
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 67b7316..3899bb0 100644
--- a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
+++ b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -57,6 +57,7 @@
List<EquipmentVOS> lazyList(Long parentId, Map<String, Object> param);
EquipmentVOS selectInfo(Equipment equipment);
+ List<Map<String, Object>> selectInfos(String deviceNumber);
/**
* 设备列表
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 f35fceb..17de56c 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
@@ -87,6 +87,11 @@
}
@Override
+ public List<Map<String, Object>> selectInfos(String deviceNumber) {
+ return baseMapper.selectInfos(deviceNumber);
+ }
+
+ @Override
public List<EquipmentVOS> selectList(String deviceType) {
return baseMapper.selectList(deviceType);
}
--
Gitblit v1.9.3