From 0d560afee047c64d8287dfdf236b2070cff2d715 Mon Sep 17 00:00:00 2001 From: stone <827672943@qq.com> Date: Tue, 9 May 2023 11:24:05 +0800 Subject: [PATCH] 11 --- .../main/java/com/psdc/entity/PsdcDevice.java | 48 ++++++++++----- .../com/psdc/service/IPsdcDeviceService.java | 38 ++++++++++++ .../service/impl/PsdcDeviceServiceImpl.java | 58 +++++++++++++++++++ .../controller/control/ManualControl.java | 32 ++++++++++ .../{PowerControl.java => TimerControl.java} | 2 +- 5 files changed, 161 insertions(+), 17 deletions(-) create mode 100644 psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java create mode 100644 psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java create mode 100644 psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java rename psdc-web/src/main/java/com/psdc/controller/control/{PowerControl.java => TimerControl.java} (58%) diff --git a/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java b/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java index 47f3a34..b7bc197 100644 --- a/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java +++ b/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java @@ -16,22 +16,38 @@ import java.util.Date; @NoArgsConstructor public class PsdcDevice { - private long deviceId; - private long userId; - private long deviceType; - private String deviceSn; - private String deviceName; - private String hardVersion; - private String softVersion; - private String deviceAddress; - private String startTime; - private long deviceStatus; - private long deviceRunstatus; - private String photoUrl; - private String createBy; - private Date createTime; - private String updateBy; - private Date updateTime; + /** 设备id */ + private Integer deviceId ; + /** 用户id */ + private Integer userId ; + /** 设备类型：1-监测设备，2-运行设备 */ + private Integer deviceType ; + /** 设备sn */ + private String deviceSn ; + /** 设备名称 */ + private String deviceName ; + /** 硬件版本 */ + private String hardVersion ; + /** 软件版本 */ + private String softVersion ; + /** 安装地址 */ + private String deviceAddress ; + /** 启用时间 */ + private Date startTime ; + /** 设备状态：1-未激活，2-禁用，3-在线，4-离线 */ + private Integer deviceStatus ; + /** 图片地址 */ + private String photoUrl ; + /** 创建者 */ + private String createBy ; + /** 创建时间 */ + private Date createTime ; + /** 修改者 */ + private String updateBy ; + /** 修改时间 */ + private Date updateTime ; + /** 设备运行状态：1-开启，2-关闭 */ + private Integer deviceRunstatus ; } diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java new file mode 100644 index 0000000..9d0d9e0 --- /dev/null +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java @@ -0,0 +1,38 @@ +package com.psdc.service; + +import com.psdc.entity.PsdcDevice; +import org.springframework.data.domain.PageRequest; + +public interface IPsdcDeviceService { + + /** + * 通过ID查询单条数据 + * + * @param deviceId 主键 + * @return 实例对象 + */ + PsdcDevice queryById(Integer deviceId); + + /** + * 新增数据 + * + * @param psdcDevice 实例对象 + * @return 实例对象 + */ + PsdcDevice insert(PsdcDevice psdcDevice); + /** + * 更新数据 + * + * @param psdcDevice 实例对象 + * @return 实例对象 + */ + PsdcDevice update(PsdcDevice psdcDevice); + /** + * 通过主键删除数据 + * + * @param deviceId 主键 + * @return 是否成功 + */ + boolean deleteById(Integer deviceId); + +} diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java new file mode 100644 index 0000000..b9203d3 --- /dev/null +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java @@ -0,0 +1,58 @@ +package com.psdc.service.impl; + +import com.psdc.entity.PsdcDevice; +import com.psdc.mapper.PsdcDeviceMapper; +import com.psdc.service.IPsdcDeviceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +@Service +public class PsdcDeviceServiceImpl implements IPsdcDeviceService{ + @Autowired + private PsdcDeviceMapper psdcDeviceMapper; + + /** + * 通过ID查询单条数据 + * + * @param deviceId 主键 + * @return 实例对象 + */ + public PsdcDevice queryById(Integer deviceId){ + return psdcDeviceMapper.queryById(deviceId); + } + + /** + * 新增数据 + * + * @param psdcDevice 实例对象 + * @return 实例对象 + */ + public PsdcDevice insert(PsdcDevice psdcDevice){ + psdcDeviceMapper.insert(psdcDevice); + return psdcDevice; + } + + /** + * 更新数据 + * + * @param psdcDevice 实例对象 + * @return 实例对象 + */ + public PsdcDevice update(PsdcDevice psdcDevice){ + psdcDeviceMapper.update(psdcDevice); + return queryById(psdcDevice.getDeviceId()); + } + + /** + * 通过主键删除数据 + * + * @param deviceId 主键 + * @return 是否成功 + */ + public boolean deleteById(Integer deviceId){ + int total = psdcDeviceMapper.deleteById(deviceId); + return total > 0; + } +} \ No newline at end of file diff --git a/psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java b/psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java new file mode 100644 index 0000000..0d1d086 --- /dev/null +++ b/psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java @@ -0,0 +1,32 @@ +package com.psdc.controller.control; + +import com.psdc.core.domain.AjaxResult; +import com.psdc.core.domain.R; +import com.psdc.core.domain.entity.SysRole; +import com.psdc.core.domain.entity.SysUser; +import com.psdc.utils.StringUtils; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/control/manual") +public class ManualControl { + + + + @PreAuthorize("@ss.hasPermi('control:user:query')") + @GetMapping("/deviceList") + public AjaxResult getControlDeviceList() { + + return ajax; + } + + + +} diff --git a/psdc-web/src/main/java/com/psdc/controller/control/PowerControl.java b/psdc-web/src/main/java/com/psdc/controller/control/TimerControl.java similarity index 58% rename from psdc-web/src/main/java/com/psdc/controller/control/PowerControl.java rename to psdc-web/src/main/java/com/psdc/controller/control/TimerControl.java index 7202573..91a30ab 100644 --- a/psdc-web/src/main/java/com/psdc/controller/control/PowerControl.java +++ b/psdc-web/src/main/java/com/psdc/controller/control/TimerControl.java @@ -1,4 +1,4 @@ package com.psdc.controller.control; -public class PowerControl { +public class TimerControl { }