健康小屋-冲突解决

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

@@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.controller.facilities;
import com.yihu.jw.healthyhouse.model.facilities.Facilities;
import com.yihu.jw.healthyhouse.service.facilities.FacilitiesService;
import com.yihu.jw.healthyhouse.model.facility.Facility;
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;
@@ -27,15 +27,15 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
 */
@RestController
@RequestMapping(HealthyHouseMapping.api_healthyHouse_common)
@Api(value = "Facilities", description = "设施管理", tags = {"设施管理"})
@Api(value = "Facility", description = "设施管理", tags = {"设施管理"})
public class FacilitiesController extends EnvelopRestEndpoint {
    @Autowired
    private FacilitiesService facilitiesService;
    private FacilityService facilityService;
    @ApiOperation(value = "获取设施列表", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.PAGE)
    public PageEnvelop<Facilities> getDictionaries(
    public PageEnvelop<Facility> getDictionaries(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器", defaultValue = "")
@@ -46,90 +46,90 @@ public class FacilitiesController extends EnvelopRestEndpoint {
            @RequestParam(value = "size", required = false) Integer size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        List<Facilities> FacilitiesList = facilitiesService.search(fields, filters, sorts, page, size);
        return success(FacilitiesList, FacilitiesList.size(), page, size);
        List<Facility> facilityList = facilityService.search(fields, filters, sorts, page, size);
        return success(facilityList, facilityList.size(), page, size);
    }
    @ApiOperation(value = "创建设施")
    @PostMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.CREATE)
    public ObjEnvelop<Facilities> createDictionary(
            @ApiParam(name = "facilities", value = "设施JSON结构")
            @RequestBody Facilities facilities) throws IOException {
        List<Facilities> facilitiesList = null;
        if (StringUtils.isEmpty(facilities.getCode())) {
    public ObjEnvelop<Facility> createDictionary(
            @ApiParam(name = "facility", value = "设施JSON结构")
            @RequestBody Facility facility) throws IOException {
        List<Facility> facilityList = null;
        if (StringUtils.isEmpty(facility.getCode())) {
            return failed("设施编码不能为空！", ObjEnvelop.class);
        } else {
            facilitiesList = facilitiesService.findByField("code", facilities.getCode());
            if (null != facilitiesList && facilitiesList.size() > 0) {
            facilityList = facilityService.findByField("code", facility.getCode());
            if (null != facilityList && facilityList.size() > 0) {
                return failed("设施编码已存在！", ObjEnvelop.class);
            }
        }
        if (StringUtils.isEmpty(facilities.getName())) {
        if (StringUtils.isEmpty(facility.getName())) {
            return failed("设施名称不能为空！", ObjEnvelop.class);
        } else {
            facilitiesList = facilitiesService.findByField("name", facilities.getName());
            if (null != facilitiesList && facilitiesList.size() > 0) {
            facilityList = facilityService.findByField("name", facility.getName());
            if (null != facilityList && facilityList.size() > 0) {
                return failed("设施名称已存在！", ObjEnvelop.class);
            }
        }
        if (!(facilities.getLongitude() > 0)) {
        if (!(facility.getLongitude() > 0)) {
            return failed("设施经度不能为空！", ObjEnvelop.class);
        }
        if (!(facilities.getLatitude() > 0)) {
        if (!(facility.getLatitude() > 0)) {
            return failed("设施纬度不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilities.getCategory().toString())) {
        if (StringUtils.isEmpty(facility.getCategory().toString())) {
            return failed("设施类别不正确，请参考系统字典：设施类别！", ObjEnvelop.class);
        }
        Facilities Facilities = facilitiesService.save(facilities);
        return success(Facilities);
        Facility Facility = facilityService.save(facility);
        return success(Facility);
    }
    @ApiOperation(value = "获取设施")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.GET_FACILITIES_BY_ID)
    public ObjEnvelop<Facilities> getDictionary(
    public ObjEnvelop<Facility> getDictionary(
            @ApiParam(name = "id", value = "设施ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        Facilities facilities = facilitiesService.findById(id);
        if (facilities == null) {
        Facility facility = facilityService.findById(id);
        if (facility == null) {
            return failed("设施不存在！", ObjEnvelop.class);
        }
        return success(facilities);
        return success(facility);
    }
    @ApiOperation(value = "获取设施")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.GET_FACILITIES_BY_FIELD)
    public ListEnvelop<Facilities> getDictionaryByPhoneticCode(
    public ListEnvelop<Facility> getDictionaryByPhoneticCode(
            @ApiParam(name = "field", value = "查找字段名", required = true)
            @RequestParam(value = "field") String field,
            @ApiParam(name = "value", value = "检索值")
            @RequestParam(value = "value") String value) throws Exception {
        List<Facilities> facilitiesList = facilitiesService.findByField(field, value);
        return success(facilitiesList);
        List<Facility> facilityList = facilityService.findByField(field, value);
        return success(facilityList);
    }
    @ApiOperation(value = "更新设施")
    @PutMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    public ObjEnvelop<Facilities> updateDictionary(
            @ApiParam(name = "facilities", value = "设施JSON结构")
            @RequestBody Facilities facilities) throws Exception {
        if (StringUtils.isEmpty(facilities.getCode())) {
    public ObjEnvelop<Facility> updateDictionary(
            @ApiParam(name = "facility", value = "设施JSON结构")
            @RequestBody Facility facility) throws Exception {
        if (StringUtils.isEmpty(facility.getCode())) {
            return failed("设施编码不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilities.getName())) {
        if (StringUtils.isEmpty(facility.getName())) {
            return failed("设施名称不能为空！", ObjEnvelop.class);
        }
        if (!(facilities.getLongitude() > 0)) {
        if (!(facility.getLongitude() > 0)) {
            return failed("设施经度不能为空！", ObjEnvelop.class);
        }
        if (!(facilities.getLatitude() > 0)) {
        if (!(facility.getLatitude() > 0)) {
            return failed("设施纬度不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilities.getCategory().toString())) {
        if (StringUtils.isEmpty(facility.getCategory().toString())) {
            return failed("设施类别不正确，请参考系统字典：设施类别！", ObjEnvelop.class);
        }
        facilities = facilitiesService.save(facilities);
        return success(facilities);
        facility = facilityService.save(facility);
        return success(facility);
    }
    @ApiOperation(value = "删除设施")
@@ -137,9 +137,9 @@ public class FacilitiesController extends EnvelopRestEndpoint {
    public Envelop deleteDictionary(
            @ApiParam(name = "facilitiesId", value = "设施ID")
            @RequestParam(value = "facilitiesId") String facilitiesId) throws Exception {
        Facilities facilities = new Facilities();
        facilities.setId(facilitiesId);
        facilitiesService.delete(facilities);
        Facility facility = new Facility();
        facility.setId(facilitiesId);
        facilityService.delete(facility);
        return success("success");
    }

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

@@ -1,7 +1,7 @@
package com.yihu.jw.healthyhouse.controller.facilities;
import com.yihu.jw.healthyhouse.model.facilities.FacilitiesServer;
import com.yihu.jw.healthyhouse.service.facilities.FacilitiesServerService;
import com.yihu.jw.healthyhouse.model.facility.FacilityServer;
import com.yihu.jw.healthyhouse.service.facility.FacilityServerService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -26,15 +26,15 @@ import java.util.List;
 */
@RestController
@RequestMapping(HealthyHouseMapping.api_healthyHouse_common)
@Api(value = "FacilitiesServer", description = "设施服务管理", tags = {"设施服务管理"})
@Api(value = "FacilityServer", description = "设施服务管理", tags = {"设施服务管理"})
public class FacilitiesServerController extends EnvelopRestEndpoint {
    @Autowired
    private FacilitiesServerService facilitiesServerService;
    private FacilityServerService facilityServerService;
    @ApiOperation(value = "获取设施服务列表", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.PAGE)
    public PageEnvelop<FacilitiesServer> getDictionaries(
    public PageEnvelop<FacilityServer> getDictionaries(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器", defaultValue = "")
@@ -45,80 +45,80 @@ public class FacilitiesServerController extends EnvelopRestEndpoint {
            @RequestParam(value = "size", required = false) Integer size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        List<FacilitiesServer> facilitiesServerList = facilitiesServerService.search(fields, filters, sorts, page, size);
        return success(facilitiesServerList, facilitiesServerList.size(), page, size);
        List<FacilityServer> facilityServerList = facilityServerService.search(fields, filters, sorts, page, size);
        return success(facilityServerList, facilityServerList.size(), page, size);
    }
    @ApiOperation(value = "创建设施服务")
    @PostMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.CREATE)
    public ObjEnvelop<FacilitiesServer> createDictionary(
            @ApiParam(name = "FacilitiesServer", value = "设施服务JSON结构")
            @RequestBody FacilitiesServer facilitiesServer) throws IOException {
        List<FacilitiesServer> facilitiesServerList = null;
        if (StringUtils.isEmpty(facilitiesServer.getCode())) {
    public ObjEnvelop<FacilityServer> createDictionary(
            @ApiParam(name = "FacilityServer", value = "设施服务JSON结构")
            @RequestBody FacilityServer facilityServer) throws IOException {
        List<FacilityServer> facilityServerList = null;
        if (StringUtils.isEmpty(facilityServer.getCode())) {
            return failed("设施服务编码不能为空！", ObjEnvelop.class);
        } else {
            facilitiesServerList = facilitiesServerService.findByField("code", facilitiesServer.getCode());
            if (null != facilitiesServerList && facilitiesServerList.size() > 0) {
            facilityServerList = facilityServerService.findByField("code", facilityServer.getCode());
            if (null != facilityServerList && facilityServerList.size() > 0) {
                return failed("设施服务编码已存在！", ObjEnvelop.class);
            }
        }
        if (StringUtils.isEmpty(facilitiesServer.getName())) {
        if (StringUtils.isEmpty(facilityServer.getName())) {
            return failed("设施服务名称不能为空！", ObjEnvelop.class);
        } else {
            facilitiesServerList = facilitiesServerService.findByField("name", facilitiesServer.getName());
            if (null != facilitiesServerList && facilitiesServerList.size() > 0) {
            facilityServerList = facilityServerService.findByField("name", facilityServer.getName());
            if (null != facilityServerList && facilityServerList.size() > 0) {
                return failed("设施服务名称已存在！", ObjEnvelop.class);
            }
        }
        if (StringUtils.isEmpty(facilitiesServer.getType())) {
        if (StringUtils.isEmpty(facilityServer.getType())) {
            return failed("设施服务类别不正确，请参考系统字典：设施服务类别！", ObjEnvelop.class);
        }
        facilitiesServer = facilitiesServerService.save(facilitiesServer);
        return success(facilitiesServer);
        facilityServer = facilityServerService.save(facilityServer);
        return success(facilityServer);
    }
    @ApiOperation(value = "获取设施服务")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.GET_FACILITIESERVERS_BY_ID)
    public ObjEnvelop<FacilitiesServer> getDictionary(
    public ObjEnvelop<FacilityServer> getDictionary(
            @ApiParam(name = "id", value = "设施服务ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        FacilitiesServer facilitiesServer = facilitiesServerService.findById(id);
        if (facilitiesServer == null) {
        FacilityServer facilityServer = facilityServerService.findById(id);
        if (facilityServer == null) {
            return failed("设施服务不存在！", ObjEnvelop.class);
        }
        return success(facilitiesServer);
        return success(facilityServer);
    }
    @ApiOperation(value = "获取设施服务")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.GET_FACILITIESERVERS_BY_FIELD)
    public ListEnvelop<FacilitiesServer> getDictionaryByPhoneticCode(
    public ListEnvelop<FacilityServer> getDictionaryByPhoneticCode(
            @ApiParam(name = "field", value = "查找字段名", required = true)
            @RequestParam(value = "field") String field,
            @ApiParam(name = "value", value = "检索值")
            @RequestParam(value = "value") String value) throws Exception {
        List<FacilitiesServer> facilitiesServerList = facilitiesServerService.findByField(field, value);
        return success(facilitiesServerList);
        List<FacilityServer> facilityServerList = facilityServerService.findByField(field, value);
        return success(facilityServerList);
    }
    @ApiOperation(value = "更新设施服务")
    @PutMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    public ObjEnvelop<FacilitiesServer> updateDictionary(
            @ApiParam(name = "FacilitiesServer", value = "设施服务JSON结构")
            @RequestBody FacilitiesServer facilitiesServer) throws Exception {
        if (StringUtils.isEmpty(facilitiesServer.getCode())) {
    public ObjEnvelop<FacilityServer> updateDictionary(
            @ApiParam(name = "FacilityServer", value = "设施服务JSON结构")
            @RequestBody FacilityServer facilityServer) throws Exception {
        if (StringUtils.isEmpty(facilityServer.getCode())) {
            return failed("设施服务编码不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilitiesServer.getName())) {
        if (StringUtils.isEmpty(facilityServer.getName())) {
            return failed("设施服务名称不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilitiesServer.getType())) {
        if (StringUtils.isEmpty(facilityServer.getType())) {
            return failed("设施服务类别不正确，请参考系统字典：设施服务类别！", ObjEnvelop.class);
        }
        facilitiesServer = facilitiesServerService.save(facilitiesServer);
        return success(facilitiesServer);
        facilityServer = facilityServerService.save(facilityServer);
        return success(facilityServer);
    }
    @ApiOperation(value = "删除设施服务")
@@ -126,9 +126,9 @@ public class FacilitiesServerController extends EnvelopRestEndpoint {
    public Envelop deleteDictionary(
            @ApiParam(name = "facilitiesServerId", value = "设施服务ID")
            @RequestParam(value = "facilitiesServerId") String facilitiesServerId) throws Exception {
        FacilitiesServer facilitiesServer = new FacilitiesServer();
        facilitiesServer.setId(facilitiesServerId);
        facilitiesServerService.delete(facilitiesServer);
        FacilityServer facilityServer = new FacilityServer();
        facilityServer.setId(facilitiesServerId);
        facilityServerService.delete(facilityServer);
        return success("success");
    }

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

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

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

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

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

@@ -0,0 +1,16 @@
package com.yihu.jw.healthyhouse.dao.facility;
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 FacilityDao extends JpaRepository<Facility, Long> {
    Facility findById(String id);
}

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

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

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/facilities/Facilities.java

@@ -1,250 +0,0 @@
package com.yihu.jw.healthyhouse.model.facilities;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.healthyhouse.util.PinyinUtil;
import javax.persistence.*;
/**
 * 设施
 * @author zdm
 * @version 1.0
 * @created 2018.09.19
 */
@Entity
@Table(name = "facilities")
@Access(value = AccessType.PROPERTY)
public class Facilities extends UuidIdentityEntityWithOperator {
    //设施编码
    @Column(name = "code", nullable = false)
    private String code;
    //设施名字
    @Column(name = "name", nullable = false)
    private String name;
    //设施类别-系统字典-设施类别
    @Column(name = "category", nullable = false)
    private Integer category ;
    //设施联系人隶属机构编码
    @Column(name = "org_code")
    private String orgCode;
    //设施联系人隶属机构名称
    @Column(name = "org_name")
    private String orgName;
    // （管理员）联系人id
    @Column(name = "user_id")
    private String userId;
    //联系人电话
    @Column(name = "user_telephone")
    private String userTelephone ;
    //设施所在省份id
    @Column(name = "province_id")
    private String provinceId;
    //城市编码
    @Column(name = "city_code")
    private String cityCode;
    //城市名称
    @Column(name = "city_name")
    private String cityName;
    //县编码
    @Column(name = "county_code")
    private String countyCode ;
    //县名称
    @Column(name = "county_name")
    private String countyName;
    //街道
    @Column(name = "street")
    private String street;
    //服务时间：周一至周天，用逗号隔开
    @Column(name = "service_date")
    private String serviceDate ;
    //服务开始时间：默认00:00:00
    @Column(name = "service_start_time")
    private String serviceStartTime;
    // 服务结束时间：默认23:59:59
    @Column(name = "service_end_time")
    private String serviceEndTime;
    // 运营状态：0开放，1关闭，2损坏，3维修
    @Column(name = "state")
    private String state;
    //  设施经度
    @Column(name = "longitude")
    private double longitude;
    // 设施维度
    @Column(name = "latitude")
    private double latitude;
    // 备注
    @Column(name = "remarks")
    private String remarks;
    //小屋形象照
    @Column(name = "img_path")
    private String imgPath;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public Integer getCategory() {
        return category;
    }
    public void setCategory(Integer category) {
        this.category = category;
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getUserTelephone() {
        return userTelephone;
    }
    public void setUserTelephone(String userTelephone) {
        this.userTelephone = userTelephone;
    }
    public String getProvinceId() {
        return provinceId;
    }
    public void setProvinceId(String provinceId) {
        this.provinceId = provinceId;
    }
    public String getCityCode() {
        return cityCode;
    }
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getCountyCode() {
        return countyCode;
    }
    public void setCountyCode(String countyCode) {
        this.countyCode = countyCode;
    }
    public String getCountyName() {
        return countyName;
    }
    public void setCountyName(String countyName) {
        this.countyName = countyName;
    }
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
    public String getServiceDate() {
        return serviceDate;
    }
    public void setServiceDate(String serviceDate) {
        this.serviceDate = serviceDate;
    }
    public String getServiceStartTime() {
        return serviceStartTime;
    }
    public void setServiceStartTime(String serviceStartTime) {
        this.serviceStartTime = serviceStartTime;
    }
    public String getServiceEndTime() {
        return serviceEndTime;
    }
    public void setServiceEndTime(String serviceEndTime) {
        this.serviceEndTime = serviceEndTime;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    public double getLongitude() {
        return longitude;
    }
    public void setLongitude(double longitude) {
        this.longitude = longitude;
    }
    public double getLatitude() {
        return latitude;
    }
    public void setLatitude(double latitude) {
        this.latitude = latitude;
    }
    public String getRemarks() {
        return remarks;
    }
    public void setRemarks(String remarks) {
        this.remarks = remarks;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getImgPath() {
        return imgPath;
    }
    public void setImgPath(String imgPath) {
        this.imgPath = imgPath;
    }
}

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

@@ -1,59 +1,83 @@
package com.yihu.jw.healthyhouse.model.facility;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.*;
/**
 *  设施服务
 * @author HZY
 * @created 2018/9/20 8:48
 * 设施
 * @author zdm
 * @version 1.0
 * @created 2018.09.19
 */
@Entity
@Table(name = "facility")
public class Facility extends UuidIdentityEntity{
@Table(name = "facilities")
@Access(value = AccessType.PROPERTY)
public class Facility extends UuidIdentityEntityWithOperator {
    //设施编码
    @Column(name = "code", nullable = false)
    private String code;
    @Column(name = "code", nullable = false)
    //设施名字
    @Column(name = "name", nullable = false)
    private String name;
    //设施类别-系统字典-设施类别
    @Column(name = "category", nullable = false)
    private String category;
    @Column(name = "org_code", nullable = false)
    private Integer category ;
    //设施联系人隶属机构编码
    @Column(name = "org_code")
    private String orgCode;
    //设施联系人隶属机构名称
    @Column(name = "org_name")
    private String orgName;
    @Column(name = "user_id", nullable = false)
    // （管理员）联系人id
    @Column(name = "user_id")
    private String userId;
    @Column(name = "user_telephone", nullable = false)
    private String userTelephone;
    @Column(name = "province_id", nullable = false)
    //联系人电话
    @Column(name = "user_telephone")
    private String userTelephone ;
    //设施所在省份id
    @Column(name = "province_id")
    private String provinceId;
    @Column(name = "city_code", nullable = false)
    //城市编码
    @Column(name = "city_code")
    private String cityCode;
    @Column(name = "county_code", nullable = false)
    private String countyCode;
    @Column(name = "street", nullable = false)
    //城市名称
    @Column(name = "city_name")
    private String cityName;
    //县编码
    @Column(name = "county_code")
    private String countyCode ;
    //县名称
    @Column(name = "county_name")
    private String countyName;
    //街道
    @Column(name = "street")
    private String street;
    @Column(name = "service_day", nullable = false)
    private String serviceDay;
    @Column(name = "service_start_time", nullable = false)
    //服务时间：周一至周天，用逗号隔开
    @Column(name = "service_date")
    private String serviceDate ;
    //服务开始时间：默认00:00:00
    @Column(name = "service_start_time")
    private String serviceStartTime;
    @Column(name = "service_end_time", nullable = false)
    // 服务结束时间：默认23:59:59
    @Column(name = "service_end_time")
    private String serviceEndTime;
    @Column(name = "status", nullable = false)
    private String status;
    @Column(name = "longitude", nullable = false)
    private String longitude;
    @Column(name = "latitude", nullable = false)
    private String latitude;
    @Column(name = "img_path")
    private String imgPath;
    // 运营状态：0开放，1关闭，2损坏，3维修
    @Column(name = "state")
    private String state;
    //  设施经度
    @Column(name = "longitude")
    private double longitude;
    // 设施维度
    @Column(name = "latitude")
    private double latitude;
    // 备注
    @Column(name = "remarks")
    private String remarks;
    //小屋形象照
    @Column(name = "img_path")
    private String imgPath;
    public String getCode() {
        return code;
@@ -63,19 +87,11 @@ public class Facility extends UuidIdentityEntity{
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getCategory() {
    public Integer getCategory() {
        return category;
    }
    public void setCategory(String category) {
    public void setCategory(Integer category) {
        this.category = category;
    }
@@ -127,6 +143,14 @@ public class Facility extends UuidIdentityEntity{
        this.cityCode = cityCode;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getCountyCode() {
        return countyCode;
    }
@@ -135,6 +159,14 @@ public class Facility extends UuidIdentityEntity{
        this.countyCode = countyCode;
    }
    public String getCountyName() {
        return countyName;
    }
    public void setCountyName(String countyName) {
        this.countyName = countyName;
    }
    public String getStreet() {
        return street;
    }
@@ -143,12 +175,12 @@ public class Facility extends UuidIdentityEntity{
        this.street = street;
    }
    public String getServiceDay() {
        return serviceDay;
    public String getServiceDate() {
        return serviceDate;
    }
    public void setServiceDay(String serviceDay) {
        this.serviceDay = serviceDay;
    public void setServiceDate(String serviceDate) {
        this.serviceDate = serviceDate;
    }
    public String getServiceStartTime() {
@@ -167,38 +199,30 @@ public class Facility extends UuidIdentityEntity{
        this.serviceEndTime = serviceEndTime;
    }
    public String getStatus() {
        return status;
    public String getState() {
        return state;
    }
    public void setStatus(String status) {
        this.status = status;
    public void setState(String state) {
        this.state = state;
    }
    public String getLongitude() {
    public double getLongitude() {
        return longitude;
    }
    public void setLongitude(String longitude) {
    public void setLongitude(double longitude) {
        this.longitude = longitude;
    }
    public String getLatitude() {
    public double getLatitude() {
        return latitude;
    }
    public void setLatitude(String latitude) {
    public void setLatitude(double latitude) {
        this.latitude = latitude;
    }
    public String getImgPath() {
        return imgPath;
    }
    public void setImgPath(String imgPath) {
        this.imgPath = imgPath;
    }
    public String getRemarks() {
        return remarks;
    }
@@ -206,4 +230,20 @@ public class Facility extends UuidIdentityEntity{
    public void setRemarks(String remarks) {
        this.remarks = remarks;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getImgPath() {
        return imgPath;
    }
    public void setImgPath(String imgPath) {
        this.imgPath = imgPath;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/facilities/FacilitiesServer.java

@@ -1,4 +1,4 @@
package com.yihu.jw.healthyhouse.model.facilities;
package com.yihu.jw.healthyhouse.model.facility;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
@@ -14,7 +14,7 @@ import javax.persistence.*;
@Entity
@Table(name = "facilities_services")
@Access(value = AccessType.PROPERTY)
public class FacilitiesServer extends UuidIdentityEntityWithOperator {
public class FacilityServer extends UuidIdentityEntityWithOperator {
    //设施服务编码
    @Column(name = "code", nullable = false)
    private String code;

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

@@ -1,39 +0,0 @@
package com.yihu.jw.healthyhouse.model.facility;
import com.yihu.jw.entity.UuidIdentityEntity;
/**
 *  设施服务
 * @author HZY
 * @created 2018/9/20 8:48
 */
public class FacilityServices extends UuidIdentityEntity{
    private String code;
    private String name;
    private String type;//所属设施类型：系统字典设施类型
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/facilities/FacilitiesServerService.java

@@ -1,28 +0,0 @@
package com.yihu.jw.healthyhouse.service.facilities;
import com.yihu.jw.healthyhouse.dao.facilities.FacilitiesServerDao;
import com.yihu.jw.healthyhouse.model.facilities.FacilitiesServer;
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.19
 */
@Service
@Transactional
public class FacilitiesServerService extends BaseJpaService<FacilitiesServer, FacilitiesServerDao> {
    @Autowired
    private FacilitiesServerDao facilitiesServerDao;
    public FacilitiesServer findById(String id) {
        return  facilitiesServerDao.findById(id);
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/facilities/FacilitiesService.java

@@ -1,28 +0,0 @@
package com.yihu.jw.healthyhouse.service.facilities;
import com.yihu.jw.healthyhouse.dao.facilities.FacilitiesDao;
import com.yihu.jw.healthyhouse.model.facilities.Facilities;
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.19
 */
@Service
@Transactional
public class FacilitiesService extends BaseJpaService<Facilities, FacilitiesDao> {
    @Autowired
    private FacilitiesDao facilitiesDao;
    public Facilities findById(String id) {
        return  facilitiesDao.findById(id);
    }
}

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

@@ -0,0 +1,28 @@
package com.yihu.jw.healthyhouse.service.facility;
import com.yihu.jw.healthyhouse.dao.facility.FacilityServerDao;
import com.yihu.jw.healthyhouse.model.facility.FacilityServer;
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.19
 */
@Service
@Transactional
public class FacilityServerService extends BaseJpaService<FacilityServer, FacilityServerDao> {
    @Autowired
    private FacilityServerDao facilityServerDao;
    public FacilityServer findById(String id) {
        return  facilityServerDao.findById(id);
    }
}

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

@@ -0,0 +1,28 @@
package com.yihu.jw.healthyhouse.service.facility;
import com.yihu.jw.healthyhouse.dao.facility.FacilityDao;
import com.yihu.jw.healthyhouse.model.facility.Facility;
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.19
 */
@Service
@Transactional
public class FacilityService extends BaseJpaService<Facility, FacilityDao> {
    @Autowired
    private FacilityDao facilityDao;
    public Facility findById(String id) {
        return  facilityDao.findById(id);
    }
}