Merge branch 'feature/userAnalysisReform'

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java

@@ -34,6 +34,8 @@ import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
 import com.elink.esua.epdc.modules.user.dao.MetaUserGridOpiningDao;
 import com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity;
 import com.elink.esua.epdc.modules.user.service.MetaUserGridOpiningService;
+import com.elink.esua.epdc.modules.user.service.MetaUserPartyRankService;
+import com.elink.esua.epdc.modules.user.service.MetaUserRegisterRankService;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +57,12 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
     @Autowired
     private UserAnalysisService userAnalysisService;
 
+    @Autowired
+    private MetaUserPartyRankService metaUserPartyRankService;
+
+    @Autowired
+    private MetaUserRegisterRankService metaUserRegisterRankService;
+
     @Override
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserGridOpiningDTO> page(Map<String, Object> params) {
@@ -130,9 +138,15 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
     @Override
     @DataSource(name = DataSourceNames.TWELVE)
     public Result createUserAnalysisData() {
+        String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        Map<String,Object> params = new HashMap<>();
+        params.put("startTime","2018-01-01");
+        params.put("endTime",nowTime);
         List<GridOpeningResultDTO> list = userAnalysisService.getToLeadGridOpenings(new HashMap<>());
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntities = ConvertUtils.sourceToTarget(list, MetaUserGridOpiningEntity.class);
         boolean b = insertBatch(metaUserGridOpiningEntities);
+        metaUserPartyRankService.toLeadPartyRankData();
+        metaUserRegisterRankService.toLeadUserRegisterRandData();
         return b?new Result<>():new Result().error("录入失败");
     }
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java

@@ -132,6 +132,9 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
         // 获取导出数据
         Map<String,Object> params = new HashMap<>();
         params.put("partyFlag", YesOrNoEnum.YES.value());
+        String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        params.put("startTime","2018-01-01");
+        params.put("endTime",nowTime);
         List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(params);
         List<MetaUserPartyRankEntity> metaUserPartyRankEntities = ConvertUtils.sourceToTarget(toLeadUserRegisterRandData, MetaUserPartyRankEntity.class);
         return insertBatch(metaUserPartyRankEntities)? new Result(): new Result().error("导入党员排行失败") ;

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -124,8 +125,12 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
     @Override
     @DataSource(name = DataSourceNames.TWELVE)
     public Result toLeadUserRegisterRandData() {
+        Map<String,Object> params = new HashMap<>();
+        String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        params.put("startTime","2018-01-01");
+        params.put("endTime",nowTime);
         // 获取导出数据
-        List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(new HashMap<>());
+        List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(params);
         // 导入数据
         List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = ConvertUtils.sourceToTarget(toLeadUserRegisterRandData, MetaUserRegisterRankEntity.class);
         return insertBatch(metaUserRegisterRankEntities) ? new Result():new Result().error("导入注册用户排行失败");

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserPartyRankDao.xml

@@ -43,6 +43,8 @@
                 #{streetId}
             </foreach>
         </if>
+        ORDER BY
+        pr.PARTY_MEMBER_COUNT DESC
     </select>
 
 </mapper>

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml

@@ -44,6 +44,8 @@
                 #{streetId}
             </foreach>
         </if>
+        ORDER BY
+        rr.USER_COUNT DESC
     </select>
 
     <select id="selectListStreetId" resultType="String">

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobUserServiceImpl.java

@@ -20,10 +20,10 @@ public class ScheduleJobUserServiceImpl implements ScheduleJobUserService {
     public void createUserAnalysisData() {
         // 网格开通
         userFeignClint.createUserAnalysisData();
-        // 用户注册
+//        // 用户注册
-        userFeignClint.toLeadUserRegisterRandData();
+//        userFeignClint.toLeadUserRegisterRandData();
-
+//
-        // 党员排行绑
+//        // 党员排行绑
-        userFeignClint.toLeadPartyRankData();
+//        userFeignClint.toLeadPartyRankData();
     }
 }