From 781c9724dac7d3698161ecb845e55ba1800b8ec1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:46:52 +0800
Subject: [PATCH] mac地址唯一性服务，查询数据行业功能添加。
---
src/main/java/com/moral/controller/ProfessionController.java | 6 ++++--
src/main/resources/mapper/HistoryMinutelyMapper.xml | 3 +++
src/main/java/com/moral/entity/charts/DataCondition.java | 2 ++
src/main/java/com/moral/service/ProfessionService.java | 2 ++
src/main/java/com/moral/entity/charts/DeviceDimension.java | 5 +++++
src/main/java/com/moral/service/impl/ProfessionServiceImpl.java | 11 ++++++++++-
6 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ProfessionController.java b/src/main/java/com/moral/controller/ProfessionController.java
index bfa2aa6..10138a7 100644
--- a/src/main/java/com/moral/controller/ProfessionController.java
+++ b/src/main/java/com/moral/controller/ProfessionController.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Optional;
@RestController
@RequestMapping("profession")
@@ -16,7 +17,8 @@
@Resource
ProfessionService professionService;
@GetMapping(value = "getall")
- public ResultBean<List<Profession>> getALL(){
- return new ResultBean<>(professionService.getProfessiontList());
+ public ResultBean<List<Profession>> getALL(Optional<String> name){
+ String queryName = name.isPresent()?name.get():null;
+ return new ResultBean<>(professionService.queryByName(queryName));
}
}
diff --git a/src/main/java/com/moral/entity/charts/DataCondition.java b/src/main/java/com/moral/entity/charts/DataCondition.java
index 65bf0f8..67f0d7d 100644
--- a/src/main/java/com/moral/entity/charts/DataCondition.java
+++ b/src/main/java/com/moral/entity/charts/DataCondition.java
@@ -10,4 +10,6 @@
private Integer actualTime;//������������
private AreaRange areaRange;//������������
private Integer areaRangeId;//���������������ID
+ private DeviceDimension deviceDimension; // ������������
+ private Object dimensionValue;// ���������
}
diff --git a/src/main/java/com/moral/entity/charts/DeviceDimension.java b/src/main/java/com/moral/entity/charts/DeviceDimension.java
new file mode 100644
index 0000000..b59e404
--- /dev/null
+++ b/src/main/java/com/moral/entity/charts/DeviceDimension.java
@@ -0,0 +1,5 @@
+package com.moral.entity.charts;
+
+public enum DeviceDimension {
+ MONITORPOINT,PROFESSION,NONE;
+}
diff --git a/src/main/java/com/moral/service/ProfessionService.java b/src/main/java/com/moral/service/ProfessionService.java
index 0d91271..289dbc9 100644
--- a/src/main/java/com/moral/service/ProfessionService.java
+++ b/src/main/java/com/moral/service/ProfessionService.java
@@ -6,5 +6,7 @@
public interface ProfessionService {
+ List<Profession> queryByName(String nameLike);
+
public List<Profession> getProfessiontList();
}
diff --git a/src/main/java/com/moral/service/impl/ProfessionServiceImpl.java b/src/main/java/com/moral/service/impl/ProfessionServiceImpl.java
index 19bc47b..c46fadd 100644
--- a/src/main/java/com/moral/service/impl/ProfessionServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/ProfessionServiceImpl.java
@@ -1,9 +1,11 @@
package com.moral.service.impl;
+import com.moral.common.util.StringUtils;
import com.moral.entity.Profession;
import com.moral.mapper.ProfessionMapper;
import com.moral.service.ProfessionService;
import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
import java.util.List;
@@ -13,7 +15,14 @@
@Resource
private ProfessionMapper professionMapper;
-
+ @Override
+ public List<Profession> queryByName(String nameLike){
+ Example example = new Example(Profession.class);
+ if(!StringUtils.isNullOrEmpty(nameLike)){
+ example.or().andLike("name",nameLike);
+ }
+ return professionMapper.selectByExample(example);
+ }
@Override
public List<Profession> getProfessiontList() {
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 4b1ea6e..ff3b4fc 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -93,6 +93,9 @@
<if test='"DEVICE"==dataCondition.areaRange.toString()'>
and dev.id = #{dataCondition.areaRangeId}
</if>
+ <if test='"PROFESSION"==dataCondition.deviceDimension.toString()'>
+ and dev.profession_id = #{dataCondition.dimensionValue}
+ </if>
<if test='"MONITORPOINT"==dataCondition.areaRange.toString()'>
and mpt.id = #{dataCondition.areaRangeId}
</if>
--
Gitblit v1.8.0