fix(): 修复bug

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<RemoteUserServ
             public Result<Boolean> registerUserInfo (SysUser sysUser, String source) {
                 return Result.error("注册用户失败:" + throwable.getMessage());
             }
-
-            @Override
-            public Result list(SysCarMessage sysCarMessage) {
-                return null;
-            }
-
             @Override
             public Result<List<SysUser>> companyList() {
                 return Result.error("获取企业列表失败:" + throwable.getMessage());

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;
 
     /** 自增主键 */

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() {

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")
+@RequestMapping("/messageInfo")
-public class SysCarMessageController extends BaseController
+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>> list(SysCarMessage sysCarMessage)
+    public Result<List<SysCarMessage>> list(SysCarMessage sysCarMessage) {
-    {
 //        Result info = feign.getInfo();
 //        SysUser sysUser = (SysUser) info.getData();
         List<SysCarMessage> list = sysCarMessageService.selectSysCarMessageList(sysCarMessage);
 
-        list.forEach(syscar -> {
+        /*list.forEach(syscar -> {
             List<SysCar> list1 = sysCarMessageService.selectSysCarMessageList(new LambdaQueryWrapper<SysCar>()
-                    .eq(SysCar::getCarType,syscar.getMessageType()));
+                    .eq(SysCar::getCarType, syscar.getMessageType()));
-        list1.forEach(sysCar -> {
+            list1.forEach(sysCar -> {
-
+                vehiCachService.put(vehiCachService.keyPre() + sysCar.getCarVin(), 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<SysCarMessage> list = sysCarMessageService.selectSysCarMessageList(sysCarMessage);
         ExcelUtil<SysCarMessage> util = new ExcelUtil<SysCarMessage>(SysCarMessage.class);
         util.exportExcel(response, list, "车辆报文记录数据");
@@ -137,8 +133,7 @@ public class SysCarMessageController extends BaseController
      */
     @RequiresPermissions("message:message:query")
     @GetMapping(value = "/{id}")
-    public Result<List<SysCarMessage>> getInfo(@PathVariable("id") Long id)
+    public Result<List<SysCarMessage>> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable("ids") Long[] ids)
+    public Result<Integer> remove(@PathVariable("ids") Long[] ids) {
-    {
         sysCarMessageService.removeBatchByIds(Arrays.asList(ids));
         return success();
     }

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<TableDataInfo<SysCorpuscle>> list(SysCorpuscle sysCorpuscle) {
         startPage();