Merge branch 'dev-new' into dev-new-rabbitmq

This commit is contained in:
Guoqs
2024-11-22 14:21:58 +08:00
43 changed files with 1859 additions and 445 deletions

View File

@@ -12,6 +12,7 @@ import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.PileBasicInfoService;
import com.jsowell.pile.service.PileFirmwareInfoService;
import com.jsowell.pile.service.PileMerchantInfoService;
import com.jsowell.pile.service.PileReservationInfoService;
import com.jsowell.pile.vo.PileReservationInfoVO;
@@ -52,6 +53,9 @@ public class PersonPileController extends BaseController {
@Autowired
private PileReservationInfoService pileReservationInfoService;
@Autowired
private PileFirmwareInfoService pileFirmwareInfoService;
/**
* 用户绑定个人桩
@@ -91,7 +95,7 @@ public class PersonPileController extends BaseController {
*/
@RequestMapping("/pileMemberBindingForBT")
public RestApiResponse<?> pileMemberBindingForBT(HttpServletRequest request, @RequestBody PileMemberBindingDTO dto) {
logger.info("绑定个人桩信息(蓝牙) params:{}", JSON.toJSONString(dto));
// logger.info("绑定个人桩信息(蓝牙) params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -105,7 +109,7 @@ public class PersonPileController extends BaseController {
logger.error("绑定个人桩信息(蓝牙) error,", exception);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_BINDING_PERSONAL_PILE_ERROR);
}
logger.info("绑定个人桩信息(蓝牙) result:{}", response);
logger.info("绑定个人桩信息(蓝牙), params:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -509,4 +513,22 @@ public class PersonPileController extends BaseController {
logger.info("保存蓝牙充电记录params:{}, result:{}", dto, JSON.toJSONString(response));
return response;
}
/**
* 查询桩升级程序信息列表
* http://localhost:8080/uniapp/personalPile/selectPileFirmwareList
* @return
*/
@PostMapping("/selectPileFirmwareList")
public RestApiResponse<?> selectPileFirmwareList(@RequestBody PileFirmwareInfoDTO dto) {
RestApiResponse<?> response = null;
try {
PageResponse pageResponse = pileFirmwareInfoService.selectPileFirmwareListByUseRange(dto);
response = new RestApiResponse<>(pageResponse);
} catch (Exception e) {
logger.error("查询桩升级程序信息列表 error, ",e);
}
logger.info("查询桩升级程序信息列表 param:{}, result:{}", JSON.toJSONString(dto), response);
return response;
}
}