diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomerdeptDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomerdeptDTO.java new file mode 100644 index 000000000..de3744e62 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomerdeptDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: esua-epdc + * @description: 部门信息上传 包装类 + * @author: wangtong + * @create: 2020-09-10 14:34 + **/ +@Data +public class CustomerdeptDTO implements Serializable { + + private static final long serialVersionUID = -4363497942180317879L; + + /** + * 是否是本次传输的第一次 + */ + private Boolean isFirst = true; + + /** + * 组装数据 + */ + private List dataList; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomerdeptResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomerdeptResultDTO.java new file mode 100644 index 000000000..893ee6db0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomerdeptResultDTO.java @@ -0,0 +1,53 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 部门信息上传 + * @author: wangtong + * @create: 2020-09-10 14:33 + **/ +@Data +public class CustomerdeptResultDTO implements Serializable { + + private static final long serialVersionUID = -8998861985519746586L; + + /** + *部门id + */ + private String deptId; + + /** + *部门名称 + */ + private String deptName; + + /** + *部门所属组织id + */ + private String parentAgencyId; + + /** + *坐标区域可空 + */ + private String areaMarks; + + /** + *中心点位可空 + */ + private String centerMark; + + /** + *党支部的位置！！！ + */ + private String partyMark; + + /** + *数据更新至: yyyy|yyyyMM|yyyyMMdd + */ + private String dataEndTime; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java index 6543e93fa..cdefb2c11 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java @@ -130,5 +130,17 @@ public class DataStatsScreencollController { return dataStatsScreencollService.customeragency(); } + /** + * @describe: 016、部门信息上传 + * @author wangtong + * @date 2020/9/10 14:32 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("customerdept") + public Result customerdept() { + return dataStatsScreencollService.customerdept(); + } + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java index 75a5aa3ed..ed2020d06 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java @@ -111,4 +111,13 @@ public interface DataStatsScreencollDao extends BaseDao */ List publicpartitotaldata(); + + /** + * @describe: 部门信息上传 + * @author wangtong + * @date 2020/9/10 14:37 + * @params [] + * @return java.util.List + */ + List customerdept(); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java index 536948154..3944ead69 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java @@ -92,4 +92,13 @@ public interface DataStatsScreencollService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result publicpartitotaldata(); + + /** + * @describe: 016、部门信息上传 + * @author wangtong + * @date 2020/9/10 14:32 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result customerdept(); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java index 782f9a29d..4e6767753 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java @@ -161,6 +161,19 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl list = baseDao.customerdept(); + // 将list转换为json格式 + CustomerdeptDTO result = new CustomerdeptDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost("/data/stats/screencoll/customerdept", json); + log.info(body); + return null; + } + /** * 将一组数据固定分组，每组n个元素 * diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml index a6c8a7da4..f7d6b2ce5 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml @@ -2103,4 +2103,19 @@ union all + diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java similarity index 94% rename from esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java rename to esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 8e8f55906..62bab62c5 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -2,7 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.fallback.AnalysisFeignClintFallback; +import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PostMapping; * @Date: 2020/3/25 10:20 * @Description: 用户数据分析 */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClintFallback.class) -public interface AnalysisFeignClint { +@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class,url = "http://127.0.0.1:9077") +public interface AnalysisFeignClient { /*** * 生成用户分析数据导入临时表 diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/CloudAnalysisFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/CloudAnalysisFeignClient.java index 520a67efa..98eb84ac3 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/CloudAnalysisFeignClient.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/CloudAnalysisFeignClient.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping; * @Author：wanggongfeng * @Date：2020/08/25 09:36 */ -@FeignClient(name = ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, fallback = CloudAnalysisFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, fallback = CloudAnalysisFeignClientFallback.class,url = "http://127.0.0.1:9060") public interface CloudAnalysisFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java similarity index 94% rename from esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java rename to esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 8c026032a..e52a68205 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -3,7 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.AnalysisFeignClint; +import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.springframework.stereotype.Component; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; * @Description: 用户数据分析 */ @Component -public class AnalysisFeignClintFallback implements AnalysisFeignClint { +public class AnalysisFeignClientFallback implements AnalysisFeignClient { @Override public Result createUserAnalysisData() { diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java index c25f91290..a6506220f 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java @@ -1,6 +1,6 @@ package com.elink.esua.epdc.service.impl; -import com.elink.esua.epdc.feign.AnalysisFeignClint; +import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.service.ScheduleJobUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; @Component public class ScheduleJobUserServiceImpl implements ScheduleJobUserService { @Autowired - private AnalysisFeignClint userFeignClint; + private AnalysisFeignClient userFeignClint; @Override public void createUserAnalysisData() { diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java index dc71eb4a7..0a923569e 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java @@ -1,6 +1,6 @@ package com.elink.esua.epdc.task.screen; -import com.elink.esua.epdc.feign.AnalysisFeignClint; +import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.feign.CloudAnalysisFeignClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { private CloudAnalysisFeignClient cloudAnalysisFeignClient; @Autowired - private AnalysisFeignClint analysisFeignClint; + private AnalysisFeignClient analysisFeignClient; @Override public void run(String param) { @@ -164,7 +164,7 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { //方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); logger.info("<"+methodName+"|党建引领-党员联系群众数据>定时任务开始执行"); - analysisFeignClint.partylinkmassesdata(); + analysisFeignClient.partylinkmassesdata(); logger.info("<"+methodName+"|党建引领-党员联系群众数据>定时任务执行结束"); } @@ -173,7 +173,7 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { //方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); logger.info("<"+methodName+"|党建引领-先锋模范数据>定时任务开始执行"); - analysisFeignClint.pioneerdata(); + analysisFeignClient.pioneerdata(); logger.info("<"+methodName+"|党建引领-先锋模范数据>定时任务执行结束"); } @@ -181,7 +181,7 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { //方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); logger.info("<"+methodName+"|公众参与各类总数>定时任务开始执行"); - analysisFeignClint.publicpartitotaldata(); + analysisFeignClient.publicpartitotaldata(); logger.info("<"+methodName+"|公众参与各类总数>定时任务执行结束"); } @@ -189,7 +189,7 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { //方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); logger.info("<"+methodName+"|基层党建-建设情况数据（支部、联建、志愿）>定时任务开始执行"); - analysisFeignClint.meetdata(); + analysisFeignClient.meetdata(); logger.info("<"+methodName+"|基层党建-建设情况数据（支部、联建、志愿）>定时任务执行结束"); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java index b32305163..5d0b2cfa9 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java @@ -1,6 +1,6 @@ package com.elink.esua.epdc.task.screen; -import com.elink.esua.epdc.feign.AnalysisFeignClint; +import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +26,7 @@ public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { private static ExecutorService service = Executors.newFixedThreadPool(100); @Autowired - private AnalysisFeignClint analysisFeignClint; + private AnalysisFeignClient analysisFeignClient; @Override public void run(String param) { @@ -77,7 +77,7 @@ public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { //方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); logger.info("<"+methodName+"|党员基本情况>定时任务开始执行"); - analysisFeignClint.cpcbasedata(); + analysisFeignClient.cpcbasedata(); logger.info("<"+methodName+"|党员基本情况>定时任务执行结束"); } @@ -86,7 +86,7 @@ public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { //方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); logger.info("<"+methodName+"|事件数据>定时任务开始执行"); - analysisFeignClint.eventdata(); + analysisFeignClient.eventdata(); logger.info("<"+methodName+"|事件数据>定时任务执行结束"); } @@ -94,7 +94,7 @@ public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { //方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); logger.info("<"+methodName+"|中央区各类总数>定时任务开始执行"); - analysisFeignClint.usertotaldata(); + analysisFeignClient.usertotaldata(); logger.info("<"+methodName+"|中央区各类总数>定时任务执行结束"); }