ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java
@@ -30,15 +30,15 @@ @TableField("green_electricity_today") @ApiModelProperty("今日绿电消纳值") private BigDecimal greenElectricityToday; private BigDecimal greenElectricityToday=BigDecimal.ZERO; @TableField("car_discharge") @ApiModelProperty("累计汽车放电量") private BigDecimal carDischarge; private BigDecimal carDischarge=BigDecimal.ZERO; @TableField("green_electricity") @ApiModelProperty("累计绿电消纳电量") private BigDecimal greenElectricity; private BigDecimal greenElectricity=BigDecimal.ZERO; @TableField("title") @ApiModelProperty("标题") @@ -83,15 +83,15 @@ @TableField("statistical_deadline") @ApiModelProperty("截止统计日期") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime statisticalDeadline; private Date statisticalDeadline; @TableField("create_time") @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; private Date createTime; @TableField("update_time") @ApiModelProperty("更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; private Date updateTime; } ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
@@ -38,8 +38,8 @@ /** * 每天的9点执行的任务 */ // @Scheduled(cron = "0 0 9 * * *") @Scheduled(fixedRate = 60000) @Scheduled(cron = "0 0 9 * * *") // @Scheduled(fixedRate = 60000) public void taskDay(){ try { // 传输mongodb的硬件数据 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
@@ -18,10 +18,10 @@ // private final static String CLIENT_ID = "mqttx_3267186711111fdsasdsa"; // private final static String USER_NAME = "admin"; // private final static String PASS_WORD = "mingxingdianli123"; private final static String HOST = "tcp://183.220.129.95:1883"; private final static String HOST = "tcp://182.129.202.2:1883"; private final static String CLIENT_ID = "mqttx_3267186711111mxcdszyun"; private final static String USER_NAME = "mxEmqx"; private final static String PASS_WORD = "admin"; private final static String PASS_WORD = "csDN_wlwpt"; private final static Integer TIME_OUT = 30000; private final static Integer KEEP_ALIVE = 60000; private MqttClient mqttClient; ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java
@@ -20,6 +20,8 @@ import javax.annotation.Resource; import java.util.Arrays; import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; /** @@ -112,7 +114,7 @@ if(list==null|| list.isEmpty()){ return AjaxResult.success(tScreenContent); } BeanUtils.copyProperties( list.get(0),tScreenContent); BeanUtils.copyProperties(list.get(0),tScreenContent); list.remove(0); list.forEach(x->{ tScreenContent.setCarDischarge(tScreenContent.getCarDischarge().add(x.getCarDischarge())); @@ -121,11 +123,28 @@ tScreenContent.setValueOne(tScreenContent.getValueOne().add(x.getValueOne())); tScreenContent.setValueTwo(tScreenContent.getValueTwo().add(x.getValueTwo())); tScreenContent.setValueThree(tScreenContent.getValueThree().add(x.getValueThree())); if(tScreenContent.getStatisticalDeadline().isBefore(x.getStatisticalDeadline())) tScreenContent.setStatisticalDeadline(x.getStatisticalDeadline()); if(tScreenContent.getStatisticalDeadline().getTime()<(x.getStatisticalDeadline().getTime())) { tScreenContent.setStatisticalDeadline(x.getStatisticalDeadline()); } }); return AjaxResult.success(tScreenContent); } @ApiOperation(tags = {"车位数据传输"},value = "充电桩数据大屏") @PostMapping(value = "/carportData") public AjaxResult<?> carportData(Integer parkingPlace,Integer remainPlace) { screenContentService.carportData(parkingPlace,remainPlace); return AjaxResult.success(); } @ApiOperation(tags = {"获取车位数据传输"},value = "充电桩数据大屏") @GetMapping(value = "/getCarportData") public AjaxResult<?> getCarportData() { HashMap<String,Object> map = screenContentService.getCarportData(); return AjaxResult.success(map); } /** * 数据回显 站点id */ ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TScreenContentMapper.java
@@ -1,12 +1,12 @@ package com.ruoyi.other.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.other.api.domain.TNotice; import com.ruoyi.other.api.domain.TScreenContent; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.HashMap; import java.util.List; /** @@ -23,4 +23,13 @@ BigDecimal getCarDisCharge(@Param("siteIds") List<Integer> siteIds); BigDecimal getGreenElectricity(@Param("siteIds") List<Integer> siteIds); void carportData(@Param("parkingPlace") Integer parkingPlace, @Param("remainPlace") Integer remainPlace); HashMap<String, Object> getCarportData(); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TScreenContentService.java
@@ -7,6 +7,7 @@ import com.ruoyi.other.vo.PhotovoltaicPowerGenerationVO; import com.ruoyi.other.vo.ScreenTopVO; import java.util.HashMap; import java.util.List; /** @@ -24,4 +25,12 @@ PhotovoltaicPowerGenerationVO photovoltaicPowerGeneration(List<Integer> siteIds); ScreenTopVO top(List<Integer> siteIds); void carportData(Integer parkingPlace, Integer remainPlace); HashMap<String, Object> getCarportData(); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java
@@ -30,10 +30,7 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Random; import java.util.*; import java.util.concurrent.ThreadLocalRandom; /** @@ -209,4 +206,17 @@ vo.setStorageDisCharge(storageDisCharge); return vo; } @Override public void carportData(Integer parkingPlace, Integer remainPlace) { this.baseMapper.carportData(parkingPlace,remainPlace); } @Override public HashMap<String, Object> getCarportData() { HashMap<String, Object> carportData = this.baseMapper.getCarportData(); int count = Integer.valueOf(carportData.get("parkingPlace").toString()) - Integer.valueOf(carportData.get("remainPlace").toString()); carportData.put("useCarport",count); return carportData; } }
