Merge remote-tracking branch 'remotes/origin/dev' into release

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.16
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.17
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.16</version>
+    <version>0.3.17</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java

@@ -1,6 +1,6 @@
 package com.epmet.task;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
@@ -26,7 +26,7 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask {
 		logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params);
 		StatsFormDTO formDTO = null;
 		if (StringUtils.isNotBlank(params)){
-			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}
 		Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(formDTO);
 		if (result.success()) {
@@ -35,4 +35,13 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask {
 			logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg());
 		}
 	}
+
+	public static void main(String[] args) {
+		StatsFormDTO formDTO = null;
+		String params = "{'date':'\"2020-06-20','customerId':'123'}";
+		if (StringUtils.isNotBlank(params)){
+			formDTO = JSON.parseObject(params,StatsFormDTO.class);
+		}
+		System.out.println(JSON.toJSONString(formDTO));
+	}
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java

@@ -1,6 +1,6 @@
 package com.epmet.task;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
@@ -26,7 +26,7 @@ public class PublicityTagUsedDailyStatsTask implements ITask {
 		logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行，参数为：{}", params);
 		StatsFormDTO formDTO = null;
 		if (StringUtils.isNotBlank(params)){
-			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}
 		Result result = statsPublicityTaskService.tagUsedDailyStatsjob(formDTO);
 		if (result.success()) {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java

@@ -1,6 +1,6 @@
 package com.epmet.task;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
@@ -26,7 +26,7 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask {
 		logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params);
 		StatsFormDTO formDTO = null;
 		if (StringUtils.isNotBlank(params)){
-			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}
 		Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(formDTO);
 		if (result.success()) {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java

@@ -1,6 +1,6 @@
 package com.epmet.task;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
@@ -26,7 +26,7 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask {
 		logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params);
 		StatsFormDTO formDTO = null;
 		if (StringUtils.isNotBlank(params)){
-			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}
 		Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(formDTO);
 		if (result.success()) {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java

@@ -1,6 +1,6 @@
 package com.epmet.task;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
@@ -26,7 +26,7 @@ public class PublicityTagViewedDailyStatsTask implements ITask {
 		logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params);
 		StatsFormDTO formDTO = null;
 		if (StringUtils.isNotBlank(params)){
-			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}
 		Result result = statsPublicityTaskService.tagViewedDailyStatsjob(formDTO);
 		if (result.success()) {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java

@@ -1,6 +1,6 @@
 package com.epmet.task;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
@@ -26,7 +26,7 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask {
 		logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
 		StatsFormDTO formDTO = null;
 		if (StringUtils.isNotBlank(params)){
-			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}
 		Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(formDTO);
 		if (result.success()) {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java

@@ -1,6 +1,6 @@
 package com.epmet.task;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
@@ -26,7 +26,7 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask {
 		logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
 		StatsFormDTO formDTO = null;
 		if (StringUtils.isNotBlank(params)){
-			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+			formDTO = JSON.parseObject(params,StatsFormDTO.class);
 		}
 		Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(formDTO);
 		if (result.success()) {