From c3e802fd10bbd22989a5167172188e6e969ebd4b Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 16 十月 2023 10:04:37 +0800
Subject: [PATCH] 电子围栏

---
 ard-work/src/main/java/com/ruoyi/oil/domain/OilWall.java                  |   24 +++++++++++++++++++++++-
 ard-work/src/main/java/com/ruoyi/oil/controller/OilWallController.java    |   12 +++++++++++-
 ard-work/src/main/java/com/ruoyi/oil/service/impl/OilWallServiceImpl.java |    4 ++--
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/oil/controller/OilWallController.java b/ard-work/src/main/java/com/ruoyi/oil/controller/OilWallController.java
index fe6bcc3..e4096a5 100644
--- a/ard-work/src/main/java/com/ruoyi/oil/controller/OilWallController.java
+++ b/ard-work/src/main/java/com/ruoyi/oil/controller/OilWallController.java
@@ -2,6 +2,8 @@
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.oil.domain.OilWall;
 import com.ruoyi.oil.param.OilWallParam;
 import com.ruoyi.oil.service.OilWallService;
@@ -11,6 +13,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.logging.SimpleFormatter;
 
 /**
  * @author Administrator
@@ -26,6 +31,9 @@
     @PostMapping("/add")
     @ApiOperation("娣诲姞鐢靛瓙鍥存爮")
     public Results add(OilWall oilWall){
+        oilWall.setId(String.valueOf(UUID.randomUUID()));
+        oilWall.setCreateBy(SecurityUtils.getUsername());
+        oilWall.setCreateTime(new Date());
         return Results.succeed("鎴愬姛娣诲姞"+oilWallService.addOilWall(oilWall)+"鏉℃暟鎹�");
     }
 
@@ -38,13 +46,15 @@
     @PutMapping("/upd")
     @ApiOperation("淇敼鐢靛瓙鍥存爮")
     public Results upd(OilWall oilWall){
+        oilWall.setUpdateBy(SecurityUtils.getUsername());
+        oilWall.setUpdateTime(new Date());
         return Results.succeed("鎴愬姛淇敼"+oilWallService.updOilWall(oilWall)+"鏉℃暟鎹�");
     }
 
     @GetMapping("/one")
     @ApiOperation("鏌ヨ涓�鏉＄數瀛愬洿鏍�")
     public Results one(String id){
-        return Results.succeed(oilWallService.delOilWall(id));
+        return Results.succeed(oilWallService.one(id));
     }
 
     @GetMapping("/query")
diff --git a/ard-work/src/main/java/com/ruoyi/oil/domain/OilWall.java b/ard-work/src/main/java/com/ruoyi/oil/domain/OilWall.java
index 9f49470..3873426 100644
--- a/ard-work/src/main/java/com/ruoyi/oil/domain/OilWall.java
+++ b/ard-work/src/main/java/com/ruoyi/oil/domain/OilWall.java
@@ -1,15 +1,37 @@
 package com.ruoyi.oil.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * @author Administrator
  */
 @Data
-public class OilWall extends BaseEntity {
+public class OilWall{
     private String id;
     private String name;
     private String coord;
     private String type;
+    /** 鍒涘缓鑰� */
+    @ApiModelProperty(hidden = true)
+    private String createBy;
+
+    /** 鍒涘缓鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(hidden = true)
+    private Date createTime;
+
+    /** 鏇存柊鑰� */
+    @ApiModelProperty(hidden = true)
+    private String updateBy;
+
+    /** 鏇存柊鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(hidden = true)
+    private Date updateTime;
 }
diff --git a/ard-work/src/main/java/com/ruoyi/oil/service/impl/OilWallServiceImpl.java b/ard-work/src/main/java/com/ruoyi/oil/service/impl/OilWallServiceImpl.java
index c7a2772..62ba905 100644
--- a/ard-work/src/main/java/com/ruoyi/oil/service/impl/OilWallServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/oil/service/impl/OilWallServiceImpl.java
@@ -43,8 +43,8 @@
     @Override
     public List<OilWall> query(OilWallParam oilWallParam) {
         QueryWrapper<OilWall> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(!oilWallParam.getName().isEmpty(),"name",oilWallParam.getName())
-                .eq(!oilWallParam.getType().isEmpty(),"type",oilWallParam.getType());
+        queryWrapper.like(oilWallParam.getName()!=null,"name",oilWallParam.getName())
+                .eq(oilWallParam.getType()!=null,"type",oilWallParam.getType());
         return oilWallMapper.selectList(queryWrapper);
     }
 }

--
Gitblit v1.9.3