Commit a811cbd4 authored by 赵啸非's avatar 赵啸非

修改redis 过期事件通知

parent 552d2b59
...@@ -25,10 +25,10 @@ CREATE TABLE mortals_xhx_device( ...@@ -25,10 +25,10 @@ CREATE TABLE mortals_xhx_device(
`siteCode` varchar(256) COMMENT '站点编号,来源基础服务平台', `siteCode` varchar(256) COMMENT '站点编号,来源基础服务平台',
`siteName` varchar(256) COMMENT '站点名称', `siteName` varchar(256) COMMENT '站点名称',
`deviceMac` varchar(64) COMMENT '设备的MAC地址', `deviceMac` varchar(64) COMMENT '设备的MAC地址',
`platformId` bigint(20) NOT NULL COMMENT '平台系统Id', `platformId` bigint(20) COMMENT '平台系统Id',
`platformName` varchar(256) NOT NULL COMMENT '平台系统名称', `platformName` varchar(256) COMMENT '平台系统名称',
`productId` bigint(20) NOT NULL COMMENT '产品Id', `productId` bigint(20) COMMENT '产品Id',
`productName` varchar(256) NOT NULL COMMENT '产品名称', `productName` varchar(256) COMMENT '产品名称',
`deviceFirmId` bigint(20) COMMENT '设备生产厂商ID', `deviceFirmId` bigint(20) COMMENT '设备生产厂商ID',
`deviceFirmname` varchar(20) COMMENT '设备生产厂商名称', `deviceFirmname` varchar(20) COMMENT '设备生产厂商名称',
`ip` varchar(64) COMMENT '设备访问ip', `ip` varchar(64) COMMENT '设备访问ip',
......
...@@ -177,8 +177,7 @@ export default { ...@@ -177,8 +177,7 @@ export default {
activeDevice(row) { activeDevice(row) {
this.$post("/device/active", { this.$post("/device/active", {
"entity.id": row.id, "deviceCode": row.deviceCode
"entity.active": 1,
}) })
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
......
...@@ -177,7 +177,7 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic ...@@ -177,7 +177,7 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
public String deviceActive(@RequestParam(value = "deviceCode") String deviceCode) { public String deviceActive(@RequestParam(value = "deviceCode") String deviceCode) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<>(); Map<String, Object> model = new HashMap<>();
String busiDesc = this.getModuleDesc() + "下发设备消息"; String busiDesc = this.getModuleDesc() + "设备激活";
try { try {
this.service.active(deviceCode, getContext()); this.service.active(deviceCode, getContext());
this.init(request, response, null, model, getContext()); this.init(request, response, null, model, getContext());
......
...@@ -71,7 +71,7 @@ POST {{baseUrl}}/api/register ...@@ -71,7 +71,7 @@ POST {{baseUrl}}/api/register
Content-Type: application/json Content-Type: application/json
{ {
"deviceCode": "a12345678" "deviceCode": "b12345678"
} }
> {% > {%
......
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