修改时间问题

src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.StrPool;
+import cn.hutool.json.JSONUtil;
 import com.baiyee.adcallback.api.constants.SqlConstant;
 import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
 import com.baiyee.adcallback.api.dto.DmpMonitorNumDto;
@@ -191,14 +192,13 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
         query.setParameter("tag", tags);
         query.unwrap(NativeQueryImpl.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
         List list = query.getResultList();
-        log.error("the result list ");
         return getDmpMonitorJpaDto(list, flag);
     }
 
     private String getSqlString(String tableName, Integer flag) {
         StringBuilder sql = new StringBuilder();
         if (1 == flag) {
-            sql.append(" select a.tag,a.date as date ,COUNT(*) as num FROM ( SELECT tb.imei,tb.tag ,substring_index(group_concat(DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' )),',',-1)  AS date FROM ").append(tableName).append(" as tb where ");
+            sql.append(" select a.tag,a.date as date ,COUNT(*) as num FROM ( SELECT tb.imei,tb.tag ,substring_index(group_concat(DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' )),',',1)  AS date FROM ").append(tableName).append(" as tb where ");
             sql.append(" tb.imei != :imei1 ");
             sql.append(" and tb.imei != :imei2 ");
             sql.append(" and tb.gmt_create >= :startDate ");
@@ -207,7 +207,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
             sql.append(" group by  imei,tag");
             sql.append(" ) a group by a.tag,a.date");
         } else {
-            sql.append("select substring_index(group_concat( DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' )),',',-1)  as date ,tb.imei as imei ,tb.tag as tag from ").append(tableName).append(" as tb where");
+            sql.append("select substring_index(group_concat( DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' )),',',1)  as date ,tb.imei as imei ,tb.tag as tag from ").append(tableName).append(" as tb where");
             sql.append(" tb.imei != :imei1 ");
             sql.append(" and tb.imei != :imei2 ");
             sql.append(" and tb.gmt_create >= :startDate ");
@@ -253,7 +253,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
     private String getGdtSqlString(String tableName, Integer flag) {
         StringBuilder sql = new StringBuilder();
         if (1 == flag) {
-            sql.append(" select a.tag,a.date as date ,COUNT(*) as num FROM ( SELECT tb.muid,tb.tag ,substring_index(group_concat(DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' )),',',-1)  AS date FROM ").append(tableName).append(" as tb where ");
+            sql.append(" select a.tag,a.date as date ,COUNT(*) as num FROM ( SELECT tb.muid,tb.tag ,substring_index(group_concat(DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' )),',',1)  AS date FROM ").append(tableName).append(" as tb where ");
             sql.append(" tb.muid != :muid1 ");
             sql.append(" and tb.muid != :muid2 ");
             sql.append(" and tb.gmt_create >= :startDate ");
@@ -263,7 +263,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
             sql.append(" group by  muid,tag");
             sql.append(" ) a group by a.tag,a.date");
         } else {
-            sql.append("select substring_index(group_concat( DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' )),',',-1)  as date ,tb.muid as imei ,tb.tag as tag from ").append(tableName).append(" as tb where");
+            sql.append("select substring_index(group_concat( DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' )),',',1)  as date ,tb.muid as imei ,tb.tag as tag from ").append(tableName).append(" as tb where");
             sql.append(" tb.muid != :muid1 ");
             sql.append(" and tb.muid != :muid2 ");
             sql.append(" and tb.gmt_create >= :startDate ");