Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java

@@ -1,10 +1,16 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.LoginUserModel;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformWaterGas;
import com.doumee.dao.openapi.request.GasByMonthRequest;
import com.doumee.dao.openapi.request.WaterByMonthRequest;
import com.doumee.dao.openapi.response.GasByMonthResponse;
import com.doumee.dao.openapi.response.PlatformLastMonthListResponse;
import com.doumee.dao.openapi.response.WaterByMonthResponse;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

/**
@@ -98,4 +104,12 @@
     * @return long
     */
    long count(PlatformWaterGas platformWaterGas);

    WaterByMonthResponse waterDataByMonth(WaterByMonthRequest param);

    GasByMonthResponse gasDataByMonth(GasByMonthRequest param);

    List<PlatformLastMonthListResponse> getPlatformLastMonthListResponse(Integer type);

    String importBatch(MultipartFile file, LoginUserInfo loginUserInfo);
}