代码修改

svr/svr-basic/pom.xml

@@ -59,7 +59,10 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
@@ -75,8 +78,19 @@
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>fastdfs-starter</artifactId>
            <version>${version.yihu-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>commons-data-redis</artifactId>
            <version>${version.wlyy-common}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

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

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.quota.controller;
import com.yihu.jw.basic.quota.service.TjQuotaCategoryService;
import com.yihu.jw.basic.quota.service.TjQuotaService;
import com.yihu.jw.entity.ehr.quota.TjQuotaCategory;
import com.yihu.jw.restmodel.tj.MQuotaCategory;
import com.yihu.jw.restmodel.ehr.tj.MQuotaCategory;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;

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

@@ -4,9 +4,9 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.service.*;
import com.yihu.jw.entity.ehr.quota.*;
import com.yihu.jw.restmodel.tj.MTjQuotaDataSaveModel;
import com.yihu.jw.restmodel.tj.MTjQuotaDataSourceModel;
import com.yihu.jw.restmodel.tj.MTjQuotaModel;
import com.yihu.jw.restmodel.ehr.tj.MTjQuotaDataSaveModel;
import com.yihu.jw.restmodel.ehr.tj.MTjQuotaDataSourceModel;
import com.yihu.jw.restmodel.ehr.tj.MTjQuotaModel;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;

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

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.service.TjQuotaLogService;
import com.yihu.jw.entity.ehr.quota.TjQuotaLog;
import com.yihu.jw.restmodel.tj.MTjQuotaLog;
import com.yihu.jw.restmodel.ehr.tj.MTjQuotaLog;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.svrBasic.ApiVersion;
import com.yihu.jw.rm.svrBasic.ServiceApi;

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

@@ -8,8 +8,8 @@ import com.yihu.jw.entity.ehr.quota.TjDimensionMain;
import com.yihu.jw.entity.ehr.quota.TjDimensionSlave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
import com.yihu.jw.restmodel.tj.DictModel;
import com.yihu.jw.restmodel.tj.SaveModel;
import com.yihu.jw.restmodel.ehr.tj.DictModel;
import com.yihu.jw.restmodel.ehr.tj.SaveModel;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.svrBasic.ApiVersion;
import com.yihu.jw.rm.svrBasic.ServiceApi;

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

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.quota.service.TjQuotaService;
import com.yihu.jw.basic.quota.service.TjQuotaWarnService;
import com.yihu.jw.entity.ehr.quota.TjQuota;
import com.yihu.jw.entity.ehr.quota.TjQuotaWarn;
import com.yihu.jw.restmodel.tj.MTjQuotaWarn;
import com.yihu.jw.restmodel.ehr.tj.MTjQuotaWarn;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.svrBasic.ApiVersion;
import com.yihu.jw.rm.svrBasic.ServiceApi;

svr/svr-basic/src/main/java/com/yihu/jw/basic/util/ConstantUtil.java

@@ -0,0 +1,25 @@
package com.yihu.jw.basic.util;
/**
 * @author litaohong on 2018/4/17
 * @project ehr
 * 常量
 */
public class ConstantUtil {
//    public static String appId = "PHI08rYrmT68BxqQ7sRmw4";
//    public static String appKey = "rOhgfYYl9DAkSl8c35Hfk";
//    public static String masterSecret = "jTnpcu23yCALhmXyy3TtqA";
//个推相关的常量
    public static String appId = "NI9LdPxzjx9zL4nOEd81RA";
    public static String appKey = "LNffJVQfeg5fh99mog5JZA";
    public static String masterSecret = "aG1ostd7xe9qbE4VCfwPXA";
    //卫生人员初始化 用户类型id(编码是可变的)
    public static String DOCTORUSERTYPEID="2";
    public static String PATIENTUSERTYPEID="5";
    /**
     * 默认角色组，在新建应用时需要生成的角色组
     */
    public static String[][] roles={{"AdminManager","行政管理"},{"SuperAdmin","超级管理员"},{"MedicalStaff","医护人员"},{"Operation","运维人员"}};
}