数据汇聚接口只查询当前月份汇聚结果

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/ConvergeAppsInterfaceVo.java

@@ -15,5 +15,6 @@ import java.util.Date;
 */
 @Data
 public class ConvergeAppsInterfaceVo extends BaseEntityLong {
-
+    private String currMonthStart;
+    private String currMonthEnd;
 }
\ No newline at end of file

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

@@ -26,6 +26,7 @@ import com.mortals.xhx.module.converge.dao.ConvergeSiteDao;
 import com.mortals.xhx.module.converge.service.ConvergeSiteService;
 import lombok.extern.slf4j.Slf4j;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -54,6 +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");
             for(ConvergeSiteEntity siteEntity:siteList){
                 BranchVO branchVO = new BranchVO();
                 BeanUtils.copyProperties(siteEntity,branchVO,BeanUtil.getNullPropertyNames(siteEntity));
@@ -66,7 +74,7 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
                         ConvergeAppsQuery appsQuery = new ConvergeAppsQuery();
                         appsQuery.setSiteId(deviceEntity.getSiteId());
                         appsQuery.setEquipmentId(deviceEntity.getId());
-                        appsQuery.setStatYearMonth(DateUtils.getCurrDateTime("yyyy-MM"));
+                        appsQuery.setStatYearMonth(currMonth);
                         List<ConvergeAppsEntity> apps = convergeAppsService.find(appsQuery);
                         if(CollectionUtils.isEmpty(apps)){
                             continue;
@@ -75,6 +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);
                             List<InterfaceStatsVO> interfaceEntityList = convergeAppsInterfaceService.getTotalInvokeSum(query);
                             if(CollectionUtils.isEmpty(interfaceEntityList) || interfaceEntityList.get(0) == null){
                                 continue;

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

@@ -16,5 +16,11 @@
         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