From 6196701d53b72ce1aae25905ef6404065b3d2edd Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 13 May 2021 16:53:21 +0800
Subject: [PATCH] 因子、站点模糊查询
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 83 +++++++++++++++++++++++++++++------------
1 files changed, 59 insertions(+), 24 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index 1f72e2e..fae31a5 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -87,19 +87,15 @@
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
- if (updateSensorMap.containsKey("name")){
- if (updateSensorMap.get("name")==null||updateSensorMap.get("name")==""){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- return resultMap;
- }
+ if (updateSensorMap.get("name")==""){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
}
- if (updateSensorMap.containsKey("code")){
- if(ObjectUtils.isEmpty(updateSensorMap.get("code"))){
- resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
- resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- return resultMap;
- }
+ if(updateSensorMap.get("code")==""){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
}
Sensor oldSensor = sensorMapper.getSensorById(Integer.parseInt(updateSensorMap.get("id").toString()));
if (ObjectUtils.isEmpty(oldSensor)){
@@ -111,7 +107,6 @@
wrapper_code.eq("code",updateSensorMap.get("code"));
wrapper_code.eq("is_delete","0");
List<Sensor> sensorList = sensorMapper.selectList(wrapper_code);
- System.out.println(sensorList.get(0));
if (sensorList.size()!=0&&!sensorList.get(0).getId().toString().equals(updateSensorMap.get("id").toString())){
resultMap.put("code",ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode());
resultMap.put("msg",ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg());
@@ -145,6 +140,7 @@
Page<Sensor> page = new Page(current,size);
QueryWrapper<Sensor> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
+ int totleNum = sensorMapper.selectCount(wrapper);
String orderType = map.get("orderType").toString();
if (orderType.equals(Constants.ORDER_ASC)){
wrapper.orderByAsc("create_time");
@@ -154,22 +150,21 @@
Page resultPage = sensorMapper.selectPage(page,wrapper);
List<Sensor> sensors = resultPage.getRecords();
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- List<Map<String,Object>> sensotList = new ArrayList<>();
+ List<Map<String,Object>> sensorList = new ArrayList<>();
for (Sensor sensor:sensors) {
- Map manageRoleMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
String createTime = SDF.format(sensor.getCreateTime());
String updateTime = SDF.format(sensor.getUpdateTime());
- manageRoleMap.put("createTime",createTime);
- manageRoleMap.put("updateTime",updateTime);
- manageRoleMap.put("key",sensor.getId());
- sensotList.add(manageRoleMap);
+ sensorMap.put("createTime",createTime);
+ sensorMap.put("updateTime",updateTime);
+ sensorMap.put("key",sensor.getId());
+ sensorList.add(sensorMap);
}
- resultMap.put("manageRoles",sensotList);
- int totalNumber = sensors.size();
- resultMap.put("totalNumber",totalNumber);
+ resultMap.put("manageRoles",sensorList);
+ resultMap.put("totalNumber",totleNum);
resultMap.put("current",current);
- int totalPageNumber = totalNumber/size;
- if(totalNumber%size != 0){
+ int totalPageNumber = totleNum/size;
+ if(totleNum%size != 0){
totalPageNumber += 1;
}
resultMap.put("totalPageNumber",totalPageNumber);
@@ -200,4 +195,44 @@
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
}
+
+ @Override
+ public Map<String, Object> getSensorByFuzzy(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ Page<Sensor> page = new Page(current,size);
+ QueryWrapper<Sensor> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ wrapper.like("name",map.get("key")).or().like("code",map.get("key"));
+ int totleNum = sensorMapper.selectCount(wrapper);
+ String orderType = map.get("orderType").toString();
+ if (orderType.equals(Constants.ORDER_ASC)){
+ wrapper.orderByAsc("create_time");
+ }else {
+ wrapper.orderByDesc("create_time");
+ }
+ Page resultPage = sensorMapper.selectPage(page,wrapper);
+ List<Sensor> sensors = resultPage.getRecords();
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> sensorList = new ArrayList<>();
+ for (Sensor sensor:sensors) {
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ String createTime = SDF.format(sensor.getCreateTime());
+ String updateTime = SDF.format(sensor.getUpdateTime());
+ sensorMap.put("createTime",createTime);
+ sensorMap.put("updateTime",updateTime);
+ sensorMap.put("key",sensor.getId());
+ sensorList.add(sensorMap);
+ }
+ resultMap.put("manageRoles",sensorList);
+ resultMap.put("totalNumber",totleNum);
+ resultMap.put("current",current);
+ int totalPageNumber = totleNum/size;
+ if(totleNum%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
}
--
Gitblit v1.8.0