workrecord接口修改

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

@@ -19,11 +19,13 @@ package com.epmet.service.plugins.impl;
 
 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.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.ScreenWorkRecordGridMonthlyDao;
 import com.epmet.dto.plugins.ScreenWorkRecordGridMonthlyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
@@ -110,6 +112,8 @@ public class ScreenWorkRecordGridMonthlyServiceImpl extends BaseServiceImpl<Scre
      * @author wangc
      * @date 2021.02.04 15:27
      */
+    @Transactional(rollbackFor = Exception.class)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenWorkRecordGridMonthlyDTO> data) {
         if(data.getIsFirst()){

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

@@ -19,11 +19,13 @@ package com.epmet.service.plugins.impl;
 
 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.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.ScreenWorkRecordOrgMonthlyDao;
 import com.epmet.dto.plugins.ScreenWorkRecordOrgMonthlyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
@@ -110,6 +112,8 @@ public class ScreenWorkRecordOrgMonthlyServiceImpl extends BaseServiceImpl<Scree
      * @author wangc
      * @date 2021.02.04 15:27
      */
+    @Transactional(rollbackFor = Exception.class)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenWorkRecordOrgMonthlyDTO> data) {
         if(data.getIsFirst()){

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

@@ -67,8 +67,6 @@
 
             #{item.showFlag},
 
-            #{item.closedTotal},
-
             #{item.sort},
 
             #{item.dataType},

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

@@ -71,9 +71,9 @@ public class ExtAppJwtTokenUtils {
 //        String customrId = "2fe0065f70ca0e23ce4c26fca5f1d933";
 
         //测试-模拟客户
-        String secret = "c4096eb0497943c78327c5192621b209c38f20592f6a49cc8c79e8b77f3bd5c8";
-        String appId = "f358d63a89f3670c197c62ca4c3a0366";
-        String customrId = "45687aa479955f9d06204d415238f7cc";
+        String secret = "0e04d0344891462cb2c6cab297cd3953c4175804b9204b129cb2ecd6a3f86aa0";
+        String appId = "c04e26dd472b845a5dbc1c5394706253";
+        String customrId = "613cc61a6b8ce4c70d21bd413dac72cc";
 
         long ts = System.currentTimeMillis() + 1000 * 60 * 1;
         System.out.println("时间戳:" + ts);