qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.关联收费模式发短信提示

Browse Source 
2.缓存的key改成mac
This commit is contained in:
邱贞招 2024-10-07 09:51:22 +08:00
parent 6555e10eab
commit 40249eef4e
8 changed files with 90 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
View File

@ -162,7 +162,7 @@ public class ReceiveController {
}
if(ObjectUtil.isNotNull(asDevice)){
// 将msg的定位信息保存到redis中
redisCache.setCacheObject(CacheConstants.CACHE_DEVICE_KEY+asDevice.getSn(),msg);
redisCache.setCacheObject(CacheConstants.CACHE_DEVICE_KEY+asDevice.getMac(),msg);
log.info("reids更新定位成功==========================>" +asDevice.getSn());
// 坐标转换 WGS84 转 GCJ02

2
electripper-system/src/main/java/com/ruoyi/system/mapper/EtModelMapper.java
View File

@ -61,4 +61,6 @@ public interface EtModelMapper
int selectAllCount();
List<EtModel> selectNotRuleModelList();
}

4
electripper-system/src/main/java/com/ruoyi/system/mapper/EtModelRuleMapper.java
View File

@ -15,11 +15,11 @@ public interface EtModelRuleMapper extends BaseMapper<EtModelRule>
/**
* 通过用运营区ID删除区域与收费方式关联
*
* @param areaId 运营区id
* @param modelId 车型id
* @return 结果
*/
@Log(title = "mapper中，根据车型id删除车型与收费方式关系", businessType = BusinessType.DELETE)
public int deleteModelRuleByModelId(Long areaId);
public int deleteModelRuleByModelId(Long modelId);
// /**
// * 通过用ruleId删除区域与收费方式关联

4
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -216,7 +216,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
asDevice.setRemainingMileage(CommonUtil.getRemainingMileage(asDevice.getVoltage(),model.getFullVoltage(),model.getLowVoltage(),model.getFullEndurance()));
}
}
String msg = redisCache.getCacheObject(CacheConstants.CACHE_DEVICE_KEY + asDevice.getSn());
String msg = redisCache.getCacheObject(CacheConstants.CACHE_DEVICE_KEY + asDevice.getMac());
if(StrUtil.isNotBlank(msg)){
log.info("【根据sn号查询车辆实时信息】-========redis缓存中的数据：" + msg);
LogEntry logEntry = JSONObject.parseObject(msg, LogEntry.class);
@ -752,7 +752,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
}
private void getLatestLocation(AsDevice asDevice) {
String msg = redisCache.getCacheObject(CacheConstants.CACHE_DEVICE_KEY + asDevice.getSn());
String msg = redisCache.getCacheObject(CacheConstants.CACHE_DEVICE_KEY + asDevice.getMac());
if(StrUtil.isNotBlank(msg)){
log.info("【根据sn号查询车辆实时信息】-========redis缓存中的数据：" + msg);
LogEntry logEntry = JSONObject.parseObject(msg, LogEntry.class);

89
electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java
View File

@ -4,10 +4,10 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.IotConstants;
import com.ruoyi.common.constant.ServiceConstants;
import com.ruoyi.common.core.domain.entity.AsUser;
import com.ruoyi.common.core.domain.entity.SysUser;
@ -15,6 +15,8 @@ import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.CommonUtil;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SendAliSmsUtil;
import com.ruoyi.common.utils.SendSmsVo;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.map.GeoUtils;
import com.ruoyi.common.utils.map.GpsCoordinateUtils;
@ -25,7 +27,6 @@ import com.ruoyi.common.utils.onenet.Token;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.domain.vo.AsDeviceVO;
import com.ruoyi.system.domain.vo.OperatingDataVo;
import com.ruoyi.system.domain.vo.SelfReconciliationVO;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.*;
@ -101,10 +102,12 @@ public class EtTask {
@Autowired
private IAsDeviceService deviceService;
@Autowired
private IEtModelService etModelService;
@Resource
private EtModelMapper etModelMapper;
@Resource
private EtCouponClaimLogMapper etCouponClaimLogMapper;
@ -117,12 +120,27 @@ public class EtTask {
@Autowired
private EtChannelService smEtChannelService;
@Resource
private EtModelRuleMapper etModelRuleMapper;
@Value(value = "${iot.deviceUrl}")
private String deviceUrl;
@Value(value = "${iot.productId}")
private String productId;
@Value("${aliyun.accessKeyId}")
private String accessKeyId;
@Value("${aliyun.accessKeySecret}")
private String accessKeySecret;
@Value("${aliyun.signName}")
private String signName;
@Value("${aliyun.templateCode}")
private String templateCode;
/**
* 1.启动时判断是否有未取消预约的订单
@ -818,26 +836,29 @@ public class EtTask {
if(StrUtil.isNotBlank(areaId)){
aLong = Long.parseLong(areaId);
}
if(StrUtil.isNotBlank(timeStart) && StrUtil.isNotBlank(timeEnd)){
List<ChannelVO> channelVOS = smEtChannelService.selectSmChannelList(new ChannelQuery());
for (ChannelVO channel:channelVOS) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
int limit = DateUtils.differentDaysByMillisecond(timeStart, timeEnd) + 1;
Calendar calendar = Calendar.getInstance();
calendar.setTime(dateFormat.parse(timeEnd));
for (int i = 0; i < limit; i++) {
String formattedDate = dateFormat.format(calendar.getTime());
String startDateStr = formattedDate + " " + Constants.DATE_FORMAT_START_PEREND;
String endDateStr = formattedDate + " " + Constants.DATE_FORMAT_END_PEREND;
/** 总收入*/
SelfReconciliationVO selfReconciliationVO = buildSelfReconciliation(startDateStr,endDateStr, formattedDate,aLong,channel.getChannelId());
// 保存
saveRecon(formattedDate, selfReconciliationVO,channel.getChannelId());
calendar.add(Calendar.DATE, -1);
}
if(StrUtil.isBlank(timeStart) || StrUtil.isBlank(timeEnd)){
// 默认取昨天的时间
LocalDate yesterday = LocalDate.now().minusDays(1);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
timeStart = yesterday.format(formatter);
timeEnd = yesterday.format(formatter);
}
List<ChannelVO> channelVOS = smEtChannelService.selectSmChannelList(new ChannelQuery());
for (ChannelVO channel:channelVOS) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
int limit = DateUtils.differentDaysByMillisecond(timeStart, timeEnd) + 1;
Calendar calendar = Calendar.getInstance();
calendar.setTime(dateFormat.parse(timeEnd));
for (int i = 0; i < limit; i++) {
String formattedDate = dateFormat.format(calendar.getTime());
String startDateStr = formattedDate + " " + Constants.DATE_FORMAT_START_PEREND;
String endDateStr = formattedDate + " " + Constants.DATE_FORMAT_END_PEREND;
/** 总收入*/
SelfReconciliationVO selfReconciliationVO = buildSelfReconciliation(startDateStr,endDateStr, formattedDate,aLong,channel.getChannelId());
// 保存
saveRecon(formattedDate, selfReconciliationVO,channel.getChannelId());
calendar.add(Calendar.DATE, -1);
}
}else{
throw new ServiceException("请选择时间");
}
}
@ -897,4 +918,28 @@ public class EtTask {
private BigDecimal defaultIfNull(BigDecimal value, BigDecimal defaultValue) {
return value != null ? value : defaultValue;
}
/**
* 如果发现车型没有关联收费模式则发短信提示
* */
@SneakyThrows
public void sendMsgtips() {
List<EtModel> etModels = etModelMapper.selectNotRuleModelList();
for (EtModel etModel :etModels){
QueryWrapper<EtModelRule> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("model_id", etModel.getModelId()); // 设备状态正常
Integer integer = etModelRuleMapper.selectCount(queryWrapper);
if(integer == 0){
JSONObject jsonObject = new JSONObject();
jsonObject.put("name",etModel.getModelId());
SendSmsVo sendSmsVo = new SendSmsVo();
sendSmsVo.setMobile("18650502300");
sendSmsVo.setTemplateCode(templateCode);
sendSmsVo.setParam(jsonObject.toJSONString());
sendSmsVo.setSignName(signName);
SendSmsResponse response = SendAliSmsUtil.sendVerifyCode(accessKeyId,accessKeySecret,sendSmsVo);
log.info("【发送短信】发送短信结果:【{}】",response.getMessage());
}
}
}
}

15
electripper-system/src/main/resources/mapper/system/EtModelMapper.xml
View File

@ -52,6 +52,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectAllCount" resultType="java.lang.Integer">
select count(1) from et_model
</select>
<select id="selectNotRuleModelList" resultType="com.ruoyi.system.domain.EtModel">
SELECT
m.model_id,
m.model,
d.dept_id AS operator
FROM
et_model m
LEFT JOIN et_model_rule r ON m.model_id = r.model_id
JOIN sys_dept d ON d.dept_id = m.operator
WHERE
r.rule_id IS NULL
AND d.dept_name != '沈瞬灵'
AND d.dept_name != '庄载旺'
AND (d.balance != 0 OR d.dept_name = '福瑶列岛');
</select>
<insert id="insertEtModel" parameterType="EtModel" keyProperty="modelId" useGeneratedKeys="true">
insert into et_model

3
electripper-system/src/main/resources/mapper/system/EtModelRuleMapper.xml
View File

@ -8,7 +8,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from et_model_rule where model_id=#{modelId}
</delete>
<!-- <delete id="deleteModelRuleByRuleId">-->
<!-- delete from et_model_rule where rule_id=#{ruleId}-->
<!-- </delete>-->
</mapper>

2
electripper-system/src/main/resources/mapper/system/EtReconciliationMapper.xml
View File

@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND `day` &lt;= #{params.endTime}
</if>
</where>
order by create_time desc
order by `day` desc
</select>
<select id="selectEtReconciliationByReconciliationId" parameterType="Long" resultMap="EtReconciliationResult">