15928045575 2 rokov pred
rodič
commit
fc8efc32cf

+ 9 - 0
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/controller/DeviceController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.sckw.core.annotation.Log;
 import com.sckw.core.annotation.RepeatSubmit;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.slope.detection.model.dto.ProjectUpdateDTO;
 import com.sckw.slope.detection.model.param.DeviceAdd;
 import com.sckw.slope.detection.model.param.DeviceQuery;
 import com.sckw.slope.detection.service.DeviceService;
@@ -81,4 +82,12 @@ public class DeviceController {
         log.info("设备位置配置 locationSet param :{}", JSONObject.toJSONString(list));
         return deviceService.locationSet(list,request);
     }
+
+    @Log(description = "设备编辑")
+    //@RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
+    @RequestMapping(name = "设备编辑", value = "/update", method = RequestMethod.POST)
+    public HttpResult update(@Valid @RequestBody DeviceAdd deviceAdd, HttpServletRequest response) {
+        log.info("设备编辑 update param:{}", JSONObject.toJSONString(deviceAdd));
+        return deviceService.update(deviceAdd, response);
+    }
 }

+ 2 - 1
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDevice.java

@@ -1,5 +1,6 @@
 package com.sckw.slope.detection.model.dos.mysql;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import jakarta.validation.constraints.NotNull;
@@ -47,7 +48,7 @@ public class KwsDevice implements Serializable {
     /**
      * 质保日期
      */
-    private Date validTime;
+    private DateTime validTime;
 
     /**
      * 秘钥

+ 5 - 0
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/param/DeviceAdd.java

@@ -16,6 +16,11 @@ import java.util.Date;
 @Data
 public class DeviceAdd {
 
+    /**
+     * id
+     */
+    private String id;
+
     /**
      * 矿山id
      */

+ 15 - 8
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceService.java

@@ -3,6 +3,7 @@ package com.sckw.slope.detection.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.enums.DeviceEnum;
 import com.sckw.core.utils.StringUtils;
@@ -12,17 +13,11 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.slope.detection.dao.mysql.KwsDeviceMapper;
 import com.sckw.slope.detection.dao.mysql.KwsAlarmMapper;
 import com.sckw.slope.detection.dao.mysql.KwsDeviceModelMapper;
-import com.sckw.slope.detection.model.dos.mysql.KwsAlarm;
-import com.sckw.slope.detection.model.dos.mysql.KwsDevice;
-import com.sckw.slope.detection.model.dos.mysql.KwsDeviceModel;
-import com.sckw.slope.detection.model.dos.mysql.KwsProject;
-import com.sckw.slope.detection.model.dto.DeviceDataDTO;
-import com.sckw.slope.detection.model.dto.HeaderData;
-import com.sckw.slope.detection.model.dto.ProjectAddDTO;
+import com.sckw.slope.detection.model.dos.mysql.*;
+import com.sckw.slope.detection.model.dto.*;
 import com.sckw.slope.detection.model.param.DeviceAdd;
 import com.sckw.slope.detection.model.param.DeviceQuery;
 import com.sckw.slope.detection.model.vo.ProjectVo;
-import com.sckw.slope.detection.model.dto.DeviceLocationDTO;
 import com.sckw.slope.detection.model.dto.HeaderData;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
@@ -168,4 +163,16 @@ public class DeviceService {
         }
         return HttpResult.ok();
     }
+
+    @Transactional
+    public HttpResult update(DeviceAdd deviceAdd, HttpServletRequest response) {
+        KwsDevice device = new KwsDevice();
+        BeanUtils.copyProperties(deviceAdd, device);
+        device.setId(Long.parseLong(deviceAdd.getId()));
+        LocalDateTime now = LocalDateTime.now();
+        device.setUpdateBy(Long.parseLong(commonService.getHeaderData(response).getUpdateBy()));
+        device.setUpdateTime(now);
+        deviceMapper.updateById(device);
+        return HttpResult.ok();
+    }
 }