From 9b683e61290e5faf5e1cbd6d67899f524e2b05b5 Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Sun, 31 Mar 2024 10:12:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 6 ++++++ .../java/com/couplet/common/system/domain/SysDept.java | 7 +++++++ .../couplet-gen/src/main/resources/bootstrap.yml | 2 ++ .../couplet-job/src/main/resources/bootstrap.yml | 2 ++ .../com/couplet/system/controller/SysFirmController.java | 2 +- .../couplet/system/service/impl/SysDeptServiceImpl.java | 2 +- .../couplet-system/src/main/resources/bootstrap.yml | 2 ++ 7 files changed, 21 insertions(+), 2 deletions(-) diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index efc78ba..c6e73a0 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -1,9 +1,14 @@ # Tomcat + server: port: 9200 + + # Spring spring: + main: + allow-bean-definition-overriding: true application: # 应用名称 name: couplet-auth @@ -16,6 +21,7 @@ spring: # 服务注册地址 server-addr: 121.89.211.230:8848 namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + config: # 配置中心地址 server-addr: 121.89.211.230:8848 diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java index 85f67b2..32daa90 100644 --- a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java @@ -1,5 +1,6 @@ package com.couplet.common.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.couplet.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; @@ -39,6 +40,10 @@ public class SysDept extends BaseEntity { */ private Long parentId; + + @TableField(exist = false) + private String remark; + /** * 祖级列表 */ @@ -82,11 +87,13 @@ public class SysDept extends BaseEntity { /** * 父部门名称 */ + @TableField(exist = false) private String parentName; /** * 子部门 */ + @TableField(exist = false) private List children = new ArrayList(); public Long getDeptId () { diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index 79e5b8d..04f6a17 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: # Spring spring: + main: + allow-bean-definition-overriding: true application: # 应用名称 name: couplet-gen diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index a0c84ca..06af10b 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: # Spring spring: + main: + allow-bean-definition-overriding: true application: # 应用名称 name: couplet-job 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 index c7d6bca..069efca 100644 --- 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 @@ -66,7 +66,7 @@ public class SysFirmController { * @param deptId * @return com.couplet.common.core.domain.Result **/ - @DeleteMapping("delFirm/{deptId}") + @PostMapping("delFirm/{deptId}") public Result delFirm(@PathVariable Integer deptId){ int i = sysFirmService.delFirm(deptId); Result success = Result.success(i); 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 05f5ec9..e6e8a30 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 @@ -224,7 +224,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int updateDept (SysDept dept) { + public int updateDept (SysDept dept) { SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) { diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index 3ae0d47..e8c2729 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: # Spring spring: + main: + allow-bean-definition-overriding: true application: # 应用名称 name: couplet-system From f597b6cbfc8c009256fc2d01616061978a278c8d Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Sun, 31 Mar 2024 22:10:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=99=8E=EF=BC=8C=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AE=8C=E5=96=84=EF=BC=8C=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=8C=E5=8A=9F=E8=83=BD=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= 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 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../couplet-modules-vehicle/pom.xml | 7 ++++ .../vehicle/controller/VehicleController.java | 29 +++++++++++-- .../vehicle/domain/req/VehicleEditParams.java | 4 ++ .../domain/req/VehicleInsertParams.java | 1 - .../vehicle/domain/req/VehicleListParams.java | 6 +++ .../vehicle/mapper/VehicleAndLogoMapper.java | 4 ++ .../service/VehicleAndLogoService.java | 4 ++ .../vehicle/service/VehicleService.java | 2 + .../impl/VehicleAndLogoServiceImpl.java | 37 +++++++++++++++++ .../service/impl/VehicleServiceImpl.java | 41 ++++++++++++++++--- .../src/main/resources/bootstrap.yml | 4 +- .../mapper/vehicle/VehicleAndLogoMapper.xml | 12 ++++++ .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- pom.xml | 4 +- 24 files changed, 164 insertions(+), 25 deletions(-) diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 3853815..ff483b1 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: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index 091e68a..6dc39fe 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: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 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 index 770cb7e..470080e 100644 --- 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 @@ -16,9 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 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 index 97e6515..7ae87e9 100644 --- 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 @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index 8681657..b0d1d24 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 172469 # 配置文件格式 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 b1f7d75..617a4d1 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: 172469 # 配置文件格式 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 147fbc9..41d1fef 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml index 29958e8..61d454f 100644 --- a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-modules-vehicle/pom.xml b/couplet-modules/couplet-modules-vehicle/pom.xml index bd06244..52301c1 100644 --- a/couplet-modules/couplet-modules-vehicle/pom.xml +++ b/couplet-modules/couplet-modules-vehicle/pom.xml @@ -84,6 +84,13 @@ couplet-common-swagger + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + 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 d78d7aa..655dc34 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 @@ -10,6 +10,8 @@ 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.VehicleService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -39,10 +41,13 @@ public class VehicleController extends BaseController { @PostMapping("/list") @Log(title = "车辆列表") public Result list(@RequestBody VehicleListParams listParams) { + PageHelper.startPage(listParams.getPageNum(), listParams.getPageSize()); - List List = vehicleService.list(listParams); + List list = vehicleService.list(listParams); - return Result.success(List); + PageInfo vehiclePageInfo = new PageInfo<>(list); + + return Result.success(vehiclePageInfo); } /* @@ -90,9 +95,27 @@ public class VehicleController extends BaseController { @PostMapping("/insert") @Log(title = "新增车辆", businessType = BusinessType.INSERT) public Result insert(@RequestBody @Validated VehicleInsertParams insertParams) { - + System.out.println(insertParams); String result = vehicleService.insert(insertParams); return Result.success(result); } + + + /* + * @Author: LiuYunHu + * @Date: 2024/3/31 21:34 + * @Description: 获取绑定当前车辆的标识 + * @Param: [vehicleId] + * @Return: com.couplet.common.core.domain.Result + **/ + @RequiresPermissions("couplet:vehicle:list") + @GetMapping("/getBindLogoById/{vehicleId}") + public Result getBindLogoById(@PathVariable("vehicleId") Long vehicleId) { + + List bindLogoById = vehicleService.getBindLogoById(vehicleId); + + + return Result.success(bindLogoById); + } } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java index d2186d4..3eeeb6f 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotNull; +import java.util.List; /** @@ -53,4 +54,7 @@ public class VehicleEditParams { * */ private String batteryNumber; + //标识id集合 + private List logoIds; + } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java index db7a36d..51c2279 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java @@ -57,7 +57,6 @@ public class VehicleInsertParams { /* * 一辆车可以绑定多个标识 * */ - @Size(min = 1, message = "车辆至少绑定一个标识") private List logoIds; } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java index 7568e72..31acc33 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java @@ -26,4 +26,10 @@ public class VehicleListParams { * */ private Integer vehicleState; + /* + * 分页参数 + * */ + private Integer pageNum = 1; + private Integer pageSize = 5; + } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleAndLogoMapper.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleAndLogoMapper.java index 4d0072b..aff8454 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleAndLogoMapper.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleAndLogoMapper.java @@ -18,4 +18,8 @@ import java.util.List; @Component public interface VehicleAndLogoMapper extends BaseMapper { int vehicleBindLogo(@Param("vehicleId") Long vehicleId, @Param("logoIds") List logoIds); + + int deleteByVehicleId(@Param("vehicleId") Long vehicleId); + + List getBindLogoById(@Param("vehicleId") Long vehicleId); } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleAndLogoService.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleAndLogoService.java index 59c40d7..1e15138 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleAndLogoService.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleAndLogoService.java @@ -14,4 +14,8 @@ import java.util.List; public interface VehicleAndLogoService extends IService { int vehicleBindLogo(Long vehicleId, List logoIds); + + int deleteByVehicleId(Long vehicleId); + + List getBindLogoById(Long vehicleId); } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java index dcf66fa..ee6b50f 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java @@ -23,4 +23,6 @@ public interface VehicleService extends IService { String editById(VehicleEditParams editParams); String insert(VehicleInsertParams insertParams); + + List getBindLogoById(Long vehicleId); } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleAndLogoServiceImpl.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleAndLogoServiceImpl.java index 7a82c69..e5e5a5e 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleAndLogoServiceImpl.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleAndLogoServiceImpl.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -34,7 +35,43 @@ public class VehicleAndLogoServiceImpl extends ServiceImpl logoIds) { + //将ids转为list +// ArrayList logoIdList = new ArrayList<>(); +// String[] split = logoIds.split(","); +// for (String s : split) { +// logoIdList.add(Long.parseLong(s)); +// } + //执行绑定 return mapper.vehicleBindLogo(vehicleId, logoIds); } + + /* + * @Author: LiuYunHu + * @Date: 2024/3/31 21:21 + * @Description: 删除掉车辆绑定 + * @Param: [vehicleId] + * @Return: int + **/ + @Override + public int deleteByVehicleId(Long vehicleId) { + + + return mapper.deleteByVehicleId(vehicleId); + } + + /* + * @Author: LiuYunHu + * @Date: 2024/3/31 21:35 + * @Description: 获取绑定当前车辆的标识 + * @Param: [vehicleId] + * @Return: java.util.List + **/ + @Override + public List getBindLogoById(Long vehicleId) { + + + return mapper.getBindLogoById(vehicleId); + } + } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java index 5302c01..1a4d5f8 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java @@ -3,13 +3,13 @@ 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.domain.Result; import com.couplet.common.core.utils.StringUtils; import com.couplet.vehicle.domain.Vehicle; import com.couplet.vehicle.domain.VehicleType; 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.exception.VehicleException; import com.couplet.vehicle.mapper.VehicleMapper; import com.couplet.vehicle.service.VehicleAndLogoService; import com.couplet.vehicle.service.VehicleService; @@ -107,7 +107,7 @@ public class VehicleServiceImpl extends ServiceImpl impl if (!update) { result = "删除失败"; - throw new VehicleException(result); + Result.error(result); } result = "删除成功！"; @@ -126,10 +126,14 @@ public class VehicleServiceImpl extends ServiceImpl impl public String editById(VehicleEditParams editParams) { String result = ""; + if ((editParams.getLogoIds() == null || editParams.getLogoIds().isEmpty())) { + result = "未选择电子围栏"; + Result.error(result); + } + UpdateWrapper updateWrapper = new UpdateWrapper<>(); //编辑车辆类型 - updateWrapper.set("vehicle_type", editParams.getVehicleType()) //编辑电机厂商 @@ -152,9 +156,15 @@ public class VehicleServiceImpl extends ServiceImpl impl if (!update) { result = "编辑失败"; - throw new VehicleException(result); + Result.error(result); } + //删除掉车辆id为入参的车辆、标识的中间表数据 + int delete = vehicleAndLogoService.deleteByVehicleId(editParams.getVehicleId()); + + //删除绑定之后，再添加新的绑定 + vehicleAndLogoService.vehicleBindLogo(editParams.getVehicleId(), editParams.getLogoIds()); + result = "编辑成功！"; return result; @@ -171,6 +181,12 @@ public class VehicleServiceImpl extends ServiceImpl impl public String insert(VehicleInsertParams insertParams) { String result = ""; + if ((insertParams.getLogoIds() == null || insertParams.getLogoIds().isEmpty())) { + result = "未选择电子围栏"; + Result.error(result); + } + + //雪花算法生成随机数 SnowflakeIdGenerator idGenerator = new SnowflakeIdGenerator(1, 1); long randomId = idGenerator.nextId(); @@ -195,7 +211,7 @@ public class VehicleServiceImpl extends ServiceImpl impl if (insert == 0) { result = "新增失败"; - throw new VehicleException(result); + Result.error(result); } //获取新增的车辆id值 @@ -208,4 +224,19 @@ public class VehicleServiceImpl extends ServiceImpl impl return result; } + + /* + * @Author: LiuYunHu + * @Date: 2024/3/31 21:34 + * @Description: 获取绑定当前车辆的标识 + * @Param: [vehicleId] + * @Return: java.util.List + **/ + @Override + public List getBindLogoById(Long vehicleId) { + List logoIds = vehicleAndLogoService.getBindLogoById(vehicleId); + + return logoIds; + } + } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml index 7676300..f985e0c 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleAndLogoMapper.xml b/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleAndLogoMapper.xml index ac6051c..854c18e 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleAndLogoMapper.xml +++ b/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleAndLogoMapper.xml @@ -12,4 +12,16 @@ (#{vehicleId},#{logoId}) + + + DELETE + FROM `couplet_vehicle_and_logo` + WHERE `vehicle_id` = #{vehicleId} + + + diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index d9315bd..91453d0 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: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml b/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml index 0472d28..8dc0fff 100644 --- a/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index fe8cc0a..d219500 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/pom.xml b/pom.xml index 3152da5..5cbe281 100644 --- a/pom.xml +++ b/pom.xml @@ -250,14 +250,14 @@ com.couplet couplet-modules-vehicle - 3.6.3 + ${couplet.version} com.couplet couplet-modules-mq - 3.6.3 + ${couplet.version} From ef85dad9c9bfc7290eb9a0482537ab48875cc797 Mon Sep 17 00:00:00 2001 From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com> Date: Mon, 1 Apr 2024 19:47:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E7=94=B5=E5=AD=90=E5=9B=B4?= =?UTF-8?q?=E6=A0=8F=E7=BC=96=E8=BE=91=E5=92=8C=E5=8C=96=E5=A4=9A=E8=BE=B9?= =?UTF-8?q?=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/couplet/map/common/domain/Fence.java | 13 ++++++-- .../common/domain/request/FenceConfig.java | 4 --- .../common/domain/request/FenceRequest.java | 3 +- .../server/controller/FenceController.java | 28 ++++++++-------- .../map/server/mapper/FenceMapper.java | 6 ++++ .../map/server/service/FenceService.java | 8 +++++ .../server/service/impl/FenceServiceImpl.java | 21 ++++++------ .../resources/mapper/map/FenAndLogoMapper.xml | 9 ++--- .../main/resources/mapper/map/FenceMapper.xml | 33 ++++++++++++++----- 9 files changed, 82 insertions(+), 43 deletions(-) diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Fence.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Fence.java index ba58949..7f1c787 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Fence.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Fence.java @@ -14,8 +14,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.validation.annotation.Validated; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.Date; +import java.util.List; /** * @Author: LiJiaYao @@ -37,6 +41,8 @@ public class Fence extends BaseEntity{ /** * 围栏名称 */ + + @NotEmpty(message = "围栏名称不能为空") private String fenceName; /** * 围栏经纬度 @@ -45,6 +51,7 @@ public class Fence extends BaseEntity{ /** * 围栏描述 */ + @NotEmpty(message = "围栏描述不能为空") private String fenceDescription; /** * 是否删除 @@ -66,15 +73,15 @@ public class Fence extends BaseEntity{ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; - /** * 创建人 */ + @NotEmpty(message = "创建人不能为空") private String createName; /** * 维护人 */ - + @NotEmpty(message = "维护人不能为空") private String maintainerName; /** * 告警状态 @@ -86,7 +93,7 @@ public class Fence extends BaseEntity{ /** * 标识 */ - private Integer[] logoId; + private Integer logoId; @TableField(exist = false) private String logoName; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java index 0c26d46..c2be21a 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java @@ -15,13 +15,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class FenceConfig { - private String fenceName; /** * 围栏状态 */ private Integer fenceState; - private Integer pageNum=1; - private Integer pageSize=3; - } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceRequest.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceRequest.java index e57e4d3..9b74a87 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceRequest.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceRequest.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +import java.util.List; /** * @Author: LiJiaYao @@ -69,5 +70,5 @@ public class FenceRequest { * 标识 */ @TableField(exist = false) - private String[] logoId; + private String[] logoIds; } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java index b752861..76bdf82 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java @@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; -import static com.couplet.common.core.utils.PageUtils.startPage; - /** * @Author: LiJiaYao * @Date: 2024/3/28 @@ -39,7 +37,6 @@ public class FenceController extends BaseController { @RequiresPermissions("couplet:fence:fenceList") @PostMapping("/fenceList") public Result fenceList(@RequestBody FenceConfig fenceConfig){ - startPage(); List list = fenceService.pageQuery(fenceConfig); return getDataTable(list); @@ -55,10 +52,11 @@ public class FenceController extends BaseController { @RequiresPermissions("couplet:fence:fenceAdd") @Log(title = "电子围栏新增",businessType = BusinessType.INSERT) public Result fenceInsert(HttpServletRequest request, @RequestBody FenceRequest fenceRequest){ - + if (!fenceService.checkFenceKeyUnique(fenceRequest.getFenceName())) { + return error("新增参数'" + fenceRequest.getFenceName() + "'失败，参数键名已存在"); + } fenceService.fenceInsert(request,fenceRequest); return Result.success("新增成功"); - } /** @@ -69,8 +67,10 @@ public class FenceController extends BaseController { @PostMapping("/fenceUpdate") @RequiresPermissions("couplet:fence:fenceUpdate") @Log(title = "电子围栏修改",businessType = BusinessType.UPDATE) - public Result fenceUpdate(@Validated @RequestBody FenceUpdateRequest fenceUpdateRequest){ - + public Result fenceUpdate(@Validated @RequestBody FenceUpdateRequest fenceUpdateRequest){ + if (!fenceService.checkFenceKeyUnique(fenceUpdateRequest.getFenceName())) { + return error("修改参数'" + fenceUpdateRequest.getFenceName() + "'失败，参数键名已存在"); + } fenceService.changeFenceStatus(fenceUpdateRequest); return Result.success("修改成功"); } @@ -83,19 +83,21 @@ public class FenceController extends BaseController { @DeleteMapping("/{fenceId}") @RequiresPermissions("couplet:fence:fenceDelete") @Log(title = "电子围栏删除",businessType = BusinessType.DELETE) - public Result fenceDelete(@PathVariable Long fenceId){ - boolean b = fenceService.removeById(fenceId); -// fenceService.removeByFenceId(fenceId); - return toAjax(b); + public Result fenceDelete(@PathVariable Long fenceId){ + fenceService.removeByFenceId(fenceId); + return Result.success(); } + /** + * 启用停用 + * @param fenceUpdateRequest + * @return + */ @PostMapping("/fenceState") @RequiresPermissions("couplet:fence:fenceState") @Log(title = "围栏启用和停用",businessType = BusinessType.OTHER) public Result fenceState(@RequestBody FenceUpdateRequest fenceUpdateRequest){ - fenceService.changeFenceStatus(fenceUpdateRequest); - return success(); } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java index 579d56c..2623be8 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java @@ -32,4 +32,10 @@ public interface FenceMapper extends BaseMapper { */ List pageQuery(FenceConfig fenceConfig); + /** + * 判断名字唯一 + * @param fenceName + * @return + */ + boolean checkFenceKeyUnique(String fenceName); } 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 index e0caed8..67b7cf9 100644 --- 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 @@ -35,4 +35,12 @@ public interface FenceService extends IService { */ void removeByFenceId(Long fenceId); + /** + * 判断数据是否存在 + * + * @param fenceName + * @return + */ + boolean checkFenceKeyUnique(String fenceName); + } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java index 159dd44..efdaa0d 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java @@ -1,7 +1,5 @@ package com.couplet.map.server.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.couplet.map.common.domain.Fence; import com.couplet.map.common.domain.request.FenceConfig; @@ -57,15 +55,13 @@ public class FenceServiceImpl extends ServiceImpl implements @Override public void fenceInsert(HttpServletRequest request,FenceRequest fenceRequest) { - int a= fenceMapper.insertFence(fenceRequest); - String[] logoId = fenceRequest.getLogoId(); - String[] split=null; - if (logoId != null && logoId.length> 0){ - split = logoId[0].split(","); - } - if (a>0){ - fenAndLogoService.addBach(fenceRequest.getFenceId(),split); + String[] logoIds = fenceRequest.getLogoIds(); + String[] parts = new String[0]; + for (String logoId : logoIds) { + parts = logoId.split(","); + fenAndLogoService.addBach(fenceRequest.getFenceId(),parts); + } } @@ -74,4 +70,9 @@ public class FenceServiceImpl extends ServiceImpl implements public void removeByFenceId(Long fenceId) { fenceMapper.removeByFenceId(fenceId); } + + @Override + public boolean checkFenceKeyUnique(String fenceName) { + return fenceMapper.checkFenceKeyUnique(fenceName); + } } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenAndLogoMapper.xml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenAndLogoMapper.xml index a1d097f..7ff788a 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenAndLogoMapper.xml +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenAndLogoMapper.xml @@ -22,9 +22,10 @@ INSERT INTO `couplet-cloud`.`couplet_fences_and_logo` - (`fences_id`, `logo_id`) VALUES - - (#{fenceId}, #{logoItemId}) - + (`fences_id`, `logo_id`) + VALUES + + (#{fenceId}, #{item}) + diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml index 71257ab..0cf782d 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml @@ -21,7 +21,7 @@ SELECT - fence_id, + f.fence_id, fence_name, fence_longitude_latitude, fence_description, @@ -33,19 +33,32 @@ maintainer_name, alarm_status, l.logo_id, - logo_name + GROUP_CONCAT(logo_name) as logoName FROM couplet_fence_info f INNER JOIN couplet_fences_and_logo m on - f.fence_id=m.fences_id INNER JOIN couplet_logo_info l on l.logo_id=m.logo_id GROUP BY fence_id + f.fence_id=m.fences_id INNER JOIN couplet_logo_info l on l.logo_id=m.logo_id + + + SELECT + fence_id, + fence_name, + fence_longitude_latitude, + fence_description, + is_delete, + fence_state, + create_time, + update_time, + create_name, + maintainer_name, + alarm_status + FROM couplet_fence_info - INSERT INTO `couplet-cloud`.`couplet_fence_info` - (`fence_name`, `fence_description`, `is_delete`, `fence_state`, `create_time`, - `create_name`, `maintainer_name`, `alarm_status`) + (`fence_name`, `fence_longitude_latitude`, `fence_description`, `is_delete`, `fence_state`, `create_time`, + `update_time`, `create_name`, `maintainer_name`, `alarm_status`) VALUES - (#{fenceName}, #{fenceDescription}, 0, 0, now(), #{createTime}, - #{createName}, 0); + (#{fenceName}, null, #{fenceDescription}, 0, 0, now(), null, null, #{maintainerName}, 0) @@ -78,5 +91,9 @@ and fence_state = #{fenceState} + GROUP BY f.fence_id + + From 5148ae5e140bd7c6c7253a4197f1f1dd9ff23fbd Mon Sep 17 00:00:00 2001 From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com> Date: Tue, 2 Apr 2024 14:23:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=E6=96=B0=E5=A2=9E=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E7=B3=BB=E7=BB=9F=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couplet-analyze-incident/pom.xml | 20 ++++++++++ .../couplet-analyze-msg/pom.xml | 20 ++++++++++ .../java/com/couplet/msg/domain/MsgData.java | 0 .../com/couplet/msg/domain/TroubleLog.java | 0 .../src/test/java/com/couplet/msg/Main.java | 0 .../test/java/com/couplet/msg/ParsingMsg.java | 0 .../{couplet-msg => couplet-analyze}/pom.xml | 7 +++- .../couplet-electronic-fence-server/pom.xml | 4 ++ .../src/test/java/test.java | 33 +++++++++++++++ .../src/test/java/test2.java | 40 +++++++++++++++++++ couplet-modules/pom.xml | 2 +- 11 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/pom.xml create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml rename couplet-modules/{couplet-msg => couplet-analyze/couplet-analyze-msg}/src/main/java/com/couplet/msg/domain/MsgData.java (100%) rename couplet-modules/{couplet-msg => couplet-analyze/couplet-analyze-msg}/src/main/java/com/couplet/msg/domain/TroubleLog.java (100%) rename couplet-modules/{couplet-msg => couplet-analyze/couplet-analyze-msg}/src/test/java/com/couplet/msg/Main.java (100%) rename couplet-modules/{couplet-msg => couplet-analyze/couplet-analyze-msg}/src/test/java/com/couplet/msg/ParsingMsg.java (100%) rename couplet-modules/{couplet-msg => couplet-analyze}/pom.xml (93%) create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test.java create mode 100644 couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test2.java diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/pom.xml b/couplet-modules/couplet-analyze/couplet-analyze-incident/pom.xml new file mode 100644 index 0000000..cc43d1a --- /dev/null +++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.couplet + couplet-analyze + 3.6.3 + + + couplet-analyze-incident + + + 17 + 17 + UTF-8 + + + diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml b/couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml new file mode 100644 index 0000000..2c78901 --- /dev/null +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.couplet + couplet-analyze + 3.6.3 + + + couplet-analyze-msg + + + 17 + 17 + UTF-8 + + + diff --git a/couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/MsgData.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/domain/MsgData.java similarity index 100% rename from couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/MsgData.java rename to couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/domain/MsgData.java diff --git a/couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java similarity index 100% rename from couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java rename to couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java diff --git a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Main.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/test/java/com/couplet/msg/Main.java similarity index 100% rename from couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Main.java rename to couplet-modules/couplet-analyze/couplet-analyze-msg/src/test/java/com/couplet/msg/Main.java diff --git a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/test/java/com/couplet/msg/ParsingMsg.java similarity index 100% rename from couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java rename to couplet-modules/couplet-analyze/couplet-analyze-msg/src/test/java/com/couplet/msg/ParsingMsg.java diff --git a/couplet-modules/couplet-msg/pom.xml b/couplet-modules/couplet-analyze/pom.xml similarity index 93% rename from couplet-modules/couplet-msg/pom.xml rename to couplet-modules/couplet-analyze/pom.xml index d826790..1e3d70e 100644 --- a/couplet-modules/couplet-msg/pom.xml +++ b/couplet-modules/couplet-analyze/pom.xml @@ -9,7 +9,12 @@ 3.6.3 - couplet-msg + couplet-analyze + pom + + couplet-analyze-incident + couplet-analyze-msg + 17 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 index c207416..0dbec53 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml @@ -89,6 +89,10 @@ com.couplet couplet-common-system + + org.apache.kafka + kafka-clients + diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test.java new file mode 100644 index 0000000..58bc462 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test.java @@ -0,0 +1,33 @@ +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerRecord; + +import java.util.Properties; + +/** + * @Author: LiJiaYao + * @Date: 2024/4/1 + * 异步发送 + */ +public class test { + public static void main(String[] args) { + + Properties props = new Properties(); + props.put("bootstrap.servers","39.103.133.136:9092"); + //使用默认的配置 +// props.put("acks","all"); +// props.put("retries",0); +// props.put("batch.size",16384); +// props.put("linger.ms",1); +// props.put("buffer.memory",33554432); + props.put("key.serializer","org.apache.kafka.common.serialization.StringSerializer"); + props.put("value.serializer","org.apache.kafka.common.serialization.StringSerializer"); + KafkaProducer producer = new KafkaProducer<>(props); + for (int i = 0; i < 10; i++) { + producer.send(new ProducerRecord("my-topic",Integer.toString(i),Integer.toString(i))); + } + producer.close(); + } + + + +} diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test2.java b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test2.java new file mode 100644 index 0000000..1969ae1 --- /dev/null +++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test2.java @@ -0,0 +1,40 @@ +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.clients.producer.RecordMetadata; +import org.yaml.snakeyaml.introspector.Property; + +import java.util.Properties; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +/** + * @Author: LiJiaYao + * @Date: 2024/4/1 + * 同步发送 + */ +public class test2 { + + public static void main(String[] args) { + + Properties properties = new Properties(); + properties.put("bootstrap.servers", "39.103.133.136:9092"); + properties.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer"); + properties.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer"); + KafkaProducer producer = new KafkaProducer(properties); + for (int i = 0; i < 10; i++) { + Future result = producer.send(new ProducerRecord<>("test", Integer.toString(i), Integer.toString(i))); + try { + RecordMetadata recordMetadata =result.get(); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (ExecutionException e) { + e.printStackTrace(); + } + } + producer.close(); + + } + + +} diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 2ef9b94..1ce01cd 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -18,7 +18,7 @@ couplet-modules-vehicle couplet-modules-mq couplet-enterprisemanagement - couplet-msg + couplet-analyze couplet-modules