wuzudaniu
/
cloud-plus-server
6
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	cloud-common/cloud-common-saas/pom.xml
#	cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java
#	cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/VehicleCacheService.java
dev.gateway
王鑫 2024-10-07 14:07:19 +08:00
parent 536c40a8e2 bfb3b98684
commit dfdcbdbd86
23 changed files with 47 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cloud-common/cloud-common-cache/pom.xml
View File

@ -30,6 +30,7 @@
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
</dependencies>

1
cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java vendored
View File

@ -1,5 +1,6 @@
package com.muyu.common.cache;
/**
* 主键基础
* * @className: PrimaryKeyBasic ️✈️

18
cloud-common/cloud-common-saas/pom.xml
View File

@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.muyu</groupId>
<artifactId>cloud-common</artifactId>
<artifactId>cloud-modules-enterprise</artifactId>
<version>3.6.3</version>
</parent>
<artifactId>cloud-common-saas</artifactId>
<artifactId>enterprise-cache</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
@ -18,16 +18,22 @@
</properties>
<dependencies>
<!-- 多数据源依赖 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datasource</artifactId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- 鉴权依赖 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-security</artifactId>
<artifactId>cloud-common-cache</artifactId>
<version>${muyu.version}</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-vehicle-gateway</artifactId>
<version>${muyu.version}</version>
</dependency>
</dependencies>

34
cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-enterprise</artifactId>
<version>3.6.3</version>
</parent>
<artifactId>enterpise-cache</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-cache</artifactId>
<version>${muyu.version}</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
</dependency>
</dependencies>
</project>

28
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/VehicleCacheService.java vendored
View File

@ -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<String, CarInformation> {
@Override
public String keyPre() {
return "vehicle:info:";
}
@Override
public String decode(String key){
return key.replace("vehicle:info:","");
}
}

2
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -1,2 +0,0 @@
com.muyu.enterpise.cache.MessageValueCacheService
com.muyu.enterpise.cache.SysCarCacheService

1
cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java
View File

@ -88,7 +88,6 @@ public class SysCar extends BaseEntity{
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

1
cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml
View File

@ -21,6 +21,7 @@
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
</dependencies>
</project>

3
cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
View File

@ -22,6 +22,7 @@
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- SpringCloud Alibaba Nacos -->
@ -92,7 +93,7 @@
<!-- cache缓存框架 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-cache</artifactId>
<artifactId>enterprise-cache</artifactId>
<version>${muyu.version}</version>
</dependency>

13
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java
View File

@ -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();
}
/**

1
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java
View File

@ -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;

2
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java
View File

@ -15,5 +15,5 @@ import java.util.List;
@Mapper
public interface SysCarMapper extends BaseMapper<SysCar>{
List<SysCarResp> selectSysCarList(SysCar sysCar);
// List<SysCarResp> selectSysCarList(SysCar sysCar);
}

2
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java
View File

@ -19,6 +19,6 @@ import java.util.List;
*/
public interface SysTypeMapper extends BaseMapper<SysCarType> {
List<SysCarType> selectSysList();
// List<SysCarType> selectSysList();
}

11
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java
View File

@ -29,18 +29,9 @@ public interface CarFenceServiceMybaits extends IService<CarMiddle> {
boolean saveBatch(List<CarFenceAdd> carFences, Integer fenceGroupId);
/**
* 修改围栏状态
* @param groupId
* @return
*/
Object updateFenceGroupById(Integer groupId);
/**
* 启动围栏
*/
Object activate(Integer groupId);
/**
* 根据围栏组的id查询绑定的围栏的中间表

32
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java
View File

@ -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;
@ -30,6 +32,8 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl<CarFenceServiceMybai
private CarFenceServiceMybaitsMapper carFenceServiceMybaitsMapper;
/**
* 添加多对多围栏组
*
@ -49,26 +53,8 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl<CarFenceServiceMybai
return b;
}
/**
* 修改围栏状态
* @param groupId
* @return
*/
@Override
public Object updateFenceGroupById(Integer groupId) {
return null;
}
/**
* 启动围栏
*
* @param groupId
* @return
*/
@Override
public Object activate(Integer groupId) {
return null;
}
/**
@ -89,9 +75,11 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl<CarFenceServiceMybai
}
/**
* 获取绑定的围栏组
*
* @param carId
*/
@Override
@ -113,4 +101,6 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl<CarFenceServiceMybai
}
}

1
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java
View File

@ -10,7 +10,6 @@ import com.muyu.domain.resp.MessageValueListResp;
import com.muyu.enterpise.cache.MessageValueCacheService;
import com.muyu.enterpise.mapper.MessageValueMapper;
import com.muyu.enterpise.service.MessageValueService;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

2
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java
View File

@ -40,8 +40,6 @@ public class SysCarServiceImpl
LambdaQueryWrapper<SysCar> queryWrapper = new LambdaQueryWrapper<>();
Assert.notNull(id, "id不可为空");
queryWrapper.eq(SysCar::getId, id);
return this.getOne(queryWrapper);
}

2
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java
View File

@ -30,7 +30,7 @@ public class SysTypeServiceImpl
*/
@Override
public List<SysCarType> selectSysTypeList() {
return sysTypeMapper.selectSysList();
return this.list();
}

0
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java → cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java vendored
View File

0
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java → cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java vendored
View File

0
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java → cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java vendored
View File

3
cloud-modules/cloud-modules-parse/pom.xml
View File

@ -99,11 +99,12 @@
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- 缓存框架 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-cache</artifactId>
<artifactId>enterprise-cache</artifactId>
<version>${muyu.version}</version>
</dependency>

10
pom.xml
View File

@ -283,11 +283,11 @@
<version>${muyu.version}</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.muyu</groupId>-->
<!-- <artifactId>enterpise-common</artifactId>-->
<!-- <version>${muyu.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.muyu</groupId>-->