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 50f2341..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,5 +1,6 @@ package com.muyu.common.cache; + /** * 主键基础 * * @className: PrimaryKeyBasic ️✈️ diff --git a/cloud-common/cloud-common-saas/pom.xml b/cloud-common/cloud-common-saas/pom.xml index 60b4041..d2df2c4 100644 --- a/cloud-common/cloud-common-saas/pom.xml +++ b/cloud-common/cloud-common-saas/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - cloud-common + cloud-modules-enterprise 3.6.3 - cloud-common-saas + enterprise-cache 17 @@ -18,16 +18,22 @@ - com.muyu - cloud-common-datasource + enterpise-common + ${muyu.version} - com.muyu - cloud-common-security + cloud-common-cache + ${muyu.version} + + + com.muyu + cloud-modules-vehicle-gateway + ${muyu.version} + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml deleted file mode 100644 index 534a1a4..0000000 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules-enterprise - 3.6.3 - - - enterpise-cache - - - 17 - 17 - UTF-8 - - - - - - com.muyu - cloud-common-cache - ${muyu.version} - - - - com.muyu - enterpise-common - - - - diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/VehicleCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/VehicleCacheService.java deleted file mode 100644 index 441186f..0000000 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/VehicleCacheService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.enterpise.cache; - -import com.muyu.common.cache.CacheAbsBasic; -import com.muyu.domain.CarInformation; - -/** - * 车辆缓存服务 - * @className: VehicleCacheService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/30 00:36 ⏰ - * @Version: 1.0 - * @description: - */ -public class VehicleCacheService extends CacheAbsBasic { - - @Override - public String keyPre() { - return "vehicle:info:"; - } - - @Override - public String decode(String key){ - return key.replace("vehicle:info:",""); - } - - -} - diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3257b72..0000000 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.muyu.enterpise.cache.MessageValueCacheService -com.muyu.enterpise.cache.SysCarCacheService diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java index c2d8093..7103dbc 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java @@ -88,7 +88,6 @@ public class SysCar extends BaseEntity{ .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) .toString(); } } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml index d9fd4f6..e94a784 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml @@ -21,6 +21,7 @@ com.muyu enterpise-common + ${muyu.version} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index 09f2df8..9901086 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -22,6 +22,7 @@ com.muyu enterpise-common + ${muyu.version} @@ -92,7 +93,7 @@ com.muyu - enterpise-cache + enterprise-cache ${muyu.version} 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 740df8f..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 @@ -2,6 +2,7 @@ package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.req.CarFenceAdd; + import com.muyu.enterpise.service.CarFenceServiceMybaits; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -39,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/controller/SysTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java index a0a883c..e45a73f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java @@ -4,7 +4,6 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.domain.SysCarType; -import com.muyu.enterpise.cache.SysCarCacheService; import com.muyu.enterpise.cache.SysCarTypeCacheService; import com.muyu.enterpise.service.SysTypeService; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java index abd13a3..65a1fc8 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java @@ -15,5 +15,5 @@ import java.util.List; @Mapper public interface SysCarMapper extends BaseMapper{ - List selectSysCarList(SysCar sysCar); +// List selectSysCarList(SysCar sysCar); } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java index 8ca2562..fd6a542 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java @@ -19,6 +19,6 @@ import java.util.List; */ public interface SysTypeMapper extends BaseMapper { - List selectSysList(); +// List selectSysList(); } 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 7f5f644..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,11 +1,13 @@ package com.muyu.enterpise.service.impl; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.CarAndGroupMiddle; 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.enterpise.mapper.CarFenceServiceMybaitsMapper; import com.muyu.enterpise.service.CarFenceServiceMybaits; import lombok.extern.log4j.Log4j2; @@ -17,19 +19,21 @@ import java.util.List; /** * 围栏组服务实现类 - * * @Author：yan - * * @Package：com.muyu.car.service.impl - * * @Project：plues - * * @name：CarFenceServiceMybaitsImpl - * * @Date：2024/9/22 19:24 + * * @Author：yan + * * @Package：com.muyu.car.service.impl + * * @Project：plues + * * @name：CarFenceServiceMybaitsImpl + * * @Date：2024/9/22 19:24 */ @Service @Log4j2 -public class CarFenceServiceMybaitsImpl extends ServiceImpl implements CarFenceServiceMybaits { +public class CarFenceServiceMybaitsImpl extends ServiceImpl implements CarFenceServiceMybaits { @Autowired private CarFenceServiceMybaitsMapper carFenceServiceMybaitsMapper; + + /** * 添加多对多围栏组 * @@ -49,26 +53,8 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl selectBoundGFenceGroup(Integer carId) { /*根据id查询围栏组的id*/ - List list = carFenceServiceMybaitsMapper.selectBoundGFenceGroup(carId); + List list = carFenceServiceMybaitsMapper.selectBoundGFenceGroup(carId); ArrayList fenceGroups = new ArrayList<>(); /*循环*/ @@ -113,4 +101,6 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); Assert.notNull(id, "id不可为空"); queryWrapper.eq(SysCar::getId, id); - - return this.getOne(queryWrapper); } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java index e2f8728..be9475d 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java @@ -30,7 +30,7 @@ public class SysTypeServiceImpl */ @Override public List selectSysTypeList() { - return sysTypeMapper.selectSysList(); + return this.list(); } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java b/cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java b/cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java diff --git a/cloud-modules/cloud-modules-parse/pom.xml b/cloud-modules/cloud-modules-parse/pom.xml index 45f2124..91a2e59 100644 --- a/cloud-modules/cloud-modules-parse/pom.xml +++ b/cloud-modules/cloud-modules-parse/pom.xml @@ -99,11 +99,12 @@ com.muyu enterpise-common + ${muyu.version} com.muyu - enterpise-cache + enterprise-cache ${muyu.version} diff --git a/pom.xml b/pom.xml index 7646f74..879e258 100644 --- a/pom.xml +++ b/pom.xml @@ -283,11 +283,11 @@ ${muyu.version} - - com.muyu - enterpise-common - ${muyu.version} - + + + + +