From 9df04a6af28aa1b16dcb1ad8637f6ef12f71201a Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Tue, 26 Mar 2024 22:37:57 +0800 Subject: [PATCH 01/13] aa --- .../couplet-modules-vehicle/pom.xml | 114 ++++++++++++++++++ .../vehicle/LyhVehicleApplication.java | 23 ++++ .../controller/LyhVehicleController.java | 59 +++++++++ .../couplet/vehicle/domain/LyhVehicle.java | 84 +++++++++++++ .../domain/req/LyhVehicleListParams.java | 33 +++++ .../vehicle/mapper/LyhVehicleMapper.java | 17 +++ .../vehicle/service/LyhVehicleService.java | 20 +++ .../service/impl/LyhVehicleServiceImpl.java | 86 +++++++++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 30 +++++ .../src/main/resources/logback.xml | 74 ++++++++++++ .../mapper/vehicle/LyhVehicleMapper.xml | 8 ++ couplet-modules/pom.xml | 1 + 13 files changed, 551 insertions(+) create mode 100644 couplet-modules/couplet-modules-vehicle/pom.xml create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/LyhVehicle.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/resources/banner.txt create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/resources/logback.xml create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml diff --git a/couplet-modules/couplet-modules-vehicle/pom.xml b/couplet-modules/couplet-modules-vehicle/pom.xml new file mode 100644 index 0000000..d7be645 --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/pom.xml @@ -0,0 +1,114 @@ + + + + com.couplet + couplet-modules + 3.6.3 + + 4.0.0 + + couplet-modules-vehicle + + + + + + + + + couplet-modules-vehicle车辆管理模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.couplet + couplet-common-datasource + + + + + com.couplet + couplet-common-datascope + + + + + com.couplet + couplet-common-log + + + + + com.couplet + couplet-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java new file mode 100644 index 0000000..19937ef --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java @@ -0,0 +1,23 @@ +package com.couplet.vehicle; + +import com.couplet.common.security.annotation.EnableCustomConfig; +import com.couplet.common.security.annotation.EnableMyFeignClients; +import com.couplet.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @ProjectName: Default (Template) Project + * @Author: LiuYunHu + * @CreateTime: 2024/3/26 + * @Description: + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class LyhVehicleApplication { + public static void main(String[] args) { + SpringApplication.run(LyhVehicleApplication.class, args); + } +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java new file mode 100644 index 0000000..73b0e9c --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java @@ -0,0 +1,59 @@ +package com.couplet.vehicle.controller; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.controller.BaseController; +import com.couplet.common.log.annotation.Log; +import com.couplet.common.log.enums.BusinessType; +import com.couplet.vehicle.domain.LyhVehicle; +import com.couplet.vehicle.domain.req.LyhVehicleListParams; +import com.couplet.vehicle.service.LyhVehicleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/26 + * @Description: + */ +@RestController +@RequestMapping("/vehicle") +public class LyhVehicleController extends BaseController { + @Autowired + private LyhVehicleService lyhVehicleService; + + /* + * @Author: LiuYunHu + * @Date: 2024/3/26 21:39 + * @Description: 查询车辆列表 + * @Param: [listParams] + * @Return: com.couplet.common.core.domain.Result + **/ + @PostMapping("/list") + @Log(title = "车辆列表") + public Result list(@RequestBody LyhVehicleListParams listParams) { + + List List = lyhVehicleService.list(listParams); + + return Result.success(List); + } + + /* + * @Author: LiuYunHu + * @Date: 2024/3/26 22:35 + * @Description: 通过id删除车辆 + * @Param: [vehicleId] + * @Return: com.couplet.common.core.domain.Result + **/ + @GetMapping("/deleteById/{vehicleId}") + @Log(title = "删除车辆", businessType = BusinessType.DELETE) + public Result deleteById(@PathVariable Long vehicleId) { + String result = lyhVehicleService.deleteById(vehicleId); + + return Result.success(result); + } + + +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/LyhVehicle.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/LyhVehicle.java new file mode 100644 index 0000000..bec3f15 --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/LyhVehicle.java @@ -0,0 +1,84 @@ +package com.couplet.vehicle.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.couplet.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/26 + * @Description: 车辆信息表 + */ + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName("lyh_vehicle") +public class LyhVehicle { + + /* + *车辆id + * */ + @TableId(type = IdType.AUTO, value = "vehicle_id") + private Long vehicleId; + + /* + *车辆类型 + * */ + @TableField(value = "vehicle_type") + private Integer vehicleType; + + + /* + *电机厂商 + * */ + @TableField(value = "motor_manufacturer") + private String motorManufacturer; + + /* + *电池厂商 + * */ + @TableField(value = "battery_manufacturer") + private String batteryManufacturer; + + /* + *电机编号 + * */ + @TableField(value = "motor_number") + private String motorNumber; + + /* + *电池编号 + * */ + @TableField(value = "battery_number") + private String batteryNumber; + + /* + *vin码 + * */ + @TableField(value = "vin") + private String vin; + + /* + *0离线 1在线 + * */ + @TableField(value = "vehicle_state") + private Integer vehicleState; + + /* + *0未删除 1删除 + * */ + @TableField(value = "isdelete") + private Integer isdelete; + + +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java new file mode 100644 index 0000000..767ccde --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java @@ -0,0 +1,33 @@ +package com.couplet.vehicle.domain.req; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.couplet.common.core.web.domain.BaseEntity; +import io.swagger.models.auth.In; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/26 + * @Description: 查询车辆列表入参 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class LyhVehicleListParams { + /* + *车辆类型 + * */ + private Integer vehicleType; + + /* + *0离线 1在线 + * */ + private Integer vehicleState; + +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java new file mode 100644 index 0000000..2d2d712 --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java @@ -0,0 +1,17 @@ +package com.couplet.vehicle.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.couplet.vehicle.domain.LyhVehicle; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/26 + * @Description: + */ +@Mapper +@Component +public interface LyhVehicleMapper extends BaseMapper { +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java new file mode 100644 index 0000000..e92fd4a --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java @@ -0,0 +1,20 @@ +package com.couplet.vehicle.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.couplet.vehicle.domain.LyhVehicle; +import com.couplet.vehicle.domain.req.LyhVehicleListParams; + +import java.util.List; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/26 + * @Description: + */ + +public interface LyhVehicleService extends IService { + List list(LyhVehicleListParams listParams); + + String deleteById(Long vehicleId); +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java new file mode 100644 index 0000000..c824e79 --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java @@ -0,0 +1,86 @@ +package com.couplet.vehicle.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.couplet.common.core.utils.StringUtils; +import com.couplet.vehicle.domain.LyhVehicle; +import com.couplet.vehicle.domain.req.LyhVehicleListParams; +import com.couplet.vehicle.mapper.LyhVehicleMapper; +import com.couplet.vehicle.service.LyhVehicleService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/26 + * @Description: + */ + +@Service +@Slf4j +public class LyhVehicleServiceImpl extends ServiceImpl implements LyhVehicleService { + @Autowired + private LyhVehicleMapper lyhVehicleMapper; + + /* + * @Author: LiuYunHu + * @Date: 2024/3/26 22:11 + * @Description: 查询列表 + * @Param: [listParams] + * @Return: java.util.List + **/ + @Override + public List list(LyhVehicleListParams listParams) { + // 创建查询条件包装器 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + // 如果车辆类型不为空，添加车辆类型作为查询条件 + if (!StringUtils.isNull(listParams.getVehicleType())) { + queryWrapper.eq(LyhVehicle::getVehicleType, listParams.getVehicleType()); + } + + // 如果车辆状态不为空，添加车辆状态作为查询条件 + if (!StringUtils.isNull(listParams.getVehicleState())) { + queryWrapper.eq(LyhVehicle::getVehicleState, listParams.getVehicleState()); + } + + //只查询车辆未被删除的 + queryWrapper.eq(LyhVehicle::getIsdelete, 0); + + // 执行查询并返回结果 + return this.list(queryWrapper); + } + + /* + * @Author: LiuYunHu + * @Date: 2024/3/26 22:31 + * @Description: 通过id删除 + * @Param: [vehicleId] + * @Return: java.lang.String + **/ + @Override + public String deleteById(Long vehicleId) { + String result = ""; + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + + updateWrapper.set("isdelete", 1) + .eq("vehicle_id", vehicleId); + + boolean update = update(updateWrapper); + + if (!update) { + result = "删除失败"; + throw new RuntimeException(result); + } + + result = "删除成功！"; + + return result; + } +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/resources/banner.txt b/couplet-modules/couplet-modules-vehicle/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..b30719a --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 9615 + +# Spring +spring: + application: + # 应用名称 + name: couplet-vehicle + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 121.89.211.230:8848 + namespace: 172469 + config: + # 配置中心地址 + server-addr: 121.89.211.230:8848 + namespace: 172469 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.couplet.system.mapper: DEBUG diff --git a/couplet-modules/couplet-modules-vehicle/src/main/resources/logback.xml b/couplet-modules/couplet-modules-vehicle/src/main/resources/logback.xml new file mode 100644 index 0000000..4940ee0 --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/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/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml b/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml new file mode 100644 index 0000000..99ffce9 --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 5d1cb7d..e0b68b2 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,6 +13,7 @@ couplet-gen couplet-job couplet-file + couplet-modules-vehicle couplet-modules From 39c764922c6e362ae260a69e4b8f317af131d969 Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Wed, 27 Mar 2024 16:58:14 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=BD=95=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E6=88=90vin=E7=A0=81=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=94=A8=E4=BA=8E=E6=A8=A1=E6=8B=9F=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=92=8C=E9=AA=8C=E8=AF=81=E8=BD=A6=E8=BE=86=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couplet-modules-vehicle/pom.xml | 10 +-- .../controller/LyhVehicleController.java | 33 ++++++++ .../couplet/vehicle/domain/LyhVehicle.java | 2 - .../domain/req/LyhVehicleEditParams.java | 51 ++++++++++++ .../domain/req/LyhVehicleInsertParams.java | 55 +++++++++++++ .../domain/req/LyhVehicleListParams.java | 4 - .../vehicle/service/LyhVehicleService.java | 6 ++ .../service/impl/LyhVehicleServiceImpl.java | 76 ++++++++++++++++++ .../vehicle/utils/SnowflakeIdGenerator.java | 79 +++++++++++++++++++ .../src/test/java/IdTest.java | 20 +++++ 10 files changed, 325 insertions(+), 11 deletions(-) create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/utils/SnowflakeIdGenerator.java create mode 100644 couplet-modules/couplet-modules-vehicle/src/test/java/IdTest.java diff --git a/couplet-modules/couplet-modules-vehicle/pom.xml b/couplet-modules/couplet-modules-vehicle/pom.xml index d7be645..bd06244 100644 --- a/couplet-modules/couplet-modules-vehicle/pom.xml +++ b/couplet-modules/couplet-modules-vehicle/pom.xml @@ -11,11 +11,11 @@ couplet-modules-vehicle - - - - - + + + + + couplet-modules-vehicle车辆管理模块 diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java index 73b0e9c..f7900b8 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java @@ -5,6 +5,8 @@ import com.couplet.common.core.web.controller.BaseController; import com.couplet.common.log.annotation.Log; import com.couplet.common.log.enums.BusinessType; import com.couplet.vehicle.domain.LyhVehicle; +import com.couplet.vehicle.domain.req.LyhVehicleEditParams; +import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; import com.couplet.vehicle.domain.req.LyhVehicleListParams; import com.couplet.vehicle.service.LyhVehicleService; import org.springframework.beans.factory.annotation.Autowired; @@ -56,4 +58,35 @@ public class LyhVehicleController extends BaseController { } + /* + * @Author: LiuYunHu + * @Date: 2024/3/27 16:09 + * @Description: 编辑车辆 + * @Param: [editParams] + * @Return: com.couplet.common.core.domain.Result + **/ + @PostMapping("/editById") + @Log(title = "编辑车辆", businessType = BusinessType.UPDATE) + public Result editById(@RequestBody LyhVehicleEditParams editParams) { + + String result = lyhVehicleService.editById(editParams); + + return Result.success(result); + } + + /* + * @Author: LiuYunHu + * @Date: 2024/3/27 16:21 + * @Description: 新增车辆 + * @Param: [insertParams] + * @Return: com.couplet.common.core.domain.Result + **/ + @PostMapping("/insert") + @Log(title = "新增车辆", businessType = BusinessType.INSERT) + public Result insert(@RequestBody LyhVehicleInsertParams insertParams) { + + String result = lyhVehicleService.insert(insertParams); + + return Result.success(result); + } } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/LyhVehicle.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/LyhVehicle.java index bec3f15..26058ed 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/LyhVehicle.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/LyhVehicle.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.couplet.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java new file mode 100644 index 0000000..7a99349 --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java @@ -0,0 +1,51 @@ +package com.couplet.vehicle.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/27 + * @Description: 车辆编辑入参 + */ + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class LyhVehicleEditParams { + /* + *车辆id + * */ + private Long vehicleId; + + /* + *车辆类型 + * */ + private Integer vehicleType; + + + /* + *电机厂商 + * */ + private String motorManufacturer; + + /* + *电池厂商 + * */ + private String batteryManufacturer; + + /* + *电机编号 + * */ + private String motorNumber; + + /* + *电池编号 + * */ + private String batteryNumber; + +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java new file mode 100644 index 0000000..587a1fd --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java @@ -0,0 +1,55 @@ +package com.couplet.vehicle.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/27 + * @Description: 车辆编辑入参 + */ + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class LyhVehicleInsertParams { + + /* + *车辆类型 + * */ + @NotNull(message = "车辆类型不能为空") + private Integer vehicleType; + + + /* + *电机厂商 + * */ + @NotBlank(message = "电机厂商不能为空") + private String motorManufacturer; + + /* + *电池厂商 + * */ + @NotBlank(message = "电池厂商不能为空") + private String batteryManufacturer; + + /* + *电机编号 + * */ + @NotBlank(message = "电机编号不能为空") + private String motorNumber; + + /* + *电池编号 + * */ + @NotBlank(message = "电池编号不能为空") + private String batteryNumber; + +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java index 767ccde..382e5b6 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java @@ -1,11 +1,7 @@ package com.couplet.vehicle.domain.req; -import com.baomidou.mybatisplus.annotation.TableField; -import com.couplet.common.core.web.domain.BaseEntity; -import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java index e92fd4a..b230bd6 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java @@ -2,6 +2,8 @@ package com.couplet.vehicle.service; import com.baomidou.mybatisplus.extension.service.IService; import com.couplet.vehicle.domain.LyhVehicle; +import com.couplet.vehicle.domain.req.LyhVehicleEditParams; +import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; import com.couplet.vehicle.domain.req.LyhVehicleListParams; import java.util.List; @@ -17,4 +19,8 @@ public interface LyhVehicleService extends IService { List list(LyhVehicleListParams listParams); String deleteById(Long vehicleId); + + String editById(LyhVehicleEditParams editParams); + + String insert(LyhVehicleInsertParams insertParams); } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java index c824e79..14953f9 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java @@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.couplet.common.core.utils.StringUtils; import com.couplet.vehicle.domain.LyhVehicle; +import com.couplet.vehicle.domain.req.LyhVehicleEditParams; +import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; import com.couplet.vehicle.domain.req.LyhVehicleListParams; import com.couplet.vehicle.mapper.LyhVehicleMapper; import com.couplet.vehicle.service.LyhVehicleService; +import com.couplet.vehicle.utils.SnowflakeIdGenerator; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -83,4 +86,77 @@ public class LyhVehicleServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); + + //编辑车辆类型 + + updateWrapper.set("vehicle_type", editParams.getVehicleType()) + + //编辑电机厂商 + .set("motor_manufacturer", editParams.getMotorManufacturer()) + + //编辑电池厂商 + .set("battery_manufacturer", editParams.getBatteryManufacturer()) + + //编辑电机编号 + .set("motor_number", editParams.getMotorNumber()) + + //编辑电池编号 + .set("battery_number", editParams.getBatteryNumber()) + + //匹配车辆id + .eq("vehicle_id", editParams.getVehicleId()); + + + boolean update = update(updateWrapper); + + if (!update) { + result = "编辑失败"; + throw new RuntimeException(result); + } + + result = "编辑成功！"; + + return result; + } + + /* + * @Author: LiuYunHu + * @Date: 2024/3/27 16:34 + * @Description: 新增车辆 + * @Param: [insertParams] + * @Return: java.lang.String + **/ + @Override + public String insert(LyhVehicleInsertParams insertParams) { + String result = ""; + + SnowflakeIdGenerator idGenerator = new SnowflakeIdGenerator(1, 1); + long randomId = idGenerator.nextId(); + String vin = "VIN" + randomId; + + int insert = lyhVehicleMapper.insert(new LyhVehicle(null, insertParams.getVehicleType(), insertParams.getMotorManufacturer(), insertParams.getBatteryManufacturer(), insertParams.getMotorNumber(), insertParams.getBatteryNumber(), vin, 0, 0)); + + if (insert == 0) { + result = "新增失败"; + throw new RuntimeException(result); + } + + result = "新增成功！"; + + return result; + } + } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/utils/SnowflakeIdGenerator.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/utils/SnowflakeIdGenerator.java new file mode 100644 index 0000000..3f6132c --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/utils/SnowflakeIdGenerator.java @@ -0,0 +1,79 @@ +package com.couplet.vehicle.utils; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/27 + * @Description: 雪花ID生成器 + * 使用方法 + * SnowflakeIdGenerator idGenerator = new SnowflakeIdGenerator(1, 1); // 创建一个 ID 生成器，传入机器 ID 和数据中心 ID + * long id = idGenerator.nextId(); // 生成 ID + */ + +public class SnowflakeIdGenerator { + + private final long epoch = 1420041600000L; // 起始时间戳，用于缩小时间戳范围，可根据实际情况调整 + private final long workerIdBits = 5L; // 机器 ID 所占位数 + private final long dataCenterIdBits = 5L; // 数据中心 ID 所占位数 + private final long sequenceBits = 12L; // 序列号所占位数 + + private final long maxWorkerId = -1L ^ (-1L << workerIdBits); // 机器 ID 最大值 + private final long maxDataCenterId = -1L ^ (-1L << dataCenterIdBits); // 数据中心 ID 最大值 + private final long maxSequence = -1L ^ (-1L << sequenceBits); // 序列号最大值 + + private final long workerIdShift = sequenceBits; // 机器 ID 向左移动位数 + private final long dataCenterIdShift = sequenceBits + workerIdBits; // 数据中心 ID 向左移动位数 + private final long timestampShift = sequenceBits + workerIdBits + dataCenterIdBits; // 时间戳向左移动位数 + + private long workerId; // 机器 ID + private long dataCenterId; // 数据中心 ID + private long sequence = 0L; // 序列号 + private long lastTimestamp = -1L; // 上次生成的时间戳 + + public SnowflakeIdGenerator(long workerId, long dataCenterId) { + if (workerId > maxWorkerId || workerId < 0) { + throw new IllegalArgumentException("Worker ID can't be greater than " + maxWorkerId + " or less than 0"); + } + if (dataCenterId > maxDataCenterId || dataCenterId < 0) { + throw new IllegalArgumentException("Data center ID can't be greater than " + maxDataCenterId + " or less than 0"); + } + this.workerId = workerId; + this.dataCenterId = dataCenterId; + } + + public synchronized long nextId() { + long timestamp = timeGen(); + + if (timestamp < lastTimestamp) { + throw new RuntimeException("Clock moved backwards, refusing to generate ID"); + } + + if (timestamp == lastTimestamp) { + sequence = (sequence + 1) & maxSequence; + if (sequence == 0) { + timestamp = tilNextMillis(lastTimestamp); + } + } else { + sequence = 0L; + } + + lastTimestamp = timestamp; + + return ((timestamp - epoch) << timestampShift) | + (dataCenterId << dataCenterIdShift) | + (workerId << workerIdShift) | + sequence; + } + + private long tilNextMillis(long lastTimestamp) { + long timestamp = timeGen(); + while (timestamp <= lastTimestamp) { + timestamp = timeGen(); + } + return timestamp; + } + + private long timeGen() { + return System.currentTimeMillis(); + } +} diff --git a/couplet-modules/couplet-modules-vehicle/src/test/java/IdTest.java b/couplet-modules/couplet-modules-vehicle/src/test/java/IdTest.java new file mode 100644 index 0000000..8a754b4 --- /dev/null +++ b/couplet-modules/couplet-modules-vehicle/src/test/java/IdTest.java @@ -0,0 +1,20 @@ +import com.couplet.vehicle.utils.SnowflakeIdGenerator; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/27 + * @Description: + */ + +public class IdTest { + + + public static void main(String[] args) { + SnowflakeIdGenerator idGenerator = new SnowflakeIdGenerator(1, 1); + + long l = idGenerator.nextId(); + System.out.println(l); + + } +} From 3c1d76b417569159376f7b0f6ccbbbf408d0358f Mon Sep 17 00:00:00 2001 From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com> Date: Thu, 28 Mar 2024 00:44:25 +0800 Subject: [PATCH 03/13] =?UTF-8?q?style:=20=E7=94=B5=E5=AD=90=E5=9B=B4?= =?UTF-8?q?=E6=A0=8F=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couplet-electronic-fence-common/pom.xml | 29 +++++ .../com/couplet/map/common/domin/Fence.java | 71 +++++++++++ .../couplet-electronic-fence-remote/pom.xml | 29 +++++ .../couplet-electronic-fence-server/pom.xml | 116 ++++++++++++++++++ .../CoupletElectronicFenceApplication.java | 22 ++++ .../couplet-electronic-fence/pom.xml | 20 +++ pom.xml | 20 +++ 7 files changed, 307 insertions(+) create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/Fence.java create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/pom.xml create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/CoupletElectronicFenceApplication.java create mode 100644 couplet-modules/couplet-electronic-fence/pom.xml diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml new file mode 100644 index 0000000..2a75152 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.couplet + couplet-electronic-fence + 3.6.3 + + + couplet-electronic-fence-common + + + 17 + 17 + UTF-8 + + + + + + com.couplet + couplet-common-core + + + + + diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/Fence.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/Fence.java new file mode 100644 index 0000000..28b9007 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/Fence.java @@ -0,0 +1,71 @@ +package com.couplet.map.common.domin; + +import com.couplet.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Author: LiJiaYao + * @Date: 2024/3/28 + */ +@Data +@SuperBuilder +public class Fence extends BaseEntity { + + /** + * 围栏id + */ + private Long fenceId; + /** + * 围栏名称 + */ + private String fenceName; + /** + * 围栏经纬度 + */ + private String fenceLongitudeLatitude; + /** + * 围栏描述 + */ + private String fenceDescription; + /** + * 是否删除 + */ + private Integer isDelete; + /** + * 围栏状态 + */ + private Integer fenceState; + /** + * 创建时间 + */ + @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; + + /** + * 创建人 + */ + private String createName; + /** + * 维护人 + */ + + private String maintainerName; + /** + * 告警状态 + */ + + private Integer alarmStatus; + +} diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/pom.xml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/pom.xml new file mode 100644 index 0000000..b8bb402 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.couplet + couplet-electronic-fence + 3.6.3 + + + couplet-electronic-fence-remote + + + 17 + 17 + UTF-8 + + + + + + com.couplet + couplet-electronic-fence-common + + + + + diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml new file mode 100644 index 0000000..7808595 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml @@ -0,0 +1,116 @@ + + + 4.0.0 + + com.couplet + couplet-electronic-fence + 3.6.3 + + + couplet-electronic-fence-server + + + 17 + 17 + UTF-8 + + + + + com.couplet + couplet-electronic-fence-common + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.couplet + couplet-common-datasource + + + + + com.couplet + couplet-common-datascope + + + + + com.couplet + couplet-common-log + + + + + com.couplet + couplet-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/CoupletElectronicFenceApplication.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/CoupletElectronicFenceApplication.java new file mode 100644 index 0000000..2f3466e --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/CoupletElectronicFenceApplication.java @@ -0,0 +1,22 @@ +package com.couplet.map.server; + +import com.couplet.common.security.annotation.EnableCustomConfig; +import com.couplet.common.security.annotation.EnableMyFeignClients; +import com.couplet.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author couplet + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class CoupletElectronicFenceApplication { + public static void main (String[] args) { + SpringApplication.run(CoupletElectronicFenceApplication.class, args); + } +} diff --git a/couplet-modules/couplet-electronic-fence/pom.xml b/couplet-modules/couplet-electronic-fence/pom.xml new file mode 100644 index 0000000..daefea4 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.couplet + couplet-modules + 3.6.3 + + + couplet-electronic-fence + + + 17 + 17 + UTF-8 + + + diff --git a/pom.xml b/pom.xml index 196caab..3142536 100644 --- a/pom.xml +++ b/pom.xml @@ -211,6 +211,26 @@ couplet-modules-system ${couplet.version} + + com.couplet + couplet-trouble + ${couplet.version} + + + com.couplet + couplet-electronic-fence-server + ${couplet.version} + + + com.couplet + couplet-electronic-fence-common + ${couplet.version} + + + com.couplet + couplet-electronic-fence-remote + ${couplet.version} + From 759ad1ee6f2ea72ab23a5673a77651340bf48751 Mon Sep 17 00:00:00 2001 From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com> Date: Thu, 28 Mar 2024 00:57:48 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=8A=A0=E6=B2=B9=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couplet-electronic-fence-common/pom.xml | 5 +++++ couplet-modules/couplet-electronic-fence/pom.xml | 10 ++++++++++ couplet-modules/pom.xml | 1 + 3 files changed, 16 insertions(+) diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml index 2a75152..d1ab065 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml @@ -9,8 +9,13 @@ 3.6.3 + couplet-electronic-fence-common + + couplet-electronic-fence-common + + 17 17 diff --git a/couplet-modules/couplet-electronic-fence/pom.xml b/couplet-modules/couplet-electronic-fence/pom.xml index daefea4..baf57f6 100644 --- a/couplet-modules/couplet-electronic-fence/pom.xml +++ b/couplet-modules/couplet-electronic-fence/pom.xml @@ -9,8 +9,18 @@ 3.6.3 + pom + + + couplet-electronic-fence + + couplet-electronic-fence-server + couplet-electronic-fence-common + couplet-electronic-fence-remote + + 17 17 diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index f5823f2..6b3c03b 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -14,6 +14,7 @@ couplet-job couplet-file couplet-trouble + couplet-electronic-fence couplet-modules-vehicle From f9356bd0b74d1e1e1a2863b608f1b3c17037c7d6 Mon Sep 17 00:00:00 2001 From: ffr <492210217@qq.com> Date: Thu, 28 Mar 2024 17:00:41 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../pom.xml | 30 ++++++ .../pom.xml | 34 +++++++ .../com/couplet/remote/DeptServiceFegin.java | 36 ++++++++ .../factory/RemoteDeptFallbackFactory.java | 35 +++++++ .../pom.xml | 92 +++++++++++++++++++ .../couplet/server/CoupleManagementApp.java | 28 ++++++ .../server/controller/ManageController.java | 24 +++++ .../couplet/server/service/ManageServer.java | 9 ++ .../service/impl/ManageServiceImpl.java | 23 +++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 30 ++++++ .../src/main/resources/logback.xml | 74 +++++++++++++++ .../couplet-enterprisemanagement/pom.xml | 26 ++++++ .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../system/controller/SysDeptController.java | 3 - .../service/impl/SysUserServiceImpl.java | 2 + .../src/main/resources/bootstrap.yml | 2 + couplet-modules/pom.xml | 2 + .../src/main/resources/bootstrap.yml | 2 + pom.xml | 6 ++ 24 files changed, 467 insertions(+), 3 deletions(-) create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml create mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml create mode 100644 couplet-modules/couplet-enterprisemanagement/pom.xml diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 2942ec3..c9f22f8 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ 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-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index 307a581..9707804 100644 --- a/couplet-gateway/src/main/resources/bootstrap.yml +++ b/couplet-gateway/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ 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-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml new file mode 100644 index 0000000..e34dd5a --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-common + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-common-core + + + com.couplet + couplet-common-system + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml new file mode 100644 index 0000000..c9c52a9 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-remote + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-enterprisemanagement-common + + + com.couplet + couplet-common-security + + + com.couplet + couplet-common-security + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java new file mode 100644 index 0000000..08d8a37 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java @@ -0,0 +1,36 @@ +package com.couplet.remote; + +import com.couplet.common.core.constant.ServiceNameConstants; +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.security.annotation.RequiresPermissions; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.domain.SysUser; +import com.couplet.remote.factory.RemoteDeptFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + + +@FeignClient(contextId = "remoteFileService" , value = ServiceNameConstants.SYSTEM_SERVICE,fallbackFactory = RemoteDeptFallbackFactory.class) +public interface DeptServiceFegin { + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + @RequiresPermissions("system:dept:list") + @GetMapping("/list") + public Result list (SysDept dept); + /* + * @param user: + * @return Result> + * @author 付凡芮 + * @description TODO + * @date + * 用户信息集合 + */ + @RequiresPermissions("system:user:list") + @GetMapping("/list") + public Result> list (SysUser user); +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java new file mode 100644 index 0000000..816a3c7 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java @@ -0,0 +1,35 @@ +package com.couplet.remote.factory; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.domain.SysUser; +import com.couplet.remote.DeptServiceFegin; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.openfeign.FallbackFactory; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:29 + */ +@Slf4j + +public class RemoteDeptFallbackFactory implements FallbackFactory { + @Override + public DeptServiceFegin create(Throwable cause) { + log.error("sys服务调用失败:{}", cause.getMessage()); + return new DeptServiceFegin() { + @Override + public Result list(SysDept dept) { + return Result.error("调用失败..."+cause.getMessage()); + } + + @Override + public Result> list(SysUser user) { + return Result.error("调用失败..."+cause.getMessage()); + } + }; + } +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml new file mode 100644 index 0000000..a6c658e --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml @@ -0,0 +1,92 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-server + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-enterprisemanagement-common + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.couplet + couplet-common-datasource + + + + + com.couplet + couplet-common-datascope + + + + + com.couplet + couplet-common-log + + + + + com.couplet + couplet-common-swagger + + + com.couplet + couplet-enterprisemanagement-remote + + + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java new file mode 100644 index 0000000..ae96763 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java @@ -0,0 +1,28 @@ +package com.couplet.server; + +import com.couplet.common.security.annotation.EnableCustomConfig; +import com.couplet.common.security.annotation.EnableMyFeignClients; +import com.couplet.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author fufanrui + * 启动类 + * @version 1.0 + * @description: TODO + * @date 2024/3/27 14:04 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class CoupleManagementApp { + + public static void main(String[] args) { + + SpringApplication.run(CoupleManagementApp.class, args); + + + } +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java new file mode 100644 index 0000000..d51e9b6 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java @@ -0,0 +1,24 @@ +package com.couplet.server.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:33 + */ +@RestController +@RequestMapping("/manage") +public class ManageController { + + + + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java new file mode 100644 index 0000000..3728604 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java @@ -0,0 +1,9 @@ +package com.couplet.server.service; + +import com.couplet.remote.DeptServiceFegin; +import org.springframework.beans.factory.annotation.Autowired; + +public interface ManageServer { + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java new file mode 100644 index 0000000..51df9a0 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java @@ -0,0 +1,23 @@ +package com.couplet.server.service.impl; + +import com.couplet.remote.DeptServiceFegin; +import com.couplet.server.service.ManageServer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:34 + */ +@Service +public class ManageServiceImpl implements ManageServer { + + + + + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..285745c --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 9222 + +# Spring +spring: + application: + # 应用名称 + name: couplet-enterprisemanagement + profiles: + # 环境配置 + active: dev + cloud: + nacos: + 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 + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.couplet.system.mapper: DEBUG diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml new file mode 100644 index 0000000..4940ee0 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/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/couplet-modules/couplet-enterprisemanagement/pom.xml b/couplet-modules/couplet-enterprisemanagement/pom.xml new file mode 100644 index 0000000..8a9e031 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.couplet + couplet-modules + 3.6.3 + + + couplet-enterprisemanagement + pom + + couplet-enterprisemanagement-common + couplet-enterprisemanagement-server + couplet-enterprisemanagement-remote + + + + 17 + 17 + UTF-8 + + + diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index fa968e9..8681657 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ 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-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index df7344c..c041c96 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ 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-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index 49763a2..c7dbdbe 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ 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-system/src/main/java/com/couplet/system/controller/SysDeptController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java index da7f6c0..b486bd4 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java @@ -14,12 +14,9 @@ import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import java.util.List; - /** * 部门信息 - * * @author couplet */ @RestController diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java index f0463f6..4683c96 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java @@ -61,6 +61,8 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @DataScope(deptAlias = "d", userAlias = "u") public List selectUserList (SysUser user) { + Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + user.setDeptId(deptId); return userMapper.selectUserList(user); } diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index 16f0206..0c29b0b 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ 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/pom.xml b/couplet-modules/pom.xml index 5d1cb7d..6bec145 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,6 +13,8 @@ couplet-gen couplet-job couplet-file + couplet-enterprisemanagement + couplet-enterprisemanagement couplet-modules diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index ff11d05..d08106c 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ 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/pom.xml b/pom.xml index 61b166e..5a689a7 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,12 @@ ${couplet.version} + + com.couplet + couplet-enterprisemanagement-common + ${couplet.version} + + From 0e4c1d3cba521a7b0e28d4ea0c611ee6e0f97481 Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Thu, 28 Mar 2024 17:05:14 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-modules/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 6bec145..5d1cb7d 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,8 +13,6 @@ couplet-gen couplet-job couplet-file - couplet-enterprisemanagement - couplet-enterprisemanagement couplet-modules From 8f9cf1a6c679142dfe8eccc52bd03cb12dd9a011 Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Thu, 28 Mar 2024 17:07:51 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couplet-enterprisemanagement-server/pom.xml | 1 + couplet-modules/pom.xml | 1 + pom.xml | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml index a6c658e..f83a132 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml @@ -81,6 +81,7 @@ com.couplet couplet-common-swagger + com.couplet couplet-enterprisemanagement-remote diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 5d1cb7d..7e6ddf2 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,6 +13,7 @@ couplet-gen couplet-job couplet-file + couplet-enterprisemanagement couplet-modules diff --git a/pom.xml b/pom.xml index 5a689a7..2e596a9 100644 --- a/pom.xml +++ b/pom.xml @@ -206,12 +206,20 @@ ${couplet.version} + com.couplet couplet-enterprisemanagement-common ${couplet.version} + + + com.couplet + couplet-enterprisemanagement-remote + ${couplet.version} + + From 847e150cbcb27f86e413bb666cc0a39f4a42a2ac Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Thu, 28 Mar 2024 17:31:30 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E4=BC=AA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/utils/SecurityUtils.java | 10 +++ .../common/system/domain/LoginUser.java | 82 +++---------------- .../system/remote/RemoteDeptService.java | 36 ++++++++ .../factory/RemoteDeptFallbackFactory.java | 20 +++-- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../com/couplet/remote/DeptServiceFegin.java | 36 -------- .../pom.xml | 5 -- .../couplet/server/CoupleManagementApp.java | 3 +- .../service/impl/ManageServiceImpl.java | 17 +++- .../system/controller/SysDeptController.java | 11 +++ .../system/controller/SysUserController.java | 3 + .../system/service/SysDeptService.java | 14 ++++ .../service/impl/SysDeptServiceImpl.java | 30 +++++++ 13 files changed, 144 insertions(+), 124 deletions(-) create mode 100644 couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java rename {couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet => couplet-common/couplet-common-system/src/main/java/com/couplet/common/system}/remote/factory/RemoteDeptFallbackFactory.java (61%) delete mode 100644 couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java diff --git a/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java index 4daf3da..27f67ea 100644 --- a/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java +++ b/couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java @@ -7,6 +7,7 @@ import com.couplet.common.core.utils.ServletUtils; import com.couplet.common.core.utils.StringUtils; import com.couplet.common.system.domain.LoginUser; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.util.Assert; import javax.servlet.http.HttpServletRequest; @@ -44,6 +45,15 @@ public class SecurityUtils { return SecurityContextHolder.get(SecurityConstants.LOGIN_USER, LoginUser.class); } + /** + * 获取登录企业ID + */ + public static Long getEnterpriseId(){ + Long enterpriseId = getLoginUser().getEnterpriseId(); + Assert.notNull(enterpriseId, "该用户未绑定负责企业"); + return enterpriseId; + } + /** * 获取请求token */ diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java index 1edfd94..338dcb9 100644 --- a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/LoginUser.java @@ -1,6 +1,8 @@ package com.couplet.common.system.domain; +import lombok.*; + import java.io.Serializable; import java.util.Set; @@ -9,6 +11,10 @@ import java.util.Set; * * @author couplet */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; @@ -52,80 +58,14 @@ public class LoginUser implements Serializable { */ private Set roles; + /** + * 企业ID + */ + private Long enterpriseId; + /** * 用户信息 */ private SysUser sysUser; - public String getToken () { - return token; - } - - public void setToken (String token) { - this.token = token; - } - - public Long getUserid () { - return userid; - } - - public void setUserid (Long userid) { - this.userid = userid; - } - - public String getUsername () { - return username; - } - - public void setUsername (String username) { - this.username = username; - } - - public Long getLoginTime () { - return loginTime; - } - - public void setLoginTime (Long loginTime) { - this.loginTime = loginTime; - } - - public Long getExpireTime () { - return expireTime; - } - - public void setExpireTime (Long expireTime) { - this.expireTime = expireTime; - } - - public String getIpaddr () { - return ipaddr; - } - - public void setIpaddr (String ipaddr) { - this.ipaddr = ipaddr; - } - - public Set getPermissions () { - return permissions; - } - - public void setPermissions (Set permissions) { - this.permissions = permissions; - } - - public Set getRoles () { - return roles; - } - - public void setRoles (Set roles) { - this.roles = roles; - } - - public SysUser getSysUser () { - return sysUser; - } - - public void setSysUser (SysUser sysUser) { - this.sysUser = sysUser; - } } diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java new file mode 100644 index 0000000..a05dd4f --- /dev/null +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteDeptService.java @@ -0,0 +1,36 @@ +package com.couplet.common.system.remote; + +import com.couplet.common.core.constant.ServiceNameConstants; +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.domain.SysUser; +import com.couplet.common.system.remote.factory.RemoteDeptFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + + +@FeignClient(contextId = "remoteFileService" , + value = ServiceNameConstants.SYSTEM_SERVICE, + fallbackFactory = RemoteDeptFallbackFactory.class, + path = "/dept" +) +public interface RemoteDeptService { + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + @GetMapping("/list") + public Result list (SysDept dept); + + /** + * 根据企业ID获取企业下部门 + * @param enterpriseId 企业ID + * @return 企业信息，内含有部门 + */ + @GetMapping("/getSysDeptByEnterpriseId/{enterpriseId}") + public Result getSysDeptByEnterpriseId(@PathVariable(value = "enterpriseId") Long enterpriseId); +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java similarity index 61% rename from couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java rename to couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java index 816a3c7..24ef720 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteDeptFallbackFactory.java @@ -1,10 +1,10 @@ -package com.couplet.remote.factory; +package com.couplet.common.system.remote.factory; import com.couplet.common.core.domain.Result; import com.couplet.common.core.web.page.TableDataInfo; import com.couplet.common.system.domain.SysDept; import com.couplet.common.system.domain.SysUser; -import com.couplet.remote.DeptServiceFegin; +import com.couplet.common.system.remote.RemoteDeptService; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FallbackFactory; @@ -16,20 +16,28 @@ import org.springframework.cloud.openfeign.FallbackFactory; */ @Slf4j -public class RemoteDeptFallbackFactory implements FallbackFactory { +public class RemoteDeptFallbackFactory implements FallbackFactory { @Override - public DeptServiceFegin create(Throwable cause) { + public RemoteDeptService create(Throwable cause) { log.error("sys服务调用失败:{}", cause.getMessage()); - return new DeptServiceFegin() { + return new RemoteDeptService() { @Override public Result list(SysDept dept) { return Result.error("调用失败..."+cause.getMessage()); } + /** + * 根据企业ID获取企业下部门 + * + * @param enterpriseId 企业ID + * + * @return 企业信息，内含有部门 + */ @Override - public Result> list(SysUser user) { + public Result getSysDeptByEnterpriseId (Long enterpriseId) { return Result.error("调用失败..."+cause.getMessage()); } + }; } } diff --git a/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index fe7c0f3..a990272 100644 --- a/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,4 @@ com.couplet.common.system.remote.factory.RemoteUserFallbackFactory com.couplet.common.system.remote.factory.RemoteLogFallbackFactory com.couplet.common.system.remote.factory.RemoteFileFallbackFactory +com.couplet.common.system.remote.factory.RemoteDeptFallbackFactory diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java deleted file mode 100644 index 08d8a37..0000000 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.couplet.remote; - -import com.couplet.common.core.constant.ServiceNameConstants; -import com.couplet.common.core.domain.Result; -import com.couplet.common.core.web.page.TableDataInfo; -import com.couplet.common.security.annotation.RequiresPermissions; -import com.couplet.common.system.domain.SysDept; -import com.couplet.common.system.domain.SysUser; -import com.couplet.remote.factory.RemoteDeptFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - - -@FeignClient(contextId = "remoteFileService" , value = ServiceNameConstants.SYSTEM_SERVICE,fallbackFactory = RemoteDeptFallbackFactory.class) -public interface DeptServiceFegin { - /** - * 查询部门管理数据 - * - * @param dept 部门信息 - * @return 部门信息集合 - */ - @RequiresPermissions("system:dept:list") - @GetMapping("/list") - public Result list (SysDept dept); - /* - * @param user: - * @return Result> - * @author 付凡芮 - * @description TODO - * @date - * 用户信息集合 - */ - @RequiresPermissions("system:user:list") - @GetMapping("/list") - public Result> list (SysUser user); -} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml index f83a132..523c572 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml @@ -82,11 +82,6 @@ couplet-common-swagger - - com.couplet - couplet-enterprisemanagement-remote - - diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java index ae96763..2b72827 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java @@ -8,9 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author fufanrui - * 启动类 * @version 1.0 - * @description: TODO + * @description: 启动类 * @date 2024/3/27 14:04 */ @EnableCustomConfig diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java index 51df9a0..a0e9b61 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java @@ -1,10 +1,12 @@ package com.couplet.server.service.impl; -import com.couplet.remote.DeptServiceFegin; +import com.couplet.common.core.domain.Result; +import com.couplet.common.security.utils.SecurityUtils; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.remote.RemoteDeptService; import com.couplet.server.service.ManageServer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.PostMapping; /** * @author fufanrui @@ -15,8 +17,15 @@ import org.springframework.web.bind.annotation.PostMapping; @Service public class ManageServiceImpl implements ManageServer { - - + @Autowired + private RemoteDeptService remoteDeptService; + { + Long enterpriseId = SecurityUtils.getEnterpriseId(); + Result sysDeptByEnterpriseId = remoteDeptService.getSysDeptByEnterpriseId(enterpriseId); + if (sysDeptByEnterpriseId.getCode() == 200){ + SysDept sysDept = sysDeptByEnterpriseId.getData(); + } + } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java index b486bd4..3d47e40 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java @@ -107,4 +107,15 @@ public class SysDeptController extends BaseController { deptService.checkDeptDataScope(deptId); return toAjax(deptService.deleteDeptById(deptId)); } + + /** + * 根据企业ID获取企业下部门 + * @param enterpriseId 企业ID + * @return 企业信息，内含有部门 + */ + @GetMapping("/getSysDeptByEnterpriseId/{enterpriseId}") + public Result getSysDeptByEnterpriseId(@PathVariable(value = "enterpriseId") Long enterpriseId){ + SysDept sysDept = deptService.getSysDeptByEnterpriseId(enterpriseId); + return Result.success(sysDept); + } } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java index 91aa779..493cb33 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysUserController.java @@ -107,10 +107,13 @@ public class SysUserController extends BaseController { Set roles = permissionService.getRolePermission(sysUser); // 权限集合 Set permissions = permissionService.getMenuPermission(sysUser); + // 查询企业信息 + Long deptId = deptService.selectDeptIdByLeader(sysUser.getUserName()); LoginUser sysUserVo = new LoginUser(); sysUserVo.setSysUser(sysUser); sysUserVo.setRoles(roles); sysUserVo.setPermissions(permissions); + sysUserVo.setEnterpriseId(deptId); return Result.success(sysUserVo); } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java index 2a5889e..dde112b 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysDeptService.java @@ -135,4 +135,18 @@ public interface SysDeptService extends IService { * @return 结果 */ public int deleteDeptById (Long deptId); + + /** + * 通过负责人查询企业ID + * @param leader 负责人 + * @return 企业ID + */ + Long selectDeptIdByLeader (String leader); + + /** + * 根据企业ID获取企业下部门 + * @param enterpriseId 企业ID + * @return 企业信息，内含有部门 + */ + SysDept getSysDeptByEnterpriseId (Long enterpriseId); } diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java index 98059a3..05f5ec9 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,6 @@ package com.couplet.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.couplet.common.core.constant.UserConstants; import com.couplet.common.core.exception.ServiceException; @@ -17,6 +18,7 @@ import com.couplet.system.mapper.SysRoleMapper; import com.couplet.system.service.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import java.util.ArrayList; import java.util.Iterator; @@ -280,6 +282,34 @@ public class SysDeptServiceImpl extends ServiceImpl impl return deptMapper.deleteDeptById(deptId); } + /** + * 通过负责人查询企业ID + * + * @param leader 负责人 + * + * @return 企业ID + */ + @Override + public Long selectDeptIdByLeader (String leader) { + SysDept sysDept = getOne(new LambdaQueryWrapper<>() {{ + eq(SysDept::getLeader, leader); + }}); + + return sysDept == null ? null : sysDept.getDeptId(); + } + + /** + * 根据企业ID获取企业下部门 + * + * @param enterpriseId 企业ID + * + * @return 企业信息，内含有部门 + */ + @Override + public SysDept getSysDeptByEnterpriseId (Long enterpriseId) { + return null; + } + /** * 递归列表 */ From b9764dc297a68694b9d5f93674345453b9c6122a Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Thu, 28 Mar 2024 21:53:50 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=9B=B4=E6=AD=A3=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=BB=BAMqtt=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=9E=E6=8E=A5=EF=BC=8C=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=B0=E8=BE=93=E5=87=BA=E6=8E=A5=E5=8F=97=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-modules/couplet-modules-mqtt/pom.xml | 120 ++++++++++++++++++ .../com/couplet/mqtt/LyhMqttxApplatcaion.java | 26 ++++ .../com/couplet/mqtt/controller/Test.java | 51 ++++++++ .../com/couplet/mqtt/mapper/MqttMapper.java | 15 +++ .../com/couplet/mqtt/service/MqttService.java | 12 ++ .../couplet/mqtt/service/impl/MqttListen.java | 108 ++++++++++++++++ .../mqtt/service/impl/MqttServiceImpl.java | 16 +++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 40 ++++++ .../src/main/resources/logback.xml | 74 +++++++++++ .../resources/mapper/mqtt/MqttMapper.xml} | 2 +- ...on.java => CoupletVehicleApplication.java} | 5 +- ...Controller.java => VehicleController.java} | 14 +- ...EditParams.java => VehicleEditParams.java} | 2 +- ...rtParams.java => VehicleInsertParams.java} | 2 +- ...ListParams.java => VehicleListParams.java} | 2 +- ...hVehicleMapper.java => VehicleMapper.java} | 2 +- .../vehicle/service/LyhVehicleService.java | 12 +- .../service/impl/LyhVehicleServiceImpl.java | 18 +-- .../mapper/vehicle/VehicleMapper.xml | 8 ++ couplet-modules/pom.xml | 1 + 21 files changed, 503 insertions(+), 29 deletions(-) create mode 100644 couplet-modules/couplet-modules-mqtt/pom.xml create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/LyhMqttxApplatcaion.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/controller/Test.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/mapper/MqttMapper.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/MqttService.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttListen.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttServiceImpl.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/resources/banner.txt create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/resources/logback.xml rename couplet-modules/{couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml => couplet-modules-mqtt/src/main/resources/mapper/mqtt/MqttMapper.xml} (73%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/{LyhVehicleApplication.java => CoupletVehicleApplication.java} (77%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/{LyhVehicleController.java => VehicleController.java} (83%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/{LyhVehicleEditParams.java => VehicleEditParams.java} (95%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/{LyhVehicleInsertParams.java => VehicleInsertParams.java} (96%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/{LyhVehicleListParams.java => VehicleListParams.java} (93%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/{LyhVehicleMapper.java => VehicleMapper.java} (84%) create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleMapper.xml diff --git a/couplet-modules/couplet-modules-mqtt/pom.xml b/couplet-modules/couplet-modules-mqtt/pom.xml new file mode 100644 index 0000000..66187c1 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + + com.couplet + couplet-modules + 3.6.3 + + + couplet-modules-mqtt + + + + + + + + + couplet-modules-mqttx获取报文模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.couplet + couplet-common-datasource + + + + + com.couplet + couplet-common-datascope + + + + + com.couplet + couplet-common-log + + + + + com.couplet + couplet-common-swagger + + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/LyhMqttxApplatcaion.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/LyhMqttxApplatcaion.java new file mode 100644 index 0000000..02986b8 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/LyhMqttxApplatcaion.java @@ -0,0 +1,26 @@ +package com.couplet.mqtt; + +import com.couplet.common.security.annotation.EnableCustomConfig; +import com.couplet.common.security.annotation.EnableMyFeignClients; +import com.couplet.common.swagger.annotation.EnableCustomSwagger2; +import com.couplet.mqtt.service.impl.MqttListen; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @ProjectName: Default (Template) Project + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class LyhMqttxApplatcaion { + public static void main(String[] args) { + SpringApplication.run(LyhMqttxApplatcaion.class, args); + System.out.println("获取报文模块启动成功"); + } +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/controller/Test.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/controller/Test.java new file mode 100644 index 0000000..11f75ca --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/controller/Test.java @@ -0,0 +1,51 @@ +package com.couplet.mqtt.controller; + +import org.eclipse.paho.client.mqttv3.*; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ + +public class Test { + public static void main(String[] args) { + String broker = "tcp://115.159.47.13:1883"; + String clientId = "JavaMqttSubscriber"; + String topic = "test"; // 替换成您要订阅的主题 + + try { + MqttClient client = new MqttClient(broker, clientId, new MemoryPersistence()); + MqttConnectOptions connOpts = new MqttConnectOptions(); + connOpts.setCleanSession(true); + + System.out.println("Connecting to broker: " + broker); + client.connect(connOpts); + System.out.println("Connected"); + + client.setCallback(new MqttCallback() { + @Override + public void connectionLost(Throwable cause) { + System.out.println("Connection lost"); + } + + @Override + public void messageArrived(String topic, MqttMessage message) throws Exception { + System.out.println("Received message: " + new String(message.getPayload())); + } + + @Override + public void deliveryComplete(IMqttDeliveryToken token) { + } + }); + + client.subscribe(topic); + System.out.println("Subscribed to topic: " + topic); + } catch (MqttException e) { + e.printStackTrace(); + } + } +} + diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/mapper/MqttMapper.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/mapper/MqttMapper.java new file mode 100644 index 0000000..c9c07e3 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/mapper/MqttMapper.java @@ -0,0 +1,15 @@ +package com.couplet.mqtt.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ +@Component +@Mapper +public interface MqttMapper { +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/MqttService.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/MqttService.java new file mode 100644 index 0000000..68277a7 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/MqttService.java @@ -0,0 +1,12 @@ +package com.couplet.mqtt.service; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ + +public interface MqttService { + +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttListen.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttListen.java new file mode 100644 index 0000000..b519726 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttListen.java @@ -0,0 +1,108 @@ +package com.couplet.mqtt.service.impl; + +import lombok.extern.slf4j.Slf4j; +import org.eclipse.paho.client.mqttv3.*; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: mqtt客户端 + */ +@Component +@Slf4j +public class MqttListen { + /* + * 路径 + * */ + @Value("${mqtt.server.broker}") + private String BROKER; + + /* + * 主题 + * */ + @Value("${mqtt.server.topic}") + private String TOPIC; + + /* + * 客户端id + * */ + @Value("${mqtt.server.clientid}") + private String CLIENTID; + + /* + * 用户名 + * */ + @Value("${mqtt.server.username}") + private String USERNAME; + + /* + * 密码 + * */ + @Value("${mqtt.server.password}") + private String PASSWORD; + + /* + * qos + * */ + @Value("${mqtt.server.qos}") + private Integer QOS; + + + + @PostConstruct + public void connect() { + System.out.println("监听者启动"); + try { + + MqttClient client = new MqttClient(BROKER, CLIENTID, new MemoryPersistence()); + MqttConnectOptions options = new MqttConnectOptions(); + options.setUserName(USERNAME); + options.setPassword(PASSWORD.toCharArray()); + + //连接超时 + options.setConnectionTimeout(60); + + //心跳 + options.setKeepAliveInterval(60); + + log.info("连接到："+BROKER); + + client.connect(options); + log.info("连接成功"); + + //设置回调 + client.setCallback(new MqttCallback() { + @Override + public void connectionLost(Throwable throwable) { + log.error("连接断开：" + throwable.getMessage()); + } + + @Override + public void messageArrived(String topic, MqttMessage message) throws Exception { + log.info("消息到达"); + log.info("接收消息主题：" + topic); + log.info("接收消息Qos：" + message.getQos()); + log.info("接收消息内容：" + new String(message.getPayload())); + + } + + @Override + public void deliveryComplete(IMqttDeliveryToken token) { + log.info("消息发送成功----------" + token.isComplete()); + } + }); + client.subscribe(TOPIC, QOS); + + + } catch (MqttException e) { + throw new RuntimeException(e); + } + + } +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttServiceImpl.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttServiceImpl.java new file mode 100644 index 0000000..d1372ef --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttServiceImpl.java @@ -0,0 +1,16 @@ +package com.couplet.mqtt.service.impl; + +import com.couplet.mqtt.service.MqttService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ +@Service +@Slf4j +public class MqttServiceImpl implements MqttService { +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/resources/banner.txt b/couplet-modules/couplet-modules-mqtt/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..d74e389 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml @@ -0,0 +1,40 @@ +# Tomcat +server: + port: 9616 + +# Spring +spring: + application: + # 应用名称 + name: couplet-mqtt + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 121.89.211.230:8848 + namespace: 172469 + config: + # 配置中心地址 + server-addr: 121.89.211.230:8848 + namespace: 172469 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.couplet.system.mapper: DEBUG + +# 订阅端配置 +mqtt: + server: + broker: tcp://115.159.47.13:1883 + username: + password: + clientid: mqttx + qos: 0 + topic: test diff --git a/couplet-modules/couplet-modules-mqtt/src/main/resources/logback.xml b/couplet-modules/couplet-modules-mqtt/src/main/resources/logback.xml new file mode 100644 index 0000000..4940ee0 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/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/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml b/couplet-modules/couplet-modules-mqtt/src/main/resources/mapper/mqtt/MqttMapper.xml similarity index 73% rename from couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml rename to couplet-modules/couplet-modules-mqtt/src/main/resources/mapper/mqtt/MqttMapper.xml index 99ffce9..5a70a2c 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml +++ b/couplet-modules/couplet-modules-mqtt/src/main/resources/mapper/mqtt/MqttMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/CoupletVehicleApplication.java similarity index 77% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/CoupletVehicleApplication.java index 19937ef..813555c 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/CoupletVehicleApplication.java @@ -16,8 +16,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication -public class LyhVehicleApplication { +public class CoupletVehicleApplication { public static void main(String[] args) { - SpringApplication.run(LyhVehicleApplication.class, args); + SpringApplication.run(CoupletVehicleApplication.class, args); + System.out.println("车辆管理模块启动成功"); } } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java similarity index 83% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java index f7900b8..284175a 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java @@ -5,9 +5,9 @@ import com.couplet.common.core.web.controller.BaseController; import com.couplet.common.log.annotation.Log; import com.couplet.common.log.enums.BusinessType; import com.couplet.vehicle.domain.LyhVehicle; -import com.couplet.vehicle.domain.req.LyhVehicleEditParams; -import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; -import com.couplet.vehicle.domain.req.LyhVehicleListParams; +import com.couplet.vehicle.domain.req.VehicleEditParams; +import com.couplet.vehicle.domain.req.VehicleInsertParams; +import com.couplet.vehicle.domain.req.VehicleListParams; import com.couplet.vehicle.service.LyhVehicleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,7 +22,7 @@ import java.util.List; */ @RestController @RequestMapping("/vehicle") -public class LyhVehicleController extends BaseController { +public class VehicleController extends BaseController { @Autowired private LyhVehicleService lyhVehicleService; @@ -35,7 +35,7 @@ public class LyhVehicleController extends BaseController { **/ @PostMapping("/list") @Log(title = "车辆列表") - public Result list(@RequestBody LyhVehicleListParams listParams) { + public Result list(@RequestBody VehicleListParams listParams) { List List = lyhVehicleService.list(listParams); @@ -67,7 +67,7 @@ public class LyhVehicleController extends BaseController { **/ @PostMapping("/editById") @Log(title = "编辑车辆", businessType = BusinessType.UPDATE) - public Result editById(@RequestBody LyhVehicleEditParams editParams) { + public Result editById(@RequestBody VehicleEditParams editParams) { String result = lyhVehicleService.editById(editParams); @@ -83,7 +83,7 @@ public class LyhVehicleController extends BaseController { **/ @PostMapping("/insert") @Log(title = "新增车辆", businessType = BusinessType.INSERT) - public Result insert(@RequestBody LyhVehicleInsertParams insertParams) { + public Result insert(@RequestBody VehicleInsertParams insertParams) { String result = lyhVehicleService.insert(insertParams); diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java similarity index 95% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java index 7a99349..75f8c05 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java @@ -16,7 +16,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class LyhVehicleEditParams { +public class VehicleEditParams { /* *车辆id * */ diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java similarity index 96% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java index 587a1fd..047c15b 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java @@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class LyhVehicleInsertParams { +public class VehicleInsertParams { /* *车辆类型 diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java similarity index 93% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java index 382e5b6..7568e72 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java @@ -15,7 +15,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class LyhVehicleListParams { +public class VehicleListParams { /* *车辆类型 * */ diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java similarity index 84% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java index 2d2d712..adeb7bf 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java @@ -13,5 +13,5 @@ import org.springframework.stereotype.Component; */ @Mapper @Component -public interface LyhVehicleMapper extends BaseMapper { +public interface VehicleMapper extends BaseMapper { } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java index b230bd6..f5096e4 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java @@ -2,9 +2,9 @@ package com.couplet.vehicle.service; import com.baomidou.mybatisplus.extension.service.IService; import com.couplet.vehicle.domain.LyhVehicle; -import com.couplet.vehicle.domain.req.LyhVehicleEditParams; -import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; -import com.couplet.vehicle.domain.req.LyhVehicleListParams; +import com.couplet.vehicle.domain.req.VehicleEditParams; +import com.couplet.vehicle.domain.req.VehicleInsertParams; +import com.couplet.vehicle.domain.req.VehicleListParams; import java.util.List; @@ -16,11 +16,11 @@ import java.util.List; */ public interface LyhVehicleService extends IService { - List list(LyhVehicleListParams listParams); + List list(VehicleListParams listParams); String deleteById(Long vehicleId); - String editById(LyhVehicleEditParams editParams); + String editById(VehicleEditParams editParams); - String insert(LyhVehicleInsertParams insertParams); + String insert(VehicleInsertParams insertParams); } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java index 14953f9..f401960 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java @@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.couplet.common.core.utils.StringUtils; import com.couplet.vehicle.domain.LyhVehicle; -import com.couplet.vehicle.domain.req.LyhVehicleEditParams; -import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; -import com.couplet.vehicle.domain.req.LyhVehicleListParams; -import com.couplet.vehicle.mapper.LyhVehicleMapper; +import com.couplet.vehicle.domain.req.VehicleEditParams; +import com.couplet.vehicle.domain.req.VehicleInsertParams; +import com.couplet.vehicle.domain.req.VehicleListParams; +import com.couplet.vehicle.mapper.VehicleMapper; import com.couplet.vehicle.service.LyhVehicleService; import com.couplet.vehicle.utils.SnowflakeIdGenerator; import lombok.extern.slf4j.Slf4j; @@ -26,9 +26,9 @@ import java.util.List; @Service @Slf4j -public class LyhVehicleServiceImpl extends ServiceImpl implements LyhVehicleService { +public class LyhVehicleServiceImpl extends ServiceImpl implements LyhVehicleService { @Autowired - private LyhVehicleMapper lyhVehicleMapper; + private VehicleMapper lyhVehicleMapper; /* * @Author: LiuYunHu @@ -38,7 +38,7 @@ public class LyhVehicleServiceImpl extends ServiceImpl **/ @Override - public List list(LyhVehicleListParams listParams) { + public List list(VehicleListParams listParams) { // 创建查询条件包装器 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -95,7 +95,7 @@ public class LyhVehicleServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); @@ -140,7 +140,7 @@ public class LyhVehicleServiceImpl extends ServiceImpl + + + + + diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 6b3c03b..272c64c 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -16,6 +16,7 @@ couplet-trouble couplet-electronic-fence couplet-modules-vehicle + couplet-modules-mqtt couplet-modules From 2d6cbf6f1cbf170c9d6e78d595d79427603d1b43 Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Thu, 28 Mar 2024 21:55:06 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=9B=B4=E6=AD=A3=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=BB=BAMqtt=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=9E=E6=8E=A5=EF=BC=8C=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=B0=E8=BE=93=E5=87=BA=E6=8E=A5=E5=8F=97=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/couplet/vehicle/controller/VehicleController.java | 4 ++-- .../service/{LyhVehicleService.java => VehicleService.java} | 2 +- .../{LyhVehicleServiceImpl.java => VehicleServiceImpl.java} | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/{LyhVehicleService.java => VehicleService.java} (90%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/{LyhVehicleServiceImpl.java => VehicleServiceImpl.java} (96%) diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java index 284175a..3bfe921 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java @@ -8,7 +8,7 @@ import com.couplet.vehicle.domain.LyhVehicle; import com.couplet.vehicle.domain.req.VehicleEditParams; import com.couplet.vehicle.domain.req.VehicleInsertParams; import com.couplet.vehicle.domain.req.VehicleListParams; -import com.couplet.vehicle.service.LyhVehicleService; +import com.couplet.vehicle.service.VehicleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,7 +24,7 @@ import java.util.List; @RequestMapping("/vehicle") public class VehicleController extends BaseController { @Autowired - private LyhVehicleService lyhVehicleService; + private VehicleService lyhVehicleService; /* * @Author: LiuYunHu diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java similarity index 90% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java index f5096e4..93b680e 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java @@ -15,7 +15,7 @@ import java.util.List; * @Description: */ -public interface LyhVehicleService extends IService { +public interface VehicleService extends IService { List list(VehicleListParams listParams); String deleteById(Long vehicleId); diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java similarity index 96% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java index f401960..0227349 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java @@ -9,7 +9,7 @@ import com.couplet.vehicle.domain.req.VehicleEditParams; import com.couplet.vehicle.domain.req.VehicleInsertParams; import com.couplet.vehicle.domain.req.VehicleListParams; import com.couplet.vehicle.mapper.VehicleMapper; -import com.couplet.vehicle.service.LyhVehicleService; +import com.couplet.vehicle.service.VehicleService; import com.couplet.vehicle.utils.SnowflakeIdGenerator; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +26,7 @@ import java.util.List; @Service @Slf4j -public class LyhVehicleServiceImpl extends ServiceImpl implements LyhVehicleService { +public class VehicleServiceImpl extends ServiceImpl implements VehicleService { @Autowired private VehicleMapper lyhVehicleMapper; From c00d4c890443b558ca39da337976c982c1cf9b79 Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Thu, 28 Mar 2024 22:33:31 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couplet/common/system/domain/SysFirm.java | 25 ++++++++ .../system/controller/SysFirmController.java | 64 +++++++++++++++++++ .../couplet/system/mapper/SysFirmMapper.java | 22 +++++++ .../system/service/SysFirmService.java | 19 ++++++ .../service/impl/SysFirmServiceImpl.java | 35 ++++++++++ .../resources/mapper/system/SysFirmMapper.xml | 22 +++++++ 6 files changed, 187 insertions(+) create mode 100644 couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java create mode 100644 couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java create mode 100644 couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java create mode 100644 couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java create mode 100644 couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java create mode 100644 couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java new file mode 100644 index 0000000..8ade07b --- /dev/null +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysFirm.java @@ -0,0 +1,25 @@ +package com.couplet.common.system.domain; + +import lombok.Data; + +/** + * @ClassName SysFirm + * @Description 企业实体类 + * @Author YuanYongH + * @Date 2024/3/28 22:14 + */ +@Data +public class SysFirm { + /** + * 企业id + **/ + private Integer firmId; + /** + * 企业名称 + **/ + private String firmName; + /** + * 企业认证 + **/ + private Integer approveId; +} diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java new file mode 100644 index 0000000..404529b --- /dev/null +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java @@ -0,0 +1,64 @@ +package com.couplet.system.controller; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.system.domain.SysFirm; +import com.couplet.system.service.SysFirmService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @ClassName SysFirmController + * @Description 企业信息 + * @Author YuanYongH + * @Date 2024/3/28 22:14 + */ +@RestController +@RequestMapping("firm") +public class SysFirmController { + + @Autowired + private SysFirmService sysFirmService; + /** + * @Description // 管理企业列表 + * @Date 2024/3/28 + * @param sysFirm + * @return com.couplet.common.core.domain.Result> + **/ + @PostMapping("firmList") + public Result> firmList(@RequestBody SysFirm sysFirm){ + List list = sysFirmService.firmList(sysFirm); + Result> result = Result.success(list); + return result; + } + + /** + * @Description // 添加企业 默认未认证 + * @Date 2024/3/28 + * @param sysFirm + * @return com.couplet.common.core.domain.Result + **/ + @PostMapping("addFirm") + public Result addFirm(@RequestBody SysFirm sysFirm){ + int i = sysFirmService.addFirm(sysFirm); + Result result = Result.success(i); + return result; + } + + /** + * @Description // 修改企业信息 + * @Date 2024/3/28 + * @param sysFirm + * @return com.couplet.common.core.domain.Result + **/ + @PostMapping("updateFirm") + public Result updateFirm(@RequestBody SysFirm sysFirm){ + int i = sysFirmService.updateFirm(sysFirm); + Result result = Result.success(i); + return result; + } +} diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java new file mode 100644 index 0000000..f5f1429 --- /dev/null +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/mapper/SysFirmMapper.java @@ -0,0 +1,22 @@ +package com.couplet.system.mapper; + +import com.couplet.common.system.domain.SysFirm; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName SysFirmMapper + * @Description TODO + * @Author YuanYongH + * @Date 2024/3/28 22:18 + */ +@Mapper +public interface SysFirmMapper { + List firmList(SysFirm sysFirm); + + int addFirm(SysFirm sysFirm); + + int updateFirm(SysFirm sysFirm); + +} diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java new file mode 100644 index 0000000..ceeebad --- /dev/null +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/SysFirmService.java @@ -0,0 +1,19 @@ +package com.couplet.system.service; + +import com.couplet.common.system.domain.SysFirm; + +import java.util.List; + +/** + * @ClassName SysFirmService + * @Description TODO + * @Author YuanYongH + * @Date 2024/3/28 22:17 + */ +public interface SysFirmService { + List firmList(SysFirm sysFirm); + + int addFirm(SysFirm sysFirm); + + int updateFirm(SysFirm sysFirm); +} diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java new file mode 100644 index 0000000..903a67a --- /dev/null +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysFirmServiceImpl.java @@ -0,0 +1,35 @@ +package com.couplet.system.service.impl; + +import com.couplet.common.system.domain.SysFirm; +import com.couplet.system.mapper.SysFirmMapper; +import com.couplet.system.service.SysFirmService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName SysFirmServiceImpl + * @Description TODO + * @Author YuanYongH + * @Date 2024/3/28 22:17 + */ +@Service +public class SysFirmServiceImpl implements SysFirmService { + @Autowired + private SysFirmMapper sysFirmMapper; + @Override + public List firmList(SysFirm sysFirm) { + return sysFirmMapper.firmList(sysFirm); + } + + @Override + public int addFirm(SysFirm sysFirm) { + return sysFirmMapper.addFirm(sysFirm); + } + + @Override + public int updateFirm(SysFirm sysFirm) { + return sysFirmMapper.updateFirm(sysFirm); + } +} diff --git a/couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml new file mode 100644 index 0000000..99ca2eb --- /dev/null +++ b/couplet-modules/couplet-system/src/main/resources/mapper/system/SysFirmMapper.xml @@ -0,0 +1,22 @@ + + + + + INSERT INTO `ry-cloud`.`yyh_firm` ( `firm_name`) + VALUES ( #{firmName}); + + + + + UPDATE `ry-cloud`.`yyh_firm` + SET `firm_name` = #{firmName}, `approve_id` = #{approveId} + WHERE `firm_id` = #{firmId}; + + + + + From 5cba075219d18ac6f24204046e9e469a6220d3ff Mon Sep 17 00:00:00 2001 From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com> Date: Thu, 28 Mar 2024 22:36:22 +0800 Subject: [PATCH 12/13] =?UTF-8?q?feat:=20=E5=9B=B4=E6=A0=8F=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 2 - .../couplet-electronic-fence/.gitignore | 38 +++++++++++++++ .../.gitignore | 38 +++++++++++++++ .../com/couplet/map/common/domin/Fence.java | 9 ++++ .../map/common/domin/request/FenceConfig.java | 24 ++++++++++ .../.gitignore | 38 +++++++++++++++ .../.gitignore | 38 +++++++++++++++ .../server/controller/FenceController.java | 46 +++++++++++++++++++ .../map/server/mapper/FenceMapper.java | 13 ++++++ .../map/server/service/FenceService.java | 15 ++++++ .../server/service/impl/FenceServiceImpl.java | 34 ++++++++++++++ .../src/main/resources/bootstrap.yml | 28 +++++++++++ .../main/resources/mapper/map/FenceMapper.xml | 9 ++++ .../src/main/resources/bootstrap.yml | 2 - .../src/main/resources/bootstrap.yml | 2 - .../src/main/resources/bootstrap.yml | 2 - .../src/main/resources/bootstrap.yml | 2 - .../src/main/resources/bootstrap.yml | 2 - .../src/main/resources/bootstrap.yml | 2 - 19 files changed, 330 insertions(+), 14 deletions(-) create mode 100644 couplet-modules/couplet-electronic-fence/.gitignore create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/.gitignore create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/request/FenceConfig.java create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/.gitignore create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/.gitignore create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenceService.java create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 870a494..2942ec3 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -15,7 +15,6 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -24,4 +23,3 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/couplet-modules/couplet-electronic-fence/.gitignore b/couplet-modules/couplet-electronic-fence/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/.gitignore b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/Fence.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/Fence.java index 28b9007..0971935 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/Fence.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/Fence.java @@ -1,5 +1,8 @@ package com.couplet.map.common.domin; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.couplet.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -14,8 +17,10 @@ import java.util.Date; */ @Data @SuperBuilder +@TableName("couplet_fence") public class Fence extends BaseEntity { + @TableId(value = "fence_id", type = IdType.AUTO) /** * 围栏id */ @@ -67,5 +72,9 @@ public class Fence extends BaseEntity { */ private Integer alarmStatus; + /** + * 围栏类型 + */ + private Integer fenceType; } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/request/FenceConfig.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/request/FenceConfig.java new file mode 100644 index 0000000..6143e51 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/request/FenceConfig.java @@ -0,0 +1,24 @@ +package com.couplet.map.common.domin.request; + +import com.couplet.common.core.web.domain.BaseEntity; +import com.couplet.map.common.domin.Fence; +import lombok.Builder; +import lombok.Data; + +/** + * @Author: LiJiaYao + * @Date: 2024/3/28 + */ +@Data +public class FenceConfig{ + + + private String fenceName; + /** + * 围栏经纬度 + */ + private String fenceLongitudeLatitude; + private Integer pageNum=1; + private Integer pageSize=3; + +} diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/.gitignore b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/.gitignore b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file 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 new file mode 100644 index 0000000..71aa0c8 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java @@ -0,0 +1,46 @@ +package com.couplet.map.server.controller; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.controller.BaseController; +import com.couplet.map.common.domin.Fence; +import com.couplet.map.common.domin.request.FenceConfig; +import com.couplet.map.server.service.FenceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import static com.couplet.common.core.utils.PageUtils.startPage; + +/** + * @Author: LiJiaYao + * @Date: 2024/3/28 + */ +@RestController +@RequestMapping("/fence") +public class FenceController extends BaseController { + + /** + * 调用服务 + */ + @Autowired + private FenceService fenceService; + + /** + * 获取围栏列表 + * @return + * @param fenceConfig + */ + @GetMapping("/fenceList") + public Result fenceList(@RequestBody FenceConfig fenceConfig){ + + startPage(); + List list = fenceService.pageQuery(fenceConfig); + return getDataTable(list); + } + + +} 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 new file mode 100644 index 0000000..51f95cd --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java @@ -0,0 +1,13 @@ +package com.couplet.map.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.couplet.map.common.domin.Fence; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author: LiJiaYao + * @Date: 2024/3/28 + */ +@Mapper +public interface FenceMapper extends BaseMapper { +} diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenceService.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenceService.java new file mode 100644 index 0000000..d156b60 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenceService.java @@ -0,0 +1,15 @@ +package com.couplet.map.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.couplet.map.common.domin.Fence; +import com.couplet.map.common.domin.request.FenceConfig; + +import java.util.List; + +/** + * @Author: LiJiaYao + * @Date: 2024/3/28 + */ +public interface FenceService extends IService { + 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 new file mode 100644 index 0000000..85f69d4 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java @@ -0,0 +1,34 @@ +package com.couplet.map.server.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.couplet.map.common.domin.Fence; +import com.couplet.map.common.domin.request.FenceConfig; +import com.couplet.map.server.mapper.FenceMapper; +import com.couplet.map.server.service.FenceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author: LiJiaYao + * @Date: 2024/3/28 + */ +@Service +public class FenceServiceImpl extends ServiceImpl implements FenceService { + + /** + * 调用围栏mapper + */ + @Autowired + private FenceMapper fenceMapper; + + + @Override + public List pageQuery(FenceConfig fenceConfig) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return this.list(queryWrapper); + } +} diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..044ab55 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9999 + +# Spring +spring: + application: + # 应用名称 + name: couplet-electronic-fence + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 121.89.211.230:8848 + config: + # 配置中心地址 + server-addr: 121.89.211.230:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.couplet.trouble.mapper: DEBUG 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 new file mode 100644 index 0000000..04e9aac --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index 1b923b2..fa968e9 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,7 +15,6 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -24,4 +23,3 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index 8829025..df7344c 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -15,7 +15,6 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -24,4 +23,3 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index 866823e..49763a2 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,7 +15,6 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -24,4 +23,3 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index 5ddc18b..16f0206 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,7 +15,6 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -24,7 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 logging: level: com.couplet.system.mapper: DEBUG diff --git a/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml b/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml index c73ca5b..2739b92 100644 --- a/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml @@ -15,7 +15,6 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -24,7 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 logging: level: com.couplet.trouble.mapper: DEBUG diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index 98a7702..ff11d05 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,7 +15,6 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -24,4 +23,3 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 From ab6f21a6ff1e189c806f0249d4fbcfb528ee495e Mon Sep 17 00:00:00 2001 From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com> Date: Thu, 28 Mar 2024 22:41:13 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=98=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/couplet/server/service/ManageServer.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java index 3728604..c6ff389 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java @@ -1,6 +1,4 @@ package com.couplet.server.service; - -import com.couplet.remote.DeptServiceFegin; import org.springframework.beans.factory.annotation.Autowired; public interface ManageServer {