From 786524cbf9c16a8496c214c0494ffd2e3e177441 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 27 Sep 2024 10:05:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=8F=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=202024=E5=B9=B49=E6=9C=882?= =?UTF-8?q?7=E6=97=A510:05:52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reissue/controller/DataReissueController.java | 7 +++++++ .../thing/reissue/service/DataReissueService.java | 3 ++- .../service/impl/DataReissueServiceImpl.java | 14 +++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/thing/src/main/java/com/thing/reissue/controller/DataReissueController.java b/modules/thing/src/main/java/com/thing/reissue/controller/DataReissueController.java index 528bf36..e5d53c1 100644 --- a/modules/thing/src/main/java/com/thing/reissue/controller/DataReissueController.java +++ b/modules/thing/src/main/java/com/thing/reissue/controller/DataReissueController.java @@ -33,5 +33,12 @@ public class DataReissueController { return new Result>().ok(dtos); } + @GetMapping("test") + @Operation(summary="测试") + public Result testConnect(@RequestParam String username, @RequestParam String password, @RequestParam String url){ + dataReissueService.testConnect(username, password, url); + return new Result<>(); + } + } \ No newline at end of file diff --git a/modules/thing/src/main/java/com/thing/reissue/service/DataReissueService.java b/modules/thing/src/main/java/com/thing/reissue/service/DataReissueService.java index 9a9afa1..e3da98d 100644 --- a/modules/thing/src/main/java/com/thing/reissue/service/DataReissueService.java +++ b/modules/thing/src/main/java/com/thing/reissue/service/DataReissueService.java @@ -18,8 +18,9 @@ public interface DataReissueService extends IBaseService { void dataReissue(DataReissueDTO dataReissue); - List tenantList(); + void testConnect(String username, String password,String url); + } \ No newline at end of file diff --git a/modules/thing/src/main/java/com/thing/reissue/service/impl/DataReissueServiceImpl.java b/modules/thing/src/main/java/com/thing/reissue/service/impl/DataReissueServiceImpl.java index 41d4a67..c2f1151 100644 --- a/modules/thing/src/main/java/com/thing/reissue/service/impl/DataReissueServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/reissue/service/impl/DataReissueServiceImpl.java @@ -35,12 +35,12 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.*; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.kv.*; import java.util.*; import java.util.stream.Collectors; @@ -223,6 +223,18 @@ public class DataReissueServiceImpl extends BaseServiceImpl loginRequest = new HashMap(); From 2f098a341d7368607e0fe4dba997b1711a6c6aae Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 27 Sep 2024 10:26:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=8F=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=202024=E5=B9=B49=E6=9C=882?= =?UTF-8?q?7=E6=97=A510:05:52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/thing/sys/biz/controller/SysParamsController.java | 7 +++++++ .../java/com/thing/sys/biz/service/SysParamsService.java | 1 + .../thing/sys/biz/service/impl/SysParamsServiceImpl.java | 1 + 3 files changed, 9 insertions(+) diff --git a/modules/thing/src/main/java/com/thing/sys/biz/controller/SysParamsController.java b/modules/thing/src/main/java/com/thing/sys/biz/controller/SysParamsController.java index c261126..7d734cf 100644 --- a/modules/thing/src/main/java/com/thing/sys/biz/controller/SysParamsController.java +++ b/modules/thing/src/main/java/com/thing/sys/biz/controller/SysParamsController.java @@ -137,4 +137,11 @@ public class SysParamsController { return new Result().ok(sysParamsService.getValue(paramCode)); } + @GetMapping("updateValueByCode") + @Operation(summary = "通过编码获取值") + public Result updateParamCode(@RequestParam String paramCode, @RequestParam String paramValue){ + sysParamsService.updateValueByCode(paramCode, paramValue); + return new Result<>(); + } + } diff --git a/modules/thing/src/main/java/com/thing/sys/biz/service/SysParamsService.java b/modules/thing/src/main/java/com/thing/sys/biz/service/SysParamsService.java index 835034e..bce703b 100644 --- a/modules/thing/src/main/java/com/thing/sys/biz/service/SysParamsService.java +++ b/modules/thing/src/main/java/com/thing/sys/biz/service/SysParamsService.java @@ -36,6 +36,7 @@ public interface SysParamsService extends IBaseService { */ String getValue(String paramCode); + /** * 根据参数编码，获取value的Object对象 * @param paramCode 参数编码 diff --git a/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysParamsServiceImpl.java b/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysParamsServiceImpl.java index f655639..1415135 100644 --- a/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysParamsServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysParamsServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Map; @RequiredArgsConstructor @Primary public class SysParamsServiceImpl extends BaseServiceImpl implements SysParamsService { + @Value("${spring.cache.type}") private String cacheType; From 5809bd6d13de396b9cdaf2009e65351fc6d31fe0 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 27 Sep 2024 11:13:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E9=99=90=E5=88=B6=E4=BC=98=E5=8C=96=202024=E5=B9=B49=E6=9C=882?= =?UTF-8?q?7=E6=97=A511:13:24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IotThingDictRelationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java index fa37f2a..e784934 100644 --- a/modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java @@ -463,7 +463,7 @@ public class IotThingDictRelationServiceImpl extends BaseServiceImpl cache.updateAccurateKeyEntity(CacheNameEnum.THING_DICT_RELATION, entity.getTenantCode()+CacheInit.KEY+entity.getEntityCode()+CacheInit.KEY+entity.getCode()+CacheInit.KEY+entity.getId(),ConvertUtils.sourceToTarget(entity, IotThingDictRelationDTO.class))); }