zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:初始数据设备列表修改

V0.5.x
xiwa 2023-06-16 23:05:39 +08:00
parent 8c3950d563
commit 90672fe6a9
4 changed files with 43 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/init/sys_menu.json
View File

@ -2415,7 +2415,7 @@
"menuName": "品类管理",
"menuType": "C",
"orderNum": 1,
"parentId": 1658357918741422082,
"parentId": 2200,
"path": "categories",
"perms": null,
"queryParam": null,
@ -2459,7 +2459,7 @@
"menuName": "拆分组件demo",
"menuType": "C",
"orderNum": 1,
"parentId": 1660167072208510978,
"parentId": 2202,
"path": "disperseDemo",
"perms": null,
"queryParam": null,
@ -2503,7 +2503,7 @@
"menuName": "产品管理",
"menuType": "C",
"orderNum": 2,
"parentId": 1658357918741422082,
"parentId": 2200,
"path": "products",
"perms": null,
"queryParam": null,
@ -2525,7 +2525,7 @@
"menuName": "设备列表",
"menuType": "C",
"orderNum": 4,
"parentId": 1658357918741422082,
"parentId": 2200,
"path": "devices",
"perms": null,
"queryParam": null,
@ -2547,7 +2547,7 @@
"menuName": "虚拟设备",
"menuType": "C",
"orderNum": 5,
"parentId": 1658357918741422082,
"parentId": 2200,
"path": "virtualDevices",
"perms": null,
"queryParam": null,
@ -2591,7 +2591,7 @@
"menuName": "设备消息转换器",
"menuType": "C",
"orderNum": 1,
"parentId": 1662732793483530242,
"parentId": 2208,
"path": "convertors",
"perms": null,
"queryParam": null,
@ -2613,7 +2613,7 @@
"menuName": "通讯组件管理",
"menuType": "C",
"orderNum": 2,
"parentId": 1662732793483530242,
"parentId": 2208,
"path": "components",
"perms": null,
"queryParam": null,
@ -2657,7 +2657,7 @@
"menuName": "规则管理",
"menuType": "C",
"orderNum": 1,
"parentId": 1662793849241243650,
"parentId": 2211,
"path": "ruleSys",
"perms": null,
"queryParam": null,
@ -2679,7 +2679,7 @@
"menuName": "定时任务",
"menuType": "C",
"orderNum": 1,
"parentId": 1662793849241243650,
"parentId": 2211,
"path": "scheduledTask",
"perms": null,
"queryParam": null,
@ -2701,7 +2701,7 @@
"menuName": "设备详情",
"menuType": "C",
"orderNum": 1,
"parentId": 1658357918741422082,
"parentId": 2200,
"path": "devicesDetail/:id",
"perms": null,
"queryParam": null,
@ -2723,7 +2723,7 @@
"menuName": "虚拟设备详情",
"menuType": "C",
"orderNum": 16,
"parentId": 1658357918741422082,
"parentId": 2200,
"path": "virtualDeviceConfig/:id",
"perms": null,
"queryParam": null,
@ -2765,7 +2765,7 @@
"menuName": "消息列表",
"menuType": "C",
"orderNum": 1,
"parentId": 1664635724467126274,
"parentId": 2216,
"path": "messageCenterList",
"perms": null,
"queryParam": null,
@ -2809,7 +2809,7 @@
"menuName": "通道配置",
"menuType": "C",
"orderNum": 1,
"parentId": 1664638344103575553,
"parentId": 2218,
"path": "channelConfig",
"perms": null,
"queryParam": null,
@ -2831,7 +2831,7 @@
"menuName": "模板配置",
"menuType": "C",
"orderNum": 2,
"parentId": 1664638344103575553,
"parentId": 2218,
"path": "template",
"perms": null,
"queryParam": null,
@ -2875,7 +2875,7 @@
"menuName": "告警列表",
"menuType": "C",
"orderNum": 1,
"parentId": 1664827474452238338,
"parentId": 2221,
"path": "list",
"perms": null,
"queryParam": null,
@ -2897,7 +2897,7 @@
"menuName": "告警配置",
"menuType": "C",
"orderNum": 2,
"parentId": 1664827474452238338,
"parentId": 2221,
"path": "config",
"perms": null,
"queryParam": null,

39
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
View File

@ -30,7 +30,7 @@ import java.util.stream.Collectors;
@Primary
@Service
public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceInfo, String> {
public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceInfo, String> {
@Autowired
private DeviceInfoRepository deviceInfoRepository;
@ -170,7 +170,7 @@ public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceIn
@Override
public List<DeviceInfo> findByParentId(String parentId) {
return parseVoToDto(deviceInfoRepository.findByParentId(parentId ));
return parseVoToDto(deviceInfoRepository.findByParentId(parentId));
}
@Override
@ -192,7 +192,7 @@ public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceIn
"a.device_name\n" +
"FROM device_info a JOIN product p ON p.node_type=0 AND a.product_key=p.id";
if (StringUtils.isNotBlank(uid)) {
sql += " WHERE a.uid='"+uid+"'";
sql += " WHERE a.uid='" + uid + "'";
}
return jdbcTemplate.queryForList(sql);
}
@ -295,15 +295,15 @@ public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceIn
String.format("WHERE b.device_id in(%s)", deviceIds), new BeanPropertyRowMapper<>(DeviceIdGroup.class));
//取设备标签
List<TbDeviceTag> tags = list.size() == 0 ? new ArrayList<>() :
jdbcTemplate.query("\n" +
"SELECT\n" +
"a.id,\n" +
"a.code,\n" +
"a.name,\n" +
"a.value\n" +
"FROM device_tag a " +
String.format("WHERE a.device_id IN(%s)", deviceIds), new BeanPropertyRowMapper<>(TbDeviceTag.class));
// List<TbDeviceTag> tags = list.size() == 0 ? new ArrayList<>() :
// jdbcTemplate.query("\n" +
// "SELECT\n" +
// "a.id,\n" +
// "a.code,\n" +
// "a.name,\n" +
// "a.value\n" +
// "FROM device_tag a " +
// String.format("WHERE a.device_id IN(%s)", deviceIds), new BeanPropertyRowMapper<>(TbDeviceTag.class));
for (DeviceInfo device : list) {
//设置设备分组
@ -314,11 +314,11 @@ public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceIn
device.setGroup(groupMap);
//设置设备标签
Map<String, DeviceInfo.Tag> tagMap = new HashMap<>();
tags.stream().filter(t -> device.getDeviceId().equals(t.getDeviceId()))
.forEach(t -> tagMap.put(t.getCode(),
new DeviceInfo.Tag(t.getCode(), t.getName(), t.getValue())));
device.setTag(tagMap);
// Map<String, DeviceInfo.Tag> tagMap = new HashMap<>();
// tags.stream().filter(t -> device.getDeviceId().equals(t.getDeviceId()))
// .forEach(t -> tagMap.put(t.getCode(),
// new DeviceInfo.Tag(t.getCode(), t.getName(), t.getValue())));
// device.setTag(tagMap);
}
return new Paging<>(total, list);
@ -375,7 +375,7 @@ public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceIn
//按品类分组求合
rst.stream().collect(Collectors.groupingBy(DataItem::getName,
Collectors.summarizingLong(item -> (long) item.getValue())))
Collectors.summarizingLong(item -> (long) item.getValue())))
.forEach((key, sum) -> stats.add(new DataItem(key, sum.getSum())));
return stats;
@ -444,7 +444,6 @@ public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceIn
}
@Override
public DeviceInfo findById(String s) {
return MapstructUtils.convert(
@ -506,7 +505,6 @@ public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceIn
}
@Override
public long count() {
return deviceInfoRepository.count();
@ -534,5 +532,4 @@ public class DeviceInfoDataImpl implements IDeviceInfoData,IJPACommData<DeviceIn
}
}

33
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java
View File

@ -10,13 +10,8 @@
package cc.iotkit.manager.controller;
import cc.iotkit.common.api.PageRequest;
import cc.iotkit.common.api.Paging;
import cc.iotkit.common.api.Request;
import cc.iotkit.common.enums.ErrCode;
import cc.iotkit.common.exception.BizException;
import cc.iotkit.common.satoken.utils.AuthUtil;
import cc.iotkit.common.utils.ReflectUtil;
import cc.iotkit.data.manager.IRuleInfoData;
import cc.iotkit.data.manager.ITaskInfoData;
import cc.iotkit.manager.dto.bo.ruleinfo.RuleInfoBo;
import cc.iotkit.manager.dto.bo.ruleinfo.RuleLogBo;
import cc.iotkit.manager.dto.bo.taskinfo.TaskInfoBo;
@ -25,29 +20,16 @@ import cc.iotkit.manager.dto.vo.ruleinfo.RuleInfoVo;
import cc.iotkit.manager.dto.vo.ruleinfo.RuleLogVo;
import cc.iotkit.manager.dto.vo.taskinfo.TaskInfoVo;
import cc.iotkit.manager.dto.vo.taskinfo.TaskLogVo;
import cc.iotkit.manager.service.DataOwnerService;
import cc.iotkit.common.api.Paging;
import cc.iotkit.manager.service.IRuleEngineService;
import cc.iotkit.model.rule.RuleInfo;
import cc.iotkit.model.rule.RuleLog;
import cc.iotkit.model.rule.TaskInfo;
import cc.iotkit.model.rule.TaskLog;
import cc.iotkit.ruleengine.rule.RuleManager;
import cc.iotkit.ruleengine.task.TaskManager;
import cc.iotkit.temporal.IRuleLogData;
import cc.iotkit.temporal.ITaskLogData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.UUID;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = {"规则引擎"})
@Slf4j
@ -71,7 +53,6 @@ public class RuleEngineController {
@PostMapping("/edit")
public boolean saveRule(@RequestBody @Validated Request<RuleInfoBo> ruleInfoBo) {
return ruleEngineService.saveRule(ruleInfoBo.getData());
}
@ApiOperation("暂停规则")
@ -152,6 +133,7 @@ public class RuleEngineController {
return ruleEngineService.deleteTask(taskId);
}
@ApiOperation("定时任务日志list")
@PostMapping("/taskLogs/list")
public Paging<TaskLogVo> getTaskLogs(
@ -160,9 +142,10 @@ public class RuleEngineController {
return ruleEngineService.selectTaskLogPageList(request);
}
@ApiOperation("清除定时任务日志")
@PostMapping("/taskLogs/clear")
public boolean clearTaskLogs( @Validated @RequestBody PageRequest<String> request) {
public boolean clearTaskLogs( @Validated @RequestBody Request<String> request) {
return ruleEngineService.clearTaskLogs(request.getData());
}

4
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java
View File

@ -51,7 +51,6 @@ public class VirtualDeviceController {
@Autowired
private IVirtualDeviceLogData virtualDeviceLogData;
@ApiOperation("获取虚拟设备列表")
@PostMapping("/list")
public Paging<VirtualDevice> getDevices(
@ -127,7 +126,7 @@ public class VirtualDeviceController {
* 删除
*/
@ApiOperation("删除虚拟设备")
@DeleteMapping("/delete")
@PostMapping("/delete")
public void delete(@Validated @RequestBody Request<String> bo) {
String id = bo.getData();
checkOwner(id);
@ -185,7 +184,6 @@ public class VirtualDeviceController {
return virtualDeviceLogData.findByVirtualDeviceId(data.getDeviceId(), bo.getPageNum(), bo.getPageSize());
}
private VirtualDevice checkOwner(String id) {
VirtualDevice oldData = virtualDeviceData.findById(id);
if (oldData == null) {