From 5a964fa9f58acba02790810d8ba3778fb2b79c52 Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Sun, 7 Apr 2024 15:43:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhilian-auth/src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 6 +- .../business/controller/BreakController.java | 102 ++++++++++++++++++ .../com/zhilian/business/domain/Break.java | 55 ++++++++++ .../com/zhilian/business/domain/BreakVo.java | 33 ++++++ .../zhilian/business/mapper/BreakMapper.java | 26 +++++ .../business/service/BreakService.java | 21 ++++ .../service/impl/BreakServiceImpl.java | 51 +++++++++ .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/mapper/BreakMapper.xml | 24 +++++ .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../resolver/ZhilianResolverApplication.java | 18 ---- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 19 files changed, 335 insertions(+), 41 deletions(-) create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakVo.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml delete mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhilianResolverApplication.java diff --git a/zhilian-auth/src/main/resources/bootstrap.yml b/zhilian-auth/src/main/resources/bootstrap.yml index f0725a8..25f5f89 100644 --- a/zhilian-auth/src/main/resources/bootstrap.yml +++ b/zhilian-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-gateway/src/main/resources/bootstrap.yml b/zhilian-gateway/src/main/resources/bootstrap.yml index 8248701..caa0441 100644 --- a/zhilian-gateway/src/main/resources/bootstrap.yml +++ b/zhilian-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 @@ -36,7 +36,7 @@ spring: ds1: nacos: server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 dataId: sentinel-zhilian-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakController.java new file mode 100644 index 0000000..320e71c --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakController.java @@ -0,0 +1,102 @@ +package com.zhilian.business.controller; + +import com.zhilian.business.domain.Break; +import com.zhilian.business.domain.BreakVo; +import com.zhilian.business.service.BreakService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.PageResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName BreakController + * @Description 故障业务实现 + * @Author YuanYongH + * @Date 2024/4/4 9:40 + */ +@RestController +public class BreakController { + + @Autowired + private BreakService breakService; + + /** + * @Description // 故障列表 + * @Date 2024/4/4 + * @param breakVo + * @return com.zhilian.common.core.domain.Result> + **/ + @PostMapping("breakList") + public Result> breakList(@RequestBody BreakVo breakVo) { + PageResult pageResult = breakService.breakList(breakVo); + return Result.success(pageResult); + } + + /** + * @Description // 故障添加 + * @Date 2024/4/4 + * @param break1 + * @return com.zhilian.common.core.domain.Result + **/ + @PostMapping("breakAdd") + public Result breakAdd(@RequestBody Break break1) { + int i = breakService.breakAdd(break1); + Result success = Result.success(i); + return success; + } + + /** + * @Description // 故障修改 + * @Date 2024/4/4 + * @param break1 + * @return com.zhilian.common.core.domain.Result + **/ + @PostMapping("breakUpd") + public Result breadUpd(@RequestBody Break break1) { + int i = breakService.breakUpd(break1); + Result success = Result.success(i); + return success; + } + + /** + * @Description // 故障删除 + * @Date 2024/4/4 + * @param breakId + * @return com.zhilian.common.core.domain.Result + **/ + @PostMapping("breakDel/{breakId}") + public Result delFirm(@PathVariable Integer breakId){ + int i = breakService.breakDel(breakId); + Result success = Result.success(i); + return success; + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java new file mode 100644 index 0000000..42495d0 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java @@ -0,0 +1,55 @@ +package com.zhilian.business.domain; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName Break + * @Description 故障实体类 + * @Author YuanYongH + * @Date 2024/4/4 9:40 + */ +@Data +public class Break { + /** + * 故障id + **/ + private Integer breakId; + /** + * 故障码 + **/ + private String breakCode; + /** + * 车牌号 + **/ + private String breakCar; + /** + * 车辆VIN码 + **/ + private String breakVin; + /** + * 故障时间 + **/ + private Date breakTime; + /** + * 故障类型 + **/ + private String breakType; + /** + * 故障级别 + **/ + private Integer breakRank; + /** + * 故障状态 + **/ + private Integer breakState; + /** + * 故障设备 + **/ + private String breakDevice; + /** + * 故障描述 + **/ + private String breakDesc; +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakVo.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakVo.java new file mode 100644 index 0000000..56dfb5d --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakVo.java @@ -0,0 +1,33 @@ +package com.zhilian.business.domain; + +import io.swagger.models.auth.In; +import lombok.Data; + +/** + * @ClassName BreakVo + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/4 9:51 + */ +@Data +public class BreakVo { + /** + * 故障id + **/ + private Integer breakId; + /** + * 车辆VIN码 + **/ + private String breakVin; + /** + * 故障状态 + **/ + private Integer breakState; + + + /** + * 分页 + **/ + private Integer pageNum = 1; + private Integer pageSize = 3; +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java new file mode 100644 index 0000000..02aaf9a --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java @@ -0,0 +1,26 @@ +package com.zhilian.business.mapper; + +import com.zhilian.business.domain.Break; +import com.zhilian.business.domain.BreakVo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName BreakMapper + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/4 9:59 + */ +@Mapper +public interface BreakMapper { + List breakList(BreakVo breakVo); + + int breakAdd(Break break1); + + int breakUpd(Break break1); + + int breakDel(Integer breakId); + + Integer addBreak(String breakCar, String breakVin, String breakType, Integer breakRank, Integer breakState); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakService.java new file mode 100644 index 0000000..9f8b663 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakService.java @@ -0,0 +1,21 @@ +package com.zhilian.business.service; + +import com.zhilian.business.domain.Break; +import com.zhilian.business.domain.BreakVo; +import com.zhilian.common.core.web.page.PageResult; + +/** + * @ClassName BreakService + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/4 9:54 + */ +public interface BreakService { + PageResult breakList(BreakVo breakVo); + + int breakAdd(Break break1); + + int breakUpd(Break break1); + + int breakDel(Integer breakId); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java new file mode 100644 index 0000000..ada8d22 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java @@ -0,0 +1,51 @@ +package com.zhilian.business.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.zhilian.business.domain.Break; +import com.zhilian.business.domain.BreakVo; +import com.zhilian.business.mapper.BreakMapper; +import com.zhilian.business.service.BreakService; +import com.zhilian.common.core.web.page.PageResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName BreakServiceImpl + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/4 9:54 + */ +@Service +public class BreakServiceImpl implements BreakService { + @Autowired + private BreakMapper breakMapper; + @Override + public PageResult breakList(BreakVo breakVo) { + PageHelper.startPage(breakVo.getPageNum(),breakVo.getPageSize()); + List list = breakMapper.breakList(breakVo); + PageInfo info = new PageInfo<>(list); + return PageResult.toResult(info.getTotal(),list).getData(); + } + + @Override + public int breakAdd(Break break1) { + int i = breakMapper.breakAdd(break1); + if (i>0){ + breakMapper.addBreak(break1.getBreakCar(),break1.getBreakVin(),break1.getBreakType(),break1.getBreakRank(),break1.getBreakState()); + } + return i; + } + + @Override + public int breakUpd(Break break1) { + return breakMapper.breakUpd(break1); + } + + @Override + public int breakDel(Integer breakId) { + return breakMapper.breakDel(breakId); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml index 1105c2a..9b269ff 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml new file mode 100644 index 0000000..81f08f3 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml @@ -0,0 +1,24 @@ + + + + + insert into business_breakdown(break_device,break_type,break_rank,break_state,break_time,break_desc,break_id,break_car,break_vin) + values(#{breakDevice},#{breakType},#{breakRank},#{breakState},#{breakTime},#{breakDesc},#{breakId},#{breakCar},#{breakVin}) + + + insert into business_breakdown(break_device,break_type,break_rank,break_state,break_time,break_desc,break_id,break_car,break_vin) + values(#{breakCar},#{breakType},#{breakRank},#{breakState},#{breakTime},#{breakDesc},#{breakId},#{breakCar},#{breakVin}) + + + + + + + delete from business_breakdown where break_id = #{breakId} + + + diff --git a/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml index 9522161..ba6bbff 100644 --- a/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml index b9c8fb0..d6a7a3a 100644 --- a/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml index 510d6bb..1d36dc7 100644 --- a/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml index 9fc2b73..1b0e357 100644 --- a/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml index 452f88f..59fbc2c 100644 --- a/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhilianResolverApplication.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhilianResolverApplication.java deleted file mode 100644 index de0dc3d..0000000 --- a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhilianResolverApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zhilian.resolver; -import com.zhilian.common.security.annotation.EnableMyFeignClients; -import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.scheduling.annotation.EnableScheduling; - -@EnableCustomSwagger2 -@EnableScheduling -@EnableMyFeignClients -@MapperScan({"com.zhilian.resolver.mapper", "com.zhilian.resolver.resolverReport"}) -@SpringBootApplication -public class ZhiLianResolverApplication { - public static void main(String[] args) { - SpringApplication.run(ZhiLianResolverApplication.class, args); - } -} diff --git a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml index 0823fd6..040cfe5 100644 --- a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml @@ -19,11 +19,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml index cbc7840..2ca5515 100644 --- a/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml b/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml index d8696f6..9b529a1 100644 --- a/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml +++ b/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe + namespace: c854844c-45ce-4328-876c-51d85b7bab48 # 配置文件格式 file-extension: yml # 共享配置 From 6a9e8c309708f58a2c0b7055e3438e2dd3966cfb Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Sun, 7 Apr 2024 15:54:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=AE=9E=E7=8E=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusinessBreakController.java | 103 ++++++++++++ .../zhilian/system/domain/BusinessBreak.java | 150 ++++++++++++++++++ .../system/mapper/BusinessBreakMapper.java | 30 ++++ .../system/service/IBusinessBreakService.java | 25 +++ .../impl/BusinessBreakServiceImpl.java | 58 +++++++ .../mapper/system/BusinessBreakMapper.xml | 91 +++++++++++ 6 files changed, 457 insertions(+) create mode 100644 zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/BusinessBreakController.java create mode 100644 zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/BusinessBreak.java create mode 100644 zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/BusinessBreakMapper.java create mode 100644 zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/IBusinessBreakService.java create mode 100644 zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/BusinessBreakServiceImpl.java create mode 100644 zhilian-modules/zhilian-system/src/main/resources/mapper/system/BusinessBreakMapper.xml diff --git a/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/BusinessBreakController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/BusinessBreakController.java new file mode 100644 index 0000000..887754e --- /dev/null +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/BusinessBreakController.java @@ -0,0 +1,103 @@ +package com.zhilian.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.system.domain.BusinessBreak; +import com.zhilian.system.service.IBusinessBreakService; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.page.TableDataInfo; + +/** + * + * @author y + * @date 2024-04-07 + */ +@RestController +@RequestMapping("/break") +public class BusinessBreakController extends BaseController +{ + @Autowired + private IBusinessBreakService businessBreakService; + + /** + * 查询列表 + */ + @RequiresPermissions("system:break:list") + @GetMapping("/list") + public Result> list(BusinessBreak businessBreak) + { + startPage(); + List list = businessBreakService.selectBusinessBreakList(businessBreak); + return getDataTable(list); + } + + /** + * 导出列表 + */ + @RequiresPermissions("system:break:export") + @Log(title = "", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BusinessBreak businessBreak) + { + List list = businessBreakService.selectBusinessBreakList(businessBreak); + ExcelUtil util = new ExcelUtil(BusinessBreak.class); + util.exportExcel(response, list, "故障码数据"); + } + + /** + * 获取详细信息 + */ + @RequiresPermissions("system:break:query") + @GetMapping(value = "/{breakId}") + public Result getInfo(@PathVariable("breakId") Long breakId) + { + return success(businessBreakService.selectBusinessBreakByBreakId(breakId)); + } + + /** + * 新增 + */ + @RequiresPermissions("system:break:add") + @Log(title = "", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody BusinessBreak businessBreak) + { + return toAjax(businessBreakService.insertBusinessBreak(businessBreak)); + } + + /** + * 修改 + */ + @RequiresPermissions("system:break:edit") + @Log(title = "", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody BusinessBreak businessBreak) + { + return toAjax(businessBreakService.updateBusinessBreak(businessBreak)); + } + + /** + * 删除 + */ + @RequiresPermissions("system:break:remove") + @Log(title = "", businessType = BusinessType.DELETE) + @DeleteMapping("/{breakIds}") + public Result remove(@PathVariable Long[] breakIds) + { + return toAjax(businessBreakService.deleteBusinessBreakByBreakIds(breakIds)); + } +} diff --git a/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/BusinessBreak.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/BusinessBreak.java new file mode 100644 index 0000000..235a476 --- /dev/null +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/BusinessBreak.java @@ -0,0 +1,150 @@ +package com.zhilian.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; + +/** + * + * @author zhilian + * @date 2024-04-07 + */ +public class BusinessBreak extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long breakId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String breakCar; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String breakVin; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date breakTime; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String breakType; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String breakRank; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String breakState; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String breakDevice; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String breakDesc; + + public void setBreakId(Long breakId) + { + this.breakId = breakId; + } + + public Long getBreakId() + { + return breakId; + } + public void setBreakCar(String breakCar) + { + this.breakCar = breakCar; + } + + public String getBreakCar() + { + return breakCar; + } + public void setBreakVin(String breakVin) + { + this.breakVin = breakVin; + } + + public String getBreakVin() + { + return breakVin; + } + public void setBreakTime(Date breakTime) + { + this.breakTime = breakTime; + } + + public Date getBreakTime() + { + return breakTime; + } + public void setBreakType(String breakType) + { + this.breakType = breakType; + } + + public String getBreakType() + { + return breakType; + } + public void setBreakRank(String breakRank) + { + this.breakRank = breakRank; + } + + public String getBreakRank() + { + return breakRank; + } + public void setBreakState(String breakState) + { + this.breakState = breakState; + } + + public String getBreakState() + { + return breakState; + } + public void setBreakDevice(String breakDevice) + { + this.breakDevice = breakDevice; + } + + public String getBreakDevice() + { + return breakDevice; + } + public void setBreakDesc(String breakDesc) + { + this.breakDesc = breakDesc; + } + + public String getBreakDesc() + { + return breakDesc; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("breakId", getBreakId()) + .append("breakCar", getBreakCar()) + .append("breakVin", getBreakVin()) + .append("breakTime", getBreakTime()) + .append("breakType", getBreakType()) + .append("breakRank", getBreakRank()) + .append("breakState", getBreakState()) + .append("breakDevice", getBreakDevice()) + .append("breakDesc", getBreakDesc()) + .toString(); + } +} diff --git a/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/BusinessBreakMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/BusinessBreakMapper.java new file mode 100644 index 0000000..5ec33dd --- /dev/null +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/BusinessBreakMapper.java @@ -0,0 +1,30 @@ +package com.zhilian.system.mapper; + +import java.util.List; +import com.zhilian.system.domain.BusinessBreak; + +/** + * + * @author zhilian + * @date 2024-04-07 + */ +public interface BusinessBreakMapper +{ + + public BusinessBreak selectBusinessBreakByBreakId(Long breakId); + + + public List selectBusinessBreakList(BusinessBreak businessBreak); + + + public int insertBusinessBreak(BusinessBreak businessBreak); + + + public int updateBusinessBreak(BusinessBreak businessBreak); + + + public int deleteBusinessBreakByBreakId(Long breakId); + + + public int deleteBusinessBreakByBreakIds(Long[] breakIds); +} diff --git a/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/IBusinessBreakService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/IBusinessBreakService.java new file mode 100644 index 0000000..4f58306 --- /dev/null +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/IBusinessBreakService.java @@ -0,0 +1,25 @@ +package com.zhilian.system.service; + +import java.util.List; +import com.zhilian.system.domain.BusinessBreak; + + +public interface IBusinessBreakService +{ + + public BusinessBreak selectBusinessBreakByBreakId(Long breakId); + + + public List selectBusinessBreakList(BusinessBreak businessBreak); + + + public int insertBusinessBreak(BusinessBreak businessBreak); + + public int updateBusinessBreak(BusinessBreak businessBreak); + + + public int deleteBusinessBreakByBreakIds(Long[] breakIds); + + + public int deleteBusinessBreakByBreakId(Long breakId); +} diff --git a/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/BusinessBreakServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/BusinessBreakServiceImpl.java new file mode 100644 index 0000000..f32215e --- /dev/null +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/BusinessBreakServiceImpl.java @@ -0,0 +1,58 @@ +package com.zhilian.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zhilian.system.mapper.BusinessBreakMapper; +import com.zhilian.system.domain.BusinessBreak; +import com.zhilian.system.service.IBusinessBreakService; + + +@Service +public class BusinessBreakServiceImpl implements IBusinessBreakService +{ + @Autowired + private BusinessBreakMapper businessBreakMapper; + + + @Override + public BusinessBreak selectBusinessBreakByBreakId(Long breakId) + { + return businessBreakMapper.selectBusinessBreakByBreakId(breakId); + } + + + @Override + public List selectBusinessBreakList(BusinessBreak businessBreak) + { + return businessBreakMapper.selectBusinessBreakList(businessBreak); + } + + + @Override + public int insertBusinessBreak(BusinessBreak businessBreak) + { + return businessBreakMapper.insertBusinessBreak(businessBreak); + } + + + @Override + public int updateBusinessBreak(BusinessBreak businessBreak) + { + return businessBreakMapper.updateBusinessBreak(businessBreak); + } + + + @Override + public int deleteBusinessBreakByBreakIds(Long[] breakIds) + { + return businessBreakMapper.deleteBusinessBreakByBreakIds(breakIds); + } + + + @Override + public int deleteBusinessBreakByBreakId(Long breakId) + { + return businessBreakMapper.deleteBusinessBreakByBreakId(breakId); + } +} diff --git a/zhilian-modules/zhilian-system/src/main/resources/mapper/system/BusinessBreakMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/BusinessBreakMapper.xml new file mode 100644 index 0000000..cfdf33e --- /dev/null +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/BusinessBreakMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + select break_id, break_car, break_vin, break_time, break_type, break_rank, break_state, break_device, break_desc from business_break + + + + + + + + insert into business_break + + break_car, + break_vin, + break_time, + break_type, + break_rank, + break_state, + break_device, + break_desc, + + + #{breakCar}, + #{breakVin}, + #{breakTime}, + #{breakType}, + #{breakRank}, + #{breakState}, + #{breakDevice}, + #{breakDesc}, + + + + + update business_break + + break_car = #{breakCar}, + break_vin = #{breakVin}, + break_time = #{breakTime}, + break_type = #{breakType}, + break_rank = #{breakRank}, + break_state = #{breakState}, + break_device = #{breakDevice}, + break_desc = #{breakDesc}, + + where break_id = #{breakId} + + + + delete from business_break where break_id = #{breakId} + + + + delete from business_break where break_id in + + #{breakId} + + + From 447986b5aced0bb9459ea2bcf73e48d4552c2627 Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Sun, 7 Apr 2024 22:39:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=AE=9E=E7=8E=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhilian-modules/zhilian-business/pom.xml | 2 +- .../controller/BusinessBreakController.java | 104 ++++++++++++++++ .../com/zhilian/business/domain/Break.java | 37 ++---- .../business/domain/BusinessBreak.java | 112 ++++++++++++++++++ .../zhilian/business/mapper/BreakMapper.java | 3 +- .../business/mapper/BusinessBreakMapper.java | 61 ++++++++++ .../service/IBusinessBreakService.java | 61 ++++++++++ .../service/impl/BreakServiceImpl.java | 2 +- .../impl/BusinessBreakServiceImpl.java | 93 +++++++++++++++ .../src/main/resources/mapper/BreakMapper.xml | 6 +- .../resources/mapper/BusinessBreakMapper.xml | 78 ++++++++++++ .../src/main/resources/bootstrap.yml | 16 +++ 12 files changed, 544 insertions(+), 31 deletions(-) create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BusinessBreak.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml diff --git a/zhilian-modules/zhilian-business/pom.xml b/zhilian-modules/zhilian-business/pom.xml index 6e869f8..d009576 100644 --- a/zhilian-modules/zhilian-business/pom.xml +++ b/zhilian-modules/zhilian-business/pom.xml @@ -106,4 +106,4 @@ - \ No newline at end of file + diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java new file mode 100644 index 0000000..9d5431e --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java @@ -0,0 +1,104 @@ +package com.zhilian.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.business.domain.BusinessBreak; +import com.zhilian.business.service.IBusinessBreakService; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.page.TableDataInfo; + +/** + * 故障Controller + * + * @author Yy + * @date 2024-04-07 + */ +@RestController +@RequestMapping("/break") +public class BusinessBreakController extends BaseController +{ + @Autowired + private IBusinessBreakService businessBreakService; + + /** + * 查询故障列表 + */ + @RequiresPermissions("business:break:list") + @GetMapping("/list") + public Result> list(BusinessBreak businessBreak) + { + startPage(); + List list = businessBreakService.selectBusinessBreakList(businessBreak); + return getDataTable(list); + } + + /** + * 导出故障列表 + */ + @RequiresPermissions("business:break:export") + @Log(title = "故障", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BusinessBreak businessBreak) + { + List list = businessBreakService.selectBusinessBreakList(businessBreak); + ExcelUtil util = new ExcelUtil(BusinessBreak.class); + util.exportExcel(response, list, "故障数据"); + } + + /** + * 获取故障详细信息 + */ + @RequiresPermissions("business:break:query") + @GetMapping(value = "/{breakId}") + public Result getInfo(@PathVariable("breakId") Long breakId) + { + return success(businessBreakService.selectBusinessBreakByBreakId(breakId)); + } + + /** + * 新增故障 + */ + @RequiresPermissions("business:break:add") + @Log(title = "故障", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody BusinessBreak businessBreak) + { + return toAjax(businessBreakService.insertBusinessBreak(businessBreak)); + } + + /** + * 修改故障 + */ + @RequiresPermissions("business:break:edit") + @Log(title = "故障", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody BusinessBreak businessBreak) + { + return toAjax(businessBreakService.updateBusinessBreak(businessBreak)); + } + + /** + * 删除故障 + */ + @RequiresPermissions("business:break:remove") + @Log(title = "故障", businessType = BusinessType.DELETE) + @DeleteMapping("/{breakIds}") + public Result remove(@PathVariable Long[] breakIds) + { + return toAjax(businessBreakService.deleteBusinessBreakByBreakIds(breakIds)); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java index 42495d0..425d1a2 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java @@ -1,5 +1,6 @@ package com.zhilian.business.domain; +import io.swagger.models.auth.In; import lombok.Data; import java.util.Date; @@ -18,38 +19,26 @@ public class Break { private Integer breakId; /** * 故障码 - **/ + **/ private String breakCode; /** - * 车牌号 - **/ - private String breakCar; - /** - * 车辆VIN码 - **/ + * 车辆VIN + **/ private String breakVin; /** - * 故障时间 - **/ + * 开始报警时间 + **/ + private Date breakDate; + /** + * 结束报警时间 + **/ private Date breakTime; /** * 故障类型 - **/ + **/ private String breakType; /** - * 故障级别 - **/ - private Integer breakRank; - /** - * 故障状态 - **/ + * 故障状态 是否警告 + **/ private Integer breakState; - /** - * 故障设备 - **/ - private String breakDevice; - /** - * 故障描述 - **/ - private String breakDesc; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BusinessBreak.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BusinessBreak.java new file mode 100644 index 0000000..e902cf1 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BusinessBreak.java @@ -0,0 +1,112 @@ +package com.zhilian.business.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; + +/** + * 故障对象 business_break + * + * @author Yy + * @date 2024-04-07 + */ +@Data +public class BusinessBreak extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long breakId; + + /** 故障码 */ + @Excel(name = "故障码") + private String breakCode; + + /** 车辆VIN */ + @Excel(name = "车辆VIN") + private String breakVin; + + /** 结束报警时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束报警时间", width = 30, dateFormat = "yyyy-MM-dd") + private String breakTime; + + /** 故障类型 */ + @Excel(name = "故障类型") + private String breakType; + + /** 开始报警时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始报警时间", width = 30, dateFormat = "yyyy-MM-dd") + private String breakDate; + + /** 是否警告 */ + @Excel(name = "是否警告") + private String breakState; + + public void setBreakId(Long breakId) + { + this.breakId = breakId; + } + + public Long getBreakId() + { + return breakId; + } + public void setBreakCode(String breakCode) + { + this.breakCode = breakCode; + } + + public String getBreakCode() + { + return breakCode; + } + public void setBreakVin(String breakVin) + { + this.breakVin = breakVin; + } + + public String getBreakVin() + { + return breakVin; + } + + + public void setBreakType(String breakType) + { + this.breakType = breakType; + } + + public String getBreakType() + { + return breakType; + } + + public void setBreakState(String breakState) + { + this.breakState = breakState; + } + + public String getBreakState() + { + return breakState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("breakId", getBreakId()) + .append("breakCode", getBreakCode()) + .append("breakVin", getBreakVin()) + .append("breakTime", getBreakTime()) + .append("breakType", getBreakType()) + .append("breakDate", getBreakDate()) + .append("breakState", getBreakState()) + .toString(); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java index 02aaf9a..2d959d4 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java @@ -4,6 +4,7 @@ import com.zhilian.business.domain.Break; import com.zhilian.business.domain.BreakVo; import org.apache.ibatis.annotations.Mapper; +import java.util.Date; import java.util.List; /** @@ -22,5 +23,5 @@ public interface BreakMapper { int breakDel(Integer breakId); - Integer addBreak(String breakCar, String breakVin, String breakType, Integer breakRank, Integer breakState); + Integer addBreak(String breakCode, String breakVin, Date breakTime, Date breakDate, String breakType, Integer breakState); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java new file mode 100644 index 0000000..ec456bc --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java @@ -0,0 +1,61 @@ +package com.zhilian.business.mapper; + +import java.util.List; +import com.zhilian.business.domain.BusinessBreak; + +/** + * 故障Mapper接口 + * + * @author Yy + * @date 2024-04-07 + */ +public interface BusinessBreakMapper +{ + /** + * 查询故障 + * + * @param breakId 故障主键 + * @return 故障 + */ + public BusinessBreak selectBusinessBreakByBreakId(Long breakId); + + /** + * 查询故障列表 + * + * @param businessBreak 故障 + * @return 故障集合 + */ + public List selectBusinessBreakList(BusinessBreak businessBreak); + + /** + * 新增故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + public int insertBusinessBreak(BusinessBreak businessBreak); + + /** + * 修改故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + public int updateBusinessBreak(BusinessBreak businessBreak); + + /** + * 删除故障 + * + * @param breakId 故障主键 + * @return 结果 + */ + public int deleteBusinessBreakByBreakId(Long breakId); + + /** + * 批量删除故障 + * + * @param breakIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusinessBreakByBreakIds(Long[] breakIds); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java new file mode 100644 index 0000000..99c301f --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java @@ -0,0 +1,61 @@ +package com.zhilian.business.service; + +import java.util.List; +import com.zhilian.business.domain.BusinessBreak; + +/** + * 故障Service接口 + * + * @author Yy + * @date 2024-04-07 + */ +public interface IBusinessBreakService +{ + /** + * 查询故障 + * + * @param breakId 故障主键 + * @return 故障 + */ + public BusinessBreak selectBusinessBreakByBreakId(Long breakId); + + /** + * 查询故障列表 + * + * @param businessBreak 故障 + * @return 故障集合 + */ + public List selectBusinessBreakList(BusinessBreak businessBreak); + + /** + * 新增故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + public int insertBusinessBreak(BusinessBreak businessBreak); + + /** + * 修改故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + public int updateBusinessBreak(BusinessBreak businessBreak); + + /** + * 批量删除故障 + * + * @param breakIds 需要删除的故障主键集合 + * @return 结果 + */ + public int deleteBusinessBreakByBreakIds(Long[] breakIds); + + /** + * 删除故障信息 + * + * @param breakId 故障主键 + * @return 结果 + */ + public int deleteBusinessBreakByBreakId(Long breakId); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java index ada8d22..2cbd72a 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java @@ -34,7 +34,7 @@ public class BreakServiceImpl implements BreakService { public int breakAdd(Break break1) { int i = breakMapper.breakAdd(break1); if (i>0){ - breakMapper.addBreak(break1.getBreakCar(),break1.getBreakVin(),break1.getBreakType(),break1.getBreakRank(),break1.getBreakState()); + breakMapper.addBreak(break1.getBreakCode(),break1.getBreakVin(),break1.getBreakTime(),break1.getBreakDate(),break1.getBreakType(),break1.getBreakState()); } return i; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java new file mode 100644 index 0000000..0602cae --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java @@ -0,0 +1,93 @@ +package com.zhilian.business.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zhilian.business.mapper.BusinessBreakMapper; +import com.zhilian.business.domain.BusinessBreak; +import com.zhilian.business.service.IBusinessBreakService; + +/** + * 故障Service业务层处理 + * + * @author Yy + * @date 2024-04-07 + */ +@Service +public class BusinessBreakServiceImpl implements IBusinessBreakService +{ + @Autowired + private BusinessBreakMapper businessBreakMapper; + + /** + * 查询故障 + * + * @param breakId 故障主键 + * @return 故障 + */ + @Override + public BusinessBreak selectBusinessBreakByBreakId(Long breakId) + { + return businessBreakMapper.selectBusinessBreakByBreakId(breakId); + } + + /** + * 查询故障列表 + * + * @param businessBreak 故障 + * @return 故障 + */ + @Override + public List selectBusinessBreakList(BusinessBreak businessBreak) + { + return businessBreakMapper.selectBusinessBreakList(businessBreak); + } + + /** + * 新增故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + @Override + public int insertBusinessBreak(BusinessBreak businessBreak) + { + return businessBreakMapper.insertBusinessBreak(businessBreak); + } + + /** + * 修改故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + @Override + public int updateBusinessBreak(BusinessBreak businessBreak) + { + return businessBreakMapper.updateBusinessBreak(businessBreak); + } + + /** + * 批量删除故障 + * + * @param breakIds 需要删除的故障主键 + * @return 结果 + */ + @Override + public int deleteBusinessBreakByBreakIds(Long[] breakIds) + { + return businessBreakMapper.deleteBusinessBreakByBreakIds(breakIds); + } + + /** + * 删除故障信息 + * + * @param breakId 故障主键 + * @return 结果 + */ + @Override + public int deleteBusinessBreakByBreakId(Long breakId) + { + return businessBreakMapper.deleteBusinessBreakByBreakId(breakId); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml index 81f08f3..4f805b1 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml @@ -4,12 +4,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - insert into business_breakdown(break_device,break_type,break_rank,break_state,break_time,break_desc,break_id,break_car,break_vin) - values(#{breakDevice},#{breakType},#{breakRank},#{breakState},#{breakTime},#{breakDesc},#{breakId},#{breakCar},#{breakVin}) + - insert into business_breakdown(break_device,break_type,break_rank,break_state,break_time,break_desc,break_id,break_car,break_vin) - values(#{breakCar},#{breakType},#{breakRank},#{breakState},#{breakTime},#{breakDesc},#{breakId},#{breakCar},#{breakVin}) + diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml new file mode 100644 index 0000000..9aecbef --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + select break_id, break_code, break_vin, break_time, break_type, break_date, break_state from business_break + + + + + + + + insert into business_break + + break_code, + break_vin, + break_time, + break_type, + break_date, + break_state, + + + #{breakCode}, + #{breakVin}, + #{breakTime}, + #{breakType}, + #{breakDate}, + #{breakState}, + + + + + update business_break + + break_code = #{breakCode}, + break_vin = #{breakVin}, + break_time = #{breakTime}, + break_type = #{breakType}, + break_date = #{breakDate}, + break_state = #{breakState}, + + where break_id = #{breakId} + + + + delete from business_break where break_id = #{breakId} + + + + delete from business_break where break_id in + + #{breakId} + + + diff --git a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml index 040cfe5..cf9d6d2 100644 --- a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml @@ -4,6 +4,22 @@ server: # Spring spring: +# 正确格式 + datasource: + dynamic: + strict: false + primary: one + datasource: + one: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://10.10.25.1:3306/zhilian-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: fffdev + two: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/demo1?allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false + username: root + password: 123456 redis: host: 10.10.25.3 port: 6379 From 59b796f9626009e15858ff86f3bb0bbc7c373ade Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Mon, 8 Apr 2024 15:42:40 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=AE=9E=E7=8E=B0=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusinessBreakController.java | 25 ++++++++++++---- .../com/zhilian/business/domain/BreakLog.java | 30 +++++++++++++++++++ .../business/domain/request/BreakReq.java | 24 +++++++++++++++ .../business/mapper/BusinessBreakMapper.java | 26 +++++++++------- .../service/IBusinessBreakService.java | 26 +++++++++------- .../impl/BusinessBreakServiceImpl.java | 14 +++++++-- .../resources/mapper/BusinessBreakMapper.xml | 3 ++ 7 files changed, 119 insertions(+), 29 deletions(-) create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java index 9d5431e..4da3305 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java @@ -2,6 +2,9 @@ package com.zhilian.business.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhilian.business.domain.BreakLog; +import com.zhilian.business.domain.request.BreakReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -19,7 +22,7 @@ import com.zhilian.business.service.IBusinessBreakService; import com.zhilian.common.core.web.controller.BaseController; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.utils.poi.ExcelUtil; -import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.core.web.page.*; /** * 故障Controller @@ -37,12 +40,12 @@ public class BusinessBreakController extends BaseController /** * 查询故障列表 */ - @RequiresPermissions("business:break:list") +// @RequiresPermissions("business:break:list") @GetMapping("/list") - public Result> list(BusinessBreak businessBreak) + public Result> list(BreakReq breakReq) { startPage(); - List list = businessBreakService.selectBusinessBreakList(businessBreak); + List list = businessBreakService.selectBusinessBreakList(breakReq); return getDataTable(list); } @@ -52,9 +55,9 @@ public class BusinessBreakController extends BaseController @RequiresPermissions("business:break:export") @Log(title = "故障", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, BusinessBreak businessBreak) + public void export(HttpServletResponse response, BreakReq breakReq) { - List list = businessBreakService.selectBusinessBreakList(businessBreak); + List list = businessBreakService.selectBusinessBreakList(breakReq); ExcelUtil util = new ExcelUtil(BusinessBreak.class); util.exportExcel(response, list, "故障数据"); } @@ -101,4 +104,14 @@ public class BusinessBreakController extends BaseController { return toAjax(businessBreakService.deleteBusinessBreakByBreakIds(breakIds)); } + + /** + * 故障日志 + */ + @PostMapping("breakLog") + public Result> breakLog(){ + List list = businessBreakService.breakLog(); + Result> success = Result.success(list); + return success; + } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java new file mode 100644 index 0000000..068c39d --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java @@ -0,0 +1,30 @@ +package com.zhilian.business.domain; + +import com.zhilian.common.core.web.page.PageResult; +import io.swagger.models.auth.In; +import lombok.Data; + +/** + * @ClassName BreakLog + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/8 15:07 + */ +@Data +public class BreakLog { + + /** 故障日志id */ + private Integer breakLogId; + /** 故障码 */ + private String breakCode; + /** 车辆VIN */ + private String breakVin; + /** 故障类型 */ + private String breakType; + /** 结束报警时间 */ + private String breakTime; + /** 开始报警时间 */ + private String breakDate; + /** 是否报警 */ + private String breakState; +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java new file mode 100644 index 0000000..ad62483 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java @@ -0,0 +1,24 @@ +package com.zhilian.business.domain.request; + +import io.swagger.models.auth.In; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName BreakReq + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/8 15:28 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BreakReq { + private Integer breakId; + private String breakCode; + private String breakVin; + private String breakType; +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java index ec456bc..65409ba 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java @@ -1,19 +1,22 @@ package com.zhilian.business.mapper; import java.util.List; + +import com.zhilian.business.domain.BreakLog; import com.zhilian.business.domain.BusinessBreak; +import com.zhilian.business.domain.request.BreakReq; /** * 故障Mapper接口 - * + * * @author Yy * @date 2024-04-07 */ -public interface BusinessBreakMapper +public interface BusinessBreakMapper { /** * 查询故障 - * + * * @param breakId 故障主键 * @return 故障 */ @@ -21,15 +24,15 @@ public interface BusinessBreakMapper /** * 查询故障列表 - * - * @param businessBreak 故障 + * + * @param breakReq 故障 * @return 故障集合 */ - public List selectBusinessBreakList(BusinessBreak businessBreak); + public List selectBusinessBreakList(BreakReq breakReq); /** * 新增故障 - * + * * @param businessBreak 故障 * @return 结果 */ @@ -37,7 +40,7 @@ public interface BusinessBreakMapper /** * 修改故障 - * + * * @param businessBreak 故障 * @return 结果 */ @@ -45,7 +48,7 @@ public interface BusinessBreakMapper /** * 删除故障 - * + * * @param breakId 故障主键 * @return 结果 */ @@ -53,9 +56,12 @@ public interface BusinessBreakMapper /** * 批量删除故障 - * + * * @param breakIds 需要删除的数据主键集合 * @return 结果 */ public int deleteBusinessBreakByBreakIds(Long[] breakIds); + + List breakLog(); + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java index 99c301f..b49d544 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java @@ -1,19 +1,22 @@ package com.zhilian.business.service; import java.util.List; + +import com.zhilian.business.domain.BreakLog; import com.zhilian.business.domain.BusinessBreak; +import com.zhilian.business.domain.request.BreakReq; /** * 故障Service接口 - * + * * @author Yy * @date 2024-04-07 */ -public interface IBusinessBreakService +public interface IBusinessBreakService { /** * 查询故障 - * + * * @param breakId 故障主键 * @return 故障 */ @@ -21,15 +24,15 @@ public interface IBusinessBreakService /** * 查询故障列表 - * - * @param businessBreak 故障 + * + * @param breakReq 故障 * @return 故障集合 */ - public List selectBusinessBreakList(BusinessBreak businessBreak); + public List selectBusinessBreakList(BreakReq breakReq); /** * 新增故障 - * + * * @param businessBreak 故障 * @return 结果 */ @@ -37,7 +40,7 @@ public interface IBusinessBreakService /** * 修改故障 - * + * * @param businessBreak 故障 * @return 结果 */ @@ -45,7 +48,7 @@ public interface IBusinessBreakService /** * 批量删除故障 - * + * * @param breakIds 需要删除的故障主键集合 * @return 结果 */ @@ -53,9 +56,12 @@ public interface IBusinessBreakService /** * 删除故障信息 - * + * * @param breakId 故障主键 * @return 结果 */ public int deleteBusinessBreakByBreakId(Long breakId); + + List breakLog(); + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java index 0602cae..90be7e5 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java @@ -1,6 +1,9 @@ package com.zhilian.business.service.impl; import java.util.List; + +import com.zhilian.business.domain.BreakLog; +import com.zhilian.business.domain.request.BreakReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhilian.business.mapper.BusinessBreakMapper; @@ -34,13 +37,13 @@ public class BusinessBreakServiceImpl implements IBusinessBreakService /** * 查询故障列表 * - * @param businessBreak 故障 + * @param breakReq 故障 * @return 故障 */ @Override - public List selectBusinessBreakList(BusinessBreak businessBreak) + public List selectBusinessBreakList(BreakReq breakReq) { - return businessBreakMapper.selectBusinessBreakList(businessBreak); + return businessBreakMapper.selectBusinessBreakList(breakReq); } /** @@ -90,4 +93,9 @@ public class BusinessBreakServiceImpl implements IBusinessBreakService { return businessBreakMapper.deleteBusinessBreakByBreakId(breakId); } + + @Override + public List breakLog() { + return businessBreakMapper.breakLog(); + } } diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml index 9aecbef..0379105 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml @@ -31,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where break_id = #{breakId} + insert into business_break From 31155a12a6cb3118f4ee8fd994ddaa5ea93fc4bd Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Mon, 8 Apr 2024 17:23:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 + zhilian-common/pom.xml | 1 + .../zhilian-common-business/pom.xml | 28 ++++ .../com/zhilian/business/domain/Fence.java | 6 +- .../com/zhilian/business/domain/Markers.java | 35 +++++ .../com/zhilian/business/domain/Vehicle.java | 71 ++++++++++ .../zhilian/business/domain/VehicleType.java | 29 ++++ .../business/domain/middle/MarkersFence.java | 34 +++++ .../domain/middle/VehicleMarkers.java | 38 ++++++ .../zhilian/business/domain/vo}/FenceVo.java | 9 +- .../zhilian/business/domain/vo/MarkersVo.java | 8 ++ .../zhilian/business/domain/vo/VehicleVo.java | 37 ++++++ .../business/remote/RemoteFenceService.java | 7 + .../factory/RemoteFenceFallbackFactory.java | 8 ++ .../zhilian/common/core/domain/Result.java | 1 + zhilian-modules/zhilian-business/pom.xml | 6 + .../business/controller/FenceController.java | 40 +++--- .../controller/MarkersController.java | 72 ++++++++++ .../controller/MarkersFenceController.java | 24 ++++ .../controller/VehicleController.java | 124 ++++++++++++++++++ .../controller/VehicleMarkersController.java | 24 ++++ .../controller/VehicleTypeController.java | 25 ++++ .../business/domain/request/BreakReq.java | 4 + .../business/domain/request/FenceRequest.java | 31 ----- .../zhilian/business/mapper/FenceMapper.java | 2 +- .../business/mapper/MarkersFenceMapper.java | 11 ++ .../business/mapper/MarkersMapper.java | 12 ++ .../business/mapper/VehicleMapper.java | 12 ++ .../business/mapper/VehicleMarkersMapper.java | 12 ++ .../business/mapper/VehicleTypeMapper.java | 12 ++ .../business/service/FenceService.java | 10 +- .../business/service/MarkersFenceService.java | 8 ++ .../business/service/MarkersService.java | 13 ++ .../service/VehicleMarkersService.java | 14 ++ .../business/service/VehicleService.java | 12 ++ .../business/service/VehicleTypeService.java | 13 ++ .../service/impl/FenceServiceImpl.java | 40 +++--- .../service/impl/MarkersFenceServiceImpl.java | 16 +++ .../service/impl/MarkersServiceImpl.java | 43 ++++++ .../impl/VehicleMarkersServiceImpl.java | 36 +++++ .../service/impl/VehicleServiceImpl.java | 63 +++++++++ .../service/impl/VehicleTypeServiceImpl.java | 26 ++++ .../src/main/resources/mapper/FenceMapper.xml | 52 -------- .../main/resources/mapper/VehicleMapper.xml | 7 + .../resources/mapper/VehicleMarkersMapper.xml | 7 + .../resolver/ZhiLianResolverApplication.java | 18 --- 46 files changed, 951 insertions(+), 155 deletions(-) create mode 100644 zhilian-common/zhilian-common-business/pom.xml rename {zhilian-modules/zhilian-business => zhilian-common/zhilian-common-business}/src/main/java/com/zhilian/business/domain/Fence.java (94%) create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java rename {zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain => zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo}/FenceVo.java (78%) create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java delete mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml create mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml delete mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java diff --git a/pom.xml b/pom.xml index 3b995f9..0eef05b 100644 --- a/pom.xml +++ b/pom.xml @@ -250,6 +250,11 @@ ${mqttv3.version} + + com.zhilian + zhilian-common-business + ${zhilian.version} + diff --git a/zhilian-common/pom.xml b/zhilian-common/pom.xml index 40dfb0d..c126378 100644 --- a/zhilian-common/pom.xml +++ b/zhilian-common/pom.xml @@ -19,6 +19,7 @@ zhilian-common-datasource zhilian-common-system zhilian-common-resolver + zhilian-common-business zhilian-common diff --git a/zhilian-common/zhilian-common-business/pom.xml b/zhilian-common/zhilian-common-business/pom.xml new file mode 100644 index 0000000..b6a2f04 --- /dev/null +++ b/zhilian-common/zhilian-common-business/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + com.zhilian + zhilian-common + 3.6.3 + + + zhilian-common-business + + + 17 + 17 + UTF-8 + + + + + + com.zhilian + zhilian-common-core + + + + diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java similarity index 94% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java index d2ca129..e012a8d 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java @@ -12,6 +12,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import java.util.List; + @Data @SuperBuilder @NoArgsConstructor @@ -50,6 +52,6 @@ public class Fence extends BaseEntity { @Excel(name = "电子围栏经纬度信息") @TableField("fence_message") private String fenceMessage; - - + @TableField(exist = false) + List markersList; } diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java new file mode 100644 index 0000000..b89c946 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java @@ -0,0 +1,35 @@ +package com.zhilian.business.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.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +@Data +@ToString +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("business_markers") +public class Markers extends BaseEntity { + + @TableId(value = "markers_id", type = IdType.AUTO) + @Excel(name = "标识编号") + private Long markersId; + + @TableField("markers_name") + @Excel(name = "标识名称") + private String markersName; + + + @TableField(exist = false) + List fenceIds; + +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java new file mode 100644 index 0000000..f422402 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java @@ -0,0 +1,71 @@ +package com.zhilian.business.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.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * 车辆信息对象 business_vehicle + */ +@Data +@ToString +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("business_vehicle") +public class Vehicle extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 车辆ID + */ + @Excel(name = "车辆ID",cellType = Excel.ColumnType.NUMERIC) + @TableId(value = "vehicle_id",type = IdType.AUTO) + private Long vehicleId; + /** + * 车辆VIN + */ + @TableField("vehicle_vin") + private String vehicleVIN; + /** + * 车辆类型编号 + */ + private Long vehicleTypeId; + + + @TableField(exist = false) + private Long vehicleTypeName; + + /** + * 电机厂商 + */ + private String vehicleMotor; + /** + * 电池厂商 + */ + private String vehicleBattery; + /** + * 电机ID + */ + private String motorId; + /** + * 电池ID + */ + private String batteryId; + + /** + * 车辆状态 + */ + private Long vehicleState; + + @TableField(exist = false) + private List markersIds; +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java new file mode 100644 index 0000000..2d4ef73 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java @@ -0,0 +1,29 @@ +package com.zhilian.business.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.zhilian.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ToString +@TableName(value = "business_vehicle_type") +public class VehicleType { + + @TableId(value = "vehicle_type_id", type = IdType.AUTO) + @Excel(name = "车型ID") + private Long vehicleTypeId; + + @Excel(name = "车型名称") + @TableField(value = "vehicle_type_name") + private String vehicleTypeName; +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java new file mode 100644 index 0000000..d4a732e --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java @@ -0,0 +1,34 @@ +package com.zhilian.business.domain.middle; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +@TableName("business_markers_fence") +public class MarkersFence { + /** + * 车辆标识编号 + */ + @TableId(value = "markers_id",type = IdType.INPUT) + private Long markerId; + @TableField(value = "fence_id",insertStrategy = FieldStrategy.IGNORED) + private Long fenceId; + + public Long getMarkerId() { + return markerId; + } + + public void setMarkerId(Long markerId) { + this.markerId = markerId; + } + + public Long getFenceId() { + return fenceId; + } + + public void setFenceId(Long fenceId) { + this.fenceId = fenceId; + } +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java new file mode 100644 index 0000000..ca25e31 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java @@ -0,0 +1,38 @@ +package com.zhilian.business.domain.middle; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +@TableName("business_vehicle_markers") +public class VehicleMarkers { + /** + * 车辆编号 + */ + @TableId(value = "vehicle_id",type = IdType.INPUT) + private Long vehicleId; + /** + * 车辆标识编号 + */ + @TableField(value = "markers_id",insertStrategy = FieldStrategy.IGNORED) + private Long markersId; + + public Long getVehicleId() { + return vehicleId; + } + + public void setVehicleId(Long vehicleId) { + this.vehicleId = vehicleId; + } + + public Long getMarkersId() { + return markersId; + } + + public void setMarkersId(Long markersId) { + this.markersId = markersId; + } + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java similarity index 78% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java index eeb2fe3..6881bc3 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain; +package com.zhilian.business.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; @@ -33,11 +33,4 @@ public class FenceVo { private Long fenceState; - /** - * 分页查询 - */ - private Integer pageNum=1; - private Integer pageSize=5; - - } diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java new file mode 100644 index 0000000..b58a1d7 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java @@ -0,0 +1,8 @@ +package com.zhilian.business.domain.vo; + +import lombok.Data; + +@Data +public class MarkersVo { + +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java new file mode 100644 index 0000000..0d351f9 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java @@ -0,0 +1,37 @@ +package com.zhilian.business.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.zhilian.common.core.annotation.Excel; +import lombok.Data; + +@Data +public class VehicleVo { + /** + * 车辆VIN + */ + private String vehicleVIN; + /** + * 车辆类型编号 + */ + private Long vehicleTypeId; + /** + * 电子围栏编号 + */ + private Long fenceId; + /** + * 电机厂商 + */ + private String motorBusiness; + /** + * 电池厂商 + */ + private String batteryBusiness; + /** + * 电机ID + */ + private String motorID; + /** + * 电池ID + */ + private String batteryID; +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java new file mode 100644 index 0000000..9fd5a94 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java @@ -0,0 +1,7 @@ +package com.zhilian.business.remote; + +import org.springframework.stereotype.Component; + +@Component +public interface RemoteFenceService { +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java new file mode 100644 index 0000000..3ba9998 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java @@ -0,0 +1,8 @@ +package com.zhilian.business.remote.factory; + +import com.zhilian.common.core.constant.ServiceNameConstants; +import org.springframework.cloud.openfeign.FeignClient; + +//@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) +public class RemoteFenceFallbackFactory { +} diff --git a/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java index 84155de..261a564 100644 --- a/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.List; /** * 响应信息主体 diff --git a/zhilian-modules/zhilian-business/pom.xml b/zhilian-modules/zhilian-business/pom.xml index d009576..413480b 100644 --- a/zhilian-modules/zhilian-business/pom.xml +++ b/zhilian-modules/zhilian-business/pom.xml @@ -73,6 +73,12 @@ zhilian-common-log + + + com.zhilian + zhilian-common-business + + com.zhilian diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java index c7225df..1aedb8d 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java @@ -1,16 +1,17 @@ package com.zhilian.business.controller; -import com.github.pagehelper.PageInfo; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.FenceVo; import com.zhilian.business.service.FenceService; +import com.zhilian.common.core.web.page.TableDataInfo; import com.zhilian.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Date; +import java.util.List; + /** * @ClassName FenceController * @Description 电子围栏控制层 @@ -27,8 +28,10 @@ public class FenceController extends BaseController { * TODO: 围栏管理 */ @PostMapping("/list") - public Result> fenceList(@RequestBody FenceVo fenceVo) { - return success(fenceService.fenceList(fenceVo)); + public Result> fenceList(@RequestBody Fence fence) { + startPage(); + List result = fenceService.fenceList(fence); + return getDataTable(result); } /** @@ -38,24 +41,27 @@ public class FenceController extends BaseController { */ @PostMapping("/fenceAdd") public Result fenceAdd(@RequestBody Fence fence) { - boolean i = fenceService.save(fence); - return toAjax(i); + fence.setUpdateBy(SecurityUtils.getUsername()); + fence.setUpdateTime(new Date()); + return toAjax(fenceService.save(fence)); } -// @PostMapping("insertFence") -// public Result insertFence(@RequestBody Fence fence) { -// Result result = fenceService.insertFence(fence); -// return Result.success(); -// } /** * 修改电子围栏 */ - // @RequiresPermissions("system:config:fenceAdd") @PostMapping("/fenceUpdate") public Result fenceUpdate(@RequestBody Fence fence) { - boolean i = fenceService.updateById(fence); - return toAjax(i); + fence.setUpdateBy(SecurityUtils.getUsername()); + fence.setUpdateTime(new Date()); + return toAjax(fenceService.updateById(fence)); + } + + @PostMapping("/fenceUpdateMap") + public Result fenceUpdateMap(@RequestBody Fence fence) { + fence.setUpdateBy(SecurityUtils.getUsername()); + fence.setUpdateTime(new Date()); + return toAjax(fenceService.updateById(fence)); } /** @@ -65,8 +71,8 @@ public class FenceController extends BaseController { */ @PostMapping("/fenceDelete/{fenceId}") public Result fenceDelete(@PathVariable String fenceId) { - boolean i = fenceService.removeById(fenceId); - return toAjax(i); + return toAjax(fenceService.removeById(fenceId)); } + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java new file mode 100644 index 0000000..9221418 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java @@ -0,0 +1,72 @@ +package com.zhilian.business.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhilian.business.domain.Markers; +import com.zhilian.business.domain.middle.MarkersFence; +import com.zhilian.business.service.MarkersFenceService; +import com.zhilian.business.service.MarkersService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/markers") +public class MarkersController extends BaseController { + @Autowired + private MarkersService markersService; + @Autowired + private MarkersFenceService markersFenceService; + + /** + * 车辆标识列表 + * @param markers + * @return + */ + @PostMapping("list") + public Result> list(@RequestBody Markers markers) { + startPage(); + List result = markersService.selectMarkersList(markers); + return getDataTable(result); + } + + @GetMapping("markersVehicle") + public Result> markersVehicle() { + List listMarkers = markersService.listMarkers(); + return Result.success(listMarkers); + } + + @PostMapping("insert") + public Result insert(@RequestBody Markers markers){ + return toAjax(markersService.save(markers)); + } + + @PostMapping("update") + public Result update(@RequestBody Markers markers) { + return toAjax(markersService.updateById(markers)); + } + + @PostMapping("delete/{markersId}") + public Result delete(@PathVariable Long markersId) { + markersFenceList(markersId).forEach(markersFence -> { + markersFenceService.removeById(markersId); + }); + return toAjax(markersService.removeById(markersId)); + } + + @PostMapping("insertMarkersFence") + public Result insertMarkersFenceMarkers(@RequestBody MarkersFence markersFence){ + return toAjax(markersFenceService.save(markersFence)); + } + + @PostMapping("markersFenceList/{markersId}") + public List markersFenceList(@PathVariable Long markersId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MarkersFence::getMarkerId, markersId); + return markersFenceService.list(queryWrapper); + } + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java new file mode 100644 index 0000000..0db23e4 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java @@ -0,0 +1,24 @@ +package com.zhilian.business.controller; + +import com.zhilian.business.domain.middle.MarkersFence; +import com.zhilian.business.service.MarkersFenceService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +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; + +@RestController +@RequestMapping("/markersFence") +public class MarkersFenceController extends BaseController { + @Autowired + private MarkersFenceService markersFenceService; + + @PostMapping("/list") + public Result> markersFenceList() { + return Result.success(markersFenceService.list()); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java new file mode 100644 index 0000000..d6a153b --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java @@ -0,0 +1,124 @@ +package com.zhilian.business.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhilian.business.domain.Markers; +import com.zhilian.business.domain.Vehicle; +import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.business.service.MarkersService; +import com.zhilian.business.service.VehicleMarkersService; +import com.zhilian.business.service.VehicleService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("/vehicle") +public class VehicleController extends BaseController { + @Autowired + private VehicleService vehicleService; + + @Autowired + private VehicleMarkersService vehicleMarkersService; + + + @Autowired + private MarkersService markersService; + + + /** + * 查询车辆列表 + * @param vehicle + * @return + */ + @PostMapping("/list") + public Result> list(@RequestBody Vehicle vehicle) { + startPage(); + List list = vehicleService.selectVehicleList(vehicle); + return getDataTable(list); + } + + /** + * 新增车辆 + * @param vehicle + * @return + */ + @PostMapping("/vehicleInsert") + public Result vehicleInsert(@RequestBody Vehicle vehicle){ + vehicle.setCreateBy(SecurityUtils.getUsername()); + vehicle.setCreateTime(new Date()); + return toAjax(vehicleService.save(vehicle)); + } + + /** + * 修改车辆 + * @param vehicle + * @return + */ + @PostMapping("/vehicleUpdate") + public Result vehicleUpdate(@RequestBody Vehicle vehicle){ + vehicle.setUpdateBy(SecurityUtils.getUsername()); + vehicle.setUpdateTime(new Date()); + + //删除中间表全部关联数据 + vehicleMarkersService.removeAllVehicle(vehicle); + + //修改原表数据 + boolean update =vehicleService.updateById(vehicle); + + //重新添加中间表数据 + vehicleMarkersService.insert(vehicle); + return toAjax(update); + } + + /** + * 根据车辆ID查询车辆与围栏中间表 + * @param vehicleId + * @return + */ + @PostMapping("/getVehicleMarkers/{vehicleId}") + public List getVehicleMarkers(@PathVariable Long vehicleId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(VehicleMarkers::getVehicleId, vehicleId); + return vehicleMarkersService.list(queryWrapper); + } + +// @PostMapping("/getMarkers/{vehicleId}") +// public List getMarkers(@PathVariable Long vehicleId){ +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(VehicleMarkers::getVehicleId, vehicleId); +// List list = vehicleMarkersService.list(queryWrapper); +// list.forEach(vehicleMarkers -> { +// Markers markers = markersService.getById(vehicleMarkers.getMarkersId()); +// }); +// return null; +// } + /** + * 删除车辆 + * @param vehicleId + * @return + */ + @PostMapping("/vehicleDelete/{vehicleId}") + public Result vehicleDelete(@PathVariable Long vehicleId){ + getVehicleMarkers(vehicleId).forEach(vehicleMarkers -> { + vehicleMarkersService.removeById(vehicleId); + }); + return toAjax(vehicleService.removeById(vehicleId)); + } + + /** + * 车辆绑定围栏 + * @param vehicle + * @return + */ + @PostMapping("/vehicleInsertMarkers") + public Result vehicleInsertMarkers(@RequestBody Vehicle vehicle){ + boolean insert = vehicleMarkersService.insert(vehicle); + return toAjax(insert); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java new file mode 100644 index 0000000..56837a7 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java @@ -0,0 +1,24 @@ +package com.zhilian.business.controller; + +import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.business.service.VehicleMarkersService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +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; + +@RestController +@RequestMapping("/vehicleMarkers") +public class VehicleMarkersController extends BaseController { + @Autowired + private VehicleMarkersService vehicleMarkersService; + + @PostMapping("/list") + public Result> vehicleMarkersList() { + return Result.success(vehicleMarkersService.list()); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java new file mode 100644 index 0000000..29b9036 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java @@ -0,0 +1,25 @@ +package com.zhilian.business.controller; + +import com.zhilian.business.domain.VehicleType; +import com.zhilian.business.service.VehicleTypeService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("vehicleType") +public class VehicleTypeController extends BaseController { + @Autowired + private VehicleTypeService vehicleTypeService; + + @GetMapping("list") + public Result> list(){ + List list = vehicleTypeService.listVehicleType(); + return Result.success(list); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java index ad62483..a0ec734 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java @@ -17,8 +17,12 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class BreakReq { + /** 故障id */ private Integer breakId; + /** 故障码 */ private String breakCode; + /** 车辆VIN */ private String breakVin; + /** 故障类型 */ private String breakType; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java deleted file mode 100644 index 2898904..0000000 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zhilian.business.domain.request; - -import com.zhilian.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class FenceRequest extends BaseEntity { - private static final long serialVersionUID = 1L; - /** - * 电子围栏名称 - */ - private String fenceName; - /** - * 电子围栏类型编号 - */ - private Long fenceTypeId; - /** - * 电子围栏状态 - */ - private Long fenceState; - - -} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java index 9b4c3c8..acd8e76 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java @@ -2,7 +2,7 @@ package com.zhilian.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.FenceVo; +import com.zhilian.business.domain.vo.FenceVo; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java new file mode 100644 index 0000000..c5c26d8 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java @@ -0,0 +1,11 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.middle.MarkersFence; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface MarkersFenceMapper extends BaseMapper { +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java new file mode 100644 index 0000000..f766a24 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java @@ -0,0 +1,12 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.Markers; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface MarkersMapper extends BaseMapper { +} + diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java new file mode 100644 index 0000000..b917deb --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java @@ -0,0 +1,12 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.Vehicle; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface VehicleMapper extends BaseMapper { + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java new file mode 100644 index 0000000..a03d94b --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java @@ -0,0 +1,12 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.middle.VehicleMarkers; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface VehicleMarkersMapper extends BaseMapper { + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java new file mode 100644 index 0000000..4948148 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java @@ -0,0 +1,12 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.VehicleType; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface VehicleTypeMapper extends BaseMapper { + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java index 9a39ef7..4592c86 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java @@ -1,14 +1,10 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.FenceVo; -import com.zhilian.common.core.domain.Result; + +import java.util.List; public interface FenceService extends IService { - PageInfo fenceList(FenceVo fenceVo); - - -// Result insertFence(Fence fence); + List fenceList(Fence fence); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java new file mode 100644 index 0000000..0af642c --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java @@ -0,0 +1,8 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.middle.MarkersFence; + +public interface MarkersFenceService extends IService { +// List selectFenceByIdAndMarkersBuyId(List list, List list1, List list2,MarkersFence markersFence); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java new file mode 100644 index 0000000..832269e --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java @@ -0,0 +1,13 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.Markers; + +import java.util.List; + +public interface MarkersService extends IService { + List selectMarkersList(Markers markers); + + List listMarkers(); + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java new file mode 100644 index 0000000..a18835c --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java @@ -0,0 +1,14 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.Vehicle; +import com.zhilian.business.domain.middle.VehicleMarkers; +import org.springframework.stereotype.Service; + +@Service +public interface VehicleMarkersService extends IService { + + boolean insert(Vehicle vehicle); + + void removeAllVehicle(Vehicle vehicle); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java new file mode 100644 index 0000000..31a70d4 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java @@ -0,0 +1,12 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.Vehicle; + +import java.util.List; + +public interface VehicleService extends IService { + + List selectVehicleList(Vehicle vehicle); + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java new file mode 100644 index 0000000..3bff3b5 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java @@ -0,0 +1,13 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.VehicleType; + +import java.util.List; + +public interface VehicleTypeService extends IService { + + List listVehicleType(); + + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java index 6d979b9..1e3f369 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java @@ -1,38 +1,40 @@ package com.zhilian.business.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.FenceVo; import com.zhilian.business.mapper.FenceMapper; import com.zhilian.business.service.FenceService; -import com.zhilian.common.core.domain.Result; -import org.springframework.beans.factory.annotation.Autowired; +import com.zhilian.common.core.utils.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @Service public class FenceServiceImpl extends ServiceImpl implements FenceService { - @Autowired - private FenceMapper fenceMapper; @Override - public PageInfo fenceList(FenceVo fenceVo) { + public List fenceList(Fence fence) { + if (fence.getFenceName() == null && fence.getFenceTypeId() == null && fence.getFenceState() == null) { + return this.list(); + } - PageHelper.startPage(fenceVo.getPageNum(),fenceVo.getPageSize()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - List list=fenceMapper.fenceList(fenceVo); + // 模糊条件 - 电子围栏名称 + if (StringUtils.isNotEmpty(fence.getFenceName())) { + queryWrapper.like(Fence::getFenceName, fence.getFenceName()); + } - PageInfo info = new PageInfo(list); + // 精确查询 - 查询类型 + if (fence.getFenceTypeId() != null) { + queryWrapper.eq(Fence::getFenceTypeId, fence.getFenceTypeId()); + } - return info; + // 模糊查询 - 状态 + if (fence.getFenceState() != null) { + queryWrapper.eq(Fence::getFenceState, fence.getFenceState()); + } + + return this.list(queryWrapper); } - -// @Override -// public Result insertFence(Fence fence) { -// boolean save = this.save(fence); -// return Result.success(save); -// } - } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java new file mode 100644 index 0000000..ad47575 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java @@ -0,0 +1,16 @@ +package com.zhilian.business.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhilian.business.domain.middle.MarkersFence; +import com.zhilian.business.mapper.MarkersFenceMapper; +import com.zhilian.business.service.MarkersFenceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class MarkersFenceServiceImpl extends ServiceImpl implements MarkersFenceService { + @Autowired + private MarkersFenceMapper markersFenceMapper; + + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java new file mode 100644 index 0000000..27855e6 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java @@ -0,0 +1,43 @@ +package com.zhilian.business.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhilian.business.domain.Markers; +import com.zhilian.business.mapper.MarkersMapper; +import com.zhilian.business.service.MarkersService; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MarkersServiceImpl extends ServiceImpl implements MarkersService { + @Autowired + RedisService service; + @Override + public List selectMarkersList(Markers markers) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //模糊查询 查询标识名称 + queryWrapper.like(StringUtils.isNotEmpty(markers.getMarkersName()), Markers::getMarkersName, markers.getMarkersName()); + + return this.list(queryWrapper); + } + + + /** + * 查询全部标识信息 + * @return + */ + @Override + public List listMarkers() { + if(service.hasKey("markers")){ + List markers = service.getCacheList("markers"); + return markers; + } + List list = this.list(); + service.setCacheList("markers",list); + return list; + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java new file mode 100644 index 0000000..2bda78e --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java @@ -0,0 +1,36 @@ +package com.zhilian.business.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhilian.business.domain.Vehicle; +import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.business.mapper.VehicleMarkersMapper; +import com.zhilian.business.service.VehicleMarkersService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class VehicleMarkersServiceImpl extends ServiceImpl implements VehicleMarkersService { + + @Transactional(rollbackFor=Exception.class) + @Override + public boolean insert(Vehicle vehicle) { + vehicle.getMarkersIds().forEach(markerId -> { + VehicleMarkers vehicleMarkers = new VehicleMarkers(); + vehicleMarkers.setVehicleId(vehicle.getVehicleId()); + vehicleMarkers.setMarkersId(markerId); + this.save(vehicleMarkers); + }); + return true; + } + + @Override + public void removeAllVehicle(Vehicle vehicle) { + List list = this.list(new LambdaQueryWrapper().eq(VehicleMarkers::getVehicleId, vehicle.getVehicleId())); + list.forEach(item -> { + this.removeById(item.getVehicleId()); + }); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java new file mode 100644 index 0000000..dc50464 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java @@ -0,0 +1,63 @@ +package com.zhilian.business.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhilian.business.domain.Vehicle; +import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.business.mapper.VehicleMapper; +import com.zhilian.business.mapper.VehicleMarkersMapper; +import com.zhilian.business.service.VehicleService; +import com.zhilian.common.core.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class VehicleServiceImpl extends ServiceImpl implements VehicleService { + + + @Override + public List selectVehicleList(Vehicle vehicle) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //模糊条件 查询VIN + if (StringUtils.isNotEmpty(vehicle.getVehicleVIN())) { + queryWrapper.like(Vehicle::getVehicleVIN, vehicle.getVehicleVIN()); + } + // 精确查询 - 查询类型 + if (vehicle.getVehicleTypeId() != null) { + queryWrapper.eq(Vehicle::getVehicleTypeId, vehicle.getVehicleTypeId()); + } + //模糊查询 车辆电机厂商 + if (StringUtils.isNotEmpty(vehicle.getMotorId())) { + queryWrapper.like(Vehicle::getMotorId, vehicle.getMotorId()); + } + //模糊查询 车辆电池厂商 + if (StringUtils.isNotEmpty(vehicle.getBatteryId())) { + queryWrapper.like(Vehicle::getBatteryId, vehicle.getBatteryId()); + } + //模糊查询 车辆电机ID + if (StringUtils.isNotEmpty(vehicle.getVehicleMotor())) { + queryWrapper.like(Vehicle::getVehicleMotor, vehicle.getVehicleMotor()); + } + //模糊查询 车辆电池ID + if (StringUtils.isNotEmpty(vehicle.getVehicleBattery())) { + queryWrapper.like(Vehicle::getVehicleBattery, vehicle.getVehicleBattery()); + } + //精确查询 车辆状态 + if (vehicle.getVehicleState() != null) { + queryWrapper.eq(Vehicle::getVehicleState, vehicle.getVehicleState()); + } + +// queryWrapper.like(StringUtils.isNotEmpty(vehicle.getVehicleVIN()), Vehicle::getVehicleVIN, vehicle.getVehicleVIN()) +// .eq(vehicle.getVehicleTypeId() != null, Vehicle::getVehicleTypeId, vehicle.getVehicleTypeId()) +// .like(StringUtils.isNotEmpty(vehicle.getMotorID()), Vehicle::getMotorID, vehicle.getMotorID()) +// .like(StringUtils.isNotEmpty(vehicle.getBatteryID()), Vehicle::getBatteryID, vehicle.getBatteryID()) +// .like(StringUtils.isNotEmpty(vehicle.getMotorBusiness()), Vehicle::getMotorBusiness, vehicle.getMotorBusiness()) +// .like(StringUtils.isNotEmpty(vehicle.getBatteryBusiness()), Vehicle::getBatteryBusiness, vehicle.getBatteryBusiness()) +// .eq(vehicle.getVehicleState() != null, Vehicle::getVehicleState, vehicle.getVehicleState()); + return this.list(queryWrapper); + } + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java new file mode 100644 index 0000000..271ab88 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java @@ -0,0 +1,26 @@ +package com.zhilian.business.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhilian.business.domain.VehicleType; +import com.zhilian.business.mapper.VehicleTypeMapper; +import com.zhilian.business.service.VehicleTypeService; +import com.zhilian.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +public class VehicleTypeServiceImpl extends ServiceImpl implements VehicleTypeService { + @Autowired + private RedisService redisService; + @Override + public List listVehicleType() { + if(redisService.hasKey("vehicleType")){ + List vehicleType = redisService.getCacheList("vehicleType"); + return vehicleType; + } + List list = this.list(); + redisService.setCacheList("vehicleType",list); + return this.list(); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml index 7ae037c..6acc1c7 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml @@ -3,57 +3,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml new file mode 100644 index 0000000..3addf96 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml new file mode 100644 index 0000000..536f8f4 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java deleted file mode 100644 index de0dc3d..0000000 --- a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zhilian.resolver; -import com.zhilian.common.security.annotation.EnableMyFeignClients; -import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.scheduling.annotation.EnableScheduling; - -@EnableCustomSwagger2 -@EnableScheduling -@EnableMyFeignClients -@MapperScan({"com.zhilian.resolver.mapper", "com.zhilian.resolver.resolverReport"}) -@SpringBootApplication -public class ZhiLianResolverApplication { - public static void main(String[] args) { - SpringApplication.run(ZhiLianResolverApplication.class, args); - } -} From 50767b8b9a5ddee189d75c8ab4370c9a3f2d61e0 Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Tue, 9 Apr 2024 15:09:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BreakLogController.java | 31 +++++++++ .../business/mapper/BreakLogMapper.java | 18 +++++ .../business/service/BreakLogService.java | 16 +++++ .../service/impl/BreakLogServiceImpl.java | 67 +++++++++++++++++++ .../main/resources/mapper/BreakLogMapper.xml | 10 +++ .../resolver/ZhiLianResolverApplication.java | 23 +++++++ 6 files changed, 165 insertions(+) create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml create mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java new file mode 100644 index 0000000..c72bb04 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java @@ -0,0 +1,31 @@ +package com.zhilian.business.controller; + +import com.zhilian.business.domain.BreakLog; +import com.zhilian.business.service.BreakLogService; +import com.zhilian.common.core.domain.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @ClassName BreakLogController + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/8 20:48 + */ +@RestController +public class BreakLogController { + + @Autowired + private BreakLogService breakLogService; + + @PostMapping("log") + public Result> breakLog() { + List list = breakLogService.breakLog(); + Result> success = Result.success(list); + return success; + } + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java new file mode 100644 index 0000000..0da85db --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java @@ -0,0 +1,18 @@ +package com.zhilian.business.mapper; + +import com.zhilian.business.domain.BreakLog; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName BreakLogMapper + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/8 20:49 + */ +@Mapper +public interface BreakLogMapper { + List breakLog(); + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java new file mode 100644 index 0000000..a2c9dc0 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java @@ -0,0 +1,16 @@ +package com.zhilian.business.service; + +import com.zhilian.business.domain.BreakLog; + +import java.util.List; + +/** + * @ClassName BreakLogService + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/8 20:49 + */ +public interface BreakLogService { + List breakLog(); + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java new file mode 100644 index 0000000..d373650 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java @@ -0,0 +1,67 @@ +package com.zhilian.business.service.impl; + +import com.zhilian.business.domain.BreakLog; +import com.zhilian.business.mapper.BreakLogMapper; +import com.zhilian.business.service.BreakLogService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName BreakLogServiceImpl + * @Description 定时扫描故障状态 + * @Author YuanYongH + * @Date 2024/4/8 20:49 + */ +@Service +@Log4j2 +public class BreakLogServiceImpl implements BreakLogService { + @Autowired + private BreakLogMapper breakLogMapper; + + @Autowired + private RedisTemplate redisTemplate; + + + @Override + public List breakLog() { + BreakLog breakLog = new BreakLog(); + // 10秒 + final long timeInterval = 10000; + Runnable runnable = new Runnable() { + @Override + public void run() { + while (true){ + breakLogMapper.breakLog(); + log.info("扫描故障状态"); + String breakState = breakLog.getBreakState(); + if (breakState != null){ + // 判断故障状态 + if (breakLog.getBreakState().equals("0")){ + log.info("正常"); + }else if (breakLog.getBreakState().equals("1")){ + log.info("故障"); + }else { + log.info("未知"); + } + + } + try { + Thread.sleep(timeInterval); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + }; + // 开启线程 + Thread thread = new Thread(runnable); + thread.start(); + // 返回故障日志 + return breakLogMapper.breakLog(); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml new file mode 100644 index 0000000..34de1ea --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java new file mode 100644 index 0000000..a83628b --- /dev/null +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java @@ -0,0 +1,23 @@ +package com.zhilian.resolver; + +import com.zhilian.common.security.annotation.EnableCustomConfig; +import com.zhilian.common.security.annotation.EnableMyFeignClients; +import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @ClassName ZhiLianResolverApplication + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/8 17:25 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class ZhiLianResolverApplication { + public static void main(String[] args) { + SpringApplication.run(ZhiLianResolverApplication.class,args); + } +}