autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 12:05:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Guoqs
2024-11-22 14:21:58 +08:00
parent a6be4db07a ea25b5f61c
commit 02a06c8991
43 changed files with 1859 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
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;
}
}

39
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -149,6 +149,9 @@ public class OrderService {
@Resource
private RedisCache redisCache;
@Autowired
private PersonalChargingRecordService personalChargingRecordService;
// 引入线程池
private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
@@ -1451,5 +1454,41 @@ public class OrderService {
* @param dto
*/
public void saveBluetoothChargingRecord(BluetoothChargingRecordDTO dto) {
PersonalChargingRecord record = new PersonalChargingRecord();
record.setTransactionCode(dto.getTrxSN());
record.setStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
record.setMemberId(dto.getMemberId());
// record.setStationId(dto.getStationId());
// record.setMerchantId(dto.getMerchantId());
record.setPileSn(dto.getPileNo());
record.setConnectorCode(dto.getPlugNo());
record.setPileConnectorCode(record.getPileSn() + record.getConnectorCode());
record.setLogicCard(dto.getPCardID());
record.setVinCode(dto.getVin());
record.setStartMode(dto.getStartMode());
// record.setPlateNumber(dto.getPlateNumber());
record.setChargeStartTime(DateUtils.parseDate(dto.getStartTime()));
record.setChargeEndTime(DateUtils.parseDate(dto.getEndTime()));
// record.setStartType(dto.getStartType());
// record.setReservationStartTime(DateUtils.parseDate(dto.getReservationStartTime()));
// record.setReservationEndTime(DateUtils.parseDate(dto.getReservationEndTime()));
// record.setStartSoc(dto.getst());
// record.setEndSoc(dto.getEndSoc());
record.setAmmeterTotalStart(dto.getStartKwh());
record.setAmmeterTotalEnd(dto.getStopKwh());
record.setTotalUsedElectricity(new BigDecimal(dto.getTotalEnergy()));
record.setSharpUsedElectricity(new BigDecimal(dto.getEnergySharp()));
record.setPeakUsedElectricity(new BigDecimal(dto.getEnergyPeak()));
record.setFlatUsedElectricity(new BigDecimal(dto.getEnergyFlat()));
record.setValleyUsedElectricity(new BigDecimal(dto.getEnergyValley()));
record.setReason(dto.getStopReason());
record.setTradeDate(DateUtils.parseDate(dto.getTradeTime()));
record.setSourceType("BT");
record.setCreateBy(dto.getMemberId());
record.setCreateTime(new Date());
// record.setUpdateBy(dto.getUpdateBy());
// record.setUpdateTime(new Date());
record.setDelFlag(DelFlagEnum.NORMAL.getValue());
personalChargingRecordService.insertOrUpdateSelective(record);
}
}

1
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -641,6 +641,7 @@ public class PileService {
PersonPileConnectorSumInfoVO vo;
for (PersonalChargingRecord personalChargingRecord : pageInfo.getList()) {
vo = new PersonPileConnectorSumInfoVO();
vo.setSourceType(personalChargingRecord.getSourceType());
if (personalChargingRecord.getChargeStartTime() != null && personalChargingRecord.getChargeEndTime() != null){
vo.setChargeStartTime(DateUtils.dateTime(personalChargingRecord.getChargeStartTime()));
vo.setChargeEndTime(DateUtils.dateTime(personalChargingRecord.getChargeEndTime()));

2
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -14,6 +14,7 @@ import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.adapay.vo.OrderSplitResult;
import com.jsowell.adapay.vo.PaymentInfo;
import com.jsowell.common.annotation.CostTime;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.adapay.AdapayStatusEnum;
import com.jsowell.common.enums.ykc.*;
@@ -592,6 +593,7 @@ public class TempService {
/**
* 校验是否为并充订单
*/
@CostTime
public Map<String, List<String>> checkCombinedChargingOrder(List<String> orderCodeList) throws BaseAdaPayException {
Map<String, List<String>> resultMap = Maps.newHashMap();
List<String> combinedChargingOrderList = Lists.newArrayList();

25
jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java
View File

@@ -219,4 +219,29 @@ public class CommonController {
return AjaxResult.error(e.getMessage());
}
}
/**
* 上传蓝牙升级程序到阿里云oss
* http://localhost:8080/common/uploadBlueToothFile2OSS
* @param file
* @return
* @throws Exception
*/
@CrossOrigin
@PostMapping("/uploadBlueToothFile2OSS")
public AjaxResult uploadBlueToothFile2OSS(MultipartFile file) throws Exception {
try {
String url = AliyunOssUploadUtils.uploadBlueToothFile(file);
AjaxResult ajax = AjaxResult.success();
ajax.put("url", url);
ajax.put("fileName", FileUtils.getName(url));
ajax.put("newFileName", FileUtils.getName(url));
ajax.put("originalFilename", file.getOriginalFilename());
log.info("固件上传成功 url:{}", url);
return ajax;
}catch (Exception e){
log.error("上传到阿里云oss error, ", e);
return AjaxResult.error(e.getMessage());
}
}
}

18
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java
View File

@@ -5,12 +5,15 @@ import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.file.AliyunOssUploadUtils;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.PileFirmwareInfo;
import com.jsowell.pile.service.PileFirmwareInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -88,4 +91,19 @@ public class PileFirmwareInfoController extends BaseController {
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(pileFirmwareInfoService.deletePileFirmwareInfoByIds(ids));
}
/**
* 上传蓝牙升级程序
* @param file
* @return
*/
// @PostMapping("/uploadBlueToothFile")
// public AjaxResult uploadBlueToothFile(@RequestParam("blueToothFile") MultipartFile file) {
// if (!file.isEmpty()) {
// String result = AliyunOssUploadUtils.uploadBlueToothFile(file);
// return AjaxResult.success();
// }
// return AjaxResult.error("上传文件错误！！");
// }
}