修改数据汇聚接口，所有访问量累计统计不再分月统计

sst-manager/src/main/java/com/mortals/xhx/daemon/task/ProvinceConvergeTaskImpl.java

@@ -48,15 +48,15 @@ public class ProvinceConvergeTaskImpl implements ITaskExcuteService {
             log.error("汇聚设备数据出错",e);
         }
         try {
-            SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
-            Calendar calendar=Calendar.getInstance();
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-            String startTime = format.format(calendar.getTime());
-            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
-            String endTime = format.format(calendar.getTime());
+//            SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
+//            Calendar calendar=Calendar.getInstance();
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//            String startTime = format.format(calendar.getTime());
+//            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+//            String endTime = format.format(calendar.getTime());
             Map<String,String> condition = new HashMap<>();
-            condition.put("startTime",startTime);
-            condition.put("endTime",endTime);
+//            condition.put("startTime",startTime);
+//            condition.put("endTime",endTime);
             convergeAppsService.doConvergeApps(condition);
 
         }catch (Exception e){

sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeSiteServiceImpl.java

@@ -55,13 +55,13 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
         List<BranchVO> result = new ArrayList<>();
         List<ConvergeSiteEntity> siteList = this.find(new ConvergeSiteQuery());
         if(CollectionUtils.isNotEmpty(siteList)){
-            SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
-            Calendar calendar=Calendar.getInstance();
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-            String currMonthStart = format.format(calendar.getTime());
-            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
-            String currMonthEnd = format.format(calendar.getTime());
-            String currMonth = DateUtils.getCurrDateTime("yyyy-MM");
+//            SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
+//            Calendar calendar=Calendar.getInstance();
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//            String currMonthStart = format.format(calendar.getTime());
+//            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+//            String currMonthEnd = format.format(calendar.getTime());
+//            String currMonth = DateUtils.getCurrDateTime("yyyy-MM");
             for(ConvergeSiteEntity siteEntity:siteList){
                 BranchVO branchVO = new BranchVO();
                 BeanUtils.copyProperties(siteEntity,branchVO,BeanUtil.getNullPropertyNames(siteEntity));
@@ -74,7 +74,7 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
                         ConvergeAppsQuery appsQuery = new ConvergeAppsQuery();
                         appsQuery.setSiteId(deviceEntity.getSiteId());
                         appsQuery.setEquipmentId(deviceEntity.getId());
-                        appsQuery.setStatYearMonth(currMonth);
+//                        appsQuery.setStatYearMonth(currMonth);
                         List<ConvergeAppsEntity> apps = convergeAppsService.find(appsQuery);
                         if(CollectionUtils.isEmpty(apps)){
                             continue;
@@ -83,8 +83,8 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
                             ConvergeAppsInterfaceEntity query = new ConvergeAppsInterfaceEntity();
                             query.setEcode(deviceEntity.getLogo());
                             query.setApplicationId(item.getAppEname());
-                            query.setCurrMonthStart(currMonthStart);
-                            query.setCurrMonthEnd(currMonthEnd);
+//                            query.setCurrMonthStart(currMonthStart);
+//                            query.setCurrMonthEnd(currMonthEnd);
                             List<InterfaceStatsVO> interfaceEntityList = convergeAppsInterfaceService.getTotalInvokeSum(query);
                             if(CollectionUtils.isEmpty(interfaceEntityList) || interfaceEntityList.get(0) == null){
                                 continue;

sst-manager/src/main/resources/sqlmap/module/converge/ConvergeAppsAccessMapperExt.xml

@@ -12,19 +12,13 @@
             appSimpleName,
             provider,
             origin,
-            DATE_FORMAT(startTime,'%Y-%m') as statYearMonth,
             count(1) as totalPv
         FROM
             mortals_xhx_converge_apps_access
-        WHERE
-            startTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{startTime},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            AND
-            startTime <![CDATA[ <=  ]]> STR_TO_DATE(left(concat(#{endTime},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         GROUP BY
             siteId,
             applicationId,
-            ecode,
-            DATE_FORMAT(startTime,'%Y-%m')
+            ecode
     </select>
 
     <!-- 页面浏览量UV统计 -->
@@ -37,7 +31,6 @@
             appSimpleName,
             provider,
             origin,
-            statYearMonth,
             count(1) AS totalUv
         FROM
         (
@@ -49,14 +42,9 @@
                 appSimpleName,
                 provider,
                 origin,
-                count(1),
-                DATE_FORMAT(startTime,'%Y-%m') AS statYearMonth
+                count(1)
             FROM
                 mortals_xhx_converge_apps_access
-            WHERE
-                startTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{startTime},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-                AND
-                startTime <![CDATA[ <=  ]]> STR_TO_DATE(left(concat(#{endTime},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
             GROUP BY
                 siteId,
                 applicationId,

sst-manager/src/main/resources/sqlmap/module/converge/ConvergeAppsInterfaceMapperExt.xml

@@ -16,11 +16,6 @@
         WHERE 1=1
         <if test="ecode != null and ecode!=''"> AND ecode = #{ecode}</if>
         <if test="applicationId != null and applicationId!=''"> AND applicationId = #{applicationId}</if>
-        <if test="currMonthStart != null and currMonthStart !=''">
-            AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{currMonthStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="currMonthEnd != null and currMonthEnd !=''">
-            AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{currMonthEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
+
     </select>
 </mapper>
\ No newline at end of file