From 28a07b5b768096a2c75b55c440b8afd0b50b3f0b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 16:55:35 +0800
Subject: [PATCH] a
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 14 +++---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 9 ++--
server/services/src/main/java/com/doumee/dao/business/model/Bikes.java | 2
server/services/src/main/java/com/doumee/core/constants/Constants.java | 8 ++++
server/services/src/main/java/com/doumee/dao/business/model/Locks.java | 2
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 4 +-
server/platform/src/main/java/com/doumee/api/business/WxBillController.java | 13 +++++-
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 4 +-
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 3 +
10 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/WxBillController.java b/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
index cce5384..071bd15 100644
--- a/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/WxBillController.java
@@ -3,6 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -18,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -43,9 +46,15 @@
@PreventRepeat
@ApiOperation("鎵嬪姩鍚屾寰俊鏌愬ぉ璐﹀崟淇℃伅")
@PostMapping("/syncWxBill")
-// @RequiresPermissions("business:wxbill:create")
+ @RequiresPermissions("business:wxbill:create")
public ApiResponse syncWxBill(@RequestBody WxBill wxBill) {
- wxBillService.getWxBill(wxBill.getCreateDate());
+ if( wxBill.getCreateDate() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime( wxBill.getCreateDate());
+ calendar.set(Calendar.HOUR_OF_DAY,9);
+ wxBillService.getWxBill(calendar.getTime());
return ApiResponse.success(null);
}
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index c18cdbd..4aace47 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -213,6 +213,14 @@
}
return num;
}
+ public static Integer formatIntegerFromStr(String num) {
+ try {
+ return Integer.parseInt(num);
+ }catch (Exception e){
+
+ }
+ return null;
+ }
public interface UserActionsType {
String cancelPrePay = "CANCEL_PRE_PAY";
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
index 4dd61cf..6eaa715 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -82,7 +82,7 @@
@ApiModelProperty(value = "褰撳墠閿佸ご缂栫爜锛堝叧鑱攍ocks)")
@ExcelColumn(name="褰撳墠閿佸ご缂栫爜锛堝叧鑱攍ocks)")
- private String lockId;
+ private Integer lockId;
@ApiModelProperty(value = "鏈�杩戠鍊熸椂闂�")
@ExcelColumn(name="鏈�杩戠鍊熸椂闂�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
index bb86ca0..e69423b 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
@@ -57,7 +57,7 @@
@ApiModelProperty(value = "缂栧彿")
@ExcelColumn(name="缂栧彿")
- private String code;
+ private Integer code;
@ApiModelProperty(value = "鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父", example = "1")
@ExcelColumn(name="鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index d41374d..7e08143 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -72,7 +72,7 @@
@ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜")
@ExcelColumn(name="绉熻溅閿佸叿",index = 5,width = 10,align = HorizontalAlignment.CENTER)
- private String rentLockId;
+ private Integer rentLockId;
@ApiModelProperty(value = "绉熻溅鏃堕棿")
@ExcelColumn(name="绉熻溅鏃堕棿",index = 6,width = 10,align = HorizontalAlignment.CENTER)
@@ -87,7 +87,7 @@
@ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
@ExcelColumn(name="褰掕繕閿佸叿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
- private String backLockId;
+ private Integer backLockId;
@ApiModelProperty(value = "杩樿溅鏃堕棿")
private Date backDate;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index 3c939c0..9b0343f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -121,7 +121,7 @@
.leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
.like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
+ .like( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
.ne(Bikes::getLockId,collect.get(Constants.FORCE_BACK_LOCK).getCode())
.ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
.isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 95421df..c923d9e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -34,7 +34,7 @@
*/
@Override
public MqttLog openLock(Locks locks) {
- String topic = Constants.MqttTopic.pub_openLock.replace("{siteId}", locks.getSiteId()).replace("{lockId}", locks.getCode());
+ String topic = Constants.MqttTopic.pub_openLock.replace("{siteId}", locks.getSiteId()).replace("{lockId}", locks.getCode()+"");
int result = mqttToolService.pubMessage("{}",topic);
MqttLog mqttLog = createPushLog(topic,result,"璇锋眰寮�閿乢"+locks.getId());
return mqttLog;
@@ -46,7 +46,7 @@
*/
@Override
public MqttLog getLockInfo(Locks locks) {
- String topic = Constants.MqttTopic.pub_getLockInfo.replace("{siteId}", locks.getSiteId()).replace("{lockId}", locks.getCode());
+ String topic = Constants.MqttTopic.pub_getLockInfo.replace("{siteId}", locks.getSiteId()).replace("{lockId}", locks.getCode()+"");
int result = mqttToolService.pubMessage("{}",topic);
MqttLog mqttLog = createPushLog(topic,result,"瀹炴椂鏌ヨ閿佷俊鎭痏"+locks.getId());
return mqttLog;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
index 040e773..f4c8335 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
@@ -11,6 +11,7 @@
import com.doumee.dao.business.SitesMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.*;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -77,8 +78,8 @@
}
if(StringUtils.contains(topic, info)){
//濡傛灉閿佸ご淇℃伅涓婃姤
- String lockid = ss[3];//閿佸ご缂栫爜
- if( StringUtils.isBlank(lockid)){
+ Integer lockid = Constants.formatIntegerFromStr(ss[3]) ;//閿佸ご缂栫爜
+ if( lockid == null){
//濡傛灉閿佸ご缂栫爜涓虹┖
log.error("mqtt娑堟伅璁㈤槄==============鏃犳晥鏁版嵁====="+topic+param);
return;
@@ -92,8 +93,8 @@
log.info("mqtt娑堟伅璁㈤槄=========閿佷俊鎭�==========鎴愬姛");
}else if(StringUtils.contains(topic, closeLock)){
//濡傛灉杩樿溅涓婃姤
- String lockid = ss[3];//閿佸ご缂栫爜
- if( StringUtils.isBlank(lockid)){
+ Integer lockid = Constants.formatIntegerFromStr(ss[3]);//閿佸ご缂栫爜
+ if( lockid == null){
//濡傛灉閿佸ご缂栫爜涓虹┖
log.error("mqtt娑堟伅璁㈤槄==============鏃犳晥鏁版嵁====="+topic+param);
return;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index e42647e..765d668 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -368,7 +368,7 @@
update.setBackType(Constants.ONE);
update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode());
- update.setBackLockId(collect.get(Constants.FORCE_BACK_LOCK).getCode());
+ update.setBackLockId(Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()));
Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
//璁＄畻楠戣璁¤垂鏃堕暱
@@ -460,17 +460,17 @@
//鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
locks =new Locks();
- locks.setCode(codes[1]);
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
locks.setSiteId(codes[0]);
deviceService.getLockInfo(locks);
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝宸插皾璇曟洿鏂伴攣澶寸姸鎬侊紝璇风◢鍚庨噸璇曪紒");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈唦");
}
if (StringUtils.isBlank(locks.getBikeCode())) {
locks =new Locks();
- locks.setCode(codes[1]);
+ locks.setCode(Constants.formatIntegerFromStr(codes[1]));
locks.setSiteId(codes[0]);
deviceService.getLockInfo(locks);
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝宸插皾璇曟洿鏂伴攣澶寸姸鎬侊紝璇风◢鍚庨噸璇曪紒");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
}
MemberRides memberRides = new MemberRides();
//鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
@@ -578,7 +578,7 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttLockInfoEvent(Locks locks){
- if(StringUtils.isBlank(locks.getCode()) ||StringUtils.isBlank(locks.getSiteId())){
+ if( locks.getCode() !=null ||StringUtils.isBlank(locks.getSiteId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
}
//鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
@@ -814,7 +814,7 @@
}
private void mqttCloseBikeEventDo(MemberRides bikes) {
- if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
+ if(StringUtils.isBlank(bikes.getBikeCode()) || bikes.getBackLockId() == null ||StringUtils.isBlank(bikes.getBackSiteId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
}
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
index cad86af..eb1b4d5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -349,7 +349,8 @@
//鍙兘鍚屾鏄ㄥぉ10涔嬪墠鐨勬暟鎹�
Calendar caln = Calendar.getInstance();
caln.setTime(ydate);
- if(caln.get(Calendar.HOUR_OF_DAY) <= 9){
+// System.out.println(caln.get(Calendar.HOUR_OF_DAY) );
+ if(caln.get(Calendar.HOUR_OF_DAY) >= 10){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈�杩戝悓姝ユ椂闂村彧鑳芥埅姝㈠埌鏄ㄥぉ10鐐瑰墠锛�");
}
}
--
Gitblit v1.9.3