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/health/house/HealthyHouseMapping.java

@@ -47,6 +47,7 @@ public class HealthyHouseMapping {
            public static final String LIST = "/list/facilities";
            public static final String GET_FACILITIES_BY_ID = "/getFacilitiesById";
            public static final String GET_FACILITIES_BY_FIELD = "/getFacilitiesByField";
            public static final String COUNT_FACILITIES = "/count/facilities";
        }
        //设施服务

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

@@ -0,0 +1,105 @@
package com.yihu.jw.healthyhouse.controller.area;
import com.yihu.jw.healthyhouse.model.area.BaseCityDO;
import com.yihu.jw.healthyhouse.service.area.BaseCityService;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
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.BaseCity.PREFIX)
@Api(value = "城市字典管理", description = "城市字典管理服务接口", tags = {"城市字典管理服务接口"})
public class BaseCityEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseCityService baseCityService;
@PostMapping(value = BaseRequestMapping.BaseCity.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseCityVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseCityDO baseCity = toEntity(jsonData, BaseCityDO.class);
    baseCity = baseCityService.save(baseCity);
    return success(baseCity, BaseCityVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseCity.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseCityService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseCity.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseCityVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseCityDO baseCity = toEntity(jsonData, BaseCityDO.class);
        if (null == baseCity.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        baseCity = baseCityService.save(baseCity);
        return success(baseCity, BaseCityVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseCity.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseCityVO> 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<BaseCityDO> baseCitys = baseCityService.search(fields, filters, sorts, page, size);
                int count = (int)baseCityService.getCount(filters);
                return success(baseCitys, count, page, size, BaseCityVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseCity.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseCityVO> 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<BaseCityDO> baseCitys = baseCityService.search(fields, filters, sorts);
             return success(baseCitys, BaseCityVO.class);
         }
 }

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

@@ -0,0 +1,105 @@
package com.yihu.jw.healthyhouse.controller.area;
import com.yihu.jw.healthyhouse.model.area.BaseProvinceDO;
import com.yihu.jw.healthyhouse.service.area.BaseProvinceService;
import com.yihu.jw.restmodel.base.area.BaseProvinceVO;
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.BaseProvince.PREFIX)
@Api(value = "省字典管理", description = "省字典管理服务接口", tags = {"省字典管理服务接口"})
public class BaseProvinceEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseProvinceService baseProvinceService;
@PostMapping(value = BaseRequestMapping.BaseProvince.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseProvinceVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseProvinceDO baseProvince = toEntity(jsonData, BaseProvinceDO.class);
    baseProvince = baseProvinceService.save(baseProvince);
    return success(baseProvince, BaseProvinceVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseProvince.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseProvinceService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseProvince.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseProvinceVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseProvinceDO baseProvince = toEntity(jsonData, BaseProvinceDO.class);
        if (null == baseProvince.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        baseProvince = baseProvinceService.save(baseProvince);
        return success(baseProvince, BaseProvinceVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseProvince.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseProvinceVO> 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<BaseProvinceDO> baseProvinces = baseProvinceService.search(fields, filters, sorts, page, size);
                int count = (int)baseProvinceService.getCount(filters);
                return success(baseProvinces, count, page, size, BaseProvinceVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseProvince.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseProvinceVO> 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<BaseProvinceDO> baseProvinces = baseProvinceService.search(fields, filters, sorts);
                  return success(baseProvinces, BaseProvinceVO.class);
         }
 }

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

@@ -0,0 +1,105 @@
package com.yihu.jw.healthyhouse.controller.area;
import com.yihu.jw.healthyhouse.model.area.BaseStreetDO;
import com.yihu.jw.healthyhouse.service.area.BaseStreetService;
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);
         }
 }

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

@@ -0,0 +1,105 @@
package com.yihu.jw.healthyhouse.controller.area;
import com.yihu.jw.healthyhouse.model.area.BaseTownDO;
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.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);
         }
 }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/dict/SystemDictEntryController.java

@@ -46,7 +46,7 @@ public class SystemDictEntryController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        List<SystemDictEntry> systemDictEntryList = systemDictEntryService.search(fields,filters,sorts,page,size);
        return success(systemDictEntryList,systemDictEntryList.size(),page, size);
        return success(systemDictEntryList,(null==systemDictEntryList)?0:systemDictEntryList.size(),page, size);
    }
    @ApiOperation(value = "创建字典项")

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/facilities/FacilitiesController.java

@@ -1,16 +1,22 @@
package com.yihu.jw.healthyhouse.controller.facilities;
import com.fasterxml.jackson.databind.JavaType;
import com.yihu.jw.healthyhouse.model.facility.Facility;
import com.yihu.jw.healthyhouse.model.facility.FacilityServerRelation;
import com.yihu.jw.healthyhouse.service.facility.FacilityServerRelationService;
import com.yihu.jw.healthyhouse.service.facility.FacilityService;
import com.yihu.jw.restmodel.web.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.health.house.HealthyHouseMapping;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
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.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
@@ -32,10 +38,12 @@ public class FacilitiesController extends EnvelopRestEndpoint {
    @Autowired
    private FacilityService facilityService;
    @Autowired
    private FacilityServerRelationService facilityServerRelationService;
    @ApiOperation(value = "获取设施列表", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.PAGE)
    public PageEnvelop<Facility> getDictionaries(
    public PageEnvelop<Facility> getFacilities(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器", defaultValue = "")
@@ -47,71 +55,89 @@ public class FacilitiesController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        List<Facility> facilityList = facilityService.search(fields, filters, sorts, page, size);
        return success(facilityList, facilityList.size(), page, size);
        return success(facilityList, (null == facilityList) ? 0 : facilityList.size(), page, size);
    }
    @ApiOperation(value = "创建设施")
    @ApiOperation(value = "创建/更新（id存在）设施，包含设施与服务的关联关系")
    @Transactional(rollbackFor = Exception.class)
    @PostMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.CREATE)
    public ObjEnvelop<Facility> createDictionary(
    public ObjEnvelop<Facility> createFacilities(
            @ApiParam(name = "facility", value = "设施JSON结构")
            @RequestBody Facility facility) throws IOException {
            @RequestParam(value = "facility") String facility,
            @ApiParam(name = "facilityServerJson", value = "设施与服务关联关系")
            @RequestParam(value = "facilityServerJson") String facilityServerJson) throws IOException {
        Facility facility1 = toEntity(facility, Facility.class);
        List<Facility> facilityList = null;
        if (StringUtils.isEmpty(facility.getCode())) {
        if (StringUtils.isEmpty(facility1.getCode())) {
            return failed("设施编码不能为空！", ObjEnvelop.class);
        } else {
            facilityList = facilityService.findByField("code", facility.getCode());
            facilityList = facilityService.findByField("code", facility1.getCode());
            if (null != facilityList && facilityList.size() > 0) {
                return failed("设施编码已存在！", ObjEnvelop.class);
            }
        }
        if (StringUtils.isEmpty(facility.getName())) {
        if (StringUtils.isEmpty(facility1.getName())) {
            return failed("设施名称不能为空！", ObjEnvelop.class);
        } else {
            facilityList = facilityService.findByField("name", facility.getName());
            facilityList = facilityService.findByField("name", facility1.getName());
            if (null != facilityList && facilityList.size() > 0) {
                return failed("设施名称已存在！", ObjEnvelop.class);
            }
        }
        if (!(facility.getLongitude() > 0)) {
        if (!(facility1.getLongitude() > 0)) {
            return failed("设施经度不能为空！", ObjEnvelop.class);
        }
        if (!(facility.getLatitude() > 0)) {
        if (!(facility1.getLatitude() > 0)) {
            return failed("设施纬度不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facility.getCategory().toString())) {
        if (StringUtils.isEmpty(facility1.getCategory().toString())) {
            return failed("设施类别不正确，请参考系统字典：设施类别！", ObjEnvelop.class);
        }
        Facility Facility = facilityService.save(facility);
        return success(Facility);
        Facility facilityBack = facilityService.save(facility1);
        JavaType javaType = objectMapper.getTypeFactory().constructParametricType(List.class, FacilityServerRelation.class);
        List<FacilityServerRelation> models = objectMapper.readValue(facilityServerJson, javaType);
        if (null != models && models.size() > 0) {
            for (FacilityServerRelation facilityServerRelation : models) {
                facilityServerRelationService.save(facilityServerRelation);
            }
        }
        facilityBack.setFacilityServerRelation(models);
        return success(facilityBack);
    }
    @ApiOperation(value = "获取设施")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.GET_FACILITIES_BY_ID)
    public ObjEnvelop<Facility> getDictionary(
    public ObjEnvelop<Facility> getFacilitie(
            @ApiParam(name = "id", value = "设施ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        Facility facility = facilityService.findById(id);
        List<FacilityServerRelation> facilityServerRelationList = facilityServerRelationService.findByField("facilitieCode", facility.getCode());
        if (facility == null) {
            return failed("设施不存在！", ObjEnvelop.class);
        }
        facility.setFacilityServerRelation(facilityServerRelationList);
        return success(facility);
    }
    @ApiOperation(value = "获取设施")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.GET_FACILITIES_BY_FIELD)
    public ListEnvelop<Facility> getDictionaryByPhoneticCode(
    public ListEnvelop<Facility> getFacilitiesByfield(
            @ApiParam(name = "field", value = "查找字段名", required = true)
            @RequestParam(value = "field") String field,
            @ApiParam(name = "value", value = "检索值")
            @RequestParam(value = "value") String value) throws Exception {
        List<Facility> facilityList = facilityService.findByField(field, value);
        for (Facility facility : facilityList) {
            List<FacilityServerRelation> facilityServerRelationList = facilityServerRelationService.findByField("facilitieCode", facility.getCode());
            facility.setFacilityServerRelation(facilityServerRelationList);
        }
        return success(facilityList);
    }
    @ApiOperation(value = "更新设施")
    @ApiOperation(value = "新增/更新（idy已存在）设施")
    @PutMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    public ObjEnvelop<Facility> updateDictionary(
            @ApiParam(name = "facility", value = "设施JSON结构")
    public ObjEnvelop<Facility> updateFacilities(
            @ApiParam(name = "facility", value = "设施JSON结构（不包括设施与服务关联关系）")
            @RequestBody Facility facility) throws Exception {
        if (StringUtils.isEmpty(facility.getCode())) {
            return failed("设施编码不能为空！", ObjEnvelop.class);
@@ -134,14 +160,34 @@ public class FacilitiesController extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除设施")
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.DELETE)
    public Envelop deleteDictionary(
    public Envelop deleteFacilities(
            @ApiParam(name = "facilitiesId", value = "设施ID")
            @RequestParam(value = "facilitiesId") String facilitiesId) throws Exception {
        Facility facility = new Facility();
        facility.setId(facilitiesId);
        Facility facility = facilityService.findById(facilitiesId);
        facilityServerRelationService.deleteByFacilitieCode(facility.getCode());
        facilityService.delete(facility);
        return success("success");
    }
    @ApiOperation(value = "设施统计：设施总数/今日新增设施")
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.COUNT_FACILITIES)
    public ObjEnvelop<Long> countFacilities(
            @ApiParam(name = "totalCountFlag", value = "设施总数:true;今日新增设施:false", defaultValue = "true")
            @RequestParam(value = "totalCountFlag") boolean totalCountFlag) throws Exception {
        String filters = "";
        long count;
        //设施总数:true
        if (totalCountFlag) {
            count = facilityService.getCount(filters);
        } else {
            //今日新增设施:false
            String todayStart = DateUtil.getStringDateShort() + " " + "00:00:00";
            String todayEnd = DateUtil.getStringDateShort() + " " + "23:59:59";
            filters = "createTime>=" + todayStart + ";createTime<=" + todayEnd;
            count = facilityService.getCount(filters);
        }
        return success("success", count);
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/facilities/FacilitiesServerController.java

@@ -46,7 +46,7 @@ public class FacilitiesServerController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        List<FacilityServer> facilityServerList = facilityServerService.search(fields, filters, sorts, page, size);
        return success(facilityServerList, facilityServerList.size(), page, size);
        return success(facilityServerList, (null==facilityServerList)?0:facilityServerList.size(), page, size);
    }
    @ApiOperation(value = "创建设施服务")

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

@@ -0,0 +1,20 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseCityDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 城市字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseCityDao extends PagingAndSortingRepository<BaseCityDO, Integer>, JpaSpecificationExecutor<BaseCityDO>  {
}

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

@@ -0,0 +1,20 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseCommitteeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 区县居委会 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月04日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseCommitteeDao extends PagingAndSortingRepository<BaseCommitteeDO, Integer>, JpaSpecificationExecutor<BaseCommitteeDO>  {
}

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

@@ -0,0 +1,20 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseProvinceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 省字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseProvinceDao extends PagingAndSortingRepository<BaseProvinceDO, Integer>, JpaSpecificationExecutor<BaseProvinceDO>  {
}

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

@@ -0,0 +1,20 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseStreetDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 街道字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseStreetDao extends PagingAndSortingRepository<BaseStreetDO, Integer>, JpaSpecificationExecutor<BaseStreetDO>  {
}

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

@@ -0,0 +1,20 @@
package com.yihu.jw.healthyhouse.dao.area;
import com.yihu.jw.healthyhouse.model.area.BaseTownDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 区县字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseTownDao extends PagingAndSortingRepository<BaseTownDO, Integer>, JpaSpecificationExecutor<BaseTownDO>  {
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/facilities/FacilitiesDao.java

@@ -1,16 +0,0 @@
package com.yihu.jw.healthyhouse.dao.facilities;
import com.yihu.jw.healthyhouse.model.facility.Facility;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 设施dao
 * @author zdm
 * @version 1.0
 * @created 2018.09.19
 */
public interface FacilitiesDao extends JpaRepository<Facility, Long> {
    Facility findById(String id);
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/facility/FacilityDao.java

@@ -9,7 +9,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 * @version 1.0
 * @created 2018.09.19
 */
public interface FacilityDao extends JpaRepository<Facility, Long> {
public interface FacilityDao extends JpaRepository<Facility, String> {
    Facility findById(String id);
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/facility/FacilityServerRelationDao.java

@@ -0,0 +1,20 @@
package com.yihu.jw.healthyhouse.dao.facility;
import com.yihu.jw.healthyhouse.model.facility.FacilityServerRelation;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
/**
 * 设施与服务关系 dao
 * @author zdm
 * @version 1.0
 * @created 2018.09.20
 */
public interface FacilityServerRelationDao extends JpaRepository<FacilityServerRelation, Long> {
    FacilityServerRelation findById(String id);
    @Modifying
    void deleteByFacilitieCode(String facilitieCode);
}

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

@@ -0,0 +1,78 @@
package com.yihu.jw.healthyhouse.model.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 城市字典实体
 * 
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@Table(name = "base_city")
public class BaseCityDO extends IntegerIdentityEntity {
    /**
	 * 省编码
	 */
	private String province;
    /**
	 * 城市编码
	 */
	private String code;
    /**
	 * 城市名称
	 */
	private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "province")
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

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

@@ -0,0 +1,101 @@
package com.yihu.jw.healthyhouse.model.area;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 居委会实体
*
* @author Administrator on  2018年09月05日
*
*/
@Entity
@Table(name = "base_committee")
public class BaseCommitteeDO extends UuidIdentityEntityWithOperator {
    /**
	 * 省标识
	 */
	private String province;
    /**
	 * 市标识
	 */
	private String city;
    /**
	 * 区县标识
	 */
	private String town;
    /**
	 * 街道标识
	 */
	private String street;
    /**
	 * 居委会标识
	 */
	private String code;
    /**
	 * 居委会名称
	 */
	private String name;
	@Column(name = "province")
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
	@Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
	@Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
	@Column(name = "street")
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

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

@@ -0,0 +1,65 @@
package com.yihu.jw.healthyhouse.model.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 省份字典实体
 * 
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@Table(name = "base_province")
public class BaseProvinceDO extends IntegerIdentityEntity {
    /**
	 * 省份编码
	 */
	private String code;
    /**
	 * 省份名称
	 */
	private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

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

@@ -0,0 +1,104 @@
package com.yihu.jw.healthyhouse.model.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 街道字典实体
 * 
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@Table(name = "base_street")
public class BaseStreetDO extends IntegerIdentityEntity {
    /**
	 * 省标识
	 */
	private String province;
    /**
	 * 市标识
	 */
	private String city;
    /**
	 * 区县标识
	 */
	private String town;
    /**
	 * 街道标识
	 */
	private String code;
    /**
	 * 街道名称
	 */
	private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "province")
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
	@Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
	@Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

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

@@ -0,0 +1,91 @@
package com.yihu.jw.healthyhouse.model.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 区县字典实体
 * 
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@Table(name = "base_town")
public class BaseTownDO extends IntegerIdentityEntity {
    /**
	 * 省编码
	 */
	private String province;
    /**
	 * 城市编码
	 */
	private String city;
    /**
	 * 区县编码
	 */
	private String code;
    /**
	 * 区县名称
	 */
	private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "province")
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
	@Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/facility/Facility.java

@@ -4,6 +4,7 @@ package com.yihu.jw.healthyhouse.model.facility;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.*;
import java.util.List;
/**
 * 设施
@@ -13,7 +14,6 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "facility")
@Access(value = AccessType.PROPERTY)
public class Facility extends UuidIdentityEntityWithOperator {
    //设施编码
    @Column(name = "code", nullable = false)
@@ -33,6 +33,9 @@ public class Facility extends UuidIdentityEntityWithOperator {
    // （管理员）联系人id
    @Column(name = "user_id")
    private String userId;
    // （管理员）联系人姓名
    @Column(name = "user_name")
    private String userName;
    //联系人电话
    @Column(name = "user_telephone")
    private String userTelephone ;
@@ -79,6 +82,9 @@ public class Facility extends UuidIdentityEntityWithOperator {
    @Column(name = "img_path")
    private String imgPath;
    private String statusName;
    private List<FacilityServerRelation> facilityServerRelation;
    public String getCode() {
        return code;
    }
@@ -246,4 +252,29 @@ public class Facility extends UuidIdentityEntityWithOperator {
    public void setImgPath(String imgPath) {
        this.imgPath = imgPath;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    @Transient
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
    @Transient
    public List<FacilityServerRelation> getFacilityServerRelation() {
        return facilityServerRelation;
    }
    public void setFacilityServerRelation(List<FacilityServerRelation> facilityServerRelation) {
        this.facilityServerRelation = facilityServerRelation;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/facility/FacilityServerRelation.java

@@ -0,0 +1,61 @@
package com.yihu.jw.healthyhouse.model.facility;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.*;
/**
 * 设施与服务关联关系
 * @author zdm
 * @version 1.0
 * @created 2018.09.20
 */
@Entity
@Table(name = "facility_server_relation")
public class FacilityServerRelation extends UuidIdentityEntityWithOperator {
    //设施编码
    @Column(name = "facilitie_code", nullable = false)
    private String facilitieCode;
    //设施名称
    @Column(name = "facilitie_name")
    private String facilitieName;
    //设施服务编码
    @Column(name = "service_code", nullable = false )
    private String serviceCode ;
    //设施服务名称
    @Column(name = "service_name")
    private String serviceName;
    public String getFacilitieCode() {
        return facilitieCode;
    }
    public void setFacilitieCode(String facilitieCode) {
        this.facilitieCode = facilitieCode;
    }
    public String getFacilitieName() {
        return facilitieName;
    }
    public void setFacilitieName(String facilitieName) {
        this.facilitieName = facilitieName;
    }
    public String getServiceCode() {
        return serviceCode;
    }
    public void setServiceCode(String serviceCode) {
        this.serviceCode = serviceCode;
    }
    public String getServiceName() {
        return serviceName;
    }
    public void setServiceName(String serviceName) {
        this.serviceName = serviceName;
    }
}

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

@@ -0,0 +1,22 @@
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.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 城市字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年08月31日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseCityService extends BaseJpaService<BaseCityDO, BaseCityDao> {
}

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

@@ -0,0 +1,22 @@
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.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 区县居委会服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator    1.0  2018年09月04日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseCommitteeService extends BaseJpaService<BaseCommitteeDO, BaseCommitteeDao> {
}

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

@@ -0,0 +1,22 @@
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.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 省字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年08月31日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseProvinceService extends BaseJpaService<BaseProvinceDO, BaseProvinceDao> {
}

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

@@ -0,0 +1,22 @@
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.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 街道字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年08月31日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseStreetService extends BaseJpaService<BaseStreetDO, BaseStreetDao> {
}

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

@@ -0,0 +1,22 @@
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.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 区县字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年08月31日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseTownService extends BaseJpaService<BaseTownDO, BaseTownDao> {
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/facility/FacilityServerRelationService.java

@@ -0,0 +1,32 @@
package com.yihu.jw.healthyhouse.service.facility;
import com.yihu.jw.healthyhouse.dao.facility.FacilityServerRelationDao;
import com.yihu.jw.healthyhouse.model.facility.FacilityServerRelation;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
 * 设施与服务关系 管理器.
 *
 * @author zdm
 * @version 1.0
 * @created 2018.09.20
 */
@Service
@Transactional
public class FacilityServerRelationService extends BaseJpaService<FacilityServerRelation, FacilityServerRelationDao> {
    @Autowired
    private FacilityServerRelationDao facilityServerRelationDao;
    public FacilityServerRelation findById(String id) {
        return facilityServerRelationDao.findById(id);
    }
    public void deleteByFacilitieCode(String facilitieCode) {
        facilityServerRelationDao.deleteByFacilitieCode(facilitieCode);
    }
}