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] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=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 # 共享配置