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 01/24] 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} - - - - - From ed66fd2f7a009ed05f600ec709558a04832e1308 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 19:48:59 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/god/base/common/domain/Fence.java | 2 +- .../java/com/god/base/server/controller/FenceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 13ab2cc..53f2e68 100644 --- 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 @@ -33,7 +33,7 @@ public class Fence { * 围栏主建编号 */ @TableId(value = "fence_id",type = IdType.AUTO) - private long fenceId; + private Long fenceId; /** * 围栏名称 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 def1081..12e46be 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 @@ -79,7 +79,7 @@ public class FenceController { * @return */ @PostMapping("/deleteFence/{fenceId}") - public Result deleteFence(@RequestParam("fenceId") String fenceId){ + public Result deleteFence(@RequestParam("fenceId") Long fenceId){ log.info("功能介绍:通过围栏编号删除围栏,请求方式:{},请求路径:{},请求参数:{}", request.getMethod(), request.getRequestURL(), From 3bce1fc97afde934af770ea3752794b366d9dcb9 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 20:06:51 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E5=8F=82=E6=95=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/god/base/common/domain/Fence.java | 3 +-- .../java/com/god/base/server/controller/FenceController.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 index 53f2e68..e4535a1 100644 --- 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 @@ -32,8 +32,7 @@ public class Fence { /** * 围栏主建编号 */ - @TableId(value = "fence_id",type = IdType.AUTO) - private Long fenceId; + private Integer fenceId; /** * 围栏名称 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 12e46be..658b743 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 @@ -79,7 +79,7 @@ public class FenceController { * @return */ @PostMapping("/deleteFence/{fenceId}") - public Result deleteFence(@RequestParam("fenceId") Long fenceId){ + public Result deleteFence(@RequestParam("fenceId") Integer fenceId){ log.info("功能介绍:通过围栏编号删除围栏,请求方式:{},请求路径:{},请求参数:{}", request.getMethod(), request.getRequestURL(), From fa85bb90caf78a31bee4e5f64f1df29e1459a0a0 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 20:14:30 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E5=8F=82=E6=95=B03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/god/base/common/domain/Fence.java | 1 + 1 file changed, 1 insertion(+) 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 index e4535a1..da3935b 100644 --- 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 @@ -32,6 +32,7 @@ public class Fence { /** * 围栏主建编号 */ + @TableId(value = "fence_id",type = IdType.AUTO) private Integer fenceId; /** From 0a6f6fbace8f9eb20e9ccf9794b43afaf478bca9 Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Tue, 21 Nov 2023 20:24:08 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/server/common/domain/BatteryBox.java | 64 ++++++++ .../server/common/domain/BatteryBoxModel.java | 56 +++++++ .../god/base/server/common/domain/Car.java | 127 +++++++++++++++ .../base/server/common/domain/CarType.java | 29 ++++ .../god/base/server/common/domain/Fence.java | 43 ++++++ .../common/domain/request/CarRequest.java | 58 +++++++ car-base-common/src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 28 ++++ .../src/main/resources/logback.xml | 74 +++++++++ car-base-server/pom.xml | 13 +- .../base/server/GodCarBaseApplication.java | 2 +- .../base/server/controller/CarController.java | 77 ++++++++++ .../com/god/base/server/mapper/CarMapper.java | 19 +++ .../god/base/server/service/CarService.java | 21 +++ .../main/java/com/god/base/server/test/5.html | 89 +++++++++++ .../java/com/god/base/server/test/Test.html | 30 ++++ .../java/com/god/base/server/test/Test2.html | 81 ++++++++++ .../java/com/god/base/server/test/Test3.html | 145 ++++++++++++++++++ .../java/com/god/base/server/test/Test4.html | 82 ++++++++++ .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/mapper/CarMapper.xml | 21 +++ 21 files changed, 1062 insertions(+), 3 deletions(-) create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domain/Car.java create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java create mode 100644 car-base-common/src/main/resources/banner.txt create mode 100644 car-base-common/src/main/resources/bootstrap.yml create mode 100644 car-base-common/src/main/resources/logback.xml create mode 100644 car-base-server/src/main/java/com/god/base/server/controller/CarController.java create mode 100644 car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java create mode 100644 car-base-server/src/main/java/com/god/base/server/service/CarService.java create mode 100644 car-base-server/src/main/java/com/god/base/server/test/5.html create mode 100644 car-base-server/src/main/java/com/god/base/server/test/Test.html create mode 100644 car-base-server/src/main/java/com/god/base/server/test/Test2.html create mode 100644 car-base-server/src/main/java/com/god/base/server/test/Test3.html create mode 100644 car-base-server/src/main/java/com/god/base/server/test/Test4.html create mode 100644 car-base-server/src/main/resources/mapper/CarMapper.xml diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java b/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java new file mode 100644 index 0000000..ddb8ec1 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java @@ -0,0 +1,64 @@ +package com.god.base.server.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + +/** + * 电池箱信息表 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName("t_battery_box") +public class BatteryBox { + + /** + * 电池箱主键 + */ + private long batteryBoxId; + /** + * 电池包编码 + */ + private String batteryBoxBatteryPackCoding; + /** + * 电池包型名称 + */ + private String batteryBoxName; + /** + * 电池型号编号 + */ + private String batteryBoxNumber; + /** + * 实际容量 + */ + private String batteryBoxActualCapacity; + /** + * 实际电压 + */ + private String batteryBoxVirtualVoltage; + /** + * 实际质量 + */ + private String batteryBoxActualMass; + /** + * 出厂时间 + */ + @DateTimeFormat + private Date batteryBoxDate; + /** + * 所在电池组编码 + */ + private long cellId; + /** + * 所在车辆VIN + */ + private String carVin; +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java b/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java new file mode 100644 index 0000000..f224dac --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java @@ -0,0 +1,56 @@ +package com.god.base.server.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 电池箱型号 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName("t_batteryBox_model") +public class BatteryBoxModel { + /** + * 电池箱型号主键 + */ + private long batteryBoxModelId; + /** + * 型号名称 + */ + private String batteryBoxModelName; + /** + * 型号编号 + */ + private String batteryBoxModelNumber; + /** + * 电池包规格代码 + */ + private String batteryBoxModelPackSpecificationCode; + /** + * 电池品牌 + */ + private int batteryBoxModelBrand; + /** + * 温度探针总数 + */ + private String batteryBoxModelTemperatureProbePopulation; + /** + * 模块串并联方式 + */ + private String batteryBoxModelModuleSeriesParallelMode; + /** + * 模块个数 + */ + private String batteryBoxModelNumberOfModules; + /** + * 生产厂商名称 + */ + private String batteryBoxModelManufacturerName; + + +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/Car.java b/car-base-common/src/main/java/com/god/base/server/common/domain/Car.java new file mode 100644 index 0000000..3ceef4a --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/Car.java @@ -0,0 +1,127 @@ +package com.god.base.server.common.domain; + + +import com.baomidou.mybatisplus.annotation.TableName; +import com.god.base.server.common.domain.request.CarRequest; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 车辆信息 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "t_car") +public class Car { + /** + * 车辆Vin 主键 + */ + private String carVinId; + /** + * 单位id + */ + private long userId; + /** + * 车辆类型id + */ + private long carTypeId; + /** + * 电池箱信息id + */ + private long batteryBoxId; + /** + * 电池组id + */ + private long cellId; + /** + * 单体电池id + */ + private long batteryCellId; + /** + * 电池组模块id + */ + private long batteryPackInformationId; + /** + * 电子围栏ID + */ + private long fenceId; + /** + * 车牌号 + */ + private String carNumber; + /** + * 驱动机主键 + */ + private long driveMotorId; + /** + * 车辆总里程 + */ + private String carMileage; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + @DateTimeFormat + private Date updateTime; + /** + * 区域 + */ + private String address; + /** + * 电池厂商 + */ + private String batteryManufacturer; + /** + * 电机厂商 + */ + private String motorManufacturer; + /** + * 电机编号 + */ + private String motorNumber; + /** + * 电池编号 + */ + private String batteryNumber; + /** + * 逻辑删除 + */ + private int isDelete; + + + public static Car addReqBuild(CarRequest carRequest){ + return Car.builder() + //把所有的属性点都加上 + .carVinId(carRequest.getCarVinId()) + .carTypeId(carRequest.getCarTypeId()) + .batteryManufacturer(carRequest.getBatteryManufacturer()) + .motorManufacturer(carRequest.getMotorManufacturer()) + .motorNumber(carRequest.getMotorNumber()) + .batteryNumber(carRequest.getBatteryNumber()) + .batteryNumber(carRequest.getBatteryNumber()) + .build() + ; + } + + + + +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java b/car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java new file mode 100644 index 0000000..cb39128 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java @@ -0,0 +1,29 @@ +package com.god.base.server.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 车辆类型表 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName("t_carT_type") +public class CarType { + + /** + * 车辆类型主建 + */ + private long id; + /** + * 类型名称 + */ + private String carTypename; + + +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java b/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java new file mode 100644 index 0000000..20dd588 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java @@ -0,0 +1,43 @@ +package com.god.base.server.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 电子围栏 + */ +@NoArgsConstructor +@AllArgsConstructor +@Data +@Builder +@TableName("t_fence") +public class Fence { + /** + * 围栏id + */ + private String fenceId; + /** + * 围栏经纬度串（逗号拼接字符串） + */ + private String fenceAddress; + /** + * 标签编号 + */ + private String labelId; + /** + * 创建时间 + */ + private String createTime; + /** + * 修改时间 + */ + private String updateTime; + /** + * 创建者 + */ + private String createBy; + +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java b/car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java new file mode 100644 index 0000000..a2ddded --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java @@ -0,0 +1,58 @@ +package com.god.base.server.common.domain.request; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 车辆请求参数 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@NotNull +public class CarRequest { + + /** + * 车辆Vin 主键 + */ + @NotEmpty(message = "车辆vin不能为空") + private String carVinId; + /** + * 车辆类型 + */ + @NotEmpty(message = "车辆类型不能为空") + private long carTypeId; + /** + * 电子围栏ID + */ + @NotEmpty(message = "电子围栏不能为空") + private long fenceId; + /** + * 电池厂商 + */ + @NotEmpty(message = "电池厂商不能为空") + private String batteryManufacturer; + /** + * 电机厂商 + */ + @NotEmpty(message = "电机厂商不能为空") + private String motorManufacturer; + /** + * 电机编号 + */ + @NotEmpty(message = "电机编号不能为空") + private String motorNumber; + /** + * 电池编号 + */ + @NotEmpty(message = "电池编号不能为空") + private String batteryNumber; + + + + +} diff --git a/car-base-common/src/main/resources/banner.txt b/car-base-common/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/car-base-common/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +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 new file mode 100644 index 0000000..403a368 --- /dev/null +++ b/car-base-common/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9803 + +# 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 new file mode 100644 index 0000000..4800c95 --- /dev/null +++ b/car-base-common/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${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-server/pom.xml b/car-base-server/pom.xml index f434546..f4257ee 100644 --- a/car-base-server/pom.xml +++ b/car-base-server/pom.xml @@ -59,6 +59,17 @@ com.mysql mysql-connector-j + + com.ruoyi + ruoyi-common-security + 3.6.3 + + + + com.baomidou + mybatis-plus-boot-starter + 3.4.2 + com.baomidou @@ -93,4 +104,4 @@ - \ No newline at end of file + diff --git a/car-base-server/src/main/java/com/god/base/server/GodCarBaseApplication.java b/car-base-server/src/main/java/com/god/base/server/GodCarBaseApplication.java index bcf1604..49d14d9 100644 --- a/car-base-server/src/main/java/com/god/base/server/GodCarBaseApplication.java +++ b/car-base-server/src/main/java/com/god/base/server/GodCarBaseApplication.java @@ -17,6 +17,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class GodCarBaseApplication { public static void main (String[] args) { - SpringApplication.run(com.god.base.server.GodCarBaseApplication .class, args); + SpringApplication.run(GodCarBaseApplication.class, args); } } diff --git a/car-base-server/src/main/java/com/god/base/server/controller/CarController.java b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java new file mode 100644 index 0000000..4f6fab7 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java @@ -0,0 +1,77 @@ +package com.god.base.server.controller; +import com.god.base.server.common.domain.Car; +import com.god.base.server.common.domain.request.CarRequest; +import com.god.base.server.service.CarService; +import com.ruoyi.common.core.domain.R; +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 java.util.List; + +/** + * 车辆管理 + */ +@RestController +@RequestMapping("/car") +@Log4j2 +public class CarController { + @Autowired + private CarService carService; + + + /** + * 车辆信息查看 + */ + @GetMapping("carList/{userId}") + public R carList(@PathVariable String userId){ + log.info("请求参数" + userId); + R> carList = carService.carList(userId); + log.info("响应参数" + carList); + return R.ok(carList); + } + + + /** + * 添加车辆 + */ + @PostMapping("/addCar") + public R addCarP(@RequestBody @Validated CarRequest carRequest){ + log.info("请求参数" + carRequest); + boolean save = carService.save(Car.addReqBuild(carRequest)); + log.info("响应参数" + save); + return R.ok(); + } + /** + * 修改车辆的连接 进行上报 + */ + @PostMapping("/updCar/{vinId}") + public R updCat(@PathVariable @Validated String vinId){ + log.info("请求参数" + vinId); + carService.updateById(vinId); + log.info("响应参数" + vinId); + return R.ok(); + } + + /** + * 逻辑删除 + */ + @PostMapping("/delCar/{vinId}") + public R delCar(@PathVariable String vinId){ + log.info("请求参数" + vinId); + boolean b = carService.removeById(vinId); + log.info("响应参数" + b); + return R.ok(); + } + + /** + * 实时轨迹 + */ + @PostMapping + public R sSgj(){ + return null; + } + + +} diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java new file mode 100644 index 0000000..70785fa --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java @@ -0,0 +1,19 @@ +package com.god.base.server.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.god.base.server.common.domain.Car; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * 车辆mapper + */ +@Mapper +public interface CarMapper extends BaseMapper { + + List getList(@Param("userId1") Long userId1); +} diff --git a/car-base-server/src/main/java/com/god/base/server/service/CarService.java b/car-base-server/src/main/java/com/god/base/server/service/CarService.java new file mode 100644 index 0000000..6e92a2a --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/service/CarService.java @@ -0,0 +1,21 @@ +package com.god.base.server.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.god.base.server.common.domain.Car; +import com.ruoyi.common.core.domain.R; +import org.apache.ibatis.annotations.Param; + + +import java.util.List; + +/** + * 车辆管理层 + */ +public interface CarService extends IService { + + + R> carList(@Param("userId") String userId); + + void updateById(@Param("vinId") String vinId); +} diff --git a/car-base-server/src/main/java/com/god/base/server/test/5.html b/car-base-server/src/main/java/com/god/base/server/test/5.html new file mode 100644 index 0000000..3d946d4 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/5.html @@ -0,0 +1,89 @@ + + + + + Title + + +开始搭建围栏 + +
+ + + + + centers: ["116.400274 , 39.9322"], +
+ + + + + + + diff --git a/car-base-server/src/main/java/com/god/base/server/test/Test.html b/car-base-server/src/main/java/com/god/base/server/test/Test.html new file mode 100644 index 0000000..b32a738 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/Test.html @@ -0,0 +1,30 @@ + + + + + + + + 地图显示 + + + +
+ + + + + diff --git a/car-base-server/src/main/java/com/god/base/server/test/Test2.html b/car-base-server/src/main/java/com/god/base/server/test/Test2.html new file mode 100644 index 0000000..473ee34 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/Test2.html @@ -0,0 +1,81 @@ + + + + + + + + 多边形的绘制和编辑 + + + + + +
+
+ + +
+ + + diff --git a/car-base-server/src/main/java/com/god/base/server/test/Test3.html b/car-base-server/src/main/java/com/god/base/server/test/Test3.html new file mode 100644 index 0000000..376e220 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/Test3.html @@ -0,0 +1,145 @@ + + + + + Title + + + + + +开始建围栏点击开始建立围栏后，围栏操作按钮才可见 + +
+ + + + + +
+ + + + diff --git a/car-base-server/src/main/java/com/god/base/server/test/Test4.html b/car-base-server/src/main/java/com/god/base/server/test/Test4.html new file mode 100644 index 0000000..22871dc --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/Test4.html @@ -0,0 +1,82 @@ + + + + + Title + + + + + + + + diff --git a/car-base-server/src/main/resources/bootstrap.yml b/car-base-server/src/main/resources/bootstrap.yml index 21efc42..df297f8 100644 --- a/car-base-server/src/main/resources/bootstrap.yml +++ b/car-base-server/src/main/resources/bootstrap.yml @@ -4,9 +4,11 @@ server: # Spring spring: +# main: +# allow-bean-definition-overriding: true application: # 应用名称 - name: god-car-base + name: god-car-management profiles: # 环境配置 active: dev diff --git a/car-base-server/src/main/resources/mapper/CarMapper.xml b/car-base-server/src/main/resources/mapper/CarMapper.xml new file mode 100644 index 0000000..761df06 --- /dev/null +++ b/car-base-server/src/main/resources/mapper/CarMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + From c1e8d944b236987d6b533157ffb76562871be010 Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Tue, 21 Nov 2023 20:45:26 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96=E7=99=BB=E5=BD=95=E4=BA=BA?= =?UTF-8?q?=E5=86=99=E6=AD=BB=E5=80=BC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/god/base/server/mapper/CarMapper.java | 2 +- car-base-server/src/main/resources/mapper/CarMapper.xml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java index 70785fa..e0df394 100644 --- a/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java +++ b/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java @@ -15,5 +15,5 @@ import java.util.List; @Mapper public interface CarMapper extends BaseMapper { - List getList(@Param("userId1") Long userId1); + List getList(int userId1); } diff --git a/car-base-server/src/main/resources/mapper/CarMapper.xml b/car-base-server/src/main/resources/mapper/CarMapper.xml index 761df06..2cb039a 100644 --- a/car-base-server/src/main/resources/mapper/CarMapper.xml +++ b/car-base-server/src/main/resources/mapper/CarMapper.xml @@ -9,12 +9,13 @@ FROM t_car JOIN t_car_type ON t_car.car_type_id = t_car_type.id - JOIN t_batterybox ON t_car.batterybox_id = t_batterybox.batterybox_id + JOIN t_battery_box ON t_car.battery_box_id = t_battery_box.battery_box_id JOIN t_cell ON t_car.cell_id = t_cell.cell_id - JOIN t_batterycell ON t_car.batterycell_id = t_batterycell.batterycell_id - JOIN t_batterypackinformation ON t_car.batterypackinformation_id = t_batterypackinformation.batterypackinformation_id + JOIN t_batterycell ON t_car.battery_cell_id = t_batterycell.batterycell_id + JOIN t_batterypackinformation ON t_car.battery_pack_information_id = t_batterypackinformation.batterypackinformation_id JOIN t_drive_motor ON t_car.drive_motor_id = t_drive_motor.drive_motor_id + From e01c0e66ddf49d0568c9339b550ed92cf0583b05 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 21:55:47 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E5=8F=82=E6=95=B04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/god/base/server/controller/FenceController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 658b743..670ddcd 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 @@ -78,7 +78,7 @@ public class FenceController { * @param fenceId * @return */ - @PostMapping("/deleteFence/{fenceId}") + @PostMapping("/deleteFence") public Result deleteFence(@RequestParam("fenceId") Integer fenceId){ log.info("功能介绍:通过围栏编号删除围栏,请求方式:{},请求路径:{},请求参数:{}", request.getMethod(), @@ -87,7 +87,6 @@ public class FenceController { //根据围栏编号删除围栏 fenceService.removeById(fenceId); - return Result.success(); } From f7e908d3e4f37966445cfd29fc97d33bd82d1826 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 21:58:50 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/god/base/common/domain/Fence.java | 2 +- .../god/base/server/common/domain/Fence.java | 43 ------------------- .../server/controller/FenceController.java | 1 + .../god/base/server/service/FenceService.java | 5 +++ .../server/service/impl/FenceServiceImpl.java | 5 +++ 5 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java 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 index da3935b..fa619b1 100644 --- 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 @@ -18,7 +18,7 @@ import java.util.Date; /** * 电子围栏信息 * - * @Author Lou-Zs + * @author Lou-Zs * @Date 2023/11/20 19:41 **/ @Data diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java b/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java deleted file mode 100644 index 20dd588..0000000 --- a/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.god.base.server.common.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 电子围栏 - */ -@NoArgsConstructor -@AllArgsConstructor -@Data -@Builder -@TableName("t_fence") -public class Fence { - /** - * 围栏id - */ - private String fenceId; - /** - * 围栏经纬度串（逗号拼接字符串） - */ - private String fenceAddress; - /** - * 标签编号 - */ - private String labelId; - /** - * 创建时间 - */ - private String createTime; - /** - * 修改时间 - */ - private String updateTime; - /** - * 创建者 - */ - private String createBy; - -} 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 670ddcd..cc72ef0 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 @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; /** * base围栏操作 + * @author Lou-Zs */ @RestController @RequestMapping("/baseFence") 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 1ef8060..9bb810a 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 @@ -12,6 +12,11 @@ import com.god.common.core.web.page.TableDataInfo; * @Version 1.0 * @Description TODO **/ + +/** + * 电子围栏 + * @author Lou-Zs + */ public interface FenceService extends IService { 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 3eb1113..9ae230a 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 @@ -23,6 +23,11 @@ import java.io.Serializable; * @Version 1.0 * @Description TODO **/ + +/** + * 电子围栏 + * @author Lou-Zs + */ @Service @Log4j2 public class FenceServiceImpl extends ServiceImpl implements FenceService { From 2ebe1810d580df4b8c91cc6c04bd2746a22f65e4 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 21:58:50 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96=E7=99=BB=E5=BD=95=E4=BA=BA?= =?UTF-8?q?=E5=86=99=E6=AD=BB=E5=80=BC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/CarServiceImpl.java | 46 ++++++++++++++++ .../main/java/com/god/base/server/test/5.html | 55 +++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java new file mode 100644 index 0000000..3f0f43f --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java @@ -0,0 +1,46 @@ +package com.god.base.server.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.god.base.server.common.domain.Car; +import com.god.base.server.mapper.CarMapper; +import com.god.base.server.service.CarService; +import com.ruoyi.common.core.domain.R; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.security.utils.SecurityUtils; + +import java.util.List; + +/** + * 车辆管理业务层 + */ +@Log4j2 +@Service +public class CarServiceImpl extends ServiceImpl implements CarService { + @Autowired + private CarMapper carMapper; + + @Override + public R> carList(String userId) { +// Long userId1 = SecurityUtils.getUserId(); +// if (null == userId1){ +// throw new SecurityException("请先登录"); +// } + int userId1 = 1; + List carList = carMapper.getList(userId1); + return R.ok(carList); + } + + + /** + * 修改车辆管理信息 + * @param vinId + */ + @Override + public void updateById(String vinId) { + + } + + +} diff --git a/car-base-server/src/main/java/com/god/base/server/test/5.html b/car-base-server/src/main/java/com/god/base/server/test/5.html index 3d946d4..27e7dea 100644 --- a/car-base-server/src/main/java/com/god/base/server/test/5.html +++ b/car-base-server/src/main/java/com/god/base/server/test/5.html @@ -81,9 +81,64 @@ } }; } + //多边形样式; + mouseTool.poltgon({ + strokeColor:"#1E9FFF", + strokeWeight:2, + strokeStyle:'dashed', + strokeOpacity:1, + fillOpacity:1, + fillColor:'#1E9FFF', + zIndex:50, + }); + //清除覆盖物 + document.getElementsByName('func'); + document.getElementById('clear').onclick=function ({ + map.remove(overlays) + overlays = []; + }) + + + + + +
+ + +
+ + From e707cc73d7d9e6abd919388a2b4e4ebcff9271e9 Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Tue, 21 Nov 2023 22:14:07 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/server/controller/CarController.java | 23 +-- .../god/base/server/service/CarService.java | 4 +- .../server/service/impl/CarServiceImpl.java | 6 +- .../main/java/com/god/base/server/test/5.html | 144 ------------------ 4 files changed, 17 insertions(+), 160 deletions(-) delete mode 100644 car-base-server/src/main/java/com/god/base/server/test/5.html diff --git a/car-base-server/src/main/java/com/god/base/server/controller/CarController.java b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java index 4f6fab7..7952079 100644 --- a/car-base-server/src/main/java/com/god/base/server/controller/CarController.java +++ b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java @@ -2,11 +2,12 @@ package com.god.base.server.controller; import com.god.base.server.common.domain.Car; import com.god.base.server.common.domain.request.CarRequest; import com.god.base.server.service.CarService; -import com.ruoyi.common.core.domain.R; + 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 com.god.common.core.domain.Result; import java.util.List; @@ -25,11 +26,11 @@ public class CarController { * 车辆信息查看 */ @GetMapping("carList/{userId}") - public R carList(@PathVariable String userId){ + public Result carList(@PathVariable String userId){ log.info("请求参数" + userId); - R> carList = carService.carList(userId); + Result> carList = carService.carList(userId); log.info("响应参数" + carList); - return R.ok(carList); + return Result.success(carList); } @@ -37,39 +38,39 @@ public class CarController { * 添加车辆 */ @PostMapping("/addCar") - public R addCarP(@RequestBody @Validated CarRequest carRequest){ + public Result addCarP(@RequestBody @Validated CarRequest carRequest){ log.info("请求参数" + carRequest); boolean save = carService.save(Car.addReqBuild(carRequest)); log.info("响应参数" + save); - return R.ok(); + return Result.success(); } /** * 修改车辆的连接 进行上报 */ @PostMapping("/updCar/{vinId}") - public R updCat(@PathVariable @Validated String vinId){ + public Result updCat(@PathVariable @Validated String vinId){ log.info("请求参数" + vinId); carService.updateById(vinId); log.info("响应参数" + vinId); - return R.ok(); + return Result.success(); } /** * 逻辑删除 */ @PostMapping("/delCar/{vinId}") - public R delCar(@PathVariable String vinId){ + public Result delCar(@PathVariable String vinId){ log.info("请求参数" + vinId); boolean b = carService.removeById(vinId); log.info("响应参数" + b); - return R.ok(); + return Result.success(); } /** * 实时轨迹 */ @PostMapping - public R sSgj(){ + public Result sSgj(){ return null; } diff --git a/car-base-server/src/main/java/com/god/base/server/service/CarService.java b/car-base-server/src/main/java/com/god/base/server/service/CarService.java index 6e92a2a..2fadcea 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/CarService.java +++ b/car-base-server/src/main/java/com/god/base/server/service/CarService.java @@ -3,7 +3,7 @@ package com.god.base.server.service; import com.baomidou.mybatisplus.extension.service.IService; import com.god.base.server.common.domain.Car; -import com.ruoyi.common.core.domain.R; +import com.god.common.core.domain.Result; import org.apache.ibatis.annotations.Param; @@ -15,7 +15,7 @@ import java.util.List; public interface CarService extends IService { - R> carList(@Param("userId") String userId); + Result> carList(@Param("userId") String userId); void updateById(@Param("vinId") String vinId); } diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java index 3f0f43f..bf93775 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.god.base.server.common.domain.Car; import com.god.base.server.mapper.CarMapper; import com.god.base.server.service.CarService; -import com.ruoyi.common.core.domain.R; +import com.god.common.core.domain.Result; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,14 +22,14 @@ public class CarServiceImpl extends ServiceImpl implements CarSer private CarMapper carMapper; @Override - public R> carList(String userId) { + public Result> carList(String userId) { // Long userId1 = SecurityUtils.getUserId(); // if (null == userId1){ // throw new SecurityException("请先登录"); // } int userId1 = 1; List carList = carMapper.getList(userId1); - return R.ok(carList); + return Result.success(carList); } diff --git a/car-base-server/src/main/java/com/god/base/server/test/5.html b/car-base-server/src/main/java/com/god/base/server/test/5.html deleted file mode 100644 index 27e7dea..0000000 --- a/car-base-server/src/main/java/com/god/base/server/test/5.html +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Title - - -开始搭建围栏 - -
- - - - - centers: ["116.400274 , 39.9322"], -
- - - - - - - - - - - - -
- - -
- - From e66aeff898fab5bfe3772d6385b27b283bb7a15f Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Tue, 21 Nov 2023 22:17:28 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/god/base/server/controller/CarController.java | 1 - .../src/main/java/com/god/base/server/service/CarService.java | 4 ---- .../java/com/god/base/server/service/impl/CarServiceImpl.java | 1 - 3 files changed, 6 deletions(-) diff --git a/car-base-server/src/main/java/com/god/base/server/controller/CarController.java b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java index 7952079..991d700 100644 --- a/car-base-server/src/main/java/com/god/base/server/controller/CarController.java +++ b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java @@ -2,7 +2,6 @@ package com.god.base.server.controller; import com.god.base.server.common.domain.Car; import com.god.base.server.common.domain.request.CarRequest; import com.god.base.server.service.CarService; - import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/car-base-server/src/main/java/com/god/base/server/service/CarService.java b/car-base-server/src/main/java/com/god/base/server/service/CarService.java index 2fadcea..506ed27 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/CarService.java +++ b/car-base-server/src/main/java/com/god/base/server/service/CarService.java @@ -1,12 +1,8 @@ package com.god.base.server.service; - - import com.baomidou.mybatisplus.extension.service.IService; import com.god.base.server.common.domain.Car; import com.god.common.core.domain.Result; import org.apache.ibatis.annotations.Param; - - import java.util.List; /** diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java index bf93775..811629a 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java @@ -1,5 +1,4 @@ package com.god.base.server.service.impl; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.god.base.server.common.domain.Car; import com.god.base.server.mapper.CarMapper; From d8e98b40c18afb6361555ed7c7d364371475a127 Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Tue, 21 Nov 2023 22:22:44 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9B=862?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/god/base/server/service/impl/CarServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java index 811629a..7aecd35 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java @@ -7,7 +7,6 @@ import com.god.common.core.domain.Result; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.security.utils.SecurityUtils; import java.util.List; From 9bb5a6e369a30d47c91e8329acf089eaeb3df90f Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Tue, 21 Nov 2023 22:29:15 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- car-base-server/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/car-base-server/pom.xml b/car-base-server/pom.xml index f4257ee..f6ab95e 100644 --- a/car-base-server/pom.xml +++ b/car-base-server/pom.xml @@ -59,9 +59,10 @@ com.mysql mysql-connector-j + - com.ruoyi - ruoyi-common-security + com.god + god-common-security 3.6.3 From 9bf0bd8fc6e955f0b95db9adb77aa3f16fd7f253 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 22:18:59 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/god/base/server/service/impl/CarServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java index 7aecd35..811629a 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java @@ -7,6 +7,7 @@ import com.god.common.core.domain.Result; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.ruoyi.common.security.utils.SecurityUtils; import java.util.List; From d661fa112b9921d4e0f06ae17c8fe44639e9fffb Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 22:19:03 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/god/base/server/controller/FenceController.java | 4 ++-- .../com/god/base/server/service/impl/FenceServiceImpl.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) 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 cc72ef0..581f60c 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 @@ -9,7 +9,7 @@ package com.god.base.server.controller; **/ import com.alibaba.fastjson.JSONObject; -import com.alibaba.nacos.api.model.v2.Result; + import com.god.base.common.domain.Fence; import com.god.base.common.domain.request.FenceAddRequest; import com.god.base.common.domain.request.FenceQueryRequest; @@ -19,7 +19,7 @@ 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 com.god.common.core.domain.Result; import javax.servlet.http.HttpServletRequest; /** * base围栏操作 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 9ae230a..326182a 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 @@ -11,7 +11,6 @@ import com.god.base.server.service.FenceService; 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.io.Serializable; From f1f9fc0ff1d264d6d1c8fa6b959ec133f2a671ee Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Tue, 21 Nov 2023 22:35:11 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/god/base/server/service/impl/CarServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java index 811629a..2bb4f19 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java @@ -7,8 +7,6 @@ import com.god.common.core.domain.Result; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.security.utils.SecurityUtils; - import java.util.List; /** From dafba115835cde8d1542f447cb81d13a10a26d80 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Wed, 22 Nov 2023 13:49:57 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- car-base-server/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/car-base-server/src/main/resources/bootstrap.yml b/car-base-server/src/main/resources/bootstrap.yml index df297f8..40c59f2 100644 --- a/car-base-server/src/main/resources/bootstrap.yml +++ b/car-base-server/src/main/resources/bootstrap.yml @@ -8,7 +8,7 @@ spring: # allow-bean-definition-overriding: true application: # 应用名称 - name: god-car-management + name: god-car-base profiles: # 环境配置 active: dev From 48b31c244f5d34af029ee706e16e68ddb10baea5 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Wed, 22 Nov 2023 20:10:46 +0800 Subject: [PATCH 18/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=AD=A3=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/god/base/server/service/impl/FenceServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 326182a..38b8549 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 @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.io.Serializable; +import java.util.Date; /** * @ClassName FenceServiceImpl @@ -50,7 +51,7 @@ public class FenceServiceImpl extends ServiceImpl implement } /** - * 根据围栏编号编辑围栏信息 + * 根据围栏编号删除围栏 * @param id * @return */ @@ -66,12 +67,13 @@ public class FenceServiceImpl extends ServiceImpl implement } /** - * 根据围栏编号删除围栏 + * 根据围栏编号编辑围栏信息 * @param entity * @return */ @Override public boolean updateById(Fence entity) { + entity.setUpdateTime(new Date()); boolean update = super.updateById(entity); if (!update){ log.warn("编辑围栏[/-{}-/]未成功! 请求参数:{}", From d16944575911838290237bcd7a59926b42f198c8 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 09:15:47 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/god/base/server/controller/FenceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 581f60c..69e9e25 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 @@ -79,7 +79,7 @@ public class FenceController { * @param fenceId * @return */ - @PostMapping("/deleteFence") + @GetMapping("/deleteFence") public Result deleteFence(@RequestParam("fenceId") Integer fenceId){ log.info("功能介绍:通过围栏编号删除围栏,请求方式:{},请求路径:{},请求参数:{}", request.getMethod(), From c575e1391d79f6f17a813e0e5a943799544aa1b9 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 14:21:51 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/god/base/server/service/impl/FenceServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 38b8549..bfa3e97 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 @@ -108,7 +108,10 @@ public class FenceServiceImpl extends ServiceImpl implement //精确查询 lambdaQueryWrapper.eq(Fence::getDriveStatus,fenceQueryRequest.getDriveStatus()); } - Page page = this.page(fenceQueryRequest.buildPage(), lambdaQueryWrapper); + //分页 + Page fencePage = fenceQueryRequest.buildPage(); + log.info("分页查询:[ {} ]", JSONObject.toJSONString(fencePage)); + Page page = this.page(fencePage, lambdaQueryWrapper); return TableDataInfo.builder() .rows(page.getRecords()) .total(page.getTotal()) From d60978fda77812cbc21be8d1a0b690b2edeb40b8 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 14:48:54 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/MyBatisPlusPageHelperConfig.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 car-base-server/src/main/java/com/god/base/server/util/MyBatisPlusPageHelperConfig.java diff --git a/car-base-server/src/main/java/com/god/base/server/util/MyBatisPlusPageHelperConfig.java b/car-base-server/src/main/java/com/god/base/server/util/MyBatisPlusPageHelperConfig.java new file mode 100644 index 0000000..e50bce9 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/util/MyBatisPlusPageHelperConfig.java @@ -0,0 +1,25 @@ +package com.god.base.server.util; + +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * mybatis-plus 分页配置类 + * @author 孙帅比 + */ +@Configuration +@MapperScan("com.god.base.server.mapper") //mapper持久层所在位置 +public class MyBatisPlusPageHelperConfig { + + + /** + * 项目启动创建分页插件实例 + * @return + */ + @Bean + public PaginationInterceptor paginationInterceptor(){ + return new PaginationInterceptor(); + } +} From ca91f1eacd966ce80a53aa233153dd8317d34823 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 22:13:18 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E5=B0=86=E4=BF=AE=E6=94=B9=E7=9A=84?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E5=9D=90=E6=A0=87=E5=AD=98=E5=82=A8redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/server/service/impl/FenceServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 bfa3e97..bb694f0 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 @@ -9,8 +9,10 @@ import com.god.base.common.domain.request.FenceQueryRequest; import com.god.base.server.mapper.FenceMapper; import com.god.base.server.service.FenceService; import com.god.common.core.web.page.TableDataInfo; +import com.god.common.redis.service.RedisService; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.Serializable; @@ -32,6 +34,9 @@ import java.util.Date; @Log4j2 public class FenceServiceImpl extends ServiceImpl implements FenceService { + //redis + @Autowired + private RedisService redisService; /** * 增添电子围栏 @@ -74,6 +79,12 @@ public class FenceServiceImpl extends ServiceImpl implement @Override public boolean updateById(Fence entity) { entity.setUpdateTime(new Date()); + //获取当前围栏坐标 + String fenceLocation = entity.getFenceLocation(); + //将围栏坐标存储到redis中 + //key 围栏编号 + //value 围栏坐标信息 + redisService.setCacheObject(entity.getFenceId()+"",fenceLocation); boolean update = super.updateById(entity); if (!update){ log.warn("编辑围栏[/-{}-/]未成功! 请求参数:{}", From 408645b006a6312bbfd5720af8f695b62cfd9f2c Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Fri, 24 Nov 2023 09:14:47 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../god/base/server/service/impl/FenceServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 bb694f0..d8a6603 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 @@ -34,9 +34,9 @@ import java.util.Date; @Log4j2 public class FenceServiceImpl extends ServiceImpl implements FenceService { - //redis - @Autowired - private RedisService redisService; +// //redis +// @Autowired +// private RedisService redisService; /** * 增添电子围栏 @@ -80,11 +80,11 @@ public class FenceServiceImpl extends ServiceImpl implement public boolean updateById(Fence entity) { entity.setUpdateTime(new Date()); //获取当前围栏坐标 - String fenceLocation = entity.getFenceLocation(); +// String fenceLocation = entity.getFenceLocation(); //将围栏坐标存储到redis中 //key 围栏编号 //value 围栏坐标信息 - redisService.setCacheObject(entity.getFenceId()+"",fenceLocation); +// redisService.setCacheObject(entity.getFenceId()+"",fenceLocation); boolean update = super.updateById(entity); if (!update){ log.warn("编辑围栏[/-{}-/]未成功! 请求参数:{}", From 40a7b21d3263600ea3b9aa6a054a2078f3d71e2b Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Fri, 24 Nov 2023 09:25:35 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0redis=20=E5=9B=B4?= =?UTF-8?q?=E6=A0=8F=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/FenceServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 d8a6603..801e450 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 @@ -34,9 +34,9 @@ import java.util.Date; @Log4j2 public class FenceServiceImpl extends ServiceImpl implements FenceService { -// //redis -// @Autowired -// private RedisService redisService; + //redis + @Autowired + private RedisService redisService; /** * 增添电子围栏 @@ -79,12 +79,12 @@ public class FenceServiceImpl extends ServiceImpl implement @Override public boolean updateById(Fence entity) { entity.setUpdateTime(new Date()); - //获取当前围栏坐标 -// String fenceLocation = entity.getFenceLocation(); - //将围栏坐标存储到redis中 - //key 围栏编号 - //value 围栏坐标信息 -// redisService.setCacheObject(entity.getFenceId()+"",fenceLocation); +// 获取当前围栏坐标 + String fenceLocation = entity.getFenceLocation(); +// 将围栏坐标存储到redis中 +// key 围栏编号 +// value 围栏坐标信息 + redisService.setCacheObject(entity.getFenceId()+"",fenceLocation); boolean update = super.updateById(entity); if (!update){ log.warn("编辑围栏[/-{}-/]未成功! 请求参数:{}",