完善项目详情、修改等

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/controller/IotProjectController.java

@@ -4,6 +4,7 @@ import com.middle.platform.common.utils.Result;
 import com.middle.platform.manage.biz.domain.req.ChangeStatus;
 import com.middle.platform.manage.biz.domain.req.IotProjectPara;
 import com.middle.platform.manage.biz.domain.req.ProjectPage;
+import com.middle.platform.manage.biz.entity.IotProject;
 import com.middle.platform.manage.biz.service.IotProjectService;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -39,6 +40,14 @@ public class IotProjectController {
         return Result.ok(iotProjectService.save(iotProjectPara), "保存成功");
     }
 
+    /**
+     * 编辑项目
+     */
+    @PostMapping("/update")
+    public Result<Object> update(@RequestBody @Validated IotProject iotProject) {
+        return Result.ok(iotProjectService.updateById(iotProject), "保存成功");
+    }
+
     /**
      * 删除项目
      */
@@ -65,24 +74,4 @@ public class IotProjectController {
         return Result.ok(iotProjectService.detail(id), "查询成功");
     }
 
-
-
-    /**
-     * 设备位置选点
-     */
-
-
-    /**
-     * 项目关联设备
-     */
-
-
-    /**
-     * 设备解绑
-     */
-
-
-
-
-
 }

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/controller/RealTimeMonitoringController.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @date 2023-12-24 16:26
  */
 @RestController
-@RequestMapping("/realTimeMonitoring")
+@RequestMapping(name = "实时统计", path = "/realTimeMonitoring")
 @RequiredArgsConstructor
 @Validated
 public class RealTimeMonitoringController {

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotProjectDeviceService.java

@@ -1,8 +1,8 @@
 package com.middle.platform.manage.biz.service;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
-import com.middle.platform.pagehelper.core.PageRes;
 import com.middle.platform.manage.biz.domain.req.IotProDevicePara;
 import com.middle.platform.manage.biz.domain.req.IotProjectDevicePara;
 import com.middle.platform.manage.biz.domain.vo.IotDeviceVo;
@@ -12,10 +12,12 @@ import com.middle.platform.manage.biz.entity.IotProjectDeviceLog;
 import com.middle.platform.manage.biz.mapper.IotDeviceMapper;
 import com.middle.platform.manage.biz.mapper.IotProjectDeviceLogMapper;
 import com.middle.platform.manage.biz.mapper.IotProjectDeviceMapper;
+import com.middle.platform.pagehelper.core.PageRes;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -62,9 +64,13 @@ public class IotProjectDeviceService extends ServiceImpl<IotProjectDeviceMapper,
         iotProjectDevicePara.getDeviceIds().forEach(e -> {
             IotProjectDevice iotProjectDevice = new IotProjectDevice();
             iotProjectDevice.setDeviceId(e);
+            iotProjectDevice.setUpdateBy(StpUtil.getLoginIdAsLong());
+            iotProjectDevice.setUpdateTime(LocalDateTime.now());
             iotProjectDevice.setProjectId(iotProjectDevicePara.getProjectId());
             IotProjectDevice res = iotProjectDeviceMapper.selectByProjectDevice(iotProjectDevice);
             if (res == null) {
+                iotProjectDevice.setCreateBy(StpUtil.getLoginIdAsLong());
+                iotProjectDevice.setCreateTime(LocalDateTime.now());
                 //没有则新增
                 iotProjectDeviceMapper.insert(iotProjectDevice);
             } else {
@@ -84,6 +90,8 @@ public class IotProjectDeviceService extends ServiceImpl<IotProjectDeviceMapper,
     public Object updateProjectDevice(IotProDevicePara iotProDevicePara) {
         IotDevice iotDevice = iotDeviceMapper.selectById(iotProDevicePara.getId());
         BeanUtils.copyProperties(iotProDevicePara, iotDevice);
+        iotDevice.setUpdateBy(StpUtil.getLoginIdAsLong());
+        iotDevice.setUpdateTime(LocalDateTime.now());
         return iotDeviceMapper.updateById(iotDevice);
     }
 
@@ -109,6 +117,10 @@ public class IotProjectDeviceService extends ServiceImpl<IotProjectDeviceMapper,
         if (res != null) {
             IotProjectDeviceLog iotProjectDeviceLog = new IotProjectDeviceLog();
             BeanUtils.copyProperties(res, iotProjectDeviceLog);
+            iotProjectDeviceLog.setCreateBy(StpUtil.getLoginIdAsLong());
+            iotProjectDeviceLog.setCreateTime(LocalDateTime.now());
+            iotProjectDeviceLog.setUpdateBy(StpUtil.getLoginIdAsLong());
+            iotProjectDeviceLog.setUpdateTime(LocalDateTime.now());
             iotProjectDeviceLog.setRemark("设备解绑");
             iotProjectDeviceLogMapper.insert(iotProjectDeviceLog);
             return iotProjectDeviceMapper.deleteProDeviceUntie(id);

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotProjectService.java

@@ -1,9 +1,9 @@
 package com.middle.platform.manage.biz.service;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
-import com.middle.platform.pagehelper.core.PageRes;
 import com.middle.platform.manage.api.enums.DeviceStatus;
 import com.middle.platform.manage.biz.domain.req.ChangeStatus;
 import com.middle.platform.manage.biz.domain.req.IotProjectPara;
@@ -12,9 +12,11 @@ import com.middle.platform.manage.biz.domain.vo.IotProjectVo;
 import com.middle.platform.manage.biz.entity.IotProject;
 import com.middle.platform.manage.biz.mapper.IotProjectDeviceMapper;
 import com.middle.platform.manage.biz.mapper.IotProjectMapper;
+import com.middle.platform.pagehelper.core.PageRes;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 
@@ -34,6 +36,7 @@ public class IotProjectService extends ServiceImpl<IotProjectMapper, IotProject>
 
     /**
      * 分页查询
+     *
      * @author Aick Spt
      * @date 2023-12-23 14:35
      */
@@ -57,12 +60,16 @@ public class IotProjectService extends ServiceImpl<IotProjectMapper, IotProject>
         iotProject.setTitle(iotProjectPara.getTitle());
         iotProject.setStatus(iotProjectPara.getStatus());
         iotProject.setCompanyId(iotProjectPara.getCompanyId());
+        iotProject.setCreateBy(StpUtil.getLoginIdAsLong());
+        iotProject.setCreateTime(LocalDateTime.now());
+        iotProject.setUpdateBy(StpUtil.getLoginIdAsLong());
+        iotProject.setUpdateTime(LocalDateTime.now());
         return iotProjectMapper.insert(iotProject);
     }
 
-
     /**
      * 删除
+     *
      * @author Aick Spt
      * @date 2023-12-23 14:35
      */
@@ -72,16 +79,22 @@ public class IotProjectService extends ServiceImpl<IotProjectMapper, IotProject>
 
     /**
      * 详情
+     *
      * @author Aick Spt
      * @date 2023-12-23 14:36
      */
     public IotProjectVo detail(Long id) {
         IotProjectVo iotProjectVo = iotProjectMapper.detail(id);
-        return this.getIotProjectStatusAndDeviceNum(iotProjectVo);
+        if (iotProjectVo == null) {
+            return null;
+        } else {
+            return this.getIotProjectStatusAndDeviceNum(iotProjectVo);
+        }
     }
 
     /**
      * 调整返回结果
+     *
      * @author Aick Spt
      * @date 2023-12-23 14:36
      */
@@ -100,4 +113,5 @@ public class IotProjectService extends ServiceImpl<IotProjectMapper, IotProject>
         }
         return 0;
     }
+
 }