Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java

@@ -2,29 +2,23 @@

import  com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.TmsBasePageResponse;
import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.core.tms.model.response.TmsOrderNoFinishListResponse;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.request.TmsOrderInfoRequest;
import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
import com.doumee.service.business.third.model.response.TmsBasePageResponse;
import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
import com.doumee.service.business.third.model.response.TmsOrderNoFinishListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
import com.doumee.service.business.third.TmsService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Random;

/**
 * Created by IntelliJ IDEA.
@@ -44,7 +38,7 @@
    @Autowired
    private BoardService boardService;
    @LoginNoRequired
    @ApiOperation("中心数据")
    @ApiOperation("中心数据（废弃）")
    @GetMapping("/centerData")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
@@ -53,6 +47,16 @@
        WholeProvinceBoardVO data = boardService.centerProvinceData(  factoryCode);
        return ApiResponse.success(data);
    }
    @LoginNoRequired
    @ApiOperation("中心数据（更新版本）")
    @GetMapping("/centerDataNew")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "查询类型厂区编码", required = false)
    })
    public ApiResponse<WholeProvinceBoardVO> centerDataNew(@RequestParam(required = false) String factoryCode) {
        WholeProvinceBoardVO data = boardService.centerProvinceDataNew(  factoryCode);
        return ApiResponse.success(data);
    }


    @LoginNoRequired