From 1bd707698e1d141ad5f0dccd24bb9414afab408e Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 15:18:41 +0800 Subject: [PATCH] lzs --- .../main/java/com/god/base/common/Fence.java | 30 ---- .../com/god/base/common/domain/Fence.java | 96 +++++++++++++ .../domain/request/FenceAddRequest.java | 76 ++++++++++ .../domain/request/FenceQueryRequest.java | 46 +++++++ .../com/god/base/common/page/PageQuery.java | 36 +++++ .../base/common/response/FenceResponse.java | 30 ---- car-base-common/src/main/resources/banner.txt | 2 - .../src/main/resources/bootstrap.yml | 28 ---- .../src/main/resources/logback.xml | 74 ---------- car-base-remote/pom.xml | 2 +- car-base-server/pom.xml | 6 + .../server/controller/FenceController.java | 130 ++++++++++++------ .../god/base/server/mapper/FenceMapper.java | 21 ++- .../god/base/server/service/FenceService.java | 29 ++-- .../server/service/impl/FenceServiceImpl.java | 118 ++++++++++++---- .../src/main/resources/mapper/FenceMapper.xml | 36 ----- 16 files changed, 464 insertions(+), 296 deletions(-) delete mode 100644 car-base-common/src/main/java/com/god/base/common/Fence.java create mode 100644 car-base-common/src/main/java/com/god/base/common/domain/Fence.java create mode 100644 car-base-common/src/main/java/com/god/base/common/domain/request/FenceAddRequest.java create mode 100644 car-base-common/src/main/java/com/god/base/common/domain/request/FenceQueryRequest.java create mode 100644 car-base-common/src/main/java/com/god/base/common/page/PageQuery.java delete mode 100644 car-base-common/src/main/java/com/god/base/common/response/FenceResponse.java delete mode 100644 car-base-common/src/main/resources/banner.txt delete mode 100644 car-base-common/src/main/resources/bootstrap.yml delete mode 100644 car-base-common/src/main/resources/logback.xml delete mode 100644 car-base-server/src/main/resources/mapper/FenceMapper.xml diff --git a/car-base-common/src/main/java/com/god/base/common/Fence.java b/car-base-common/src/main/java/com/god/base/common/Fence.java deleted file mode 100644 index f76de0c..0000000 --- a/car-base-common/src/main/java/com/god/base/common/Fence.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.god.base.common; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Fence { - /** 电子围栏ID */ - private Integer fenceId ; - /** 围栏名称 */ - private String fenceName ; - /** 围栏经纬度 */ - private String fenceLat ; - /** 激活状态 */ - private Integer fenceStatus ; - /** 操作时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date fenceTime ; - /** 操作者 */ - private Integer createBy ; -} diff --git a/car-base-common/src/main/java/com/god/base/common/domain/Fence.java b/car-base-common/src/main/java/com/god/base/common/domain/Fence.java new file mode 100644 index 0000000..13ab2cc --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/common/domain/Fence.java @@ -0,0 +1,96 @@ +package com.god.base.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.god.base.common.domain.request.FenceAddRequest; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 电子围栏信息 + * + * @Author Lou-Zs + * @Date 2023/11/20 19:41 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "t_fence") +public class Fence { + + + /** + * 围栏主建编号 + */ + @TableId(value = "fence_id",type = IdType.AUTO) + private long fenceId; + + /** + * 围栏名称 + */ + @NotEmpty(message = "围栏名称不能为空") + private String fenceName; + + /** + * 围栏坐标位置 + */ + private String fenceLocation; + + /** + * 激活状态 + * 0-停用 + * 1-开启 + */ + private Integer fenceStatus; + + /** + * 行驶状态 + * 1-驶入 + * 2-驶出 + */ + private Integer driveStatus; + + /** + * 车辆主建 + */ + private String carVinId; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss") + @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") + private Date createTime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss") + @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") + private Date updateTime; + + + + public static Fence fenceBuildAdd(FenceAddRequest fenceAddRequest){ + return Fence.builder() + .fenceName(fenceAddRequest.getFenceName()) + .fenceLocation(fenceAddRequest.getFenceLocation()) + .fenceStatus(fenceAddRequest.getFenceStatus()) + .driveStatus(fenceAddRequest.getDriveStatus()) + .carVinId(fenceAddRequest.getCarVinId()) + .createTime(fenceAddRequest.getCreateTime()) + .updateTime(fenceAddRequest.getUpdateTime()) + .build(); + } + +} diff --git a/car-base-common/src/main/java/com/god/base/common/domain/request/FenceAddRequest.java b/car-base-common/src/main/java/com/god/base/common/domain/request/FenceAddRequest.java new file mode 100644 index 0000000..956f4ff --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/common/domain/request/FenceAddRequest.java @@ -0,0 +1,76 @@ +package com.god.base.common.domain.request; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; +import java.util.Date; + +/** + * 围栏新增参数 + * + * @author Lou-Zs + * @Date 2023/11/20 19:41 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "t_fence") +public class FenceAddRequest { + + + + /** + * 围栏名称 + */ + @NotEmpty(message = "围栏名称不能为空") + private String fenceName; + + /** + * 围栏坐标位置 + */ + private String fenceLocation; + + /** + * 激活状态 + * 0-停用 + * 1-开启 + */ + private Integer fenceStatus; + + /** + * 行驶状态 + * 1-驶入 + * 2-驶出 + */ + private Integer driveStatus; + + /** + * 车辆主建 + */ + private String carVinId; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss") + @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") + private Date createTime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss") + @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") + private Date updateTime; + + +} diff --git a/car-base-common/src/main/java/com/god/base/common/domain/request/FenceQueryRequest.java b/car-base-common/src/main/java/com/god/base/common/domain/request/FenceQueryRequest.java new file mode 100644 index 0000000..ee59dbb --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/common/domain/request/FenceQueryRequest.java @@ -0,0 +1,46 @@ +package com.god.base.common.domain.request; + +import com.god.base.common.page.PageQuery; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import javax.validation.constraints.NotEmpty; + +/** + * 电子围栏查询条件 + * + * @author Lou-Zs + * @Date 2023/11/20 22:01 + **/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class FenceQueryRequest extends PageQuery { + + + /** + * 围栏名称 + */ + private String fenceName; + + + + /** + * 激活状态 + * 0-停用 + * 1-开启 + */ + private Integer fenceStatus; + + /** + * 行驶状态 + * 1-驶入 + * 2-驶出 + */ + private Integer driveStatus; + +} diff --git a/car-base-common/src/main/java/com/god/base/common/page/PageQuery.java b/car-base-common/src/main/java/com/god/base/common/page/PageQuery.java new file mode 100644 index 0000000..1a319f2 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/common/page/PageQuery.java @@ -0,0 +1,36 @@ +package com.god.base.common.page; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + + +/** + * 分页查询条件 + * + * @author Lou-Zs + * @Date 2023/11/20 22:03 + **/ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class PageQuery { + + + private Integer pageNum; + + + + private Integer pageSize; + + + + public Page buildPage(){ + Page page = new Page<>(this.pageNum, this.pageSize); + return page; + } +} diff --git a/car-base-common/src/main/java/com/god/base/common/response/FenceResponse.java b/car-base-common/src/main/java/com/god/base/common/response/FenceResponse.java deleted file mode 100644 index 3a32d2e..0000000 --- a/car-base-common/src/main/java/com/god/base/common/response/FenceResponse.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.god.base.common.response; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class FenceResponse { - /** 电子围栏ID */ - private Integer fenceId ; - /** 围栏名称 */ - private String fenceName ; - /** 围栏经纬度 */ - private String fenceLat ; - /** 激活状态 */ - private Integer fenceStatus ; - /** 操作时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date fenceTime ; - /** 操作者 */ - private Integer createBy ; -} diff --git a/car-base-common/src/main/resources/banner.txt b/car-base-common/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/car-base-common/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/car-base-common/src/main/resources/bootstrap.yml b/car-base-common/src/main/resources/bootstrap.yml deleted file mode 100644 index 21efc42..0000000 --- a/car-base-common/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Tomcat -server: - port: 9802 - -# Spring -spring: - application: - # 应用名称 - name: god-car-base - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.god.com:8848 - config: - # 配置中心地址 - server-addr: nacos.god.com:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.god.system.mapper: DEBUG diff --git a/car-base-common/src/main/resources/logback.xml b/car-base-common/src/main/resources/logback.xml deleted file mode 100644 index 4800c95..0000000 --- a/car-base-common/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/car-base-remote/pom.xml b/car-base-remote/pom.xml index 097a89d..de6bf28 100644 --- a/car-base-remote/pom.xml +++ b/car-base-remote/pom.xml @@ -25,4 +25,4 @@ - + \ No newline at end of file diff --git a/car-base-server/pom.xml b/car-base-server/pom.xml index cb85a13..f434546 100644 --- a/car-base-server/pom.xml +++ b/car-base-server/pom.xml @@ -60,8 +60,14 @@ mysql-connector-j + + com.baomidou + mybatis-plus-boot-starter + 3.4.2 + + ${project.artifactId} diff --git a/car-base-server/src/main/java/com/god/base/server/controller/FenceController.java b/car-base-server/src/main/java/com/god/base/server/controller/FenceController.java index 2ff2cc3..def1081 100644 --- a/car-base-server/src/main/java/com/god/base/server/controller/FenceController.java +++ b/car-base-server/src/main/java/com/god/base/server/controller/FenceController.java @@ -1,71 +1,113 @@ package com.god.base.server.controller; +/** + * @ClassName FenceController + * @Author Lou-Zs + * @Date 2023/11/19 20:00 + * @Version 1.0 + * @Description TODO + **/ + import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.api.model.v2.Result; -import com.god.base.common.Fence; -import com.god.base.common.response.FenceResponse; +import com.god.base.common.domain.Fence; +import com.god.base.common.domain.request.FenceAddRequest; +import com.god.base.common.domain.request.FenceQueryRequest; import com.god.base.server.service.FenceService; +import com.god.common.core.web.page.TableDataInfo; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.List; - +/** + * base围栏操作 + */ @RestController -@RequestMapping("/fence") +@RequestMapping("/baseFence") @Log4j2 public class FenceController { + + @Autowired + private HttpServletRequest request; @Autowired private FenceService fenceService; - private HttpServletRequest request; - // 电子围栏列表 - @GetMapping("/fencingList") - public Result> fencingList(){ - log.info("功能名称：电子围栏，请求URL：【{}】，请求方法：【{}】",request.getRequestURI(), - request.getMethod()); - Result> result = fenceService.fencingList(); - log.info("功能名称：电子围栏，请求URL：【{}】，请求方法：【{}】,响应结果：【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); - return result; - } + /** + * 增添电子围栏 + * @param fenceAddRequest + * @return + */ + @PostMapping("/insertFence") + public Result insertFence(@RequestBody @Validated FenceAddRequest fenceAddRequest){ + log.info("功能介绍新增电子围栏,请求方式;{},请求路径:{},请求参数:{}", + request.getMethod(), + request.getRequestURL(), + JSONObject.toJSONString(fenceAddRequest)); - // 添加电子围栏 - @PostMapping("/addfencing") - public Result addfencing(@RequestBody Fence fence){ - log.info("功能名称：添加电子围栏，请求URL：【{}】，请求方法：【{}】，请求参数：【{}】",request.getRequestURI(), - request.getMethod(),fence); - fenceService.addfencing(fence); - Result result = Result.success(); - log.info("功能名称：添加电子围栏，请求URL：【{}】，请求方法：【{}】,响应结果：【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); - return result; + //围栏添加 + fenceService.save(Fence.fenceBuildAdd(fenceAddRequest)); + + return Result.success(); } - // 删除围栏 - @PostMapping("/deleteFencingById/{fencingId}") - public Result deleteFencingById(@PathVariable Integer fencingId){ - log.info("功能名称：获取编号删除围栏，请求URL：【{}】，请求方法：【{}】，请求参数：【{}】",request.getRequestURI(), - request.getMethod(),fencingId); - Result result = fenceService.deleteFencingById(fencingId); - log.info("功能名称：获取编号删除围栏，请求URL：【{}】，请求方法：【{}】,响应结果：【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); - return result; + /** + * 根据围栏编号编辑围栏信息 + * @param fence + * @return + */ + @PostMapping("/updateFence") + public Result updateFence(@RequestBody @Validated Fence fence){ + log.info("功能介绍:编辑围栏信息,请求方式:{},请求路径:{},请求参数:{}", + request.getMethod(), + request.getRequestURL(), + JSONObject.toJSONString(fence)); + + //编辑电子围栏信息 + fenceService.updateById(fence); + + return Result.success(); } - // 修改围栏 - @PostMapping("/updateFencing") - public Result updateFencing(@RequestBody Fence fence){ - log.info("功能名称：修改围栏，请求URL：【{}】，请求方法：【{}】，请求参数：【{}】",request.getRequestURI(), - request.getMethod(),fence); - Result result = fenceService.updateFencing(fence); - log.info("功能名称：修改围栏，请求URL：【{}】，请求方法：【{}】,响应结果：【{}】",request.getRequestURI(), - request.getMethod(), JSONObject.toJSONString(result)); - return result; + /** + * 根据围栏编号删除围栏 + * @param fenceId + * @return + */ + @PostMapping("/deleteFence/{fenceId}") + public Result deleteFence(@RequestParam("fenceId") String fenceId){ + log.info("功能介绍:通过围栏编号删除围栏,请求方式:{},请求路径:{},请求参数:{}", + request.getMethod(), + request.getRequestURL(), + JSONObject.toJSONString(fenceId)); + + //根据围栏编号删除围栏 + fenceService.removeById(fenceId); + + return Result.success(); } + + /** + * 分页查询电子围栏列表 + * @param fenceQueryRequest + * @return + */ + @PostMapping("/fenceListAndPage") + public Result> fenceListAndPage(@RequestBody FenceQueryRequest fenceQueryRequest){ + log.info("功能介绍:查询围栏列表,请求方式:{},请求路径:{},请求参数:{}", + request.getMethod(), + request.getRequestURL(), + JSONObject.toJSONString(fenceQueryRequest)); + + //分页查询围栏列表 + TableDataInfo dataInfo = fenceService.fenceListAndPage(fenceQueryRequest); + + return Result.success(dataInfo); + + } } diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java index 7900781..6d8cd8a 100644 --- a/car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java +++ b/car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java @@ -1,18 +1,17 @@ package com.god.base.server.mapper; -import com.god.base.common.Fence; -import com.god.base.common.response.FenceResponse; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.god.base.common.domain.Fence; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - +/** + * @ClassName FenceMapper + * @Author Lou-Zs + * @Date 2023/11/19 20:28 + * @Version 1.0 + * @Description TODO + **/ @Mapper -public interface FenceMapper { - List fencingList(); +public interface FenceMapper extends BaseMapper { - void addfencing(Fence fence); - - int deleteFencingById(Integer fencingId); - - int updateFencing(Fence fence); } diff --git a/car-base-server/src/main/java/com/god/base/server/service/FenceService.java b/car-base-server/src/main/java/com/god/base/server/service/FenceService.java index 3dd1ff7..1ef8060 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/FenceService.java +++ b/car-base-server/src/main/java/com/god/base/server/service/FenceService.java @@ -1,17 +1,24 @@ package com.god.base.server.service; -import com.alibaba.nacos.api.model.v2.Result; -import com.god.base.common.Fence; -import com.god.base.common.response.FenceResponse; +import com.baomidou.mybatisplus.extension.service.IService; +import com.god.base.common.domain.Fence; +import com.god.base.common.domain.request.FenceQueryRequest; +import com.god.common.core.web.page.TableDataInfo; -import java.util.List; +/** + * @ClassName FenceService + * @Author Lou-Zs + * @Date 2023/11/19 22:26 + * @Version 1.0 + * @Description TODO + **/ +public interface FenceService extends IService { -public interface FenceService { - Result> fencingList(); - void addfencing(Fence fence); - - Result deleteFencingById(Integer fencingId); - - Result updateFencing(Fence fence); + /** + * 分页查询电子围栏列表 + * @param fenceQueryRequest + * @return + */ + TableDataInfo fenceListAndPage(FenceQueryRequest fenceQueryRequest); } diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java index a287490..3eb1113 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java @@ -1,51 +1,111 @@ package com.god.base.server.service.impl; -import com.alibaba.nacos.api.model.v2.Result; -import com.god.base.common.Fence; -import com.god.base.common.response.FenceResponse; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.god.base.common.domain.Fence; +import com.god.base.common.domain.request.FenceQueryRequest; import com.god.base.server.mapper.FenceMapper; import com.god.base.server.service.FenceService; -import org.springframework.beans.factory.annotation.Autowired; +import com.god.common.core.web.page.TableDataInfo; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.util.StringUtil; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.io.Serializable; +/** + * @ClassName FenceServiceImpl + * @Author Lou-Zs + * @Date 2023/11/19 22:26 + * @Version 1.0 + * @Description TODO + **/ @Service -public class FenceServiceImpl implements FenceService { - @Autowired - private FenceMapper fenceMapper; +@Log4j2 +public class FenceServiceImpl extends ServiceImpl implements FenceService { - // 围栏列表 + /** + * 增添电子围栏 + * @param entity + * @return + */ @Override - public Result> fencingList() { - List list=fenceMapper.fencingList(); - return Result.success(list); + public boolean save(Fence entity) { + boolean save = super.save(entity); + if (!save){ + log.warn("增加围栏:[/-{}-/]失败! 请求参数:{}", + entity.getFenceName(), + JSONObject.toJSONString(entity)); + throw new RuntimeException("增添围栏失败!"); + } + return true; } - // 添加围栏 + /** + * 根据围栏编号编辑围栏信息 + * @param id + * @return + */ @Override - public void addfencing(Fence fence) { - Date date = new Date(); - fence.setFenceTime(date); - fenceMapper.addfencing(fence); - + public boolean removeById(Serializable id) { + boolean remove = super.removeById(id); + if (!remove){ + log.warn("删除围栏编号:[/-{}-/]失败!", + id); + throw new RuntimeException("删除围栏失败!"); + } + return true; } - // 删除围栏 + /** + * 根据围栏编号删除围栏 + * @param entity + * @return + */ @Override - public Result deleteFencingById(Integer fencingId) { - int i=fenceMapper.deleteFencingById(fencingId); - return i>0?Result.success("围栏已成功删除"):Result.failure("删除失败"); + public boolean updateById(Fence entity) { + boolean update = super.updateById(entity); + if (!update){ + log.warn("编辑围栏[/-{}-/]未成功! 请求参数:{}", + entity.getFenceName(), + JSONObject.toJSONString(entity)); + throw new RuntimeException("编辑围栏失败!"); + } + return true; } - // 删除围栏 + + /** + * 分页查询电子围栏列表 + * @param fenceQueryRequest + * @return + */ @Override - public Result updateFencing(Fence fence) { - Date date = new Date(); - fence.setFenceTime(date); - int i=fenceMapper.updateFencing(fence); - return i>0?Result.success("围栏已成功拦截"):Result.failure("拦截失败"); + public TableDataInfo fenceListAndPage(FenceQueryRequest fenceQueryRequest) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + //判断查询围栏是否为空 + if (StringUtils.isNotEmpty(fenceQueryRequest.getFenceName())){ + //模糊查询 + lambdaQueryWrapper.like(Fence::getFenceName,fenceQueryRequest.getFenceName()); + } + //判断激活状态是否为空 + if (null != fenceQueryRequest.getFenceStatus()){ + //精确查询 + lambdaQueryWrapper.eq(Fence::getFenceStatus,fenceQueryRequest.getFenceStatus()); + } + //判断行驶状态是否为空 + if (null != fenceQueryRequest.getDriveStatus()){ + //精确查询 + lambdaQueryWrapper.eq(Fence::getDriveStatus,fenceQueryRequest.getDriveStatus()); + } + Page page = this.page(fenceQueryRequest.buildPage(), lambdaQueryWrapper); + return TableDataInfo.builder() + .rows(page.getRecords()) + .total(page.getTotal()) + .build(); } } diff --git a/car-base-server/src/main/resources/mapper/FenceMapper.xml b/car-base-server/src/main/resources/mapper/FenceMapper.xml deleted file mode 100644 index 958ef82..0000000 --- a/car-base-server/src/main/resources/mapper/FenceMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - insert into( - fence_id, - fence_name, - fence_lat, - fence_status, - fence_time, - create_by) values( - #{fenceId}, - #{fenceName}, - #{fenceLat}, - #{fenceStatus}, - #{fenceTime}, - #{createBy}) - - - - update t_fence set - fence_name=#{fenceName}, - fence_lat=#{fenceLat}, - fence_status=#{fenceStatus}, - fence_time=#{fenceTime}, - create_By=#{createBy} where fence_id=#{fenceId} - - - delete from t_fence where fence_id=#{fenceId} - - - - -