1. 联调
This commit is contained in:
parent
5822ff6d51
commit
a15c7a369a
|
|
@ -1,17 +1,13 @@
|
|||
package com.ruoyi.web.controller.app;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.CommonUtil;
|
||||
import com.ruoyi.system.domain.*;
|
||||
import com.ruoyi.system.service.*;
|
||||
import com.wechat.pay.java.service.payments.model.Transaction;
|
||||
import com.wechat.pay.java.service.refund.RefundService;
|
||||
import com.wechat.pay.java.service.refund.model.QueryByOutRefundNoRequest;
|
||||
import com.wechat.pay.java.service.refund.model.Refund;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
|
|||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.CommonUtil;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.verify.vo.IDResponse;
|
||||
import com.ruoyi.framework.web.service.TokenService;
|
||||
|
|
@ -25,7 +26,6 @@ import com.ruoyi.system.service.*;
|
|||
import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPaymentResponse;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
|
@ -721,4 +721,19 @@ public class AppVerifyController extends BaseController
|
|||
return AjaxResult.success("操作成功",aBoolean);
|
||||
}
|
||||
|
||||
/**
|
||||
* sn和mac号绑定
|
||||
*/
|
||||
@PostMapping("/band")
|
||||
public AjaxResult bandSn(String sn,String mac)
|
||||
{
|
||||
logger.info("sn和mac号绑定：【sn="+sn+"】，【mac="+mac+"】");
|
||||
AsDevice asDevice = new AsDevice();
|
||||
asDevice.setSn(sn);
|
||||
asDevice.setMac(mac);
|
||||
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NOT_BAND);
|
||||
asDevice.setCreateTime(DateUtils.getNowDate());
|
||||
return toAjax(asDeviceService.bandSn(asDevice));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,6 +119,10 @@ public class ServiceConstants {
|
|||
|
||||
/**----------------------------车辆状态start----------------------------*/
|
||||
/** 车辆状态: 0 未上架，1-正常，2-预约中，3-骑行中，4-临时锁车，8-下线；9-废弃 */
|
||||
/**
|
||||
* 车辆状态: 7 未绑定
|
||||
*/
|
||||
public static final String VEHICLE_STATUS_NOT_BAND = "7";
|
||||
/**
|
||||
* 车辆状态: 0 未上架
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,38 +3,45 @@ package com.ruoyi.common.utils.wx;
|
|||
import cn.binarywang.wx.miniapp.api.WxMaService;
|
||||
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
|
||||
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
|
||||
import com.ruoyi.common.utils.spring.SpringUtils;
|
||||
import lombok.SneakyThrows;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@Slf4j
|
||||
public class AccessTokenUtil {
|
||||
|
||||
/** 缓存token */
|
||||
private static String cachedToken;
|
||||
|
||||
/** token过期时间 */
|
||||
private static long tokenExpirationTime;
|
||||
// 存储每个租户的token和过期时间
|
||||
private static final ConcurrentHashMap<String, String> cachedTokens = new ConcurrentHashMap<>();
|
||||
private static final ConcurrentHashMap<String, Long> tokenExpirationTimes = new ConcurrentHashMap<>();
|
||||
|
||||
@SneakyThrows
|
||||
public static String getToken(String appid, String appsecret) {
|
||||
if (isTokenExpired()) {
|
||||
String cacheKey = appid + ":" + appsecret;
|
||||
|
||||
if (isTokenExpired(cacheKey)) {
|
||||
log.info("token已过期，重新获取");
|
||||
WxMaService wxMaService = new WxMaServiceImpl();
|
||||
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
|
||||
config.setAppid(appid);
|
||||
config.setSecret(appsecret);
|
||||
wxMaService.setWxMaConfig(config);
|
||||
String accessToken = wxMaService.getAccessToken();
|
||||
cachedToken = accessToken;
|
||||
// 更新 token 过期时间
|
||||
tokenExpirationTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(3600L);
|
||||
return cachedToken;
|
||||
|
||||
// 更新缓存
|
||||
cachedTokens.put(cacheKey, accessToken);
|
||||
tokenExpirationTimes.put(cacheKey, System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(3600L));
|
||||
|
||||
return accessToken;
|
||||
}
|
||||
return cachedToken;
|
||||
log.info("token未过期，直接使用");
|
||||
return cachedTokens.get(cacheKey);
|
||||
}
|
||||
|
||||
/**判断token是否过期*/
|
||||
private static boolean isTokenExpired() {
|
||||
return cachedToken == null || System.currentTimeMillis() > tokenExpirationTime;
|
||||
private static boolean isTokenExpired(String cacheKey) {
|
||||
Long expirationTime = tokenExpirationTimes.get(cacheKey);
|
||||
return expirationTime == null || System.currentTimeMillis() > expirationTime;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,11 @@ public class AsDevice extends BaseEntityPlus implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String qrText;
|
||||
|
||||
/** 运营商 */
|
||||
@Excel(name = "运营商")
|
||||
@TableField(exist = false)
|
||||
private String deptName;
|
||||
|
||||
/** 分区 */
|
||||
@Excel(name = "分区id")
|
||||
private Long areaId;
|
||||
|
|
|
|||
|
|
@ -256,6 +256,12 @@ public interface IAsDeviceService extends IService<AsDevice>
|
|||
*/
|
||||
boolean checkMACUnique(AsDevice asDevice);
|
||||
|
||||
|
||||
/**
|
||||
* sn和mac号绑定
|
||||
*/
|
||||
int bandSn(AsDevice asDevice);
|
||||
|
||||
// /**
|
||||
// * 是否靠近运营区边界
|
||||
// */
|
||||
|
|
|
|||
|
|
@ -239,9 +239,12 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
|
|||
String typeName = sysDictDataService.selectDictLabel("as_device_status", status);
|
||||
asDevice1.setStatusStr(typeName);
|
||||
}
|
||||
SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId);
|
||||
asDevice1.setQrText(sysDept.getDomain()+"?sn="+asDevice1.getSn());
|
||||
//https://dianche.chuantewulian.cn?sn=https://dche.ccttiot.com?sn=3000900
|
||||
if(ObjectUtil.isNotNull(areaId)){
|
||||
SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId);
|
||||
//https://dianche.chuantewulian.cn?sn=https://dche.ccttiot.com?sn=3000900
|
||||
asDevice1.setQrText(sysDept.getDomain()+"?sn="+asDevice1.getSn());
|
||||
asDevice1.setDeptName(sysDept.getDeptName());
|
||||
}
|
||||
}
|
||||
return asDevices;
|
||||
}
|
||||
|
|
@ -1435,6 +1438,16 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* sn和mac号绑定
|
||||
* 注册onenet设备
|
||||
*/
|
||||
@Override
|
||||
public int bandSn(AsDevice asDevice) {
|
||||
return asDeviceMapper.insert(asDevice);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 判断是否靠近边界
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
de.activation_time, de.online_status, de.create_by, de.create_time, de.update_by,
|
||||
de.update_time, de.last_time, de.remark, de.status, de.lock_status, de.location,
|
||||
de.remaining_power, de.voltage, de.qrcode, de.longitude, de.latitude, de.is_area_out_outage, de.is_admin_unlocking from et_device de
|
||||
inner join et_area_dept ad on ad.area_id = de.area_id
|
||||
inner join sys_dept d on d.dept_id = ad.dept_id
|
||||
left join et_area_dept ad on ad.area_id = de.area_id
|
||||
left join sys_dept d on d.dept_id = ad.dept_id
|
||||
where 1 = 1
|
||||
<if test="deviceName != null and deviceName != ''"> and de.device_name like concat('%', #{deviceName}, '%')</if>
|
||||
<if test="mac != null and mac != ''"> and de.mac = #{mac}</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user