修改restModel对象，为null的属性不返回

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MFunction.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.base.base;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by chenweida on 2017/5/19.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MFunction {
    private Long id;
    private String code;//业务code

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MModule.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.base.base;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by chenweida on 2017/5/19.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MModule {
    private Long id;
    private String code; //业务code

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MSaas.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.base.base;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by chenweida on 2017/5/19.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MSaas {
    private Long id;
    private String code;//业务code、

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/sms/MSms.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.base.sms;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by chenweida on 2017/5/22.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MSms {
    private Long id;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/sms/MSmsGateway.java

@@ -1,8 +1,11 @@
package com.yihu.jw.restmodel.base.sms;
import com.fasterxml.jackson.annotation.JsonInclude;
/**
 * Created by chenweida on 2017/5/22.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MSmsGateway {
    private Long id;
    private String code; //业务code

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerVersion.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.base.version;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MBaseServerVersion {
    private String code; //业务code
    private String saasId;//关联base_saas code

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerVersionLog.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.base.version;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MBaseServerVersionLog {
    private Long id;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MWlyyVersion.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.base.version;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MWlyyVersion {
    private Long id;
    private String saasId; //saas code

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/common/Envelop.java

@@ -23,13 +23,13 @@ import java.util.List;
public class Envelop implements Serializable {
    private static final long serialVersionUID = 2076324875575488461L;
    private int pageSize = 10;
    private Integer pageSize ;
    private int currPage;
    private Integer currPage;
    private int totalPage;
    private Integer totalPage;
    private int totalCount;
    private Integer totalCount;
    private List detailModelList;
@@ -47,11 +47,11 @@ public class Envelop implements Serializable {
        this.obj = obj;
    }
    public int getTotalCount() {
    public Integer getTotalCount() {
        return totalCount;
    }
    public void setTotalCount(int totalCount) {
    public void setTotalCount(Integer totalCount) {
        this.totalCount = totalCount;
    }
@@ -72,32 +72,34 @@ public class Envelop implements Serializable {
    }
    public int getPageSize() {
    public Integer getPageSize() {
        return pageSize;
    }
    public void setPageSize(int pageSize) {
    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }
    public int getCurrPage() {
    public Integer getCurrPage() {
        return currPage;
    }
    public void setCurrPage(int currPage) {
    public void setCurrPage(Integer currPage) {
        this.currPage = currPage;
    }
    public int getTotalPage() {
        if (totalCount % pageSize == 0) {
            totalPage = totalCount / pageSize;
        } else {
            totalPage = totalCount / pageSize + 1;
    public Integer getTotalPage() {
        if (totalCount != null && pageSize != null) {
            if (totalCount % pageSize == 0) {
                totalPage = totalCount / pageSize;
            } else {
                totalPage = totalCount / pageSize + 1;
            }
        }
        return totalPage;
    }
    public void setTotalPage(int totalPage) {
    public void setTotalPage(Integer totalPage) {
        this.totalPage = totalPage;
    }
@@ -122,7 +124,7 @@ public class Envelop implements Serializable {
        return envelop;
    }
    public static Envelop getSuccessListWithPage(String message, List detailModelList, int page, int size, Long count) {
    public static Envelop getSuccessListWithPage(String message, List detailModelList, Integer page, Integer size, Long count) {
        Envelop envelop = new Envelop();
        envelop.setSuccessMsg(message);
        envelop.setPageSize(size);
@@ -132,7 +134,7 @@ public class Envelop implements Serializable {
        return envelop;
    }
    public static Envelop getError(String message, int errorCode) {
    public static Envelop getError(String message, Integer errorCode) {
        Envelop envelop = new Envelop();
        envelop.setErrorMsg(message);
        return envelop;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/manage/system/ManageUserVO.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.manage.system;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by chenweida on 2017/6/9.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ManageUserVO {
    private Integer id;
    private String code;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/MWxGraphicMessage.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.wx;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by Administrator on 2017/5/21 0021.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MWxGraphicMessage {
    private Long id;
    private String code;//业务code

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/MWxMenu.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.wx;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MWxMenu {
    private Long id;//主键id

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/MWxTemplate.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.wx;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MWxTemplate {
    private Long id;
    private String code;//模板code

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wx/MWxWechat.java

@@ -1,10 +1,13 @@
package com.yihu.jw.restmodel.wx;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MWxWechat {
    private Long id;

svr/svr-quota/src/main/java/com/yihu/jw/quota/controller/JobController.java

@@ -6,10 +6,8 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -33,7 +31,7 @@ public class JobController extends BaseController {
    @ApiOperation(value = "根据ID立即单个任务")
    @RequestMapping(value = "startNowById", method = RequestMethod.GET)
    public String startNowById(
            @ApiParam(name = "id", value = "任务ID", required = true)@RequestParam(value = "id", required = true) String id) {
            @ApiParam(name = "id", value = "任务ID", required = true) @RequestParam(value = "id", required = true) String id) {
        try {
            jobService.startNowById(id);
            return success("启动成功！");
@@ -42,4 +40,18 @@ public class JobController extends BaseController {
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    /**
     * 文件上传具体实现方法;
     *
     * @param file
     * @return
     */
    @RequestMapping("/upload")
    public String handleFileUpload(@RequestParam("file") MultipartFile file) {
        System.out.println(file.getName());
        System.out.println(file.getOriginalFilename());
        System.out.println(file.getSize()+"");
        return null;
    }
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/job/EsQuotaJob.java

@@ -6,7 +6,7 @@ import com.yihu.jw.quota.etl.extract.ExtractHelper;
import com.yihu.jw.quota.etl.save.SaveHelper;
import com.yihu.jw.quota.model.jpa.TjQuotaLog;
import com.yihu.jw.quota.util.SpringUtil;
import com.yihu.jw.quota.vo.QuotaVo;
import com.yihu.jw.quota.vo.QuotaVO;
import com.yihu.jw.quota.vo.SaveModel;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
@@ -33,7 +33,7 @@ public class EsQuotaJob implements Job {
    private Logger logger = LoggerFactory.getLogger(EsQuotaJob.class);
    private String saasid;//saasid
    private QuotaVo quotaVO;//指标对象
    private QuotaVO quotaVO;//指标对象
    private String endTime;//结束时间
    private String startTime;//开始时间
    private String timeLevel;//时间
@@ -115,7 +115,7 @@ public class EsQuotaJob implements Job {
            startTime = Contant.main_dimension_timeLevel.getStartTime(timeLevel);
        }
        this.quotaVO = (QuotaVo) map.get("quota");
        this.quotaVO = (QuotaVO) map.get("quota");
        this.timeLevel = (String) map.get("timeLevel");
        if (StringUtils.isEmpty(this.timeLevel)) {
            this.timeLevel = Contant.main_dimension_timeLevel.day;

svr/svr-quota/src/main/java/com/yihu/jw/quota/vo/QuotaVo.java

@@ -6,7 +6,7 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/6/1.
 */
public class QuotaVo implements Serializable{
public class QuotaVO implements Serializable{
    private Integer id;
    private String code;
    private String compute;

svr/svr-quota/src/main/resources/application.yml

@@ -1,8 +1,17 @@
server:
  port: 10020
##如果有配置服务的话，远程服务器和本地服务器配置不一致的情况下，优先远程的为主  git上 svr-base ->  git application ->本地 appliction ->本地 bootstarp
spring:
  application:
    name:  svr-quota  ##注册到发现服务的id 如果id一样 eurika会自动做负载
  http:
    multipart:
      enabled: true
      max-file-size: 500MB
      max-request-size: 500MB
---

web-gateway/src/main/resources/application.yml

@@ -2,6 +2,11 @@
spring:
  application:
    name:  web-gateway  ##注册到发现服务的id 如果id一样 eurika会自动做负载
  http:
    multipart:
      enabled: true
      max-file-size: 500MB
      max-request-size: 500MB
##开启feign断路器
feign:
@@ -17,10 +22,13 @@ management:
#zuul 默认会代理所有的微服务  路径 /{appliction.name}/**
zuul:
  ignored-services: '*'  ##忽略全部的代理  忽略单个微服务   ignored-services: svr-base 多个逗号分割
#  ignored-services: '*'  ##忽略全部的代理  忽略单个微服务   ignored-services: svr-base 多个逗号分割
  routes:
    svr-base: /v1/base/**  ##svr-base方向代理到/base下多层级的路径
    svr-wlyy: /v1/wlyy/**
    api-esb-url:
      path: /zuul/job/**
      url: http://localhost:10030/
#    svr-base:    这种方式和  svr-base: /base/**  一样  svr-base可以随便写 唯一即可
#      path: /base/**  path是代理后的路径
#      serviceId: svr-base  serviceId是微服务name