Merge branch 'dev' of chenweida/patient-co-management into dev

common-lib/pom.xml

@@ -18,6 +18,7 @@
    <modules>
        <!--公共的model-->
        <module>../common/common-entity</module>
        <module>../common/common-rest-model</module>
    </modules>
</project>

common/common-rest-model/pom.xml

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>common-lib</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../../common-lib/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>common-rest-model</artifactId>
    <dependencies>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
        </dependency>
    </dependencies>
</project>

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/demo/TestSwagger.java

@@ -0,0 +1,33 @@
package com.yihu.wlyy.rest.demo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by chenweida on 2018/1/17.
 */
@ApiModel(value = "TestSwagger", description = "测试swagger生成")
public class TestSwagger {
    @ApiModelProperty("姓名")
    private String name;
    @ApiModelProperty("年龄")
    private Integer age;
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Integer getAge() {
        return age;
    }
    public void setAge(Integer age) {
        this.age = age;
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/ListResult.java

@@ -0,0 +1,27 @@
package com.yihu.wlyy.rest.model.common;
import com.yihu.wlyy.rest.model.common.base.BaseResponse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
@ApiModel(value = "ListResult",description = "获取实体列表返回定义")
public class ListResult<T> extends BaseResponse {
    @ApiModelProperty("列表内容")
    private List<T> data;
    public ListResult(List<T> data) {
        this.data = data;
    }
    public List<T> getData() {
        return data;
    }
    public void setData(List<T> data) {
        this.data = data;
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/PageResult.java

@@ -0,0 +1,29 @@
package com.yihu.wlyy.rest.model.common;
import com.yihu.wlyy.rest.model.common.base.BasePagingResponse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
@ApiModel(value = "PageResult<T>",description = "分页查询返回")
public class PageResult<T> extends BasePagingResponse {
    @ApiModelProperty("所有满足条件的实体")
    private List<T> data;
    public PageResult(int page, int size, long totalCount, List<T> data) {
        super(page, size, totalCount);
        this.data = data;
    }
    public List<T> getData() {
        return data;
    }
    public void setData(List<T> data) {
        this.data = data;
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/SimpleResult.java

@@ -0,0 +1,21 @@
package com.yihu.wlyy.rest.model.common;
import com.yihu.wlyy.rest.model.common.base.BaseResponse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(description = "获取单个实体信息返回")
public class SimpleResult<T> extends BaseResponse {
    @ApiModelProperty("内容")
    private T data;
    public T getData() {
        return data;
    }
    public void setData(T data) {
        this.data = data;
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/base/BasePagingResponse.java

@@ -0,0 +1,40 @@
package com.yihu.wlyy.rest.model.common.base;
import io.swagger.annotations.ApiModelProperty;
public abstract class BasePagingResponse extends BaseResponse {
    @ApiModelProperty("页大小")
    private int size;
    @ApiModelProperty("页码")
    private int page;
    @ApiModelProperty("总页数")
    private int totalPage;
    @ApiModelProperty("总数量")
    private long totalCount;
    public BasePagingResponse(int page, int size, long totalCount) {
        this.page = page;
        this.size = size;
        this.totalPage = size == 0 ? 1 : (int) Math.ceil((double) totalCount / (double) size);
        this.totalCount = totalCount;
    }
    public int getSize() {
        return size;
    }
    public int getPage() {
        return page;
    }
    public int getTotalPage() {
        return totalPage;
    }
    public long getTotalCount() {
        return totalCount;
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/base/BaseResponse.java

@@ -0,0 +1,12 @@
package com.yihu.wlyy.rest.model.common.base;
public abstract class BaseResponse extends ErrorResponse {
    public BaseResponse() {
        super(true, 0, null);
    }
    public BaseResponse(int errorCode, String errorMessage) {
        super(errorCode, errorMessage);
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/base/ErrorResponse.java

@@ -0,0 +1,38 @@
package com.yihu.wlyy.rest.model.common.base;
import io.swagger.annotations.ApiModelProperty;
public class ErrorResponse {
    @ApiModelProperty("错误代码")
    private int status;
    @ApiModelProperty("错误消息")
    private String msg;
    @ApiModelProperty("返回时间戳")
    private long timestamp;
    public int getStatus() {
        return status;
    }
    public void setStatus(int status) {
        this.status = status;
    }
    public String getMsg() {
        return msg;
    }
    public void setMsg(String msg) {
        this.msg = msg;
    }
    public long getTimestamp() {
        return timestamp;
    }
    public void setTimestamp(long timestamp) {
        this.timestamp = timestamp;
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/base/FieldValidResponse.java

@@ -0,0 +1,28 @@
package com.yihu.wlyy.rest.model.common.base;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(value = "FieldValidResponse",description = "验证返回")
public class FieldValidResponse extends BaseResponse {
    @ApiModelProperty("是否通过，true:通过")
    private boolean valid;
    private FieldValidResponse(boolean valid) {
        this.valid = valid;
    }
    public boolean isValid() {
        return valid;
    }
    public static FieldValidResponse success() {
        return new FieldValidResponse(true);
    }
    public static FieldValidResponse fail() {
        return new FieldValidResponse(false);
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/base/KeyValueResponse.java

@@ -0,0 +1,22 @@
package com.yihu.wlyy.rest.model.common.base;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
@ApiModel(value = "KeyValueResponse",description = "选项返回")
public class KeyValueResponse extends BaseResponse {
    @ApiModelProperty("所有选项")
    private List<KeyValueVo> options;
    public KeyValueResponse(List<KeyValueVo> options) {
        this.options = options;
    }
    public List<KeyValueVo> getOptions() {
        return options;
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/base/KeyValueVo.java

@@ -0,0 +1,27 @@
package com.yihu.wlyy.rest.model.common.base;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(value = "KeyValueVo", description = "选项定义,key-value")
public class KeyValueVo {
    @ApiModelProperty("key")
    private String key;
    @ApiModelProperty("value")
    private String value;
    public KeyValueVo(String key, String value) {
        this.key = key;
        this.value = value;
    }
    public String getKey() {
        return key;
    }
    public String getValue() {
        return value;
    }
}

patient-co/patient-co-wlyy/pom.xml

@@ -34,6 +34,11 @@
            <groupId>com.yihu</groupId>
            <artifactId>common-entity</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>common-rest-model</artifactId>
            <version>1.0.0</version>
        </dependency>
        <!--Spring boot family-->
        <dependency>
            <groupId>org.springframework.boot</groupId>

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@@ -1,5 +1,7 @@
package com.yihu.wlyy.web.data;
import com.yihu.wlyy.rest.demo.TestSwagger;
import com.yihu.wlyy.rest.model.common.SimpleResult;
import com.yihu.wlyy.service.app.consult.ConsultTeamService;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import com.yihu.wlyy.web.BaseController;
@@ -150,7 +152,7 @@ public class DataHandlingController extends BaseController {
        } catch (Exception e) {
            e.printStackTrace();
        }
        return write(200, "数据转移成功！","data",flag);
        return write(200, "数据转移成功！", "data", flag);
    }
    @RequestMapping(value = "/updateEsArticlePatent", method = RequestMethod.GET)
@@ -178,34 +180,45 @@ public class DataHandlingController extends BaseController {
            e.printStackTrace();
        }
        return write(200, "数据更新成功！","data",flag);
        return write(200, "数据更新成功！", "data", flag);
    }
    @RequestMapping(value = "/deleteEsOldArticlePateint",method = RequestMethod.GET)
    @RequestMapping(value = "/deleteEsOldArticlePateint", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("删除Es里转移过去的文章发送记录")
    public String deleteEsOldArticlePatient(){
    public String deleteEsOldArticlePatient() {
        Map<String, Object> flag = null;
        try {
            flag = eduArticleService.deleteEsOldArticlePatient();
        } catch (Exception e) {
            e.printStackTrace();
        }
        return write(200, "数据更新成功！","data",flag);
        return write(200, "数据更新成功！", "data", flag);
    }
    @RequestMapping(value = "/addBatchNo",method = RequestMethod.GET)
    @RequestMapping(value = "/addBatchNo", method = RequestMethod.GET)
    @ResponseBody
    @Deprecated
    @ApiOperation("给空的batchNo赋值")
    public String addBatchNo(String doctor){
    public String addBatchNo(String doctor) {
        Map<String, Object> flag = null;
        try {
            flag = eduArticleService.addBatchNo(doctor);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return write(200, "数据更新成功！","data",flag);
        return write(200, "数据更新成功！", "data", flag);
    }
    @RequestMapping(value = "/testSwagger", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("测试swagger")
    public SimpleResult<TestSwagger> testSwagger(
            @ApiParam(name = "username", value = "账号", required = true)
            @RequestParam(value = "username") String username) {
        return new SimpleResult<>(new TestSwagger());
    }
}