Merge remote-tracking branch 'origin/dev_areaCode' into dev_pyscreen

epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgDailyDTO.java

@@ -54,6 +54,11 @@ public class ScreenWorkRecordOrgDailyDTO implements Serializable {
      */
 	private String orgId;
 
+    /**
+     * 组织名称或者网格名
+     */
+    private String orgName;
+
     /**
      * 会议类型编码；对应screen_customer_work_record_dict的资源编码
      */

epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/ScreenWorkRecordOrgMonthlyDTO.java

@@ -54,6 +54,11 @@ public class ScreenWorkRecordOrgMonthlyDTO implements Serializable {
      */
 	private String orgId;
 
+    /**
+     * 组织名称或者网格名
+     */
+    private String orgName;
+
     /**
      * 会议类型编码；对应screen_customer_work_record_dict的资源编码
      */

epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordRankResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.plugins.result;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,6 +12,7 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2021/2/23 23:11
  */
+@AllArgsConstructor
 @Data
 public class WorkRecordRankResultDTO implements Serializable {
     /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/plugins/WorkRecordController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 public class WorkRecordController {
     @Autowired
     private ScreenWorkRecordOrgDailyService screenWorkRecordOrgDailyService;
-    //todo
+    //todo 工作日志是否要添加area_code、parent_area_code、orgType;插件是否可以提供；也可以采集的时候赋值
     //5、【工作日志】本机及下级排名
     //NEI接口地址：https://nei.netease.com/interface/detail/?pid=57068&id=348966
     //返参中的当前组织的参与人数、组织次数 直接sum所有下级的值;
@@ -36,4 +36,5 @@ public class WorkRecordController {
 
     //6、【工作日志】近12月趋势图
     //NEI接口地址：https://nei.netease.com/interface/detail/?pid=57068&id=348967
+    //可以下级组织+下级网格 orgId 直接 in
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java

@@ -19,6 +19,7 @@ package com.epmet.datareport.dao.plugins;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.datareport.entity.plugins.ScreenWorkRecordOrgDailyEntity;
+import com.epmet.plugins.result.WorkRecordRankResultDTO;
 import com.epmet.plugins.result.WorkRecordSubRank;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,9 +44,14 @@ public interface ScreenWorkRecordOrgDailyDao extends BaseDao<ScreenWorkRecordOrg
      * @Date 2021/2/23 23:37
      **/
     List<WorkRecordSubRank> selectSubList(@Param("areaCode") String areaCode,
+                                          @Param("agencyId") String agencyId,
                                           @Param("dataType") String dataType,
                                           @Param("topRow") Integer topRow,
                                           @Param("dateId")String dateId);
 
     String selectLatestDateId(String customerId);
+
+    WorkRecordRankResultDTO selectCurrentAgency(@Param("areaCode") String areaCode,
+                                                @Param("dataType") String dataType,
+                                                @Param("dateId")String dateId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgDailyEntity.java

@@ -50,6 +50,11 @@ public class ScreenWorkRecordOrgDailyEntity extends BaseEpmetEntity {
      */
 	private String orgId;
 
+	/**
+	 * 组织名称或者网格名
+	 */
+	private String orgName;
+
     /**
      * 会议类型编码；对应screen_customer_work_record_dict的资源编码
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java

@@ -50,6 +50,11 @@ public class ScreenWorkRecordOrgMonthlyEntity extends BaseEpmetEntity {
      */
 	private String orgId;
 
+	/**
+	 * 组织名称或者网格名
+	 */
+	private String orgName;
+
     /**
      * 会议类型编码；对应screen_customer_work_record_dict的资源编码
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -108,15 +109,23 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
 
     @Override
     public WorkRecordRankResultDTO rankList(WorkRecordRankFormDTO formDTO) {
-        ScreenCustomerAgencyDTO agencyDTO=agencyService.queryAgencyInfo(formDTO.getAgencyId());
-        if(null==agencyDTO){
-            throw new RenException(String.format("获取组织信息异常,agencyId:%s",formDTO.getAgencyId()));
+        ////todo 待完善 直属网格是否显示？
+        ScreenCustomerAgencyDTO agencyDTO = agencyService.queryAgencyInfo(formDTO.getAgencyId());
+        if (null == agencyDTO) {
+            throw new RenException(String.format("获取组织信息异常,agencyId:%s", formDTO.getAgencyId()));
+        }
+        String dateId = baseDao.selectLatestDateId(formDTO.getCustomerId());
+        log.info(String.format("最近一次上传dateId：%s", dateId));
+        if (agencyDTO.getLevel().equals("community")) {
+            log.warn("【工作日志】本机及下级排名接口待完善");
+            //todo
+            return new WorkRecordRankResultDTO(0, 0, new ArrayList<>());
+        } else {
+            //非社区的
+            WorkRecordRankResultDTO resultDTO = baseDao.selectCurrentAgency(agencyDTO.getAreaCode(), formDTO.getDataType(), dateId);
+            resultDTO.setSubRankList(baseDao.selectSubList(agencyDTO.getAreaCode(), agencyDTO.getAgencyId(), formDTO.getDataType(), formDTO.getTopRow(), dateId));
+            return resultDTO;
         }
-        WorkRecordRankResultDTO resultDTO=new WorkRecordRankResultDTO();
-        String dateId=baseDao.selectLatestDateId(formDTO.getCustomerId());
-        resultDTO.setSubRankList(baseDao.selectSubList(agencyDTO.getAreaCode(),formDTO.getDataType(),formDTO.getTopRow(),dateId));
-        //todo 待完善
-        return resultDTO;
     }
 
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml

@@ -12,21 +12,42 @@
             m.DEL_FLAG = '0'
             AND m.CUSTOMER_ID = #{customerId}
     </select>
+
+    <!--  按照area_code查询当前组织的下级对应的数值,不包含本级  -->
     <select id="selectSubList" parameterType="map" resultType="com.epmet.plugins.result.WorkRecordSubRank">
         SELECT
-            sca.AGENCY_ID as orgId,
-            sca.AGENCY_NAME as `NAME`,
-            IFNULL(sum(m.PARTICIPATE_USER_TOTAL),0) as participateUserTotal,
-            IFNULL(sum(m.ORGANIZE_TOTAL) ,0)as participateTotal
+            sca.AGENCY_ID AS orgId,
+            sca.AGENCY_NAME AS `NAME`,
+            IFNULL( sum( m.PARTICIPATE_USER_TOTAL ), 0 ) AS participateUserTotal,
+            IFNULL( sum( m.ORGANIZE_TOTAL ), 0 ) AS participateTotal
         FROM
             screen_customer_agency sca
-            LEFT JOIN screen_work_record_org_daily m ON ( sca.AGENCY_ID = m.ORG_ID AND m.DEL_FLAG = '0' and m.DATE_ID=#{dateId})
-            left join screen_customer_work_record_dict dict on(m.TYPE_CODE=dict.RESOURCE_CODE and dict.DEL_FLAG='0')
+            LEFT JOIN screen_work_record_org_daily m ON ( sca.AGENCY_ID = m.ORG_ID AND m.DEL_FLAG = '0' AND m.DATE_ID = #{dateId} )
+            LEFT JOIN screen_customer_work_record_dict dict ON ( m.TYPE_CODE = dict.RESOURCE_CODE AND dict.DEL_FLAG = '0' AND dict.DATA_TYPE = #{dataType} )
         WHERE
             sca.DEL_FLAG = '0'
-            AND sca.PARENT_AREA_CODE = #{areaCode}
-            and dict.DATA_TYPE=#{dataType}
-            group by sca.AGENCY_ID,sca.AGENCY_NAME
-            order by participateUserTotal desc,participateTotal desc limit #{topRow}
+            AND sca.PARENT_AREA_CODE like concat( #{areaCode},'%')
+            and sca.AGENCY_ID !=#{agencyId}
+        GROUP BY
+            sca.AGENCY_ID,
+            sca.AGENCY_NAME
+        ORDER BY
+            participateUserTotal DESC,
+            participateTotal DESC
+            LIMIT #{topRow}
     </select>
+
+    <select id="selectCurrentAgency" parameterType="map" resultType="com.epmet.plugins.result.WorkRecordRankResultDTO">
+        SELECT
+            IFNULL( sum( m.PARTICIPATE_USER_TOTAL ), 0 ) AS participateUserTotal,
+            IFNULL( sum( m.ORGANIZE_TOTAL ), 0 ) AS participateTotal
+        FROM
+            screen_customer_agency sca
+            inner JOIN screen_work_record_org_daily m ON ( sca.AGENCY_ID = m.ORG_ID AND m.DEL_FLAG = '0' AND m.DATE_ID = #{dateId} )
+            inner JOIN screen_customer_work_record_dict dict ON ( m.TYPE_CODE = dict.RESOURCE_CODE AND dict.DEL_FLAG = '0' AND dict.DATA_TYPE = #{dataType} )
+        WHERE
+            sca.DEL_FLAG = '0'
+            AND sca.PARENT_AREA_CODE like concat( #{areaCode},'%')
+    </select>
+
 </mapper>

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordCommonFormDTO.java

@@ -15,10 +15,15 @@ public class ScreenWorkRecordCommonFormDTO implements Serializable {
     private static final long serialVersionUID = 819322082786098071L;
 
     /**
-     * 组织Id
+     * 组织Id或者网格id
      */
     private String orgId;
 
+    /**
+     * 组织名称或者网格名
+     */
+    private String orgName;
+
     /**
      * 会议类型编码；对应screen_customer_work_record_dict的资源编码
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java

@@ -94,6 +94,7 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
             return flag;
         } catch (Exception e) {
             e.printStackTrace();
+            log.warn("indexCalculate exception:{}",e);
             log.error("indexCalculate exception,param:{}", JSON.toJSONString(formDTO));
         } finally {
             //清除缓存

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenCustomerWorkRecordDictServiceImpl.java

@@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.plugins.ScreenCustomerWorkRecordDictDao;
 import com.epmet.dto.plugins.ScreenCustomerWorkRecordDictDTO;
@@ -33,7 +33,6 @@ import com.epmet.entity.plugins.ScreenCustomerWorkRecordDictEntity;
 import com.epmet.service.plugins.ScreenCustomerWorkRecordDictService;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -47,6 +46,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-02-04
  */
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 @Service
 public class ScreenCustomerWorkRecordDictServiceImpl extends BaseServiceImpl<ScreenCustomerWorkRecordDictDao, ScreenCustomerWorkRecordDictEntity> implements ScreenCustomerWorkRecordDictService {
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -17,8 +17,10 @@
 
 package com.epmet.service.plugins.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.plugins.ScreenWorkRecordOrgDailyDao;
 import com.epmet.dto.plugins.ScreenWorkRecordCommonFormDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
@@ -33,9 +35,11 @@ import org.springframework.stereotype.Service;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-02-23
  */
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 @Service
 public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenWorkRecordOrgDailyDao, ScreenWorkRecordOrgDailyEntity> implements ScreenWorkRecordOrgDailyService {
 
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collectOrgDaily(String customerId, ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data) {
         if(data.getIsFirst()){

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgMonthlyServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-02-04
  */
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 @Service
 public class ScreenWorkRecordOrgMonthlyServiceImpl extends BaseServiceImpl<ScreenWorkRecordOrgMonthlyDao, ScreenWorkRecordOrgMonthlyEntity> implements ScreenWorkRecordOrgMonthlyService {
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql

@@ -94,6 +94,7 @@ CREATE TABLE `screen_work_record_org_monthly` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
   `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id：yyyyMM',
   `ORG_ID` varchar(64) NOT NULL COMMENT '组织Idor网格id',
+  `ORG_NAME` varchar(255) DEFAULT NULL COMMENT '组织名或网格名',
   `MEETING_CODE` varchar(255) DEFAULT NULL COMMENT '会议类型编码；对应screen_customer_work_record_dict的资源编码',
   `TYPE_CODE` varchar(255) NOT NULL COMMENT '随手记类型编码；对应screen_customer_work_record_dict的资源编码',
   `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '组织次数',
@@ -115,6 +116,7 @@ CREATE TABLE `screen_work_record_org_daily` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
   `DATE_ID` varchar(8) NOT NULL COMMENT '日期Id：yyyyMMdd',
   `ORG_ID` varchar(64) NOT NULL COMMENT '组织Idor网格id',
+  `ORG_NAME` varchar(255) DEFAULT NULL COMMENT '组织名或网格名',
   `MEETING_CODE` varchar(255) DEFAULT NULL COMMENT '会议类型编码；对应screen_customer_work_record_dict的资源编码',
   `TYPE_CODE` varchar(255) NOT NULL COMMENT '随手记类型编码；对应screen_customer_work_record_dict的资源编码',
   `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '组织次数',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml

@@ -17,6 +17,7 @@
         customer_id,
         DATE_ID,
         org_id,
+        org_name,
         meeting_code,
         type_code,
         organize_total,
@@ -35,6 +36,7 @@
             #{customerId},
             #{dateId},
             #{item.orgId},
+            #{item.orgName},
             #{item.meetingCode},
             #{item.typeCode},
             #{item.organizeTotal},

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml

@@ -29,6 +29,7 @@
         customer_id,
         month_id,
         org_id,
+        org_name,
         meeting_code,
         type_code,
         organize_total,
@@ -50,7 +51,7 @@
             #{monthId},
 
             #{item.orgId},
-
+            #{item.orgName},
             #{item.meetingCode},
 
             #{item.typeCode},

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/GetJwtAccessTokenResultDTO.java

@@ -12,5 +12,5 @@ public class GetJwtAccessTokenResultDTO {
     private String customerId;
     private String token;
     private Long ts;
-
+    private String appId;
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java

@@ -44,7 +44,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 
@@ -212,7 +211,7 @@ public class ExternalAppServiceImpl implements ExternalAppService {
         long ts = System.currentTimeMillis();
 
         String token = tokenUtils.genToken(secret, appId, customerId, ts);
-        return new GetJwtAccessTokenResultDTO(customerId, token, ts);
+        return new GetJwtAccessTokenResultDTO(customerId, token, ts,appId);
     }
     @Override
     public AppIdInfoResultDTO appIdInfo(String appId) {

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java

@@ -71,8 +71,8 @@ public class ExtAppJwtTokenUtils {
 //        String customrId = "2fe0065f70ca0e23ce4c26fca5f1d933";
 
         //测试-模拟客户
-        String secret = "0e04d0344891462cb2c6cab297cd3953c4175804b9204b129cb2ecd6a3f86aa0";
-        String appId = "c04e26dd472b845a5dbc1c5394706253";
+        String secret = "723b8e61b55345e0a5a51798c7c1ad4aad388eed4fc8429eb8efeed1cd8564cb";
+        String appId = "d536736d93b4262970a7bbac29cae4fa";
         String customrId = "613cc61a6b8ce4c70d21bd413dac72cc";
 
         long ts = System.currentTimeMillis() + 1000 * 60 * 1;