新增智能电表、空调管理

doum

7 天以前 e46bfa3ff94a8a1b4daf37c7fcb79c2fab22a72c

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalDataCloudController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.dto.YwElectricalDataSyncDTO;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.YwElectricalData;
import com.doumee.service.business.YwElectricalDataService;
@@ -14,6 +15,7 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -94,7 +96,11 @@
    @ApiOperation("立即抄表（同步第三方抄表数据）")
    @PostMapping("/syncAll")
    @CloudRequiredPermission("business:ywelectricaldata:sync")
    public ApiResponse<String> syncAll(@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywElectricalDataService.syncFromPlatform());
    public ApiResponse<String> syncAll(@RequestBody(required = false) YwElectricalDataSyncDTO dto,
                                       @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        if (dto == null || (StringUtils.isBlank(dto.getReadTimeBegin()) && StringUtils.isBlank(dto.getReadTimeEnd()))) {
            return ApiResponse.success(ywElectricalDataService.syncFromPlatform());
        }
        return ApiResponse.success(ywElectricalDataService.syncFromPlatform(dto.getReadTimeBegin(), dto.getReadTimeEnd()));
    }
}