From 855520e4e2863a07fb35c9c4616d505ff03add57 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jan 2021 19:50:20 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/equipment/entity/Equipment.java | 70 +++++++++++-----------
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java | 18 +++---
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml | 32 +++++-----
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 46 ++++++++-------
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java | 9 --
src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java | 4
6 files changed, 88 insertions(+), 91 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 5c17f5a..99220ce 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -19,8 +19,10 @@
import io.swagger.annotations.*;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -44,7 +46,7 @@
import java.util.Map;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2020-07-01
@@ -65,10 +67,10 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入equipment")
- public R<EquipmentVOS> detail(Equipment equipment,HttpServletResponse response) {
+ public R<EquipmentVOS> detail(Equipment 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");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
/*Equipment detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));*/
return R.data(equipmentService.selectInfo(equipment));
@@ -91,27 +93,26 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入equipment")
- public R<IPage<EquipmentVO>> page(EquipmentVO equipment, Query query,String pid, HttpServletResponse response) {
+ public R<List<EquipmentVO>> page(EquipmentVO equipment, Query query, String pid, 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");
- IPage<EquipmentVO> pages;
- if (pid==null){
- pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
- }
- else {
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ List<EquipmentVO> pages;
+ if (pid == null) {
+ pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
+ } else {
String s = catalogService.selectCatalogEqNUmber(pid);
- if(s==null){
- pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
- }else{
+ if (s == null) {
+ pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
+ } else {
String[] split = s.split(",");
- String strArrays="";
- for(int i=0;i<split.length;i++){
- strArrays+="'"+split[i]+"',";
+ String strArrays = "";
+ for (int i = 0; i < split.length; i++) {
+ strArrays += "'" + split[i] + "',";
}
- String substring = strArrays.substring(0,strArrays.length()-1);
+ String substring = strArrays.substring(0, strArrays.length() - 1);
equipment.setDeviceNumber(substring);
- pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
+ pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
}
}
@@ -135,8 +136,8 @@
equipmentService.s(equipment);
String deviceNumber = equipment.getDeviceNumber();
String deviceName = equipment.getDeviceName();
- String bType="0";
- iDeployService.insterb(deviceNumber,deviceName,bType);
+ String bType = "0";
+ iDeployService.insterb(deviceNumber, deviceName, bType);
return R.success("成功");
}
@@ -204,14 +205,15 @@
/**
* 设备列表
- * @param deviceType 设备类型
+ *
+ * @param deviceType 设备类型
* @return
*/
@GetMapping("/selectList")
public R<List<EquipmentVOS>> selectList(String deviceType, 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");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
List<EquipmentVOS> list = equipmentService.selectList(deviceType);
return R.data(list);
}
diff --git a/src/main/java/org/springblade/modules/equipment/entity/Equipment.java b/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
index 78e003c..0c2fd56 100644
--- a/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
+++ b/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
@@ -19,8 +19,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+
import java.time.LocalDateTime;
+
import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -47,49 +50,49 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 设备名称
- */
- @ApiModelProperty(value = "设备名称")
- @TableField("deviceName")
+ * 设备名称
+ */
+ @ApiModelProperty(value = "设备名称")
+ @TableField("deviceName")
private String deviceName;
/**
- * 设备编码
- */
- @ApiModelProperty(value = "设备编码")
- @TableField("deviceNumber")
+ * 设备编码
+ */
+ @ApiModelProperty(value = "设备编码")
+ @TableField("deviceNumber")
private String deviceNumber;
/**
- * 设备类型
- */
- @ApiModelProperty(value = "设备类型")
- @TableField("deviceType")
+ * 设备类型
+ */
+ @ApiModelProperty(value = "设备类型")
+ @TableField("deviceType")
private String deviceType;
/**
- * 权属
- */
- @ApiModelProperty(value = "权属")
- private String ownership;
+ * 权属
+ */
+ @ApiModelProperty(value = "权属")
+ private String ownership;
/**
- * 业主id
- */
- @ApiModelProperty(value = "业主id")
- @TableField("ownerId")
+ * 业主id
+ */
+ @ApiModelProperty(value = "业主id")
+ @TableField("ownerId")
private String ownerId;
/**
- * 设备状态
- */
- @ApiModelProperty(value = "设备状态")
- private int devicestate;
+ * 设备状态
+ */
+ @ApiModelProperty(value = "设备状态")
+ private String devicestate;
/**
- * 提交日期
- */
- @ApiModelProperty(value = "提交日期")
- private String stime;
+ * 提交日期
+ */
+ @ApiModelProperty(value = "提交日期")
+ private String stime;
/**
- * 空间坐标
- */
- @ApiModelProperty(value = "空间坐标")
- private String coordinate;
+ * 空间坐标
+ */
+ @ApiModelProperty(value = "空间坐标")
+ private String coordinate;
/**
* 菜单父主键
*/
@@ -105,9 +108,6 @@
private String serialNumber;
private String stype;
private String channelNumber;
-
-
-
}
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 50f9de6..cf429fa 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
@@ -34,14 +34,7 @@
*/
public interface EquipmentMapper extends BaseMapper<Equipment> {
- /**
- * 自定义分页
- *
- * @param page
- * @param equipment
- * @return
- */
- List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment);
+ List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
void s(Equipment equipment);
void updateOne(Equipment equipment);
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 7c9c933..6ba36bf 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -55,26 +55,26 @@
<select id="selectEquipmentPage" resultMap="equipmentResultMap">
- select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,ST_ASTEXT (coordinate ) AS coordinate,dtype,
+ select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,ST_ASTEXT (coordinate ) AS
+ coordinate,dtype,
parent_id,
FORMAT( jd, 6 ) AS jd,
FORMAT( wd, 6 ) AS wd,
street,
- addvcd from sys_equipment where 1=1
- <if test="equipment.deviceName!=null">
- and deviceName like concat('%',#{equipment.deviceName},'%')
+ addvcd from sys_equipment where 1=1
+ <if test="deviceName!=null">
+ and (deviceName like concat('%',#{deviceName},'%') or deviceNumber like
+ concat('%',#{deviceName},'%'))
</if>
- <if test="equipment.addvcd!=null">
- and addvcd=#{equipment.addvcd}
+ <if test="addvcd!=null">
+ and addvcd=#{addvcd}
</if>
- <if test="equipment.deviceType!=null">
- and deviceType like concat('%',#{equipment.deviceType},'%')
+ <if test="devicestate!=null">
+ and devicestate =#{devicestate}
</if>
- <if test="equipment.deviceNumber!=null">
- and deviceNumber IN (${equipment.deviceNumber})
- </if>
- <if test="equipment.dtype!=null">
- and dtype=#{equipment.dtype}
+
+ <if test="dtype!=null">
+ and dtype=#{dtype}
</if>
and parent_id!=0
</select>
@@ -93,7 +93,8 @@
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,FORMAT(dept.jd,6) as jd,FORMAT(dept.wd,6) as wd,dept.street as streeName,u.yname,d.addvnm,dept.addvcd,
+ 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,
(
SELECT
CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
@@ -166,7 +167,8 @@
e.parent_id,e.jd,e.wd,e.addvcd,
s.yname,d.bType,di.addvnm FROM `sys_equipment` e
LEFT JOIN sys_suser s
- on s.ynumber=e.ownerId LEFT JOIN act_deploy d on d.deviceNumber=e.deviceNumber LEFT JOIN sys_district di on di.addvcds=e.addvcd LEFT JOIN sys_street t on t.id=e.street
+ on s.ynumber=e.ownerId LEFT JOIN act_deploy d on d.deviceNumber=e.deviceNumber LEFT JOIN sys_district di on
+ di.addvcds=e.addvcd LEFT JOIN sys_street t on t.id=e.street
where 1=1
<if test="deviceType!=null and deviceType!=''">
and e.deviceType=#{deviceType}
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 8a2a4a2..67b7316 100644
--- a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
+++ b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -27,40 +27,40 @@
import java.util.Map;
/**
- * 服务类
+ * 服务类
*
* @author BladeX
* @since 2020-07-01
*/
public interface IEquipmentService extends IService<Equipment> {
- /**
- * 自定义分页
- *
- * @param page
- * @param equipment
- * @return
- */
- IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment);
+ List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
+
/**
* 树形结构
*
* @return
*/
List<EquipmentVOS> tree();
+
void updateOne(Equipment equipment);
void s(Equipment equipment);
+
/**
* 懒加载
+ *
* @param parentId
* @param param
* @return
*/
List<EquipmentVOS> lazyList(Long parentId, Map<String, Object> param);
+
EquipmentVOS selectInfo(Equipment equipment);
+
/**
* 设备列表
+ *
* @param deviceType
* @return
*/
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 1b2ccac..f35fceb 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
@@ -47,8 +47,8 @@
private static final String PARENT_ID = "parentId";
@Override
- public IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment) {
- return page.setRecords(baseMapper.selectEquipmentPage(page, equipment));
+ public List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
+ return baseMapper.selectEquipmentPage(deviceName,addvcd,dtype,devicestate);
}
--
Gitblit v1.9.3