attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:77489ee59d6ac24f51170745ddf34800bc925947
Branches Tags
attiya:main
..
compare: attiya:fac44580d8b0daa26b0aaa280ef55998fb9c6982
Branches Tags
attiya:main

No commits in common. "77489ee59d6ac24f51170745ddf34800bc925947" and "fac44580d8b0daa26b0aaa280ef55998fb9c6982" have entirely different histories.
77489ee59d ... fac44580d8

2 changed files with 28 additions and 31 deletions
Show Stats Expand all files Collapse all files

58
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeCoreController.java
View File

@ -67,19 +67,15 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("online")
public JsonResult<?> online(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) throws IOException {
public JsonResult<?> online(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) throws IOException {
try {
EbikeEcuInfo ebikeEcuInfo = ecuInfoService.getById(ecuId);
boolean online = EmqxApiClient.isClientOnline(ebikeEcuInfo.getEcuSn());
CoreResult result = online ? CoreResult.online() : CoreResult.offline();
if (bikeId != null) {
saveLog(bikeId, "设备是否在线", "1");
}
saveLog(bikeId, "设备是否在线", "1");
return JsonResult.success(result);
} catch (Exception e) {
if (bikeId != null) {
saveLog(bikeId, "设备是否在线", "1");
}
saveLog(bikeId, "设备是否在线", "0");
throw e;
}
}
@ -90,9 +86,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("findEbike")
public DeferredResult<JsonResult<?>> findEbike(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> findEbike(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.VIDEO_5, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.VIDEO_5, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -120,9 +116,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("gps")
public DeferredResult<JsonResult<?>> gps(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> gps(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.GPS, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.GPS, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -161,9 +157,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("openBatteryLock")
public DeferredResult<JsonResult<?>> openBatteryLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> openBatteryLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.OPEN_BATTERY_LOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.OPEN_BATTERY_LOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -190,9 +186,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("closeBatteryLock")
public DeferredResult<JsonResult<?>> closeBatteryLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> closeBatteryLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.CLOSE_BATTERY_LOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.CLOSE_BATTERY_LOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -219,9 +215,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("lock")
public DeferredResult<JsonResult<?>> lock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> lock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.LOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.LOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -248,9 +244,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("unlock")
public DeferredResult<JsonResult<?>> unlock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> unlock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.UNLOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.UNLOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -277,9 +273,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("openHelmet")
public DeferredResult<JsonResult<?>> openHelmet(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> openHelmet(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.OPEN_HEMET, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.OPEN_HEMET, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -306,9 +302,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("cameraReturn")
public DeferredResult<JsonResult<?>> cameraReturn(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> cameraReturn(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.CAMERA_RETURN, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.CAMERA_RETURN, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -335,9 +331,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("cancelAntiTheft")
public DeferredResult<JsonResult<?>> cancelAntiTheft(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> cancelAntiTheft(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.CANCEL_ANTI_THEFT, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.CANCEL_ANTI_THEFT, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -365,9 +361,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("powerOff")
public DeferredResult<JsonResult<?>> powerOff(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> powerOff(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.GPS, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.GPS, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -395,9 +391,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("restart")
public DeferredResult<JsonResult<?>> restart(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> restart(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.RESTART, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.RESTART, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));
@ -425,9 +421,9 @@ public class EbikeCoreController {
* @return 执行结构
*/
@GetMapping("tempLock")
public DeferredResult<JsonResult<?>> tempLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId", required = false) Long bikeId) {
public DeferredResult<JsonResult<?>> tempLock(@RequestParam("ecuId") Long ecuId, @RequestParam(value = "bikeId",required = false) Long bikeId) {
DeferredResult<JsonResult<?>> deferredResult = new DeferredResult<>(5000L); // 5秒超时
ebikeCoreService.executeCommand(ecuId, CmdCode.TEMP_LOCK, bikeId, getStaffId()).whenComplete((response, ex) -> {
ebikeCoreService.executeCommand(ecuId, CmdCode.TEMP_LOCK, bikeId,getStaffId() ).whenComplete((response, ex) -> {
if (ex != null) {
CoreResult result = CoreResult.failed(ex.getMessage());
deferredResult.setResult(JsonResult.success(result));

1
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOperationController.java
View File

@ -35,6 +35,7 @@ public class EbikeOperationController {
*/
@GetMapping("page")
public JsonResult<?> page(PageParam pageParam) {
//TODO：添加筛选条件。过滤运营状态
QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_BIKE_INFO.STATE.eq(1));
Page<EbikeBikeInfo> page = bikeInfoService.page(pageParam.getPage(), queryWrapper);