From ac782f26335391de602d6033e29f936e6e7588b0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 06 七月 2021 18:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
index 8a332da..3fa78ad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
@@ -7,27 +7,25 @@
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.panzhihua.common.api.LcApiConstants;
-import com.panzhihua.common.api.LcRequestEnum;
-import com.panzhihua.common.api.LcReturnObject;
-import com.panzhihua.common.api.LcVisitRecordKeyPersonLabelEnum;
+import com.panzhihua.common.api.*;
import com.panzhihua.common.constants.TokenConstant;
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.grid.LcEventVisitingTasksListDTO;
+import com.panzhihua.common.model.vos.BcDictionaryItemVO;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
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.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
+import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.serviceapi.biz.LcApiService;
-import com.panzhihua.serviceapi.model.dto.LcFlowPersonVisitRecordDTO;
-import com.panzhihua.serviceapi.model.dto.LcGridData;
-import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordDTO;
-import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordQueryDTO;
+import com.panzhihua.serviceapi.model.dto.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -116,7 +114,7 @@
log.info("方法submitEventRegister发生错误：{}", e.getMessage());
}
HttpResponse result = request.execute();
- log.info("submit上传浪潮事件信息：{}", result.body());
+ log.info("submitEventRegister上传浪潮事件信息：{}", result.body());
return result.body();
}
@@ -137,7 +135,7 @@
file.delete();
return R.ok(result.body());
} catch (Exception e) {
- log.info("方法submitEventRelationFile发生错误：{}", e.getMessage());
+ log.info("方法submitEventOrVisitRecordRelationFile发生错误：{}", e.getMessage());
}
return R.fail();
}
@@ -161,12 +159,16 @@
}
@Override
- public String getGridMemberListByAreaIdOrName(String areaId) {
+ public List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param) {
HttpRequest request = HttpUtil.createGet(LcApiConstants.GRID_GET_GETALL_SEARCH_PAGE_URL);
request.auth(getAuthToken());
request.form("areaId", areaId);
+ if(param !=null){
+ request.form("param", param);
+ }
HttpResponse result = request.execute();
- return result.body();
+ LcReturnObject returenData = JSONObject.parseObject(result.body(), LcReturnObject.class);
+ return JSONArray.parseArray(returenData.getData(), GridMemberPageListDTO.class);
}
@Override
@@ -249,7 +251,7 @@
log.info("方法uploadFlowPersonVisitRecord发生错误：{}", e.getMessage());
}
HttpResponse result = request.execute();
- log.info("submit上传浪潮事件信息：{}", result.body());
+ log.info("uploadFlowPersonVisitRecord上传浪潮事件信息：{}", result.body());
return result.body();
}
@@ -266,7 +268,7 @@
log.info("方法uploadKeyPersonVisitRecord发生错误：{}", e.getMessage());
}
HttpResponse result = request.execute();
- log.info("submit上传浪潮事件信息：{}", result.body());
+ log.info("uploadKeyPersonVisitRecord上传浪潮事件信息：{}", result.body());
return result.body();
}
@@ -292,19 +294,25 @@
String lcGrid = gridService.getLcGridIdByLocal(lcEventVisitingTasksListDTO.getGridId());
String lcGridUserId = gridService.getLcUserIdByLocalUserId(lcEventVisitingTasksListDTO.getGridMember().toString());
R populationDetail = communityService.detailPopulation(lcEventVisitingTasksListDTO.getVisiterId());
+ ComMngPopulationVO comMngPopulationVO = (ComMngPopulationVO) populationDetail.getData();
+ BcDictionaryItemVO diction = communityService.getByCode(DictionItemConstants.LC_CULTURE_LEVEL, comMngPopulationVO.getCultureLevel().toString());
+ ComMngPopulationDTO comMngPopulationDTO = CopyUtil.copyProperties(comMngPopulationVO, ComMngPopulationDTO.class);
+ if (diction != null) {
+ comMngPopulationDTO.setCultureLevel(diction.getDictItemName());
+ }
R grid = gridService.eventGridDataDetails(lcEventVisitingTasksListDTO.getGridId());
EventGridDataDetailsVO gridData = (EventGridDataDetailsVO) grid.getData();
String[] data = lcEventVisitingTasksListDTO.getHappentLatLng().split(",");
if (lcEventVisitingTasksListDTO.getVisiterType() != null) {
log.info("上传数据导重点人口走访记录表");
- LcReturnObject lcReturnObject = requestLcKeyPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, populationDetail.getData(), gridData.getGridName(), data);
+ LcReturnObject lcReturnObject = requestLcKeyPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, comMngPopulationDTO, gridData.getGridName(), data);
if (LcRequestEnum.SUCCESS.getCode().equals(lcReturnObject.getCode())) {
uploadVisitRecord(lcEventVisitingTasksListDTO);
gridService.updateLcUploadFlagVisitingTask(lcEventVisitingTasksListDTO.getId());
}
} else {
log.info("上传数据导流动人口走访记录表");
- LcReturnObject lcReturnObject = requestLcFlowPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, populationDetail.getData(), gridData.getGridName(), data);
+ LcReturnObject lcReturnObject = requestLcFlowPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, comMngPopulationDTO, gridData.getGridName(), data);
if (LcRequestEnum.SUCCESS.getCode().equals(lcReturnObject.getCode())) {
uploadVisitRecord(lcEventVisitingTasksListDTO);
gridService.updateLcUploadFlagVisitingTask(lcEventVisitingTasksListDTO.getId());
@@ -369,10 +377,10 @@
lcFlowPersonVisitRecordDTO.setIsAbnormal(lcEventVisitingTasksListDTO.getException().toString());
lcFlowPersonVisitRecordDTO.setAbnormalSituation(lcEventVisitingTasksListDTO.getTableContentJson());
lcFlowPersonVisitRecordDTO.setRemark(lcEventVisitingTasksListDTO.getEventDes());
- log.info("事件请求数据：{}", JSONObject.toJSONString(lcFlowPersonVisitRecordDTO));
+ log.info("requestLcFlowPersonVisitRecord事件请求数据：{}", JSONObject.toJSONString(lcFlowPersonVisitRecordDTO));
String flowPersonData = uploadFlowPersonVisitRecord(lcFlowPersonVisitRecordDTO);
LcReturnObject lcReturnObject = JSONObject.parseObject(flowPersonData, LcReturnObject.class);
- log.info("提交浪潮服务器，接口返回结果为：{}", lcReturnObject);
+ log.info("requestLcFlowPersonVisitRecord提交浪潮服务器，接口返回结果为：{}", lcReturnObject);
return lcReturnObject;
}
@@ -397,10 +405,10 @@
keyPersonVisitRecordDTO.setAbnormalDes(lcEventVisitingTasksListDTO.getTableContentJson());
keyPersonVisitRecordDTO.setRemark(lcEventVisitingTasksListDTO.getEventDes());
keyPersonVisitRecordDTO.setType(LcVisitRecordKeyPersonLabelEnum.getCnDescByName(lcEventVisitingTasksListDTO.getVisiterType()));
- log.info("事件请求数据：{}", JSONObject.toJSONString(keyPersonVisitRecordDTO));
+ log.info("requestLcKeyPersonVisitRecord事件请求数据：{}", JSONObject.toJSONString(keyPersonVisitRecordDTO));
String remoteData = uploadKeyPersonVisitRecord(keyPersonVisitRecordDTO);
LcReturnObject lcReturnObject = JSONObject.parseObject(remoteData, LcReturnObject.class);
- log.info("提交浪潮服务器，接口返回结果为：{}", remoteData);
+ log.info("requestLcKeyPersonVisitRecord提交浪潮服务器，接口返回结果为：{}", remoteData);
return lcReturnObject;
}
--
Gitblit v1.7.1