From b8e3b4dcd19fd6ad750ae0b0000c5ca738bdc891 Mon Sep 17 00:00:00 2001 From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com> Date: Sun, 31 Mar 2024 10:21:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 2 - .../common/core/web/domain/BaseEntity.java | 1 - .../src/main/resources/bootstrap.yml | 2 - .../common/domain/request/FenceConfig.java | 3 +- .../domain/request/FenceUpdateRequest.java | 10 +++++ .../server/controller/FenceController.java | 4 +- .../map/server/mapper/FenceMapper.java | 10 +++++ .../server/service/impl/FenceServiceImpl.java | 18 +-------- .../main/resources/mapper/map/FenceMapper.xml | 38 +++++++++++++++++-- .../src/main/resources/bootstrap.yml | 2 - 10 files changed, 60 insertions(+), 30 deletions(-) diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index b80d812..3853815 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java index 27c4858..aeab7c5 100644 --- a/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java +++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java @@ -58,7 +58,6 @@ public class BaseEntity implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; - @TableField(exist = false) /** * 备注 */ diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index acd4642..091e68a 100644 --- a/couplet-gateway/src/main/resources/bootstrap.yml +++ b/couplet-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java index 95d484c..0c26d46 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java @@ -20,7 +20,8 @@ public class FenceConfig { /** * 围栏状态 */ - private Integer fenceState; + private Integer pageNum=1; + private Integer pageSize=3; } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceUpdateRequest.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceUpdateRequest.java index fe0e862..5c39c70 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceUpdateRequest.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceUpdateRequest.java @@ -1,6 +1,7 @@ package com.couplet.map.common.domain.request; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -47,11 +48,13 @@ public class FenceUpdateRequest { * 更新时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; /** * 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; /** @@ -67,4 +70,11 @@ public class FenceUpdateRequest { */ private Integer alarmStatus; + public Integer getIsDelete() { + return isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java index 80ac254..b752861 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java @@ -80,12 +80,12 @@ public class FenceController extends BaseController { * @param fenceId * @return */ - @DeleteMapping("/{fenceDelete}") + @DeleteMapping("/{fenceId}") @RequiresPermissions("couplet:fence:fenceDelete") @Log(title = "电子围栏删除",businessType = BusinessType.DELETE) public Result fenceDelete(@PathVariable Long fenceId){ boolean b = fenceService.removeById(fenceId); - fenceService.removeByFenceId(fenceId); +// fenceService.removeByFenceId(fenceId); return toAjax(b); } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java index a0802e6..579d56c 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java @@ -2,10 +2,13 @@ package com.couplet.map.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.couplet.map.common.domain.Fence; +import com.couplet.map.common.domain.request.FenceConfig; import com.couplet.map.common.domain.request.FenceRequest; import com.couplet.map.common.domain.request.FenceUpdateRequest; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @Author: LiJiaYao * @Date: 2024/3/28 @@ -22,4 +25,11 @@ public interface FenceMapper extends BaseMapper { void removeByFenceId(Long fenceId); + /** + * 分页查询 + * @param fenceConfig + * @return + */ + List pageQuery(FenceConfig fenceConfig); + } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java index c227cd3..159dd44 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java @@ -43,22 +43,8 @@ public class FenceServiceImpl extends ServiceImpl implements @Override public List pageQuery(FenceConfig fenceConfig) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - /** - * 模糊查询电子围栏名称 - */ - if (StringUtils.isNotEmpty(fenceConfig.getFenceName())){ - - queryWrapper.like(Fence::getFenceName,fenceConfig.getFenceName()); - } - /** - * 查询标识类型 - */ - if (fenceConfig.getFenceState()!=null){ - queryWrapper.like(Fence::getFenceState,fenceConfig.getFenceState()); - } - return this.list(queryWrapper); + List list= fenceMapper.pageQuery(fenceConfig); + return list; } @Override diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml index 80738a2..71257ab 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml @@ -19,14 +19,32 @@ + + SELECT + fence_id, + fence_name, + fence_longitude_latitude, + fence_description, + is_delete, + fence_state, + create_time, + update_time, + create_name, + maintainer_name, + alarm_status, + l.logo_id, + logo_name + FROM couplet_fence_info f INNER JOIN couplet_fences_and_logo m on + f.fence_id=m.fences_id INNER JOIN couplet_logo_info l on l.logo_id=m.logo_id GROUP BY fence_id + INSERT INTO `couplet-cloud`.`couplet_fence_info` - (`fence_name`, `fence_longitude_latitude`, `fence_description`, `is_delete`, `fence_state`, `create_time`, + (`fence_name`, `fence_description`, `is_delete`, `fence_state`, `create_time`, `create_name`, `maintainer_name`, `alarm_status`) VALUES - (#{fenceName}, #{fenceLongitudeLatitude}, #{fenceDescription}, 0, 0, now(), #{createTime}, + (#{fenceName}, #{fenceDescription}, 0, 0, now(), #{createTime}, #{createName}, 0); @@ -38,7 +56,7 @@ SET `fence_name` = #{fenceName}, `fence_longitude_latitude` = #{fenceLongitudeLatitude}, `fence_description` = #{fenceDescription}, - `is_delete` = #{isdelete}, + `is_delete` = #{isDelete}, `fence_state` = #{fenceState}, `update_time` = now(), `maintainer_name` = 'admin', @@ -47,6 +65,18 @@ - delete from t_fence where fence_id = #{fenceId} + delete from couplet_fence_info where fence_id = #{fenceId} + diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index 859221a..d9315bd 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置