11

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;
+  /** 设备id */
-  private long userId;
+  private Integer deviceId ;
-  private long deviceType;
+  /** 用户id */
-  private String deviceSn;
+  private Integer userId ;
-  private String deviceName;
+  /** 设备类型：1-监测设备，2-运行设备 */
-  private String hardVersion;
+  private Integer deviceType ;
-  private String softVersion;
+  /** 设备sn */
-  private String deviceAddress;
+  private String deviceSn ;
-  private String startTime;
+  /** 设备名称 */
-  private long deviceStatus;
+  private String deviceName ;
-  private long deviceRunstatus;
+  /** 硬件版本 */
-  private String photoUrl;
+  private String hardVersion ;
-  private String createBy;
+  /** 软件版本 */
-  private Date createTime;
+  private String softVersion ;
-  private String updateBy;
+  /** 安装地址 */
-  private Date updateTime;
+  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 ;
 
 
 }

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);
+
+}

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;
+    }
+}

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;
+    }
+
+
+
+}

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 {
 }