Skip to content

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

接口调整

parent 492b1dc7
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 21 deletions
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/TimedTask.java
View file @ a538eaa7
package com.devplatform.admin.modules.eq.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="定时任务对象",description="定时任务对象")
@TableName("timed_task")
......@@ -37,8 +36,8 @@ public class TimedTask implements Serializable {
/** 修改时间 */
@ApiModelProperty(value="修改时间",name="updateTime")
private java.util.Date updateTime;
/** 执行状态（0未执行，1执行成功，2执行失败） */
@ApiModelProperty(value="执行状态（0未执行，1执行成功，2执行失败）",name="status")
/** 状态（1开启，2关闭） */
@ApiModelProperty(value="状态（1开启，2关闭）",name="status")
private Integer status;
/** 是否已删除(0未删除，1已删除) */
@ApiModelProperty(value="是否已删除(0未删除，1已删除)",name="deleted")
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/EquipmentController.java
View file @ a538eaa7
package com.devplatform.admin.modules.eq.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.devplatform.admin.common.scheduling.SimpleJob;
import com.devplatform.admin.common.utils.AbstractController;
import com.devplatform.admin.common.utils.Constants;
import com.devplatform.admin.common.scheduling.SimpleJob;
import com.devplatform.admin.modules.eq.bean.TimedTask;
import com.devplatform.admin.modules.eq.service.EquipmentService;
import com.devplatform.admin.modules.eq.service.TimedTaskService;
......@@ -73,6 +73,9 @@ public class EquipmentController extends AbstractController {
sysSystemParams.setId(Constants.STRING_1);
sysSystemParams.setType(type);
sysSystemParams.setUpdateTime(time);
sysSystemParams.setSun(Constants.INT_2);
sysSystemParams.setFan(Constants.INT_2);
sysSystemParams.setNan(Constants.INT_2);
sysSystemParamsService.update(sysSystemParams,new LambdaQueryWrapper<SysSystemParams>()
.eq(SysSystemParams::getId,Constants.STRING_1));
......@@ -141,12 +144,12 @@ public class EquipmentController extends AbstractController {
@ApiOperation(value = "定时任务开启/关闭", notes = "定时任务开启")
@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String")
@PostMapping("/timedTask")
public R timedTask(String id, String startTime, String endTime, Integer status, String isReboot) {
public R timedTask(String taskId, String startTime, String endTime, Integer status, String isReboot) {
TimedTask timedTask = null;
//如果重启是启动的定时任务，不用更新数据库
if(StringUtils.isBlank(isReboot)){
SysUserEntity user = getUser();
if(StringUtils.isBlank(id)){
if(StringUtils.isBlank(taskId)){
timedTask = new TimedTask();
timedTask.setStartTime(startTime);
timedTask.setEndTime(endTime);
......@@ -161,22 +164,22 @@ public class EquipmentController extends AbstractController {
timedTask.setStatus(status);
timedTask.setUpdateTime(new Date());
timedTask.setUpdateUserId(user.getUserId());
timedTaskService.update(timedTask, new LambdaQueryWrapper<TimedTask>().eq(TimedTask::getId,id));
timedTaskService.update(timedTask, new LambdaQueryWrapper<TimedTask>().eq(TimedTask::getId,taskId));
}
id = timedTask.getId();
taskId = timedTask.getId();
}
//开启
if (status == 1) {
//设置定时任务
R error = setTimeTask(id, startTime, endTime);
R error = setTimeTask(taskId, startTime, endTime);
if (error != null) {
return error;
}
}else{
//关闭定时任务
removeJob(id);
removeJob(taskId);
}
return R.ok();
}
......@@ -236,4 +239,39 @@ public class EquipmentController extends AbstractController {
.append(strs[0]).append(" * * ? ");
return sb.toString();
}
/**
* 候车大厅头上所有显示数据
* @return
*/
@ApiOperation(value="候车大厅头上所有显示数据", notes="候车大厅头上所有显示数据")
@GetMapping("/getAllHcdt")
public R getAllHcdt() {
SysSystemParams sysSystemParams = sysSystemParamsService.getById(Constants.STRING_1);
TimedTask timedTask = timedTaskService.getOne(new LambdaQueryWrapper<TimedTask>().last("limit 1"));
return R.ok().put("sysSystemParams", sysSystemParams).put("timedTask",timedTask);
}
@ApiOperation(value = "切换模式", notes = "切换模式")
@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String")
@PostMapping("/checkModel")
public R checkModel(Integer type) {
SysSystemParams sysSystemParams = sysSystemParamsService.getById(Constants.STRING_1);
if(type == Constants.INT_1){
sysSystemParams.setSun(Constants.INT_1);
sysSystemParams.setFan(Constants.INT_2);
sysSystemParams.setNan(Constants.INT_2);
}else if(type == Constants.INT_2){
sysSystemParams.setSun(Constants.INT_2);
sysSystemParams.setFan(Constants.INT_1);
sysSystemParams.setNan(Constants.INT_2);
}else if(type == Constants.INT_3){
sysSystemParams.setSun(Constants.INT_2);
sysSystemParams.setFan(Constants.INT_2);
sysSystemParams.setNan(Constants.INT_1);
}
sysSystemParamsService.update(sysSystemParams,new LambdaQueryWrapper<SysSystemParams>()
.eq(SysSystemParams::getId,sysSystemParams.getId()));
return R.ok();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/KanBanController.java
View file @ a538eaa7
......@@ -59,7 +59,7 @@ public class KanBanController extends AbstractController {
*/
@ApiOperation(value="获取室外气象站数据", notes="获取室外气象站数据")
@GetMapping("/getSwqxzInfoTj")
public R getSwqxzInfoTj() {
public R getSwqxzInfoTj(Integer type) {
List<SwqxzInfoHour> list = swqxzInfoHourService.list(new LambdaQueryWrapper<SwqxzInfoHour>().orderByAsc(SwqxzInfoHour::getCreateTime));
//还未写完
List<String> temperatureList = new ArrayList<String>();
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/AnalysisServiceImpl.java
View file @ a538eaa7
......@@ -42,11 +42,11 @@ public class AnalysisServiceImpl implements AnalysisService {
//报警总数
map.put("faultAlarm",2);
//供暖模式
map.put("sun",1);
map.put("sun",sysSystemParams.getSun());
//机械通风模式
map.put("fan",2);
map.put("fan",sysSystemParams.getFan());
//自然通风模式
map.put("nan",2);
map.put("nan",sysSystemParams.getNan());
//能耗
Map<String,Object> energy = new HashMap<>();
//当天
......
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/bean/SysSystemParams.java
View file @ a538eaa7
package com.devplatform.admin.modules.sys.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="系统全局参数表对象",description="系统全局参数表对象")
@TableName("sys_system_params")
......@@ -52,4 +51,10 @@ public class SysSystemParams implements Serializable {
/** 站点ID */
@ApiModelProperty(value="站点ID",name="stationId")
private java.lang.String stationId;
@ApiModelProperty(value="供暖模式(1:开启 2:关闭)",name="sun")
private Integer sun;
@ApiModelProperty(value="机械通风模式(1:开启 2:关闭)",name="fan")
private Integer fan;
@ApiModelProperty(value="自然通风模式(1:开启 2:关闭)",name="nan")
private Integer nan;
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/model/SysSystemParamsModel.java
View file @ a538eaa7
......@@ -35,4 +35,10 @@ public class SysSystemParamsModel extends BaseModel {
private java.util.Date updateTime;
/** 站点ID */
private java.lang.String stationId;
/** 供暖模式(1:开启 2:关闭) */
private Integer sun;
/** 机械通风模式(1:开启 2:关闭) */
private Integer fan;
/** 自然通风模式(1:开启 2:关闭) */
private Integer nan;
}
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