工作日志采集接口修改

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/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;