Skip to content

E
energyai_java
Commit d53e9fe5 authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

接口调整

parent a538eaa7
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 96 deletions
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/KanBanController.java
View file @ d53e9fe5
package com.devplatform.admin.modules.eq.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.devplatform.admin.common.utils.AbstractController;
import com.devplatform.admin.common.utils.Constants;
import com.devplatform.admin.common.utils.DateUtil;
import com.devplatform.admin.common.utils.DateUtils;
import com.devplatform.admin.modules.eq.bean.SwqxzInfoHour;
import com.devplatform.admin.modules.eq.model.SwqxzInfoHourModel;
import com.devplatform.admin.modules.eq.service.KanBanService;
......@@ -60,55 +58,71 @@ public class KanBanController extends AbstractController {
@ApiOperation(value="获取室外气象站数据", notes="获取室外气象站数据")
@GetMapping("/getSwqxzInfoTj")
public R getSwqxzInfoTj(Integer type) {
List<SwqxzInfoHour> list = swqxzInfoHourService.list(new LambdaQueryWrapper<SwqxzInfoHour>().orderByAsc(SwqxzInfoHour::getCreateTime));
//还未写完
List<String> temperatureList = new ArrayList<String>();
List<String> humidityList = new ArrayList<String>();
List<String> windSpeedList = new ArrayList<String>();
List<String> windDirectionList = new ArrayList<String>();
List<String> illuminanceList = new ArrayList<String>();
List<String> carbonDioxideList = new ArrayList<String>();
List<String> fineParticlesList = new ArrayList<String>();
List<String> radiationList = new ArrayList<String>();
List<List<String>> allList = new ArrayList<List<String>>();
for (int i = 0; i < Constants.INT_24; i++) {
Boolean flag = true;
for(SwqxzInfoHour swqxzInfoHour : list){
String hour = DateUtil.convertDateToHour(swqxzInfoHour.getCreateTime());
if(i == Integer.parseInt(hour)){
temperatureList.add(swqxzInfoHour.getTemperature());
humidityList.add(swqxzInfoHour.getHumidity());
windSpeedList.add(swqxzInfoHour.getWindSpeed());
windDirectionList.add(swqxzInfoHour.getWindDirection());
illuminanceList.add(swqxzInfoHour.getIlluminance());
carbonDioxideList.add(swqxzInfoHour.getCarbonDioxide());
fineParticlesList.add(swqxzInfoHour.getFineParticles());
radiationList.add(swqxzInfoHour.getRadiation());
flag = false;
break;
}
}
if(flag){
temperatureList.add(Constants.STRING_0);
humidityList.add(Constants.STRING_0);
windSpeedList.add(Constants.STRING_0);
windDirectionList.add(Constants.STRING_0);
illuminanceList.add(Constants.STRING_0);
carbonDioxideList.add(Constants.STRING_0);
fineParticlesList.add(Constants.STRING_0);
radiationList.add(Constants.STRING_0);
}
List<SwqxzInfoHour> list = swqxzInfoHourService.getList(type);
List<List<String>> temperatureList = new ArrayList<List<String>>();
List<List<String>> humidityList = new ArrayList<List<String>>();
List<List<String>> windSpeedList = new ArrayList<List<String>>();
List<List<String>> windDirectionList = new ArrayList<List<String>>();
List<List<String>> illuminanceList = new ArrayList<List<String>>();
List<List<String>> carbonDioxideList = new ArrayList<List<String>>();
List<List<String>> fineParticlesList = new ArrayList<List<String>>();
List<List<String>> radiationList = new ArrayList<List<String>>();
for (int i = 0; i < list.size(); i++) {
List<String> temperatureListDetail = new ArrayList<String>();
List<String> humidityListDetail = new ArrayList<String>();
List<String> windSpeedListDetail = new ArrayList<String>();
List<String> windDirectionListDetail = new ArrayList<String>();
List<String> illuminanceListDetail = new ArrayList<String>();
List<String> carbonDioxideListDetail = new ArrayList<String>();
List<String> fineParticlesListDetail = new ArrayList<String>();
List<String> radiationListDetail = new ArrayList<String>();
String time = DateUtils.format(list.get(i).getCreateTime(),"yyyy-MM-dd HH:mm:ss");
temperatureListDetail.add(time);
temperatureListDetail.add(list.get(i).getTemperature());
humidityListDetail.add(time);
humidityListDetail.add(list.get(i).getHumidity());
windSpeedListDetail.add(time);
windSpeedListDetail.add(list.get(i).getWindSpeed());
windDirectionListDetail.add(time);
windDirectionListDetail.add(list.get(i).getWindDirection());
illuminanceListDetail.add(time);
illuminanceListDetail.add(list.get(i).getIlluminance());
carbonDioxideListDetail.add(time);
carbonDioxideListDetail.add(list.get(i).getCarbonDioxide());
fineParticlesListDetail.add(time);
fineParticlesListDetail.add(list.get(i).getFineParticles());
radiationListDetail.add(time);
radiationListDetail.add(list.get(i).getRadiation());
temperatureList.add(temperatureListDetail);
humidityList.add(humidityListDetail);
windSpeedList.add(windSpeedListDetail);
windDirectionList.add(windDirectionListDetail);
illuminanceList.add(illuminanceListDetail);
carbonDioxideList.add(carbonDioxideListDetail);
fineParticlesList.add(fineParticlesListDetail);
radiationList.add(radiationListDetail);
}
allList.add(temperatureList);
allList.add(humidityList);
allList.add(windSpeedList);
allList.add(windDirectionList);
allList.add(illuminanceList);
allList.add(carbonDioxideList);
allList.add(fineParticlesList);
allList.add(radiationList);
return R.ok().put("list", allList);
return R.ok().put("temperatureList", temperatureList)
.put("humidityList", humidityList)
.put("windSpeedList", windSpeedList)
.put("windDirectionList", windDirectionList)
.put("illuminanceList", illuminanceList)
.put("carbonDioxideList", carbonDioxideList)
.put("fineParticlesList", fineParticlesList)
.put("radiationList", radiationList);
}
/**
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SwqxzInfoHourDao.java
View file @ d53e9fe5
......@@ -29,4 +29,6 @@ public interface SwqxzInfoHourDao extends MyBaseMapper<SwqxzInfoHour> {
* @return
*/
List<SwqxzInfoHour> queryPageList(SwqxzInfoHourModel model);
List<SwqxzInfoHour> getList(Integer type);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SwqxzInfoHourService.java
View file @ d53e9fe5
......@@ -23,4 +23,5 @@ public interface SwqxzInfoHourService extends MyBaseService<SwqxzInfoHour> {
List<SwqxzInfoHour> queryPageList(SwqxzInfoHourModel model);
List<SwqxzInfoHour> getList(Integer type);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/AnalysisServiceImpl.java
View file @ d53e9fe5
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.common.utils.Constants;
import com.devplatform.admin.common.utils.DateUtil;
import com.devplatform.admin.common.utils.DateUtils;
import com.devplatform.admin.modules.eq.bean.TotalDay;
import com.devplatform.admin.modules.eq.bean.TotalHour;
import com.devplatform.admin.modules.eq.service.*;
import com.devplatform.admin.modules.eq.service.AnalysisService;
import com.devplatform.admin.modules.eq.service.TotalDayService;
import com.devplatform.admin.modules.eq.service.TotalHourService;
import com.devplatform.admin.modules.sys.bean.SysSystemParams;
import com.devplatform.admin.modules.sys.service.SysSystemParamsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 设备的service接口实现类
......@@ -71,53 +75,23 @@ public class AnalysisServiceImpl implements AnalysisService {
List<List<String>> list = new ArrayList<List<String>>();
//当天
List<TotalHour> listHour = totalHourService.queryList();
for (int i = 0; i <= Integer.valueOf(DateUtil.getNowHour()); i++) {
Boolean flag = true;
for (int i = 0; i < listHour.size(); i++) {
List<String> listDetail = new ArrayList<String>();
for(TotalHour bean : listHour){
String hour = DateUtil.convertDateToHour(bean.getCreateTime());
if(i == Integer.parseInt(hour)){
listDetail.add(DateUtils.format(bean.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
listDetail.add(bean.getElectricEnergy());
flag = false;
break;
}
}
if(flag){
// 0 代表前面补充0
// 10代表长度为10
// d 代表参数为正数型
listDetail.add(DateUtils.format(new Date()) +" "+ String.format("%02d", i) +":00:00");
listDetail.add(Constants.STRING_0);
}
listDetail.add(DateUtils.format(listHour.get(i).getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
listDetail.add(listHour.get(i).getElectricEnergy());
list.add(listDetail);
}
List<List<String>> listMonth = new ArrayList<List<String>>();
//当月
List<TotalDay> listDay = totalDayService.queryList();
for (int i = 1; i <= Integer.valueOf(DateUtil.getNowDay()); i++) {
Boolean flag = true;
for (int i = 0; i < listDay.size(); i++) {
List<String> listDetail = new ArrayList<String>();
for(TotalDay bean : listDay){
String day = DateUtil.convertDateToDay(bean.getCreateTime());
if(i == Integer.parseInt(day)){
listDetail.add(DateUtils.format(bean.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
listDetail.add(bean.getElectricEnergy());
flag = false;
break;
}
}
if(flag){
// 0 代表前面补充0
// 10代表长度为10
// d 代表参数为正数型
listDetail.add(DateUtils.format(new Date(),"yyyy-MM") +"-" +String.format("%02d", i) +" 00:00:00");
listDetail.add(Constants.STRING_0);
}
listDetail.add(DateUtils.format(listDay.get(i).getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
listDetail.add(listDay.get(i).getElectricEnergy());
listMonth.add(listDetail);
}
map.put("energyList",list);
map.put("energyListMonth",listMonth);
}catch (Exception e){
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SwqxzInfoHourServiceImpl.java
View file @ d53e9fe5
package com.devplatform.admin.modules.eq.service.impl;
import org.springframework.stereotype.Service;
import com.devplatform.admin.modules.eq.model.SwqxzInfoHourModel;
import com.devplatform.admin.modules.eq.bean.SwqxzInfoHour;
import com.devplatform.admin.modules.eq.dao.SwqxzInfoHourDao;
import com.devplatform.admin.modules.eq.model.SwqxzInfoHourModel;
import com.devplatform.admin.modules.eq.service.SwqxzInfoHourService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......@@ -28,4 +25,9 @@ public class SwqxzInfoHourServiceImpl extends MyBaseServiceImpl<SwqxzInfoHourDao
return baseMapper.queryPageList(model);
}
@Override
public List<SwqxzInfoHour> getList(Integer type) {
return baseMapper.getList(type);
}
}
microservice-admin/src/main/resources/mapper/eq/SwqxzInfoHourMapper.xml
View file @ d53e9fe5
......@@ -56,6 +56,23 @@
${pager.mysqlQueryCondition}
</if>
</select>
<select id="getList" resultType="com.devplatform.admin.modules.eq.bean.SwqxzInfoHour">
select * from swqxz_info_hour
where 1=1
<if test="type == 1">
and TO_DAYS(create_time) = TO_DAYS(NOW())
</if>
<if test="type == 2">
and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1);
</if>
<if test="type == 3">
and DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
</if>
<if test="type == 4">
and DATE_FORMAT( create_time, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' )
</if>
order by create_time
</select>
</mapper>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment