From 33d0574e951c9d8dfb7441259e8d38d8ca7f4c65 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Feb 2021 23:40:54 +0800
Subject: [PATCH] 初版
---
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/equipment/mapper/EquipmentMapper.xml | 22 ++++++++++
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 | 31 +++++++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 2 +
5 files changed, 61 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 7d228a5..8fb837e 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
@@ -88,6 +88,37 @@
}
/**
+ * 查询所有
+ */
+ @GetMapping("/listAll")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入equipment")
+ public R<List<EquipmentVO>> listAll(Equipment equipment, Query query) throws ParseException {
+ List<EquipmentVO> pages = equipmentService.listAll();
+
+ for (int j = 0; j < pages.size(); j++) {
+ String expireTime = pages.get(j).getExpireTime();
+ //1.获取当前时间
+ Date dd = new Date();
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String end = sim.format(dd);
+ //把string类型转换为long类型的
+ long st = sim.parse(expireTime).getTime();
+ long en = sim.parse(end).getTime();
+ //计算天数
+ int day = (int) ((st - en) / 86400000);
+ if (day <= 30) {
+ pages.get(j).setType(1);
+ } else {
+ pages.get(j).setType(0);
+ }
+ }
+
+
+ return R.data(pages);
+ }
+
+ /**
* 自定义分页
*/
@GetMapping("/pages")
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 24eb001..aaf6ad2 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
@@ -47,6 +47,8 @@
*/
List<EquipmentVOS> tree();
+ List<EquipmentVO> listAll();
+
/**
* 懒加载部门列表
* @param parentId
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 8e925ff..ac657fa 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
@@ -61,7 +61,7 @@
<select id="selectEquipmentPage" resultMap="equipmentResultMap">
select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
- parent_id,
+ parent_id,district,province,city,
jd ,
wd ,
street,
@@ -73,6 +73,17 @@
<if test="equipment.addvcd!=null">
and addvcd=#{equipment.addvcd}
</if>
+
+ <if test="equipment.district!=null">
+ and district like concat('%',#{equipment.district},'%')
+ </if>
+ <if test="equipment.province!=null">
+ and province like concat('%',#{equipment.province},'%')
+ </if>
+ <if test="equipment.city!=null">
+ and city like concat('%',#{equipment.city},'%')
+ </if>
+
<if test="equipment.devicestate!=null">
and devicestate =#{equipment.devicestate}
</if>
@@ -99,6 +110,15 @@
select id, parent_id, deviceName as title, id as "value", id as "key" from sys_equipment
</select>
+ <select id="listAll" resultMap="equipmentResultMap">
+ select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
+ parent_id,
+ jd ,
+ wd ,
+ street,
+ addvcd,pay,expireTime from sys_equipment
+ </select>
+
<select id="lazyList" resultMap="deptVOResultMap">
SELECT dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
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 ab589dd..158a589 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
@@ -43,6 +43,8 @@
*/
List<EquipmentVOS> tree();
+ List<EquipmentVO> listAll();
+
void updateOne(Equipment equipment);
void s(Equipment equipment);
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 a560473..dedecfd 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
@@ -59,6 +59,11 @@
}
@Override
+ public List<EquipmentVO> listAll() {
+ return baseMapper.listAll();
+ }
+
+ @Override
public void updateOne(Equipment equipment) {
baseMapper.updateOne(equipment);
}
--
Gitblit v1.9.3