修改就诊信息requestMapping映射路径，配置swagger接口

common/common-request-mapping/src/main/java/com/yihu/jw/rm/rehabilitation/RehabilitationRequestMapping.java

@@ -15,12 +15,13 @@ public class RehabilitationRequestMapping {
    }
    public static class Information {
        public static final String api_create = "information";
        public static final String api_delete = "information";
        public static final String api_create = "createInformation";
        public static final String api_delete = "delInformation";
        public static final String api_getById = "getInformationById";
        public static final String api_update = "information";
        public static final String api_update = "updateInformation";
        public static final String findInformationById = "findInformationById";
        public static final String findInformationByPatientId = "findInformationByPatientId";
        public static final String findInformationPage = "findInformationPage";
        public static final String message_success_update = "information update success";

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/config/SwaggerConfig.java

@@ -1,6 +1,6 @@
package com.yihu.rehabilitation.config;
import com.yihu.jw.rm.archives.PatientArchivesMapping;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -14,27 +14,27 @@ import static springfox.documentation.builders.PathSelectors.regex;
@Configuration
@EnableSwagger2
@ComponentScan("com.yihu.jw.**")
@ComponentScan("com.yihu.rehabilitation.**")
public class SwaggerConfig {
    public static final String archives_API = "archives";
    public static final String rehabilitation_API = "rehabilitation";
    @Bean
    public Docket wlyyAPI() {
    public Docket rehabilitationAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(archives_API)
                .groupName(rehabilitation_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(false)
                .pathMapping("/")
                .select()
                .paths(or(
                        regex("/" + PatientArchivesMapping.api_archives_common + "/.*")
                        regex("/" + RehabilitationRequestMapping.api_rehabilitation_common + "/.*")
                ))
                .build()
                .apiInfo(wlyyApiInfo());
                .apiInfo(rehabilitationApiInfo());
    }
    private ApiInfo wlyyApiInfo() {
        ApiInfo wlyyInfo = new ApiInfo("基卫2.0API",
    private ApiInfo rehabilitationApiInfo() {
        ApiInfo rehabilitationInfo = new ApiInfo("基卫2.0API",
                "基卫2.0API，提供基础卫生相关服务。",
                "1.0",
                "No terms of service",
@@ -43,8 +43,7 @@ public class SwaggerConfig {
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return wlyyInfo;
        return rehabilitationInfo;
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/config/jpa/WlyySpecialistJpa.java

@@ -18,27 +18,27 @@ import javax.sql.DataSource;
import java.util.Properties;
/**
 * Created by chenweida on 2017/4/6.
 * Created by humingfen on 2018/4/27.
 */
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyySpecialistEntityManagerFactory",
        transactionManagerRef = "wlyySpecialistTransactionManager",
        basePackages = {"com.yihu.jw.dao"})   //设置Repository所在位置
public class WlyySpecialistJpa {
        entityManagerFactoryRef = "rehabilitationEntityManagerFactory",
        transactionManagerRef = "rehabilitationTransactionManager",
        basePackages = {"com.yihu.rehabilitation.dao"})   //设置Repository所在位置
public class RehabilitationJpa {
    @Autowired
    private HibernateProperties hibernateProperties;
    @Bean(name = "wlyySpecialistEntityManagerFactory")
    @Bean(name = "rehabilitationEntityManagerFactory")
    @Primary
    public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary(DataSource dataSource) {
        LocalContainerEntityManagerFactoryBean emfb = new LocalContainerEntityManagerFactoryBean();
        emfb.setDataSource(dataSource);
        emfb.setPackagesToScan("com.yihu.jw.entity");
        emfb.setPersistenceUnitName("specialist");
        emfb.setPackagesToScan("com.yihu.jw.rehabilitation");
        emfb.setPersistenceUnitName("rehabilitation");
        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
        emfb.setJpaVendorAdapter(vendorAdapter);
        Properties properties = hibernateProperties.hibProperties();
@@ -49,10 +49,10 @@ public class WlyySpecialistJpa {
    }
    @Bean(name = "wlyySpecialistTransactionManager")
    @Bean(name = "rehabilitationTransactionManager")
    @Primary
    JpaTransactionManager transactionManagerSecondary(
            @Qualifier("wlyySpecialistEntityManagerFactory") EntityManagerFactory builder) {
            @Qualifier("rehabilitationEntityManagerFactory") EntityManagerFactory builder) {
        return new JpaTransactionManager(builder);
    }
}

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/controller/RehabilitationInformationController.java

@@ -1,16 +1,13 @@
package com.yihu.rehabilitation.controller;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.rehabilitation.RehabilitationInformationDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationInformationVO;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.rehabilitation.service.RehabilitationInformationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +26,7 @@ public class RehabilitationInformationController extends EnvelopRestController {
    @GetMapping(value = RehabilitationRequestMapping.Information.findInformationPage)
    @ApiOperation(value = "分页查找就诊信息", notes = "分页查找就诊信息")
    public Envelop<RehabilitationInformationVO> findCompanyPage(@ApiParam(name = "hospital", value = "就诊医院名称", defaultValue = "")
    public Envelop<RehabilitationInformationVO> findInformationPage(@ApiParam(name = "hospital", value = "就诊医院名称", defaultValue = "")
                                                 @RequestParam(value = "hospital", required = false) String hospital,
                                                 @ApiParam(name = "patientId", value = "居民id", defaultValue = "")
                                                 @RequestParam(value = "patientId", required = false) String patientId,
@@ -68,7 +65,7 @@ public class RehabilitationInformationController extends EnvelopRestController {
    @GetMapping(value = RehabilitationRequestMapping.Information.findInformationById)
    @ApiOperation(value = "根据id查找就诊信息", notes = "根据id查找就诊信息")
    public Envelop<RehabilitationInformationVO> findByCode(@ApiParam(name = "id", value = "id")
    public Envelop<RehabilitationInformationVO> findById(@ApiParam(name = "id", value = "id")
                                            @RequestParam(value = "id", required = true) String id) {
        try {
            RehabilitationInformationDO informationDO = rehabilitationInformationService.findById(id);
@@ -80,7 +77,7 @@ public class RehabilitationInformationController extends EnvelopRestController {
        }
    }
    @GetMapping(value = RehabilitationRequestMapping.Information.findInformationById)
    @GetMapping(value = RehabilitationRequestMapping.Information.findInformationByPatientId)
    @ApiOperation(value = "根据patientId查找就诊信息", notes = "根据patientId查找就诊信息")
    public Envelop<RehabilitationInformationVO> findByPatientId(@ApiParam(name = "patientId", value = "patientId")
                                                           @RequestParam(value = "patientId", required = true) String patientId) {
@@ -95,14 +92,14 @@ public class RehabilitationInformationController extends EnvelopRestController {
    }
    @PostMapping(value = RehabilitationRequestMapping.Information.api_update)
    @ApiOperation(value = "修改就诊信息", notes = "修改就诊信息")
    public Envelop<RehabilitationInformationVO> updCompany(@ApiParam(name = "jsonData", value = "json", defaultValue = "")
    @ApiOperation(value = "修改就诊信息", notes = "修改就诊信息(记得传入修改id)")
    public Envelop<RehabilitationInformationVO> updateInformation(@ApiParam(name = "jsonData", value = "json", defaultValue = "")
                                            @RequestParam(value = "jsonData", required = true)String jsonData) {
        try {
            RehabilitationInformationVO informationVO = toEntity(jsonData, RehabilitationInformationVO.class);
            RehabilitationInformationDO informationDO = rehabilitationInformationService.convertToModel(informationVO, RehabilitationInformationDO.class);
            rehabilitationInformationService.update(informationDO);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_find);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_update);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
@@ -110,12 +107,12 @@ public class RehabilitationInformationController extends EnvelopRestController {
    }
    @PostMapping(value = RehabilitationRequestMapping.Information.api_delete)
    @ApiOperation(value = "删除企业", notes = "删除企业")
    public Envelop<RehabilitationInformationVO> delCompany(@ApiParam(name = "id", value = "id")
    @ApiOperation(value = "删除就诊信息", notes = "删除就诊信息")
    public Envelop<RehabilitationInformationVO> delInformation(@ApiParam(name = "id", value = "id")
                                            @RequestParam(value = "id", required = true) String id) {
        try {
            rehabilitationInformationService.delete(id);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_find);
            return Envelop.getSuccess(RehabilitationRequestMapping.Information.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());

svr/svr-rehabilitation/src/main/java/com/yihu/rehabilitation/service/RehabilitationInformationService.java

@@ -1,11 +1,9 @@
package com.yihu.rehabilitation.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.iot.company.IotCompanyDO;
import com.yihu.jw.rehabilitation.RehabilitationInformationDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.rehabilitation.RehabilitationInformationVO;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.rm.rehabilitation.RehabilitationRequestMapping;
import com.yihu.rehabilitation.dao.RehabilitationInformationDao;
import org.apache.commons.lang.StringUtils;
@@ -40,20 +38,20 @@ public class RehabilitationInformationService extends BaseJpaService<Rehabilitat
     * @return
     */
    public Envelop<RehabilitationInformationVO> queryPage(Integer page, Integer size, String patientId, String hospital){
        StringBuffer sql = new StringBuffer("SELECT DISTINCT w.* from rehabilitation_information w ");
        StringBuffer sqlCount = new StringBuffer("SELECT COUNT(DISTINCT w.id) count from rehabilitation_information w ");
        StringBuffer sql = new StringBuffer("SELECT DISTINCT w.* from rehabilitation_information w where 1 = 1 ");
        StringBuffer sqlCount = new StringBuffer("SELECT COUNT(DISTINCT w.id) count from rehabilitation_information w where 1 = 1 ");
        List<Object> args = new ArrayList<>();
        if(StringUtils.isNotBlank(patientId)){
            sql.append(" and w.patientId = ? ");
            sqlCount.append(" and w.patientId = '").append(patientId).append("' ");
            args.add(patientId);
            sqlCount.append(" and w.patientId = '%").append(patientId).append("%' ");
            args.add('%'+ patientId + '%');
        }
        if(StringUtils.isNotBlank(hospital)){
            sql.append(" and w.hospital like ? ");
            sqlCount.append(" and w.hospital like '").append(hospital).append("' ");
            args.add(hospital);
            sqlCount.append(" and w.hospital like '%").append(hospital).append("%' ");
            args.add('%'+ hospital + '%');
        }
        sql.append("order by c.update_time desc limit ").append((page-1)*size).append(",").append(size);
        sql.append("order by w.update_time desc limit ").append((page-1)*size).append(",").append(size);
        List<RehabilitationInformationDO> list = jdbcTempalte.query(sql.toString(),args.toArray(),new BeanPropertyRowMapper(RehabilitationInformationDO.class));
        List<Map<String,Object>> countList = jdbcTempalte.queryForList(sqlCount.toString());

svr/svr-rehabilitation/src/main/resources/banner.txt

@@ -0,0 +1,6 @@
                                               .__          ___.   .__.__  .__  __          __  .__
  _________  _________          _______   ____ |  |__ _____ \_ |__ |__|  | |__|/  |______ _/  |_|__| ____   ____
 /  ___/\  \/ /\_  __ \  ______ \_  __ \_/ __ \|  |  \\__  \ | __ \|  |  | |  \   __\__  \\   __\  |/  _ \ /    \
 \___ \  \   /  |  | \/ /_____/  |  | \/\  ___/|   Y  \/ __ \| \_\ \  |  |_|  ||  |  / __ \|  | |  (  <_> )   |  \
/____  >  \_/   |__|             |__|    \___  >___|  (____  /___  /__|____/__||__| (____  /__| |__|\____/|___|  /
     \/                                      \/     \/     \/    \/                      \/                    \/