From 8524e10bf2a456e8ed3df0f48bd852f79f93fd18 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 15 Jun 2021 14:37:30 +0800
Subject: [PATCH] 修改时间格式
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index 8912001..2688fff 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -1,7 +1,9 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Device;
import com.moral.api.entity.DeviceAdjustValue;
import com.moral.api.entity.Sensor;
@@ -20,7 +22,10 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import java.sql.Time;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -86,4 +91,50 @@
return resultMap;
}
+ @Override
+ public Map<String, Object> getDataByCondition(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<DeviceAdjustValue> page = new Page<>(current,size);
+ QueryWrapper<DeviceAdjustValue> wrapper_Condition = new QueryWrapper<>();
+ wrapper_Condition.eq("is_delete",Constants.NOT_DELETE);
+ if (!ObjectUtils.isEmpty(map.get("mac"))){
+ wrapper_Condition.eq("mac",map.get("mac"));
+ }
+ if (!ObjectUtils.isEmpty(map.get("sensor_code"))){
+ wrapper_Condition.eq("sensor_code",map.get("sensor_code"));
+ }
+ if (!ObjectUtils.isEmpty(map.get("orderType"))){
+ String orderType = map.get("orderType").toString();
+ if (orderType.equals(Constants.ORDER_ASC)){
+ wrapper_Condition.orderByAsc("start_time");
+ }else {
+ wrapper_Condition.orderByDesc("start_time");
+ }
+ }
+ Page resultPage = deviceAdjustValueMapper.selectPage(page,wrapper_Condition);
+ List<DeviceAdjustValue> deviceAdjustValues = resultPage.getRecords();
+ List<Map<String,Object>> deviceAdjustValueList = new ArrayList<>();
+ for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) {
+ Map deviceAdjustValueMap = JSON.parseObject(JSON.toJSONString(deviceAdjustValue),Map.class);
+ Time startTime = new Time(Long.valueOf(Long.parseLong(deviceAdjustValueMap.get("startTime").toString())));
+ deviceAdjustValueMap.put("startTime",new Time(startTime.getTime()));
+ Time endTime = new Time(Long.valueOf(Long.parseLong(deviceAdjustValueMap.get("endTime").toString())));
+ deviceAdjustValueMap.put("endTime",new Time(endTime.getTime()));
+ deviceAdjustValueList.add(deviceAdjustValueMap);
+ }
+ resultMap.put("deviceAdjustValues",deviceAdjustValueList);
+ int totalNumber = deviceAdjustValueMapper.selectCount(wrapper_Condition);
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ resultMap.put("size",size);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
+
}
--
Gitblit v1.8.0