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 7b046b3..695a264 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 @@ -2,11 +2,13 @@ package com.muyu.openbusiness.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteDataService; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.openbusiness.apply.VehiCachService; import com.muyu.openbusiness.domain.SysCar; import com.muyu.openbusiness.domain.SysCarMessage; +import com.muyu.openbusiness.domain.req.SysCarMessageReq; import com.muyu.openbusiness.service.ISysCarMessageService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -32,66 +35,13 @@ import java.util.concurrent.ExecutionException; * @date 2024-09-18 */ @RestController + @RequestMapping("/messageInfo") public class SysCarMessageController extends BaseController { @Resource private ISysCarMessageService sysCarMessageService; - // @Autowired -// private SystemFeign feign; @Resource - private VehiCachService vehiCachService; - @Autowired - private HttpSession session; - - @Autowired - RemoteUserService remoteUserService; - - static String TEST = "7E 56 45 48 49 43 4C 45 5F 4D 53 47 3A 56 49 4E 31 32 B6 A1 C0 F2 B3 E5 D9 A8 C1 B2 E3 F4 A6 D7 C9 F1 E0 A3 B5 C8 D4 E2 A1 F5 B6 C7 E8 D9 A0 E3 B2 C4 F5 D6 A8 C0 E1 F2 B7 D8 A4 E3 C2 B1 A5 D9 F6 C8 E7 A0 B2 C3 D1 F4 E5 A9 3F 2A 7B D9 1E C8 4D A3 6F 5B 9A 0C 3E 7D F2 8B 46 1A 5E 9F 2D 73 8C 4A B1 6C 5D E2 7E C4 39 0B AD 7C 1F 0E 3C 68 92 B4 5A 7F 6E 81 0D 4B A5 E3 F9 2E 8A 37 6D 14 5C 73 8E D2 04 9B 3A 6C F1 70 BF 29 5F 8C 43 61 24 5D 7A 9C 0A D5 1B 3D 6E F4 78 3E 5B"; - - @RequiresPermissions("message:message:test") - @GetMapping("/test") - public Result test() throws InterruptedException, ExecutionException { - List list = (List) session.getAttribute("list"); - - // 检查 list 是否为空 - if (list == null || list.isEmpty()) { - return Result.success(new String[0]); // 或者返回一个适当的错误消息 - } - - String[] test = TEST.split(" "); - String[] results = new String[list.size()]; - - List> futures = new ArrayList<>(); - - for (SysCarMessage carMessage : list) { - futures.add(CompletableFuture.supplyAsync(() -> { - int startIndex = Integer.parseInt(carMessage.getMessageStartIndex()) - 1; - int endIndex = Integer.parseInt(carMessage.getMessageEndIndex()); - StringBuilder hexBuilder = new StringBuilder(); - - for (int j = startIndex; j < endIndex; j++) { - hexBuilder.append(test[j]); - } - - String hex = hexBuilder.toString(); - char[] result = new char[hex.length() / 2]; - - for (int x = 0; x < hex.length(); x += 2) { - int high = Character.digit(hex.charAt(x), 16); - int low = Character.digit(hex.charAt(x + 1), 16); - result[x / 2] = (char) ((high << 4) + low); - } - - return new String(result); - })); - } - - for (int i = 0; i < futures.size(); i++) { - results[i] = futures.get(i).get(); - } - - return Result.success(results); - } + private RemoteDataService remoteDataService; /** @@ -99,10 +49,11 @@ public class SysCarMessageController extends BaseController { */ @RequiresPermissions("message:message:list") @GetMapping("/list") - public Result> list(SysCarMessage sysCarMessage) { -// Result info = feign.getInfo(); -// SysUser sysUser = (SysUser) info.getData(); - List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); + public Result> list(SysCarMessageReq sysCarMessage) { + remoteDataService.carRealTimeStatus(sysCarMessage.getCarVin(),sysCarMessage.getFlag()); + SysCarMessage message = new SysCarMessage(); + message.setModelCode(sysCarMessage.getModelCode()); + List list = sysCarMessageService.selectSysCarMessageList(message); /*list.forEach(syscar -> { List list1 = sysCarMessageService.selectSysCarMessageList(new LambdaQueryWrapper() @@ -111,9 +62,6 @@ public class SysCarMessageController extends BaseController { vehiCachService.put(vehiCachService.keyPre() + sysCar.getCarVin(), sysCar); }); });*/ - - - session.setAttribute("list", list); return Result.success(list); } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java index 446fece..bf51ac5 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java @@ -36,7 +36,7 @@ public class WarnRuleController extends BaseController { /** * 查询预警规则列表 */ - @RequiresPermissions("warning:list") + @RequiresPermissions("warning:rule:list") @GetMapping("/list") public Result> list(WarnRuleDTO warnRuleDTO) { startPage(); @@ -60,7 +60,7 @@ public class WarnRuleController extends BaseController { /** * 导出预警规则列表 */ - @RequiresPermissions("warning:export") + @RequiresPermissions("warning:rule:export") @PostMapping("/export") public void export(HttpServletResponse response, WarnRuleDTO warnRuleDTO) { List list = warnRuleService.selectWarnRuleList(warnRuleDTO); @@ -72,7 +72,7 @@ public class WarnRuleController extends BaseController { /** * 获取预警规则详细信息 */ - @RequiresPermissions("warning:query") + @RequiresPermissions("warning:rule:query") @GetMapping(value = "/{id}") public Result> getInfo(@PathVariable("id") Long id) { return success(warnRuleService.selectWarnRuleById(id)); @@ -81,7 +81,7 @@ public class WarnRuleController extends BaseController { /** * 新增预警规则 */ - @RequiresPermissions("warning:add") + @RequiresPermissions("warning:rule:add") @PostMapping public Result add( @Validated @RequestBody WarnRuleDTO warnRuleDTO) { @@ -94,7 +94,7 @@ public class WarnRuleController extends BaseController { /** * 修改预警规则 */ - @RequiresPermissions("warning:edit") + @RequiresPermissions("warning:rule:edit") @PutMapping public Result edit( @Validated @RequestBody WarnRuleDTO warnRuleDTO) { @@ -107,7 +107,7 @@ public class WarnRuleController extends BaseController { /** * 删除预警规则 */ - @RequiresPermissions("warning:remove") + @RequiresPermissions("warning:rule:remove") @DeleteMapping("/{ids}") public Result remove(@PathVariable("ids") Long[] ids) { warnRuleService.removeBatchByIds(Arrays.asList(ids));