Merge pull request 'master' (#59) from master into V3

Reviewed-on: http://git.lrdaiot.cn:9000/thing/thing_api/pulls/59

modules/thing/src/main/java/com/thing/reissue/controller/DataReissueController.java

@@ -33,5 +33,12 @@ public class DataReissueController {
         return new Result<List<SysTenantDTO>>().ok(dtos);
     }
 
+    @GetMapping("test")
+    @Operation(summary="测试")
+    public Result<Void> testConnect(@RequestParam String username, @RequestParam String password, @RequestParam String url){
+        dataReissueService.testConnect(username, password, url);
+        return new Result<>();
+    }
+
 
 }

modules/thing/src/main/java/com/thing/reissue/service/DataReissueService.java

@@ -18,8 +18,9 @@ public interface DataReissueService extends IBaseService<DataReissueEntity> {
 
     void dataReissue(DataReissueDTO dataReissue);
 
-
     List<SysTenantDTO> tenantList();
 
+    void testConnect(String username, String password,String url);
+
 
 }

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<DataReissueMapper, D
         return sysTenantDao.queryList(params).parallelStream().sorted(Comparator.comparingLong(SysTenantDTO::getTenantCode)).collect(Collectors.toList());
     }
 
+    @Override
+    public void testConnect(String username, String password,String url) {
+        try {
+            String token = login(url, username, password);
+            if (StringUtils.isBlank(token)) {
+                throw new SysException("连接失败");
+            }
+        }catch (Exception e){
+            throw new SysException("连接失败");
+        }
+    }
+
 
     private String login(String url, String username, String password) {
         Map<String, String> loginRequest = new HashMap();

modules/thing/src/main/java/com/thing/sys/biz/controller/SysParamsController.java

@@ -137,4 +137,11 @@ public class SysParamsController {
         return new Result<String>().ok(sysParamsService.getValue(paramCode));
     }
 
+    @GetMapping("updateValueByCode")
+    @Operation(summary = "通过编码获取值")
+    public Result<Void> updateParamCode(@RequestParam String paramCode, @RequestParam String paramValue){
+        sysParamsService.updateValueByCode(paramCode, paramValue);
+        return new Result<>();
+    }
+
 }

modules/thing/src/main/java/com/thing/sys/biz/service/SysParamsService.java

@@ -36,6 +36,7 @@ public interface SysParamsService extends IBaseService<SysParamsEntity> {
      */
     String getValue(String paramCode);
 
+
     /**
      * 根据参数编码，获取value的Object对象
      * @param paramCode  参数编码

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<SysParamsMapper, SysParamsEntity> implements SysParamsService {
+
     @Value("${spring.cache.type}")
     private String cacheType;
 

modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java

@@ -463,7 +463,7 @@ public class IotThingDictRelationServiceImpl extends BaseServiceImpl<IotThingDic
                     return dictRelation;
                 })).toList();
         if (CollectionUtils.isNotEmpty(insertList)) {
-            mapper.insertBatch(insertList);
+            mapper.insertBatch(insertList,1000);
             insertList.forEach(entity -> 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)));
         }