Skip to content

D
device-new-platform
Commit 86d12663 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改设备通知刷新消息

parent 17783e2e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 384 additions and 92 deletions
device-manager-ui/admin/yarn.lock
View file @ 86d12663
This diff is collapsed.
device-manager/pom.xml
View file @ 86d12663
......@@ -193,7 +193,7 @@
<profiles.sms.apiId>k6BVS1PEbyzcJAE4</profiles.sms.apiId>
<profiles.sms.type>3</profiles.sms.type>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.filepath>/home/mortals/app/data</profiles.filepath>
<profiles.filepath>/mortals/app/data</profiles.filepath>
<profiles.log.level>INFO</profiles.log.level>
<profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
......
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @ 86d12663
......@@ -2,7 +2,6 @@ package com.mortals.xhx.busiz.web;
import cn.hutool.core.net.url.UrlBuilder;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.hutool.extra.servlet.ServletUtil;
import com.alibaba.fastjson.JSON;
......@@ -931,11 +930,14 @@ public class DeviceApiController {
public static void main(String[] args) {
String domain = "http://10.12.185.213\r" +
":11078";
// URL url = URLUtil.url(domain);
String domain = "http://10.12.185.213:11078";
System.out.println(StrUtil.removeAllLineBreaks(domain));
UrlBuilder urlBuilder = UrlBuilder.ofHttp(domain).addPath("test");
System.out.println(urlBuilder.build());
//URL url = URLUtil.url(domain);
// System.out.println(StrUtil.removeAllLineBreaks(domain));
/* String content="OTFENjJBODBBRjFFNDNERDVGMDVGNkY3RTg1MEVDNDIxQUNFNTRCRDhDQTM2QjNGM0MwNEUyNERGOTg3NzVCNjRDRkU1MDg0NjU0QjU1ODgzRTg2OUM4MUJGRTE3ODQzRjJFQkMwNjdEMTRCRTdCQ0RDRENBNDFEQkJEMzQyRThGMzUzOTQ3MjVFRjE5RDUzOTlBMTAxQkM0MzZDRTY4M0Y0Mzg5ODZGM0Y3NUZGMTNEMEQyRDMwMzYzREE4OTBCNEVFM0EwQ0IzNjk3RkNDNTY5NDhENEVGNkE4RUU1QzE5QTg3QzAzMTM4MUE5REQ3RjRCQkQ3RjZDQjhDQUM1RkFENTZCNDZGMjhGQ0Q0MkY3MzI5MUM0MDk5QkUxNDkzRTcwRTQ5NzY1OTZDOURENzJBMzQyQjNENjQ2Q0EyNTkwMDk0QkNENTEyNzNBMzM3NkMwNUJDM0VBQTU3OThDNjk5RDQ0ODMyRTE3RTI1NzdGMDBGN0FENzlDMkYwRkVFMDQwNzIzQzM1NDdGREUxMzQzNjlDMzUzNEU0MkNDRkIwMTY3ODUxRTk1ODQ4RTU1MzU0NDZFQUY4M0NGMEY2QzlEMEFERjU1M0M0QTFGOEI2N0IxQzk0RkQ3Q0VCRjVBRTdCRDlBREFCQzZCNDgyMkFGMTk5REY2QUQwNUIwNUZGMDdENjY4RjlCOTUxMUU2RDhDQzA5NTVCNkM5NDk0ODNGN0NDQUEwQzA5NDRGOTcyMkE0Q0MyRTY2RUQ1QjI3NDY2N0VEMkZEN0I2ODY0NjYzMTA2N0I4MERDMTc1MkY4OTk4QTEyOTk4RENDM0NEQUNFMUFFNjkxOUExRUJDRUM4RjYyNDkxNTBFMTBCNDE4RkNCOUEzODEwMkJCQkY4QkUzNzRCRjU3NkZERDE2OEExMTg4QjUxNDREMkUxOTRGNkEzREM0OUM0N0RCQzkzMkMzNkRGMUQ1QTU0MTBBNTE3MTA1QzMwMTk3MENDMEZDREI5MzJEMjlEOTZGMzgyQkU1Q0UwOTQxOURGQ0YyRTFDMzUxRUIyQTk5REY3QTRGMkY2NDYzODU0M0Q4Q0I1RkFENkRFMkVFREI5QzQ3REJCMjlCRUJBQ0RCN0ZCOTAxOTJGRTQwMDRFNTgzQzcyMjVBMEMxQzJFRUU2MTM4M0QyQTM4OTRFNTFERkNFQjk1QTNDRTdERTNEQUU0MTc0RTJDOTcyMDBBRDY0Rjg3REFFOTg5NTk1REFDRjhGMjcyNUUxMzM3MkY0NkNCRDQ3NjVEMjEyNzM3OEZDQ0M0OEFBMzlCMDhDRjk5QTlDQjkyQzZDRjFFMkFDMDE2OENERTA3MUE0OEE0QTVCNEYyRDg4NEIzMDgxQ0M3MjkxQ0M1RjkxRUFFNEMyMTgxQjhBMUQ1MjJGNDJDNEIxQzcxNTlFQjIyQTNBQ0VEQzkwRDVCNEY4RkQ0MzU2NDU1M0I1MTBDQzRCNEY3QkNCNjJEOUZBRkM3MjI5OTFERDBCQjgwRjgxRTE1MjQ2RDVCRjE0Q0RENzFGNTk1MzQ3MjUyNjMxMDlBQTJEREI1MkEzRDZBMTY0MUJFOEMxM0Q2NTE1OTNDMTIxMzk4QjIxNTZGMTFGMEQ0NjI4MzlEMEUxREI0NzgwMDkxNzg4RTU4NzlDRTRBMjhDMEVDOTAwQjhBMDg0RUREQ0RFNTE0OEI5MTQzOEM4Qjc0NkQ2N0Q0MDU1MEQ4OENENTU4NjQ1N0NBQjE1RTNEM0RCQTE3M0EyNjU4QTlFNTc4RUVCMkU2NEI3Nzc4MTU5Nzk1OUY2QjY1MjlFRjI5M0QzQjBEQjNCRDg5N0NEQzkxNEU5OTZCNjFCMzE5MEZCNDZDQzdCOTA1RTBGM0M5OTBFOTE2MkI3OTY5NzBDMjMxRDI5MjNFNDYzODdFOEE2QkREOThBRDlBOUIzMzNFMTgxMzBCMERCRkRFREY3NjUxNjQxODQ4MkEwQkVENTlEOEM2ODlFNkMzM0UxQkJDMzgwNzFCQkQzQUQ1MzdDOUQ0QTEzRTAwQzYxRUY0QjAwRTkzQUJCNjc5NUJCNDEyNzA5MjVCNEI5NzdCNzg4NzVCNERBMDNDRkM5NDc5NjRGNDI4RUYwRTdCN0EzNEQ1MjgwRTczM0I2N0M4MjQwQjQ4NDdEQzgzOUQ2RURDMDZENDg2OTMyNjgxNzJBRkVERERBRjI2RjY4MzI3RTQ1QzExQzU5NDEzQjc0Q0FDMDM0NDMwRUU4MEQ5RUYyQThBMTYyRjM5RTZDNjc2MjIxNUU3QUU1NTlFREFCODc3M0M4N0JFNDI2MkE2RjkxQUY4NjYwQ0Y0MjNBNjM1MjFDMUQ5RjNCRUJEMkQ0MDdCNzNBRTYwRENGNDY2NDY4Mjk5MDc4NkEyRUU5MkQ3Mjc3N0YyREVFOEY1NzNBQzFBMjI2MjA3RTNEQjYzMzc5MjI2ODUwQ0Y5MjU3QjIzNDEzQTQ5OEYxMEQ2MjI1OTc0QjUyQUU1QzcyQjg1Qjg0Qjg1QUJFNkExRjlEMTYzMUEyRTNCMUQ4MDg4QzMxNzQyREQyRUU5NzA3QzRGMzY0RDlCNzIwRkVFM0Q5QTU5NjAyQUNBQzVCMjBGREQ2Q0ZCQUUzOUZCM0U2MTQyOQ==";
......
device-manager/src/main/java/com/mortals/xhx/common/utils/DownMsgTask.java
View file @ 86d12663
......@@ -26,8 +26,6 @@ import java.util.Comparator;
import java.util.Date;
import java.util.List;
import static com.mortals.xhx.common.key.Constant.MESSAGETYPE_UPGREAD;
/**
* 接收消息
*
......@@ -82,7 +80,7 @@ public class DownMsgTask implements Runnable {
deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceCode(deviceEntity.getDeviceCode());
deviceLogEntity.setMessageHead(MESSAGETYPE_UPGREAD);
deviceLogEntity.setMessageHead(item.getMessageType());
deviceLogEntity.setContent(item.getData());
deviceLogEntity.setLogType(LogTypeEnum.下发服务.getValue());
deviceLogEntity.setCreateUserId(1L);
......
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java
View file @ 86d12663
......@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.File;
import java.nio.charset.Charset;
import java.util.Date;
/**
......@@ -92,7 +93,26 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
}
public static void main(String[] args) {
ZipUtil.unzip("F:\\1664176173348.zip", "F:\\tmp");
File file = new File("F:\\交警窗口证件照.zip");
String disPath = "F:\\pics\\";
ZipUtil.unzip("F:\\交警窗口证件照.zip", disPath, Charset.forName("GBK"));
File[] files = FileUtil.ls(disPath);
for (File file1 : files) {
System.out.println(file1.getName());
}
/* System.out.println(file.getName());
System.out.println(FileUtil.getPrefix(file));*/
// ZipUtil.unzip("F:\\1664176173348.zip", "F:\\tmp");
}
}
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductVersionServiceImpl.java
View file @ 86d12663
package com.mortals.xhx.module.product.service.impl;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
......@@ -69,6 +71,20 @@ public class ProductVersionServiceImpl extends AbstractCRUDServiceImpl<ProductVe
@Override
protected void saveAfter(ProductVersionEntity entity, Context context) throws AppException {
//推送消息
pushUpgradMsg(entity, context);
super.saveAfter(entity, context);
}
@Override
protected void updateAfter(ProductVersionEntity entity, Context context) throws AppException {
pushUpgradMsg(entity, context);
super.updateAfter(entity, context);
}
private void pushUpgradMsg(ProductVersionEntity entity, Context context) {
if (!ObjectUtils.isEmpty(entity.getProductId())) {
ProductEntity productEntity = productService.get(entity.getProductId(), context);
if (!ObjectUtils.isEmpty(productEntity)) {
......@@ -78,8 +94,7 @@ public class ProductVersionServiceImpl extends AbstractCRUDServiceImpl<ProductVe
header.put(MessageHeader.MESSAGETYPE, MESSAGETYPE_UPGREAD);
header.put(MessageHeader.DEVICECODE, deviceEntity.getDeviceCode());
header.put(MessageHeader.TIMESTAMP, DateUtils.getCurrStrDateTime());
TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastUUID(), "==", header);
TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastUUID(), Base64.encode( new JSONObject().toJSONString()), header);
messageProducer.sendMsg(QueueKey.DEFAULT_EXCHANGE, Constant.DOWN_TOPIC + deviceEntity.getDeviceCode(), JSON.toJSONString(queueMsg));
DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
......@@ -95,13 +110,8 @@ public class ProductVersionServiceImpl extends AbstractCRUDServiceImpl<ProductVe
deviceLogEntity.setCreateUserId(1L);
deviceLogEntity.setCreateTime(new Date());
deviceLogService.save(deviceLogEntity,null);
}
}
}
super.saveAfter(entity, context);
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment