From 976ac2fb210bab89a9fa47aa77fa89d550a81f64 Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Fri, 11 Oct 2024 09:56:30 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/RemoteUserFallbackFactory.java | 6 --- .../com/muyu/openbusiness/domain/SysCar.java | 2 +- .../openbusiness/domain/SysCarMessage.java | 3 -- .../controller/SysCarMessageController.java | 40 ++++++++----------- .../controller/SysCorpuscleController.java | 2 +- 5 files changed, 18 insertions(+), 35 deletions(-) diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index 79dbfa0..6b24d3b 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -47,12 +47,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUserInfo (SysUser sysUser, String source) { return Result.error("注册用户失败:" + throwable.getMessage()); } - - @Override - public Result list(SysCarMessage sysCarMessage) { - return null; - } - @Override public Result> companyList() { return Result.error("获取企业列表失败:" + throwable.getMessage()); diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java index c6e25ac..64e8f3e 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java @@ -26,7 +26,7 @@ import com.baomidou.mybatisplus.annotation.IdType; @NoArgsConstructor @AllArgsConstructor @TableName("sys_car") -public class SysCar extends VehicleMessage { +public class SysCar extends BaseEntity { private static final long serialVersionUID = 1L; /** 自增主键 */ diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java index 1fdfa49..7728066 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java @@ -53,9 +53,6 @@ public class SysCarMessage implements Serializable { @Excel(name = "报文分类") private String messageType; - /* 报文数据类型*/ - private String messageClass; - @Override public String toString() { diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java index fc57edb..7b046b3 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java @@ -32,15 +32,14 @@ import java.util.concurrent.ExecutionException; * @date 2024-09-18 */ @RestController -@RequestMapping("/messagesInfo") -public class SysCarMessageController extends BaseController -{ +@RequestMapping("/messageInfo") +public class SysCarMessageController extends BaseController { @Resource private ISysCarMessageService sysCarMessageService; -// @Autowired + // @Autowired // private SystemFeign feign; @Resource - private VehiCachService vehiCachService; + private VehiCachService vehiCachService; @Autowired private HttpSession session; @@ -100,20 +99,18 @@ public class SysCarMessageController extends BaseController */ @RequiresPermissions("message:message:list") @GetMapping("/list") - public Result> list(SysCarMessage sysCarMessage) - { + public Result> list(SysCarMessage sysCarMessage) { // Result info = feign.getInfo(); // SysUser sysUser = (SysUser) info.getData(); List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); - list.forEach(syscar -> { + /*list.forEach(syscar -> { List list1 = sysCarMessageService.selectSysCarMessageList(new LambdaQueryWrapper() - .eq(SysCar::getCarType,syscar.getMessageType())); - list1.forEach(sysCar -> { - - vehiCachService.put(vehiCachService.keyPre()+sysCar.getCarVin(),sysCar); -}); - }); + .eq(SysCar::getCarType, syscar.getMessageType())); + list1.forEach(sysCar -> { + vehiCachService.put(vehiCachService.keyPre() + sysCar.getCarVin(), sysCar); + }); + });*/ session.setAttribute("list", list); @@ -125,8 +122,7 @@ public class SysCarMessageController extends BaseController */ @RequiresPermissions("message:message:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysCarMessage sysCarMessage) - { + public void export(HttpServletResponse response, SysCarMessage sysCarMessage) { List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); ExcelUtil util = new ExcelUtil(SysCarMessage.class); util.exportExcel(response, list, "车辆报文记录数据"); @@ -137,8 +133,7 @@ public class SysCarMessageController extends BaseController */ @RequiresPermissions("message:message:query") @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { + public Result> getInfo(@PathVariable("id") Long id) { return success(sysCarMessageService.selectSysCarMessageById(id)); } @@ -148,8 +143,7 @@ public class SysCarMessageController extends BaseController @RequiresPermissions("message:message:add") @PostMapping public Result add( - @Validated @RequestBody SysCarMessage sysCarMessage) - { + @Validated @RequestBody SysCarMessage sysCarMessage) { if (sysCarMessageService.checkIdUnique(sysCarMessage)) { return error("新增 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录已存在"); @@ -163,8 +157,7 @@ public class SysCarMessageController extends BaseController @RequiresPermissions("message:message:edit") @PutMapping public Result edit( - @Validated @RequestBody SysCarMessage sysCarMessage) - { + @Validated @RequestBody SysCarMessage sysCarMessage) { if (!sysCarMessageService.checkIdUnique(sysCarMessage)) { return error("修改 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录不存在"); } @@ -178,8 +171,7 @@ public class SysCarMessageController extends BaseController */ @RequiresPermissions("message:message:remove") @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { + public Result remove(@PathVariable("ids") Long[] ids) { sysCarMessageService.removeBatchByIds(Arrays.asList(ids)); return success(); } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java index 3c0f72b..d2b4686 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java @@ -32,7 +32,7 @@ public class SysCorpuscleController extends BaseController { /** * 查询电子围栏列表 */ - @RequiresPermissions("carRail:carRail:list") + @RequiresPermissions("carRail:corpuscle:list") @GetMapping("/list") public Result> list(SysCorpuscle sysCorpuscle) { startPage();