Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -159,6 +159,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/service_package";
    }
    /**
     * 服务包类目
     */
    public static class ServicePackageNormcat extends Basic{
        public static final String PREFIX  = "/service_package_normcat";
    }
    /**
     * 康复计划
     */

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

@@ -10,7 +10,7 @@ import java.util.Date;
 * 服务包属性值表
 * @author yeshijie on 2018/8/29.
 */
@ApiModel(value = "ServicePackagePropvalueDO", description = "服务包属性值表")
@ApiModel(value = "ServicePackagePropvalueVO", description = "服务包属性值表")
public class ServicePackagePropvalueVO extends UuidIdentityVO {
    @ApiModelProperty(value = "saasId")

readme.MD

@@ -2,7 +2,7 @@
     common     公共依赖包
     svr     业务微服务  
        svr-base 基础微服务
        svr-quota 统计微服务
        svr-statistics 统计微服务
     server
         svr-configuration    配置服务 
            涉及主要技术 git(存储配置文件) 
@@ -12,9 +12,9 @@
            涉及主要技术 hystrix,hystrix-dashboard
         svr-logServer 分布式追踪
            涉及主要技术 zipkin 
     common-lib-parent-pom    common公共工程的maven父pom
     jw-lib-parent-pom   jw业务公共工程的maven父pom 
     web-gateway 对外的接口网关
     wlyy-lib-parent-pom    common公共工程的maven父pom
     wlyy-parent-pom   jw业务公共工程的maven父pom
     ag-basic 对外的接口网关
     manage-gateway 基卫后台管理系统的接口网关
     .gitignore   项目提交忽略配置文件
     

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/RehabilitationEndpoint.java

@@ -6,7 +6,7 @@ import com.yihu.jw.entity.base.servicePackage.ServicePackageSignRecordDO;
import com.yihu.jw.restmodel.base.servicePackage.RehabilitationVO;
import com.yihu.jw.restmodel.base.servicePackage.ServicePackageLogVO;
import com.yihu.jw.restmodel.base.servicePackage.ServicePackageVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
@@ -29,7 +29,7 @@ public class RehabilitationEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseRehabilitation.CREATE)
    @ApiOperation(value = "创建")
    public Envelop create (
    public ObjEnvelop<ServicePackageVO> create (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception{
        RehabilitationVO rehabilitationVO = toDateEntity(jsonData, RehabilitationVO.class);
@@ -40,15 +40,15 @@ public class RehabilitationEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseRehabilitation.CREATELOG)
    @ApiOperation(value = "新增服务包日志")
    public Envelop addRehabilitationLog(@ApiParam(name = "jsonData", value = "Json数据", required = true)
    public ObjEnvelop<ServicePackageLogVO> addRehabilitationLog(@ApiParam(name = "jsonData", value = "Json数据", required = true)
                          @RequestBody String jsonData) throws Exception{
        ServicePackageLogVO logVO = toEntity(jsonData,ServicePackageLogVO.class);
        return success(servicePackageService.addRehabilitationLog(logVO));
    }
    @GetMapping(value = BaseRequestMapping.BaseRehabilitation.FINDBYID)
    @ApiOperation(value = "查找完成度")
    public Envelop getFinish(@ApiParam(name = "servicePackId", value = "服务包id", required = true)
    @ApiOperation(value = "查找完成度",notes = "返回值中的obj=完成数")
    public ObjEnvelop getFinish(@ApiParam(name = "servicePackId", value = "服务包id", required = true)
                             @RequestParam(value = "servicePackId") String servicePackId) throws Exception{
        return success(servicePackageService.getFinish(servicePackId));
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageNormcatEndpoint.java

@@ -0,0 +1,94 @@
package com.yihu.jw.base.endpoint.servicePackage;
import com.yihu.jw.base.service.servicePackage.ServicePackageNormcatService;
import com.yihu.jw.entity.base.servicePackage.ServicePackageNormcatDO;
import com.yihu.jw.restmodel.base.servicePackage.ServicePackageNormcatVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
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.*;
import java.util.List;
/**
 * @author yeshijie on 2018/9/7.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.ServicePackageNormcat.PREFIX, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(value = "服务包类目管理", description = "服务包类目管理服务接口", tags = {"wlyy基础服务 - 服务包类目管理服务接口"})
public class ServicePackageNormcatEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ServicePackageNormcatService servicePackageNormcatService;
    @PostMapping(value = BaseRequestMapping.ServicePackageNormcat.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<ServicePackageNormcatVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        ServicePackageNormcatDO normcatDO = toEntity(jsonData, ServicePackageNormcatDO.class);
        normcatDO = servicePackageNormcatService.save(normcatDO);
        return success(convertToModel(normcatDO, ServicePackageNormcatVO.class));
    }
    @PostMapping(value = BaseRequestMapping.ServicePackageNormcat.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) throws Exception{
        servicePackageNormcatService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.ServicePackageNormcat.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<ServicePackageNormcatVO> update (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        ServicePackageNormcatDO normcatDO = toEntity(jsonData, ServicePackageNormcatDO.class);
        if (null == normcatDO.getId()) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        normcatDO = servicePackageNormcatService.save(normcatDO);
        return success(normcatDO, ServicePackageNormcatVO.class);
    }
    @GetMapping(value = BaseRequestMapping.ServicePackageNormcat.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<ServicePackageNormcatVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<ServicePackageNormcatDO> normcatDOS = servicePackageNormcatService.search(fields, filters, sorts, page, size);
        int count = (int)servicePackageNormcatService.getCount(filters);
        return success(normcatDOS, count, page, size, ServicePackageNormcatVO.class);
    }
    @GetMapping(value = BaseRequestMapping.ServicePackageNormcat.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<ServicePackageNormcatVO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<ServicePackageNormcatDO> normcatDOS = servicePackageNormcatService.search(fields, filters, sorts);
        return success(normcatDOS, ServicePackageNormcatVO.class);
    }
}

svr/svr-statistics/doc/es/QuartzJobConfig.java

@@ -2,8 +2,6 @@ package com.yihu.wlyy.entity.job;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
 * 计划任务
 */

svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/save/SaveHelper.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.statistics.etl.save;
import com.yihu.wlyy.statistics.etl.save.es.ElastricSearchSave;
import com.yihu.wlyy.statistics.etl.save.es.ElasticSearchSave;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.vo.SaveModel;
import org.springframework.context.annotation.Scope;
@@ -16,13 +16,13 @@ import java.util.List;
public class SaveHelper {
    public Boolean save(List<SaveModel> sms) {
        return SpringUtil.getBean(ElastricSearchSave.class).save(sms);
        return SpringUtil.getBean(ElasticSearchSave.class).save(sms);
    }
    public Boolean update(List<SaveModel> sms) {
        return SpringUtil.getBean(ElastricSearchSave.class).update(sms);
        return SpringUtil.getBean(ElasticSearchSave.class).update(sms);
    }

wlyy-parent-pom/pom.xml

@@ -66,7 +66,7 @@
        <module>../svr/svr-iot</module><!--物联网平台-->
        <!--<module>../svr/svr-wlyy</module>-->  <!-- i健康微服务 -->
        <module>../svr/svr-wlyy-health-bank</module> <!-- 健康银行 -->
        <module>../svr/svr-wlyy-specialist</module> <!-- 啥玩意？ -->
        <module>../svr/svr-wlyy-specialist</module> <!-- 专科医生 -->
        <!--<module>../svr/svr-manage</module>--> <!-- 后台管理系统 -->
        <module>../svr/svr-rehabilitation</module> <!--专科医生康复计划-->