Browse Source

按城市获取区域

zdm 6 years ago
parent
commit
a977aeeb1b
20 changed files with 121 additions and 96 deletions
  1. 7 0
      common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/house/HealthyHouseMapping.java
  2. 5 5
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/area/BaseCityEndpoint.java
  3. 5 5
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/area/BaseProvinceEndpoint.java
  4. 5 5
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/area/BaseStreetEndpoint.java
  5. 74 56
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/area/BaseTownEndpoint.java
  6. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseCityDao.java
  7. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseCommitteeDao.java
  8. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseProvinceDao.java
  9. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseStreetDao.java
  10. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseTownDao.java
  11. 1 1
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseCityDO.java
  12. 1 1
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseCommitteeDO.java
  13. 1 1
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseProvinceDO.java
  14. 1 1
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseStreetDO.java
  15. 1 1
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseTownDO.java
  16. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseCityService.java
  17. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseCommitteeService.java
  18. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseProvinceService.java
  19. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseStreetService.java
  20. 2 2
      svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseTownService.java

+ 7 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/house/HealthyHouseMapping.java

@ -98,6 +98,13 @@ public class HealthyHouseMapping {
            public static final String GET_NAVIGATION_SERVICE_EVALUATION_BY_FIELD = "/getNavigationServiceEvaluationByField";
            public static final String UPDATE_NAVIGATION_SERVICE_EVALUATION_BY_ID = "/updateNavigationServiceEvaluationById";
        }
        /**
         * 城市
         */
        public static class Town {
            public static final String LIST = "/list/city";
        }
    }

+ 5 - 5
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/area/BaseCityEndpoint.java

@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.controller.area;
import com.yihu.jw.healthyhouse.model.area.BaseCityDO;
import com.yihu.jw.healthyhouse.model.area.BaseCity;
import com.yihu.jw.healthyhouse.service.area.BaseCityService;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
import com.yihu.jw.restmodel.web.Envelop;
@ -44,7 +44,7 @@ private BaseCityService baseCityService;
public ObjEnvelop<BaseCityVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseCityDO baseCity = toEntity(jsonData, BaseCityDO.class);
    BaseCity baseCity = toEntity(jsonData, BaseCity.class);
    baseCity = baseCityService.save(baseCity);
    return success(baseCity, BaseCityVO.class);
    }
@ -63,7 +63,7 @@ public ObjEnvelop<BaseCityVO> create (
    public ObjEnvelop<BaseCityVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseCityDO baseCity = toEntity(jsonData, BaseCityDO.class);
        BaseCity baseCity = toEntity(jsonData, BaseCity.class);
        if (null == baseCity.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
@ -84,7 +84,7 @@ public ObjEnvelop<BaseCityVO> create (
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<BaseCityDO> baseCitys = baseCityService.search(fields, filters, sorts, page, size);
            List<BaseCity> baseCitys = baseCityService.search(fields, filters, sorts, page, size);
                int count = (int)baseCityService.getCount(filters);
                return success(baseCitys, count, page, size, BaseCityVO.class);
         }
@ -98,7 +98,7 @@ public ObjEnvelop<BaseCityVO> create (
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序,规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseCityDO> baseCitys = baseCityService.search(fields, filters, sorts);
             List<BaseCity> baseCitys = baseCityService.search(fields, filters, sorts);
             return success(baseCitys, BaseCityVO.class);
         }

+ 5 - 5
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/area/BaseProvinceEndpoint.java

@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.controller.area;
import com.yihu.jw.healthyhouse.model.area.BaseProvinceDO;
import com.yihu.jw.healthyhouse.model.area.BaseProvince;
import com.yihu.jw.healthyhouse.service.area.BaseProvinceService;
import com.yihu.jw.restmodel.base.area.BaseProvinceVO;
import com.yihu.jw.restmodel.web.Envelop;
@ -44,7 +44,7 @@ private BaseProvinceService baseProvinceService;
public ObjEnvelop<BaseProvinceVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseProvinceDO baseProvince = toEntity(jsonData, BaseProvinceDO.class);
    BaseProvince baseProvince = toEntity(jsonData, BaseProvince.class);
    baseProvince = baseProvinceService.save(baseProvince);
    return success(baseProvince, BaseProvinceVO.class);
    }
@ -63,7 +63,7 @@ public ObjEnvelop<BaseProvinceVO> create (
    public ObjEnvelop<BaseProvinceVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseProvinceDO baseProvince = toEntity(jsonData, BaseProvinceDO.class);
        BaseProvince baseProvince = toEntity(jsonData, BaseProvince.class);
        if (null == baseProvince.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
@ -84,7 +84,7 @@ public ObjEnvelop<BaseProvinceVO> create (
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<BaseProvinceDO> baseProvinces = baseProvinceService.search(fields, filters, sorts, page, size);
            List<BaseProvince> baseProvinces = baseProvinceService.search(fields, filters, sorts, page, size);
                int count = (int)baseProvinceService.getCount(filters);
                return success(baseProvinces, count, page, size, BaseProvinceVO.class);
         }
@ -98,7 +98,7 @@ public ObjEnvelop<BaseProvinceVO> create (
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序,规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseProvinceDO> baseProvinces = baseProvinceService.search(fields, filters, sorts);
             List<BaseProvince> baseProvinces = baseProvinceService.search(fields, filters, sorts);
                  return success(baseProvinces, BaseProvinceVO.class);
         }

+ 5 - 5
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/area/BaseStreetEndpoint.java

@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.controller.area;
import com.yihu.jw.healthyhouse.model.area.BaseStreetDO;
import com.yihu.jw.healthyhouse.model.area.BaseStreet;
import com.yihu.jw.healthyhouse.service.area.BaseStreetService;
import com.yihu.jw.restmodel.base.area.BaseStreetVO;
import com.yihu.jw.restmodel.web.Envelop;
@ -44,7 +44,7 @@ private BaseStreetService baseStreetService;
public ObjEnvelop<BaseStreetVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseStreetDO baseStreet = toEntity(jsonData, BaseStreetDO.class);
    BaseStreet baseStreet = toEntity(jsonData, BaseStreet.class);
    baseStreet = baseStreetService.save(baseStreet);
    return success(baseStreet, BaseStreetVO.class);
    }
@ -63,7 +63,7 @@ public ObjEnvelop<BaseStreetVO> create (
    public ObjEnvelop<BaseStreetVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseStreetDO baseStreet = toEntity(jsonData, BaseStreetDO.class);
        BaseStreet baseStreet = toEntity(jsonData, BaseStreet.class);
        if (null == baseStreet.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
@ -84,7 +84,7 @@ public ObjEnvelop<BaseStreetVO> create (
            @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);
            List<BaseStreet> baseStreets = baseStreetService.search(fields, filters, sorts, page, size);
                int count = (int)baseStreetService.getCount(filters);
                return success(baseStreets, count, page, size, BaseStreetVO.class);
         }
@ -98,7 +98,7 @@ public ObjEnvelop<BaseStreetVO> create (
             @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);
             List<BaseStreet> baseStreets = baseStreetService.search(fields, filters, sorts);
                  return success(baseStreets, BaseStreetVO.class);
         }

+ 74 - 56
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/area/BaseTownEndpoint.java

@ -1,15 +1,15 @@
package com.yihu.jw.healthyhouse.controller.area;
import com.yihu.jw.healthyhouse.model.area.BaseTownDO;
import com.yihu.jw.healthyhouse.model.area.BaseCity;
import com.yihu.jw.healthyhouse.model.area.BaseTown;
import com.yihu.jw.healthyhouse.service.area.BaseCityService;
import com.yihu.jw.healthyhouse.service.area.BaseTownService;
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.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.health.house.HealthyHouseMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@ -17,63 +17,58 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
*
* 区县字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
* @since 1.
*/
 * 区县字典控制器
 * zdm
 */
@RestController
@RequestMapping(value = BaseRequestMapping.BaseTown.PREFIX)
@Api(value = "区县字典管理", description = "区县字典管理服务接口", tags = {"区县字典管理服务接口"})
public class BaseTownEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseTownService baseTownService;
    @Autowired
    private BaseTownService baseTownService;
    @Autowired
    private BaseCityService baseCityService;
@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.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 {
        BaseTown baseTown = toEntity(jsonData, BaseTown.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("删除成功");
            @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);
    public ObjEnvelop<BaseTownVO> update(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        BaseTown baseTown = toEntity(jsonData, BaseTown.class);
        if (null == baseTown.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
            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 (
    @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 = "过滤器,为空检索所有条件")
@ -84,22 +79,45 @@ public ObjEnvelop<BaseTownVO> create (
            @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);
         }
        List<BaseTown> 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<BaseTown> baseTowns = baseTownService.search(fields, filters, sorts);
        return success(baseTowns, 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);
         }
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Town.LIST)
    @ApiOperation(value = "根据城市获取区县列表")
    public ListEnvelop<BaseTown> listTownByCity(
            @ApiParam(name = "cityId", value = "返回的字段,为空返回全部字段", defaultValue = "350200")
            @RequestParam(value = "cityId", required = true) String cityId) throws Exception {
        List<BaseCity> baseCitys = baseCityService.search(null, "code=" + cityId, null);
        List<BaseTown> baseTowns = new ArrayList<>();
        BaseTown baseTown;
        for (BaseCity cdo : baseCitys) {
            baseTown = new BaseTown();
            baseTown.setCode(cdo.getCode());
            baseTown.setCity(cdo.getCode());
            baseTown.setName(cdo.getName());
            baseTowns.add(baseTown);
            List<BaseTown> baseTownList = baseTownService.search(null, "city=" + cdo.getCode(), "+id");
            for (BaseTown m : baseTownList) {
                m.setName(cdo.getName() + " " + m.getName());
            }
            baseTowns.addAll(baseTownList);
        }
        return success(baseTowns, BaseTown.class);
    }
 }
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseCityDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseCityDO;
import com.yihu.jw.healthyhouse.model.area.BaseCity;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
@ -16,5 +16,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BaseCityDao extends PagingAndSortingRepository<BaseCityDO, Integer>, JpaSpecificationExecutor<BaseCityDO>  {
public interface BaseCityDao extends PagingAndSortingRepository<BaseCity, Integer>, JpaSpecificationExecutor<BaseCity>  {
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseCommitteeDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseCommitteeDO;
import com.yihu.jw.healthyhouse.model.area.BaseCommittee;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
@ -16,5 +16,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BaseCommitteeDao extends PagingAndSortingRepository<BaseCommitteeDO, Integer>, JpaSpecificationExecutor<BaseCommitteeDO>  {
public interface BaseCommitteeDao extends PagingAndSortingRepository<BaseCommittee, Integer>, JpaSpecificationExecutor<BaseCommittee>  {
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseProvinceDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseProvinceDO;
import com.yihu.jw.healthyhouse.model.area.BaseProvince;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
@ -16,5 +16,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BaseProvinceDao extends PagingAndSortingRepository<BaseProvinceDO, Integer>, JpaSpecificationExecutor<BaseProvinceDO>  {
public interface BaseProvinceDao extends PagingAndSortingRepository<BaseProvince, Integer>, JpaSpecificationExecutor<BaseProvince>  {
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseStreetDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseStreetDO;
import com.yihu.jw.healthyhouse.model.area.BaseStreet;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
@ -16,5 +16,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BaseStreetDao extends PagingAndSortingRepository<BaseStreetDO, Integer>, JpaSpecificationExecutor<BaseStreetDO>  {
public interface BaseStreetDao extends PagingAndSortingRepository<BaseStreet, Integer>, JpaSpecificationExecutor<BaseStreet>  {
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/area/BaseTownDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseTownDO;
import com.yihu.jw.healthyhouse.model.area.BaseTown;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
@ -16,5 +16,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BaseTownDao extends PagingAndSortingRepository<BaseTownDO, Integer>, JpaSpecificationExecutor<BaseTownDO>  {
public interface BaseTownDao extends PagingAndSortingRepository<BaseTown, Integer>, JpaSpecificationExecutor<BaseTown>  {
}

+ 1 - 1
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseCityDO.java

@ -17,7 +17,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_city")
public class BaseCityDO extends IntegerIdentityEntity {
public class BaseCity extends IntegerIdentityEntity {
    /**
	 * 省编码

+ 1 - 1
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseCommitteeDO.java

@ -15,7 +15,7 @@ import javax.persistence.Table;
*/
@Entity
@Table(name = "base_committee")
public class BaseCommitteeDO extends UuidIdentityEntityWithOperator {
public class BaseCommittee extends UuidIdentityEntityWithOperator {
    /**
	 * 省标识

+ 1 - 1
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseProvinceDO.java

@ -17,7 +17,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_province")
public class BaseProvinceDO extends IntegerIdentityEntity {
public class BaseProvince extends IntegerIdentityEntity {
    /**
	 * 省份编码

+ 1 - 1
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseStreetDO.java

@ -17,7 +17,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_street")
public class BaseStreetDO extends IntegerIdentityEntity {
public class BaseStreet extends IntegerIdentityEntity {
    /**
	 * 省标识

+ 1 - 1
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/area/BaseTownDO.java

@ -17,7 +17,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_town")
public class BaseTownDO extends IntegerIdentityEntity {
public class BaseTown extends IntegerIdentityEntity {
    /**
	 * 省编码

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseCityService.java

@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.service.area;
import com.yihu.jw.healthyhouse.dao.area.BaseCityDao;
import com.yihu.jw.healthyhouse.model.area.BaseCityDO;
import com.yihu.jw.healthyhouse.model.area.BaseCity;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
@ -18,5 +18,5 @@ import org.springframework.stereotype.Service;
 * @since 1.
 */
@Service
public class BaseCityService extends BaseJpaService<BaseCityDO, BaseCityDao> {
public class BaseCityService extends BaseJpaService<BaseCity, BaseCityDao> {
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseCommitteeService.java

@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.service.area;
import com.yihu.jw.healthyhouse.dao.area.BaseCommitteeDao;
import com.yihu.jw.healthyhouse.model.area.BaseCommitteeDO;
import com.yihu.jw.healthyhouse.model.area.BaseCommittee;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
@ -18,5 +18,5 @@ import org.springframework.stereotype.Service;
 * @since 1.
 */
@Service
public class BaseCommitteeService extends BaseJpaService<BaseCommitteeDO, BaseCommitteeDao> {
public class BaseCommitteeService extends BaseJpaService<BaseCommittee, BaseCommitteeDao> {
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseProvinceService.java

@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.service.area;
import com.yihu.jw.healthyhouse.dao.area.BaseProvinceDao;
import com.yihu.jw.healthyhouse.model.area.BaseProvinceDO;
import com.yihu.jw.healthyhouse.model.area.BaseProvince;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
@ -18,5 +18,5 @@ import org.springframework.stereotype.Service;
 * @since 1.
 */
@Service
public class BaseProvinceService extends BaseJpaService<BaseProvinceDO, BaseProvinceDao> {
public class BaseProvinceService extends BaseJpaService<BaseProvince, BaseProvinceDao> {
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseStreetService.java

@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.service.area;
import com.yihu.jw.healthyhouse.dao.area.BaseStreetDao;
import com.yihu.jw.healthyhouse.model.area.BaseStreetDO;
import com.yihu.jw.healthyhouse.model.area.BaseStreet;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
@ -18,5 +18,5 @@ import org.springframework.stereotype.Service;
 * @since 1.
 */
@Service
public class BaseStreetService extends BaseJpaService<BaseStreetDO, BaseStreetDao> {
public class BaseStreetService extends BaseJpaService<BaseStreet, BaseStreetDao> {
}

+ 2 - 2
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/area/BaseTownService.java

@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.service.area;
import com.yihu.jw.healthyhouse.dao.area.BaseTownDao;
import com.yihu.jw.healthyhouse.model.area.BaseTownDO;
import com.yihu.jw.healthyhouse.model.area.BaseTown;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
@ -18,5 +18,5 @@ import org.springframework.stereotype.Service;
 * @since 1.
 */
@Service
public class BaseTownService extends BaseJpaService<BaseTownDO, BaseTownDao> {
public class BaseTownService extends BaseJpaService<BaseTown, BaseTownDao> {
}