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