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

fix 依赖

V0.5.x
jay 2023-05-31 11:03:37 +08:00
parent 1040da6dba
commit 106763d291
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/DeviceInfoRepository.java
View File

@ -2,10 +2,11 @@ package cc.iotkit.data.dao;
import cc.iotkit.data.model.TbDeviceInfo;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import java.util.List;
public interface DeviceInfoRepository extends JpaRepository<TbDeviceInfo, String> {
public interface DeviceInfoRepository extends JpaRepository<TbDeviceInfo, String>, QuerydslPredicateExecutor<TbDeviceInfo> {
TbDeviceInfo findByDeviceId(String deviceId);

19
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/NotifyController.java
View File

@ -8,13 +8,14 @@ import cc.iotkit.model.notify.ChannelTemplate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
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;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
/**
@ -45,25 +46,25 @@ public class NotifyController {
@ApiOperation("新增通道配置")
@PostMapping("/channel/config/add")
public ChannelConfig addChannelConfig(@RequestBody @Valid Request<ChannelConfig> request) {
public ChannelConfig addChannelConfig(@RequestBody @Validated Request<ChannelConfig> request) {
return notifyService.addChannelConfig(request.getData());
}
@ApiOperation("根据ID获取通道配置")
@PostMapping("/channel/config/getById")
public ChannelConfig getChannelConfigById(@RequestBody @Valid Request<String> request) {
public ChannelConfig getChannelConfigById(@RequestBody @Validated Request<String> request) {
return notifyService.getChannelConfigById(request.getData());
}
@ApiOperation("修改通道配置")
@PostMapping("/channel/config/updateById")
public ChannelConfig updateChannelConfigById(@RequestBody @Valid Request<ChannelConfig> request) {
public ChannelConfig updateChannelConfigById(@RequestBody @Validated Request<ChannelConfig> request) {
return notifyService.updateChannelConfigById(request.getData());
}
@ApiOperation("删除通道配置")
@PostMapping("/channel/config/delById")
public Boolean delChannelConfigById(@RequestBody @Valid Request<String> request) {
public Boolean delChannelConfigById(@RequestBody @Validated Request<String> request) {
return notifyService.delChannelConfigById(request.getData());
}
@ -75,25 +76,25 @@ public class NotifyController {
@ApiOperation("新增通道模板")
@PostMapping("/channel/template/add")
public ChannelTemplate addChannelTemplate(@RequestBody @Valid Request<ChannelTemplate> request) {
public ChannelTemplate addChannelTemplate(@RequestBody @Validated Request<ChannelTemplate> request) {
return notifyService.addChannelTemplate(request.getData());
}
@ApiOperation("根据ID获取通道模板")
@PostMapping("/channel/template/getById")
public ChannelTemplate getChannelTemplateById(@RequestBody @Valid Request<String> request) {
public ChannelTemplate getChannelTemplateById(@RequestBody @Validated Request<String> request) {
return notifyService.getChannelTemplateById(request.getData());
}
@ApiOperation("修改通道模板")
@PostMapping("/channel/template/updateById")
public ChannelTemplate updateChannelTemplateById(@RequestBody @Valid Request<ChannelTemplate> request) {
public ChannelTemplate updateChannelTemplateById(@RequestBody @Validated Request<ChannelTemplate> request) {
return notifyService.updateChannelTemplateById(request.getData());
}
@ApiOperation("删除通道模板")
@PostMapping("/channel/template/delById")
public Boolean delChannelTemplateById(@RequestBody @Valid Request<String> request) {
public Boolean delChannelTemplateById(@RequestBody @Validated Request<String> request) {
return notifyService.delChannelTemplateById(request.getData());
}