From bfb3b98684c51b970eeeccfe2ac85df6e88253f4 Mon Sep 17 00:00:00 2001 From: ruyaxie <648179520@qq.comgit> Date: Fri, 4 Oct 2024 21:00:36 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98Redi?= =?UTF-8?q?s-four?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-cache/pom.xml | 1 + .../muyu/common/cache/PrimaryKeyBasic.java | 1 - .../controller/MiddleController.java | 20 +++---------------- .../service/CarFenceServiceMybaits.java | 11 +--------- .../impl/CarFenceServiceMybaitsImpl.java | 10 +++++----- .../enterprise-cache/pom.xml | 7 ++++--- 6 files changed, 14 insertions(+), 36 deletions(-) diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml index 39ddb01..09d679b 100644 --- a/cloud-common/cloud-common-cache/pom.xml +++ b/cloud-common/cloud-common-cache/pom.xml @@ -30,6 +30,7 @@ com.muyu enterpise-common + ${muyu.version} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java index 8c85947..0cc8f95 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java @@ -1,6 +1,5 @@ package com.muyu.common.cache; -import org.jetbrains.annotations.NotNull; /** * 主键基础 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java index 2eaa3cd..32ff409 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java @@ -1,11 +1,9 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.domain.FenceGroup; import com.muyu.domain.req.CarFenceAdd; -import com.muyu.domain.req.FenceGroupUpdateReq; -import com.muyu.service.CarFenceServiceMybaits; -import com.muyu.service.MiddleService; + +import com.muyu.enterpise.service.CarFenceServiceMybaits; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -42,18 +40,6 @@ public class MiddleController { return i?Result.success("添加成功"):Result.error("失败"); } - /** - * 修改围栏状态 - * @param groupId - * @return - */ - @GetMapping("/updateFenceGroupById") - @Operation(summary = "修改围栏状态",description = "修改围栏状态") - public Result updateFenceGroupById(@RequestParam("groupId") Integer groupId){ - carFenceServiceMybaits.updateFenceGroupById(groupId); - - return Result.success(); - } /** diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java index 7076018..71e9166 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java @@ -29,18 +29,9 @@ public interface CarFenceServiceMybaits extends IService { boolean saveBatch(List carFences, Integer fenceGroupId); - /** - * 修改围栏状态 - * @param groupId - * @return - */ - Object updateFenceGroupById(Integer groupId); - /** - * 启动围栏 - */ - Object activate(Integer groupId); + /** * 根据围栏组的id查询绑定的围栏的中间表 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java index 533555f..6c80d95 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java @@ -1,15 +1,15 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; + -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.CarFence; import com.muyu.domain.CarMiddle; import com.muyu.domain.CarAndGroupMiddle; import com.muyu.domain.FenceGroup; import com.muyu.domain.req.CarFenceAdd; -import com.muyu.mapper.CarFenceServiceMybaitsMapper; -import com.muyu.service.CarFenceServiceMybaits; + +import com.muyu.enterpise.mapper.CarFenceServiceMybaitsMapper; +import com.muyu.enterpise.service.CarFenceServiceMybaits; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml index b710426..d2df2c4 100644 --- a/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml @@ -21,18 +21,19 @@ com.muyu enterpise-common + ${muyu.version} com.muyu cloud-common-cache - 3.6.3 + ${muyu.version} com.muyu cloud-modules-vehicle-gateway - 3.6.3 - compile + ${muyu.version} +