Browse Source

Merge branch 'dev' of LiTaohong/wlyy2.0 into dev

LiTaohong 6 years ago
parent
commit
5a17507b1d
24 changed files with 340 additions and 29 deletions
  1. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseCityDao.java
  2. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseCommitteeDao.java
  3. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseProvinceDao.java
  4. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseStreetDao.java
  5. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseTownDao.java
  6. 2 2
      svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseCityService.java
  7. 2 2
      svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseCommitteeService.java
  8. 2 2
      svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseProvinceService.java
  9. 2 2
      svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseStreetService.java
  10. 2 2
      svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseTownService.java
  11. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseCityEndpoint.java
  12. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseCommitteeEndpoint.java
  13. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseProvinceEndpoint.java
  14. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseStreetEndpoint.java
  15. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseTownEndpoint.java
  16. 3 4
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/population/BasePopulationEndpoint.java
  17. 104 0
      svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/area/BaseCommitteeEndpoint.java
  18. 104 0
      svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/area/BaseStreetEndpoint.java
  19. 104 0
      svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/area/BaseTownEndpoint.java
  20. 1 1
      svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/personal_info/PatientEndpoint.java
  21. 1 1
      svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/personal_info/PatientMedicareCardEndpoint.java
  22. 1 1
      svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/settings/AccountAppealEndpoint.java
  23. 1 1
      svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/settings/FeedbackEndpoint.java
  24. 1 1
      svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/settings/HelpCenterEndpoint.java

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseCityDao.java

@ -1,4 +1,4 @@
package com.yihu.jw.base.dao.area;
package com.yihu.jw.area.dao;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseCommitteeDao.java

@ -1,4 +1,4 @@
package com.yihu.jw.base.dao.area;
package com.yihu.jw.area.dao;
import com.yihu.jw.entity.base.area.BaseCommitteeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseProvinceDao.java

@ -1,4 +1,4 @@
package com.yihu.jw.base.dao.area;
package com.yihu.jw.area.dao;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseStreetDao.java

@ -1,4 +1,4 @@
package com.yihu.jw.base.dao.area;
package com.yihu.jw.area.dao;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseTownDao.java

@ -1,4 +1,4 @@
package com.yihu.jw.base.dao.area;
package com.yihu.jw.area.dao;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseCityService.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.service.area;
package com.yihu.jw.area.service;
import com.yihu.jw.base.dao.area.BaseCityDao;
import com.yihu.jw.area.dao.BaseCityDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseCommitteeService.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.service.area;
package com.yihu.jw.area.service;
import com.yihu.jw.base.dao.area.BaseCommitteeDao;
import com.yihu.jw.area.dao.BaseCommitteeDao;
import com.yihu.jw.entity.base.area.BaseCommitteeDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseProvinceService.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.service.area;
package com.yihu.jw.area.service;
import com.yihu.jw.base.dao.area.BaseProvinceDao;
import com.yihu.jw.area.dao.BaseProvinceDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseStreetService.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.service.area;
package com.yihu.jw.area.service;
import com.yihu.jw.base.dao.area.BaseStreetDao;
import com.yihu.jw.area.dao.BaseStreetDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
import com.yihu.jw.entity.base.area.BaseStreetDO;

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/service/area/BaseTownService.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.service.area;
package com.yihu.jw.area.service;
import com.yihu.jw.base.dao.area.BaseTownDao;
import com.yihu.jw.area.dao.BaseTownDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseCityEndpoint.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.area;
import com.yihu.jw.base.service.area.BaseCityService;
import com.yihu.jw.area.service.BaseCityService;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseCommitteeEndpoint.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.area;
import com.yihu.jw.base.service.area.BaseCommitteeService;
import com.yihu.jw.area.service.BaseCommitteeService;
import com.yihu.jw.entity.base.area.BaseCommitteeDO;
import com.yihu.jw.restmodel.base.area.BaseCommitteeVO;
import com.yihu.jw.restmodel.web.Envelop;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseProvinceEndpoint.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.area;
import com.yihu.jw.base.service.area.BaseProvinceService;
import com.yihu.jw.area.service.BaseProvinceService;
import com.yihu.jw.restmodel.base.area.BaseProvinceVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseStreetEndpoint.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.area;
import com.yihu.jw.base.service.area.BaseStreetService;
import com.yihu.jw.area.service.BaseStreetService;
import com.yihu.jw.restmodel.base.area.BaseStreetVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseTownEndpoint.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.area;
import com.yihu.jw.base.service.area.BaseTownService;
import com.yihu.jw.area.service.BaseTownService;
import com.yihu.jw.restmodel.base.area.BaseTownVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;

+ 3 - 4
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/population/BasePopulationEndpoint.java

@ -2,9 +2,9 @@ package com.yihu.jw.base.endpoint.population;
import com.yihu.jw.base.endpoint.common.excel.AExcelReader;
import com.yihu.jw.base.endpoint.common.populationBatchImport.*;
import com.yihu.jw.base.service.area.BaseCityService;
import com.yihu.jw.base.service.area.BaseProvinceService;
import com.yihu.jw.base.service.area.BaseTownService;
import com.yihu.jw.area.service.BaseCityService;
import com.yihu.jw.area.service.BaseProvinceService;
import com.yihu.jw.area.service.BaseTownService;
import com.yihu.jw.base.service.population.BasePopulationService;
import com.yihu.jw.base.service.saas.SaasService;
import com.yihu.jw.entity.base.area.BaseTownDO;
@ -23,7 +23,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

+ 104 - 0
svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/area/BaseCommitteeEndpoint.java

@ -0,0 +1,104 @@
package com.yihu.jw.patient.endpoint.area;
import com.yihu.jw.area.service.BaseCommitteeService;
import com.yihu.jw.entity.base.area.BaseCommitteeDO;
import com.yihu.jw.restmodel.base.area.BaseCommitteeVO;
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;
/**
*
* 居委会字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseCommittee.PREFIX)
@Api(value = "居委会字典管理", description = "居委会字典管理服务接口", tags = {"居委会字典管理服务接口"})
public class BaseCommitteeEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseCommitteeService baseCommitteeService;
@PostMapping(value = BaseRequestMapping.BaseCommittee.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseCommitteeVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseCommitteeDO BaseCommittee = toEntity(jsonData, BaseCommitteeDO.class);
    BaseCommittee = baseCommitteeService.save(BaseCommittee);
    return success(BaseCommittee, BaseCommitteeVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseCommittee.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串,中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseCommitteeService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseCommittee.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseCommitteeVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseCommitteeDO BaseCommittee = toEntity(jsonData, BaseCommitteeDO.class);
        if (null == BaseCommittee.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        BaseCommittee = baseCommitteeService.save(BaseCommittee);
        return success(BaseCommittee, BaseCommitteeVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseCommittee.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseCommitteeVO> 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<BaseCommitteeDO> baseProvinces = baseCommitteeService.search(fields, filters, sorts, page, size);
                int count = (int)baseCommitteeService.getCount(filters);
                return success(baseProvinces, count, page, size, BaseCommitteeVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseCommittee.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseCommitteeVO> 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<BaseCommitteeDO> baseProvinces = baseCommitteeService.search(fields, filters, sorts);
                  return success(baseProvinces, BaseCommitteeVO.class);
         }
 }

+ 104 - 0
svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/area/BaseStreetEndpoint.java

@ -0,0 +1,104 @@
package com.yihu.jw.patient.endpoint.area;
import com.yihu.jw.area.service.BaseStreetService;
import com.yihu.jw.entity.base.area.BaseStreetDO;
import com.yihu.jw.restmodel.base.area.BaseStreetVO;
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;
/**
*
* 街道字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseStreet.PREFIX)
@Api(value = "街道字典管理", description = "街道字典管理服务接口", tags = {"街道字典管理服务接口"})
public class BaseStreetEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseStreetService baseStreetService;
@PostMapping(value = BaseRequestMapping.BaseStreet.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseStreetVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseStreetDO baseStreet = toEntity(jsonData, BaseStreetDO.class);
    baseStreet = baseStreetService.save(baseStreet);
    return success(baseStreet, BaseStreetVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseStreet.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串,中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseStreetService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseStreet.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseStreetVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseStreetDO baseStreet = toEntity(jsonData, BaseStreetDO.class);
        if (null == baseStreet.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        baseStreet = baseStreetService.save(baseStreet);
        return success(baseStreet, BaseStreetVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseStreet.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseStreetVO> 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<BaseStreetDO> baseStreets = baseStreetService.search(fields, filters, sorts, page, size);
                int count = (int)baseStreetService.getCount(filters);
                return success(baseStreets, count, page, size, BaseStreetVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseStreet.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseStreetVO> 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<BaseStreetDO> baseStreets = baseStreetService.search(fields, filters, sorts);
                  return success(baseStreets, BaseStreetVO.class);
         }
 }

+ 104 - 0
svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/area/BaseTownEndpoint.java

@ -0,0 +1,104 @@
package com.yihu.jw.patient.endpoint.area;
import com.yihu.jw.area.service.BaseTownService;
import com.yihu.jw.entity.base.area.BaseTownDO;
import com.yihu.jw.restmodel.base.area.BaseTownVO;
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;
/**
*
* 区县字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseTown.PREFIX)
@Api(value = "区县字典管理", description = "区县字典管理服务接口", tags = {"区县字典管理服务接口"})
public class BaseTownEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseTownService baseTownService;
@PostMapping(value = BaseRequestMapping.BaseTown.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseTownVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseTownDO baseTown = toEntity(jsonData, BaseTownDO.class);
    baseTown = baseTownService.save(baseTown);
    return success(baseTown, BaseTownVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseTown.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串,中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseTownService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseTown.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseTownVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseTownDO baseTown = toEntity(jsonData, BaseTownDO.class);
        if (null == baseTown.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        baseTown = baseTownService.save(baseTown);
        return success(baseTown, BaseTownVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseTown.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseTownVO> 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<BaseTownDO> baseTowns = baseTownService.search(fields, filters, sorts, page, size);
                int count = (int)baseTownService.getCount(filters);
                return success(baseTowns, count, page, size, BaseTownVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseTown.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseTownVO> 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<BaseTownDO> baseTowns = baseTownService.search(fields, filters, sorts);
                  return success(baseTowns, BaseTownVO.class);
         }
 }

+ 1 - 1
svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/personal_info/PatientEndpoint.java

@ -45,7 +45,7 @@ import java.util.*;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.BasePatient.PREFIX)
@Api(value = "居民信息管理", description = "居民信息管理服务接口", tags = {"wlyy基础服务 - 居民信息管理服务接口"})
@Api(value = "居民信息管理", description = "居民信息管理服务接口", tags = {"居民信息管理服务接口"})
public class PatientEndpoint extends EnvelopRestEndpoint {
    @Autowired

+ 1 - 1
svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/personal_info/PatientMedicareCardEndpoint.java

@ -30,7 +30,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.PatientMedicareCard.PREFIX)
@Api(value = "居民卡包管理", description = "居民卡包管理服务接口", tags = {"wlyy基础服务 - 居民卡包管理服务接口"})
@Api(value = "居民卡包管理", description = "居民卡包管理服务接口", tags = {"居民卡包管理服务接口"})
public class PatientMedicareCardEndpoint extends EnvelopRestEndpoint {
    @Autowired

+ 1 - 1
svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/settings/AccountAppealEndpoint.java

@ -31,7 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.AccountAppeal.PREFIX)
@Api(value = "账号申诉管理", description = "账号申诉管理服务接口", tags = {"wlyy基础服务 - 账号申诉管理服务接口"})
@Api(value = "账号申诉管理", description = "账号申诉管理服务接口", tags = {"账号申诉管理服务接口"})
public class AccountAppealEndpoint extends EnvelopRestEndpoint {
    @Autowired

+ 1 - 1
svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/settings/FeedbackEndpoint.java

@ -33,7 +33,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Feedback.PREFIX)
@Api(value = "意见反馈管理", description = "意见反馈管理服务接口", tags = {"wlyy基础服务 - 意见反馈管理服务接口"})
@Api(value = "意见反馈管理", description = "意见反馈管理服务接口", tags = {"意见反馈管理服务接口"})
public class FeedbackEndpoint extends EnvelopRestEndpoint {
    @Autowired

+ 1 - 1
svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/settings/HelpCenterEndpoint.java

@ -31,7 +31,7 @@ import java.util.List;
*/
@RestController
@RequestMapping(value = BaseRequestMapping.HelpCenter.PREFIX)
@Api(value = "帮助中心管理", description = "帮助中心管理服务接口", tags = {"wlyy基础服务 - 帮助中心管理服务接口"})
@Api(value = "帮助中心管理", description = "帮助中心管理服务接口", tags = {"帮助中心管理服务接口"})
public class HelpCenterEndpoint extends EnvelopRestEndpoint {
@Autowired