From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期一, 12 七月 2021 18:30:01 +0800 Subject: [PATCH] Merge branch 'test' into 'master' --- springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java | 62 ++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java index 0ce59cf..a2c7176 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java @@ -1,22 +1,31 @@ package com.panzhihua.serviceapi.biz.impl; import cn.hutool.core.util.RandomUtil; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.panzhihua.common.api.LcReturnObject; import com.panzhihua.common.enums.LocalEventToLangChaoEventTypeEnum; import com.panzhihua.common.model.dtos.api.EventFile; import com.panzhihua.common.model.dtos.api.EventInfo; import com.panzhihua.common.model.dtos.api.PartiesBody; +import com.panzhihua.common.model.vos.BcDictionaryVO; +import com.panzhihua.common.model.vos.DictionaryVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO; import com.panzhihua.common.model.vos.grid.EventResourceVO; import com.panzhihua.common.service.api.ApiServiceFeign; +import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.grid.GridService; import com.panzhihua.common.utlis.DateUtils; +import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.serviceapi.ServiceApiApplication; import com.panzhihua.serviceapi.biz.LcApiService; +import com.panzhihua.serviceapi.model.dto.GridMemberPageListDTO; import com.panzhihua.serviceapi.model.dto.LcGridData; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; @@ -40,6 +49,9 @@ @Resource private ApiServiceFeign ApiServiceFeign; + + @Autowired + private CommunityService communityService; @Test void saveTokenFromRemoteRequest() { @@ -189,8 +201,54 @@ @Test void getGridMemberListByAreaIdOrName() { - String data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp"); - log.info(data); + List<GridMemberPageListDTO> data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp", ""); + // log.info(data); } + @Test + void downloadDiction() { + //获取字典全部大类 + HttpRequest request = HttpUtil.createPost("http://171.217.92.33:53301/dict/getTypeTree"); + request.cookie("SESSION=ZTQ1ZGRmZjktNWU1MC00ZjEyLWJhOGItNDdjZjlmODc1MjQy; UISESSIONMEMBER=C6FE0698B29832B18CBAEB71CCD3A2BA"); + HttpResponse result = request.execute(); + List<DictionData> remoteData = JSONArray.parseArray(result.body(), DictionData.class); + remoteData.forEach(dictionData -> { + DictionaryVO dictionaryVO = new DictionaryVO(); + long parentzId = Snowflake.getId(); + dictionaryVO.setId(parentzId); + dictionaryVO.setDictName(dictionData.getName()); + dictionaryVO.setDictKey(dictionData.getValue()); + dictionaryVO.setLevelIndex(1); + dictionaryVO.setParentId(0L); + communityService.insertDiction(dictionaryVO); + //获取二级字典项 + dictionData.getChildren().forEach(children -> { + DictionaryVO dictionaryChiVO = new DictionaryVO(); + long erparentzId = Snowflake.getId(); + dictionaryChiVO.setId(erparentzId); + dictionaryChiVO.setDictName(children.getName()); + dictionaryChiVO.setDictKey(children.getValue()); + dictionaryChiVO.setLevelIndex(2); + dictionaryChiVO.setParentId(dictionaryVO.getId()); + communityService.insertDiction(dictionaryChiVO); + //获取字典全部值 + HttpRequest requestDictionValue = HttpUtil.createPost("http://171.217.92.33:53301/dict/getDictByTypeCodeAndParentId?typeCode=" + children.getId() + "&parentId=0"); + requestDictionValue.cookie("SESSION=ZTQ1ZGRmZjktNWU1MC00ZjEyLWJhOGItNDdjZjlmODc1MjQy; UISESSIONMEMBER=C6FE0698B29832B18CBAEB71CCD3A2BA"); + HttpResponse childResult = requestDictionValue.execute(); + LcReturnObject remoteDataChild = JSONObject.parseObject(childResult.body(), LcReturnObject.class); + List<DictionValueData> dictionValueData = JSONArray.parseArray(remoteDataChild.getData(), DictionValueData.class); + dictionValueData.forEach(dictionValueData1 -> { + BcDictionaryVO dictionaryItemVO = new BcDictionaryVO(); + dictionaryItemVO.setDictName(dictionValueData1.getDictName()); + dictionaryItemVO.setDictValue(dictionValueData1.getDictCode()); + dictionaryItemVO.setCode(""); + dictionaryItemVO.setDictId(erparentzId); + communityService.insertDictionItem(dictionaryItemVO); + }); +// String pretty = JSONArray.toJSONString(dictionValueData, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue, +// SerializerFeature.WriteDateUseDateFormat); +// log.info(pretty); + }); + }); + } } \ No newline at end of file -- Gitblit v1.7.1