Skip to content

A
amos-boot-biz
Commit 41cc6422 authored by chenzhao's avatar chenzhao
Browse files
Options

修改代码

parent 4e62e172
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 34 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java
View file @ 41cc6422
...@@ -788,8 +788,9 @@ public class MonitorFanIdxController extends BaseController { ...@@ -788,8 +788,9 @@ public class MonitorFanIdxController extends BaseController {
} }
@ApiOperation(value = "电站排名") @ApiOperation(value = "电站排名")
@Scheduled(cron = "0/10 * * * * ? ")
@GetMapping("/stationRanking") @GetMapping("/stationRanking")
public ResponseModel stationRanking(@RequestParam(value = "stationId")String stationId,@RequestParam(value = "equipNum") String equipNum) { public ResponseModel stationRanking() {
LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper); List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
List< Map<String,Object>> datDataFJ = new ArrayList<>(); List< Map<String,Object>> datDataFJ = new ArrayList<>();
...@@ -807,12 +808,12 @@ public class MonitorFanIdxController extends BaseController { ...@@ -807,12 +808,12 @@ public class MonitorFanIdxController extends BaseController {
Map<String, Object> dayMap = new HashMap<>(); Map<String, Object> dayMap = new HashMap<>();
Map<String, Object> monthMap = new HashMap<>(); Map<String, Object> monthMap = new HashMap<>();
Map<String, Object> yearMap = new HashMap<>(); Map<String, Object> yearMap = new HashMap<>();
dayMap.put("title",name); dayMap.put("name",name);
dayMap.put("data",map.get("日发电量")); dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",map.get("日发电量")));
monthMap.put("title",name); monthMap.put("name",name);
monthMap.put("data",map.get("月发电量")); monthMap.put("value",map.get("月发电量") == null?0:String.format("%.4f",map.get("月发电量")));
yearMap.put("title",name); yearMap.put("name",name);
yearMap.put("data",map.get("年发电量")); yearMap.put("value",map.get("年发电量") == null?0:String.format("%.4f",map.get("年发电量")));
datDataFJ.add(dayMap); datDataFJ.add(dayMap);
monthDataFJ.add(monthMap); monthDataFJ.add(monthMap);
yearDataFJ.add(yearMap); yearDataFJ.add(yearMap);
...@@ -822,12 +823,12 @@ public class MonitorFanIdxController extends BaseController { ...@@ -822,12 +823,12 @@ public class MonitorFanIdxController extends BaseController {
Map<String, Object> dayMap = new HashMap<>(); Map<String, Object> dayMap = new HashMap<>();
Map<String, Object> monthMap = new HashMap<>(); Map<String, Object> monthMap = new HashMap<>();
Map<String, Object> yearMap = new HashMap<>(); Map<String, Object> yearMap = new HashMap<>();
dayMap.put("title",name); dayMap.put("name",name);
dayMap.put("data",map.get("日发电量")); dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",map.get("日发电量")));
monthMap.put("title",name); monthMap.put("name",name);
monthMap.put("data",map.get("月发电量")); monthMap.put("value",map.get("月发电量") == null?0:String.format("%.4f",map.get("月发电量")));
yearMap.put("title",name); yearMap.put("name",name);
yearMap.put("data",map.get("年发电量")); yearMap.put("value",map.get("年发电量") == null?0:String.format("%.4f",map.get("年发电量")));
datDataGF.add(dayMap); datDataGF.add(dayMap);
monthDataGF.add(monthMap); monthDataGF.add(monthMap);
yearDataGF.add(yearMap); yearDataGF.add(yearMap);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @ 41cc6422
...@@ -1746,8 +1746,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1746,8 +1746,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
public void sendMqttByRanking( List< Map<String,Object>> list,String code,String topic){ public void sendMqttByRanking( List< Map<String,Object>> list,String code,String topic){
list.stream().sorted((o1,o2)->{ list.stream().sorted((o1,o2)->{
double o1Num = Double.parseDouble(o1.get("data").toString()); double o1Num = Double.parseDouble(o1.get("value").toString());
double o2Num = Double.parseDouble(o2.get("data").toString()); double o2Num = Double.parseDouble(o2.get("value").toString());
if ((o1Num-o2Num)<0){ if ((o1Num-o2Num)<0){
return -1; return -1;
}else if ((o1Num-o2Num)>0){ }else if ((o1Num-o2Num)>0){
...@@ -1756,8 +1756,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1756,8 +1756,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
return 0; return 0;
} }
}); });
IPage<Map<String,Object>> result = new Page<>();
result.setRecords(list);
result.setCurrent(1);
result.setTotal(list.size());
try { try {
emqKeeper.getMqttClient().publish(topic+"/"+code,JSON.toJSONString(list).getBytes(),0,false); emqKeeper.getMqttClient().publish(topic+"/"+code,JSON.toJSONString(result).getBytes(),0,false);
} catch (MqttException e) { } catch (MqttException e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -1768,7 +1773,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1768,7 +1773,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
public Map<String, Object> generatingCapacity (String gatewayId,String query){ public Map<String, Object> generatingCapacity (String gatewayId,String query){
String querySql = " SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName='日发电量' or equipmentIndexName='月发电量' or equipmentIndexName='年发电量'"; String querySql = " SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName='日发电量' or equipmentIndexName='月发电量' or equipmentIndexName='年发电量'";
if (null != query){ if (null != query){
querySql = querySql + " "+ querySql; querySql = querySql + " "+ query;
} }
List<IndicatorsDto> queryList = influxDButils.getListData(querySql,IndicatorsDto.class); List<IndicatorsDto> queryList = influxDButils.getListData(querySql,IndicatorsDto.class);
Map<String, List<IndicatorsDto>> maps = queryList.stream().collect(Collectors.groupingBy(IndicatorsDto::getEquipmentIndexName)); Map<String, List<IndicatorsDto>> maps = queryList.stream().collect(Collectors.groupingBy(IndicatorsDto::getEquipmentIndexName));
...@@ -1780,5 +1785,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1780,5 +1785,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
} }
return hashMap; return hashMap;
} }
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java
View file @ 41cc6422
...@@ -799,8 +799,9 @@ public class MonitorFanIdxController extends BaseController { ...@@ -799,8 +799,9 @@ public class MonitorFanIdxController extends BaseController {
@ApiOperation(value = "电站排名") @ApiOperation(value = "电站排名")
@Scheduled(cron = "0/10 * * * * ? ")
@GetMapping("/stationRanking") @GetMapping("/stationRanking")
public ResponseModel stationRanking(@RequestParam(value = "stationId")String stationId,@RequestParam(value = "equipNum") String equipNum) { public ResponseModel stationRanking() {
LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper); List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
List< Map<String,Object>> datDataFJ = new ArrayList<>(); List< Map<String,Object>> datDataFJ = new ArrayList<>();
...@@ -818,12 +819,12 @@ public class MonitorFanIdxController extends BaseController { ...@@ -818,12 +819,12 @@ public class MonitorFanIdxController extends BaseController {
Map<String, Object> dayMap = new HashMap<>(); Map<String, Object> dayMap = new HashMap<>();
Map<String, Object> monthMap = new HashMap<>(); Map<String, Object> monthMap = new HashMap<>();
Map<String, Object> yearMap = new HashMap<>(); Map<String, Object> yearMap = new HashMap<>();
dayMap.put("title",name); dayMap.put("name",name);
dayMap.put("data",map.get("日发电量")); dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",map.get("日发电量")));
monthMap.put("title",name); monthMap.put("name",name);
monthMap.put("data",map.get("月发电量")); monthMap.put("value",map.get("月发电量") == null?0:String.format("%.4f",map.get("月发电量")));
yearMap.put("title",name); yearMap.put("name",name);
yearMap.put("data",map.get("年发电量")); yearMap.put("value",map.get("年发电量") == null?0:String.format("%.4f",map.get("年发电量")));
datDataFJ.add(dayMap); datDataFJ.add(dayMap);
monthDataFJ.add(monthMap); monthDataFJ.add(monthMap);
yearDataFJ.add(yearMap); yearDataFJ.add(yearMap);
...@@ -833,12 +834,12 @@ public class MonitorFanIdxController extends BaseController { ...@@ -833,12 +834,12 @@ public class MonitorFanIdxController extends BaseController {
Map<String, Object> dayMap = new HashMap<>(); Map<String, Object> dayMap = new HashMap<>();
Map<String, Object> monthMap = new HashMap<>(); Map<String, Object> monthMap = new HashMap<>();
Map<String, Object> yearMap = new HashMap<>(); Map<String, Object> yearMap = new HashMap<>();
dayMap.put("title",name); dayMap.put("name",name);
dayMap.put("data",map.get("日发电量")); dayMap.put("value",map.get("日发电量") == null?0:String.format("%.4f",map.get("日发电量")));
monthMap.put("title",name); monthMap.put("name",name);
monthMap.put("data",map.get("月发电量")); monthMap.put("value",map.get("月发电量") == null?0:String.format("%.4f",map.get("月发电量")));
yearMap.put("title",name); yearMap.put("name",name);
yearMap.put("data",map.get("年发电量")); yearMap.put("value",map.get("年发电量") == null?0:String.format("%.4f",map.get("年发电量")));
datDataGF.add(dayMap); datDataGF.add(dayMap);
monthDataGF.add(monthMap); monthDataGF.add(monthMap);
yearDataGF.add(yearMap); yearDataGF.add(yearMap);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @ 41cc6422
...@@ -1824,8 +1824,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1824,8 +1824,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
public void sendMqttByRanking( List< Map<String,Object>> list,String code,String topic){ public void sendMqttByRanking( List< Map<String,Object>> list,String code,String topic){
list.stream().sorted((o1,o2)->{ list.stream().sorted((o1,o2)->{
double o1Num = Double.parseDouble(o1.get("data").toString()); double o1Num = Double.parseDouble(o1.get("value").toString());
double o2Num = Double.parseDouble(o2.get("data").toString()); double o2Num = Double.parseDouble(o2.get("value").toString());
if ((o1Num-o2Num)<0){ if ((o1Num-o2Num)<0){
return -1; return -1;
}else if ((o1Num-o2Num)>0){ }else if ((o1Num-o2Num)>0){
...@@ -1834,8 +1834,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1834,8 +1834,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
return 0; return 0;
} }
}); });
IPage<Map<String,Object>> result = new Page<>();
result.setRecords(list);
result.setCurrent(1);
result.setTotal(list.size());
try { try {
emqKeeper.getMqttClient().publish(topic+"/"+code,JSON.toJSONString(list).getBytes(),0,false); emqKeeper.getMqttClient().publish(topic+"/"+code,JSON.toJSONString(result).getBytes(),0,false);
} catch (MqttException e) { } catch (MqttException e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -1846,7 +1851,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1846,7 +1851,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
public Map<String, Object> generatingCapacity (String gatewayId,String query){ public Map<String, Object> generatingCapacity (String gatewayId,String query){
String querySql = " SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName='日发电量' or equipmentIndexName='月发电量' or equipmentIndexName='年发电量'"; String querySql = " SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName='日发电量' or equipmentIndexName='月发电量' or equipmentIndexName='年发电量'";
if (null != query){ if (null != query){
querySql = querySql + " "+ querySql; querySql = querySql + " "+ query;
} }
List<IndicatorsDto> queryList = influxDButils.getListData(querySql,IndicatorsDto.class); List<IndicatorsDto> queryList = influxDButils.getListData(querySql,IndicatorsDto.class);
Map<String, List<IndicatorsDto>> maps = queryList.stream().collect(Collectors.groupingBy(IndicatorsDto::getEquipmentIndexName)); Map<String, List<IndicatorsDto>> maps = queryList.stream().collect(Collectors.groupingBy(IndicatorsDto::getEquipmentIndexName));
......
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