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

@@ -37,6 +37,28 @@ public class HealthyHouseMapping {
            public static final String DELETEBYDICTIDANDCODE = "/deleteByDictIdAndCode";
            public static final String ISEXISTSDICTENTRYBYDICTIDANDCODE = "/isExistsDictEntryByDictIdAndCode";
        }
        //设施
        public static class Facilities {
            public static final String CREATE = "/create/facilities";
            public static final String DELETE = "/delete/facilities";
            public static final String UPDATE = "/update/facilities";
            public static final String PAGE = "/page/facilities";
            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 class FacilitiesServer {
            public static final String CREATE = "/create/facilitieServers";
            public static final String DELETE = "/delete/facilitieServers";
            public static final String UPDATE = "/update/facilitieServers";
            public static final String PAGE = "/page/facilitieServers";
            public static final String LIST = "/list/facilitieServers";
            public static final String GET_FACILITIESERVERS_BY_ID = "/getFacilitieServersById";
            public static final String GET_FACILITIESERVERS_BY_FIELD = "/getFacilitieServersByField";
        }
    }

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

@@ -1,7 +1,6 @@
package com.yihu.jw.healthyhouse.controller.dict;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.healthyhouse.model.dict.DictEntryKey;
import com.yihu.jw.healthyhouse.model.dict.SystemDict;
import com.yihu.jw.healthyhouse.model.dict.SystemDictEntry;
@@ -12,19 +11,11 @@ import com.yihu.jw.rm.health.house.HealthyHouseMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * @author zdm
@@ -61,7 +52,7 @@ public class SystemDictEntryController extends EnvelopRestEndpoint {
    @ApiOperation(value = "创建字典项")
    @PostMapping(value = HealthyHouseMapping.HealthyHouse.SystemDictEntry.CREATE)
    public ObjEnvelop<SystemDictEntry> createDictEntry (
            @ApiParam(name = "entryJson", value = "字典JSON结构")
            @ApiParam(name = "entryJson", value = "字典项JSON结构")
            @RequestParam(value = "entryJson") String entryJson) throws IOException{
        SystemDictEntry entry = toEntity(entryJson, SystemDictEntry.class);
        SystemDict systemDict = dictService.retrieve(entry.getDictId());
@@ -70,7 +61,8 @@ public class SystemDictEntryController extends EnvelopRestEndpoint {
        }
        int nextSort = systemDictEntryService.getNextSN(entry.getDictId());
        entry.setSort(nextSort);
        systemDictEntryService.createDictEntry(entry);
        entry.setCreateTime(new Date());
        systemDictEntryService.save(entry);
        return success(entry);
    }
@@ -96,26 +88,17 @@ public class SystemDictEntryController extends EnvelopRestEndpoint {
        return success("success");
    }
    @ApiOperation(value = "删除字典")
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.SystemDictEntry.DELETE)
    public Envelop deleteSystemDictEntry(
            @ApiParam(name = "entryId", value = "字典项ID")
            @RequestParam(value = "entryId") String entryId) throws Exception {
        systemDictEntryService.delete(entryId);
        return success("success");
    }
    @ApiOperation(value = "修改字典项")
    @PutMapping(value =HealthyHouseMapping.HealthyHouse.SystemDictEntry.UPDATE)
    public ObjEnvelop<SystemDictEntry> updateDictEntry(
            @ApiParam(name = "entryJson", value = "字典JSON结构")
            @ApiParam(name = "entryJson", value = "字典项JSON结构")
            @RequestParam(value = "entryJson") String entryJson) throws IOException {
        SystemDictEntry entry = toEntity(entryJson, SystemDictEntry.class);
        SystemDictEntry temp = systemDictEntryService.retrieve(new DictEntryKey(entry.getCode(), entry.getDictId()));
        if (null == temp) {
            failed("字典项不存在!",ObjEnvelop.class);
        }
        entry.setUpdateTime(new Date());
        systemDictEntryService.saveDictEntry(entry);
        return success(entry);
    }
@@ -123,7 +106,7 @@ public class SystemDictEntryController extends EnvelopRestEndpoint {
    @GetMapping(value =HealthyHouseMapping.HealthyHouse.SystemDictEntry.ISEXISTSDICTENTRYBYDICTIDANDCODE)
    @ApiOperation(value = "根据dictId和code判断提交的字典项是否已经存在")
    public boolean isDictEntryCodeExists(
            @ApiParam(name = "dictId", value = "字典", defaultValue = "")
            @ApiParam(name = "dictId", value = "字典id", defaultValue = "")
            @RequestParam(value = "dictId",required = true) String dictId,
            @ApiParam(name = "code", value = "字典项编码", defaultValue = "")
            @RequestParam(value = "code") String code){
@@ -131,14 +114,14 @@ public class SystemDictEntryController extends EnvelopRestEndpoint {
    }
    @GetMapping(value =HealthyHouseMapping.HealthyHouse.SystemDictEntry.GETDICTENTRYBYDICTIDANDNAME)
    @ApiOperation(value = "根据dictId和code判断提交的字典项是否已经存在")
    @ApiOperation(value = "根据dictId和name判断提交的字典项是否已经存在")
    public boolean isDictEntryNameExists(
            @ApiParam(name = "dictId", value = "字典", defaultValue = "")
            @ApiParam(name = "dictId", value = "字典id", defaultValue = "")
            @RequestParam(value = "dictId",required = true) String dictId,
            @ApiParam(name = "name", value = "字典项名称")
            @RequestParam(value = "name") String name){
        Page<SystemDictEntry> systemDictEntryPage= systemDictEntryService.findByDictIdAndValueLike(dictId, name,0,100);
        if(null!=systemDictEntryPage&&systemDictEntryPage.getSize()>0){
        List<SystemDictEntry> systemDictEntryPage= systemDictEntryService.findByDictIdAndValueLike(dictId, name);
        if(null!=systemDictEntryPage&&systemDictEntryPage.size()>0){
            return  true;
        }
        return false;

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

@@ -0,0 +1,147 @@
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.restmodel.web.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.health.house.HealthyHouseMapping;
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.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
/**
 * 设施管理
 * Created by zdm on 2018/9/19.
 */
@RestController
@RequestMapping(HealthyHouseMapping.api_healthyHouse_common)
@Api(value = "Facilities", description = "设施管理", tags = {"设施管理"})
public class FacilitiesController extends EnvelopRestEndpoint {
    @Autowired
    private FacilitiesService facilitiesService;
    @ApiOperation(value = "获取设施列表", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.PAGE)
    public PageEnvelop<Facilities> getDictionaries(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序", defaultValue = "")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @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);
    }
    @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())) {
            return failed("设施编码不能为空！", ObjEnvelop.class);
        } else {
            facilitiesList = facilitiesService.findByField("code", facilities.getCode());
            if (null != facilitiesList && facilitiesList.size() > 0) {
                return failed("设施编码已存在！", ObjEnvelop.class);
            }
        }
        if (StringUtils.isEmpty(facilities.getName())) {
            return failed("设施名称不能为空！", ObjEnvelop.class);
        } else {
            facilitiesList = facilitiesService.findByField("name", facilities.getName());
            if (null != facilitiesList && facilitiesList.size() > 0) {
                return failed("设施名称已存在！", ObjEnvelop.class);
            }
        }
        if (!(facilities.getLongitude() > 0)) {
            return failed("设施经度不能为空！", ObjEnvelop.class);
        }
        if (!(facilities.getLatitude() > 0)) {
            return failed("设施纬度不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilities.getCategory().toString())) {
            return failed("设施类别不正确，请参考系统字典：设施类别！", ObjEnvelop.class);
        }
        Facilities Facilities = facilitiesService.save(facilities);
        return success(Facilities);
    }
    @ApiOperation(value = "获取设施")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.GET_FACILITIES_BY_ID)
    public ObjEnvelop<Facilities> getDictionary(
            @ApiParam(name = "id", value = "设施ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        Facilities facilities = facilitiesService.findById(id);
        if (facilities == null) {
            return failed("设施不存在！", ObjEnvelop.class);
        }
        return success(facilities);
    }
    @ApiOperation(value = "获取设施")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.GET_FACILITIES_BY_FIELD)
    public ListEnvelop<Facilities> 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);
    }
    @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())) {
            return failed("设施编码不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilities.getName())) {
            return failed("设施名称不能为空！", ObjEnvelop.class);
        }
        if (!(facilities.getLongitude() > 0)) {
            return failed("设施经度不能为空！", ObjEnvelop.class);
        }
        if (!(facilities.getLatitude() > 0)) {
            return failed("设施纬度不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilities.getCategory().toString())) {
            return failed("设施类别不正确，请参考系统字典：设施类别！", ObjEnvelop.class);
        }
        facilities = facilitiesService.save(facilities);
        return success(facilities);
    }
    @ApiOperation(value = "删除设施")
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.DELETE)
    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);
        return success("success");
    }
}

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

@@ -0,0 +1,136 @@
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.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.health.house.HealthyHouseMapping;
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.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
/**
 * 设施服务管理
 * Created by zdm on 2018/9/19.
 */
@RestController
@RequestMapping(HealthyHouseMapping.api_healthyHouse_common)
@Api(value = "FacilitiesServer", description = "设施服务管理", tags = {"设施服务管理"})
public class FacilitiesServerController extends EnvelopRestEndpoint {
    @Autowired
    private FacilitiesServerService facilitiesServerService;
    @ApiOperation(value = "获取设施服务列表", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.PAGE)
    public PageEnvelop<FacilitiesServer> getDictionaries(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序", defaultValue = "")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @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);
    }
    @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())) {
            return failed("设施服务编码不能为空！", ObjEnvelop.class);
        } else {
            facilitiesServerList = facilitiesServerService.findByField("code", facilitiesServer.getCode());
            if (null != facilitiesServerList && facilitiesServerList.size() > 0) {
                return failed("设施服务编码已存在！", ObjEnvelop.class);
            }
        }
        if (StringUtils.isEmpty(facilitiesServer.getName())) {
            return failed("设施服务名称不能为空！", ObjEnvelop.class);
        } else {
            facilitiesServerList = facilitiesServerService.findByField("name", facilitiesServer.getName());
            if (null != facilitiesServerList && facilitiesServerList.size() > 0) {
                return failed("设施服务名称已存在！", ObjEnvelop.class);
            }
        }
        if (StringUtils.isEmpty(facilitiesServer.getType())) {
            return failed("设施服务类别不正确，请参考系统字典：设施服务类别！", ObjEnvelop.class);
        }
        facilitiesServer = facilitiesServerService.save(facilitiesServer);
        return success(facilitiesServer);
    }
    @ApiOperation(value = "获取设施服务")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.GET_FACILITIESERVERS_BY_ID)
    public ObjEnvelop<FacilitiesServer> getDictionary(
            @ApiParam(name = "id", value = "设施服务ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        FacilitiesServer facilitiesServer = facilitiesServerService.findById(id);
        if (facilitiesServer == null) {
            return failed("设施服务不存在！", ObjEnvelop.class);
        }
        return success(facilitiesServer);
    }
    @ApiOperation(value = "获取设施服务")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.GET_FACILITIESERVERS_BY_FIELD)
    public ListEnvelop<FacilitiesServer> 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);
    }
    @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())) {
            return failed("设施服务编码不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilitiesServer.getName())) {
            return failed("设施服务名称不能为空！", ObjEnvelop.class);
        }
        if (StringUtils.isEmpty(facilitiesServer.getType())) {
            return failed("设施服务类别不正确，请参考系统字典：设施服务类别！", ObjEnvelop.class);
        }
        facilitiesServer = facilitiesServerService.save(facilitiesServer);
        return success(facilitiesServer);
    }
    @ApiOperation(value = "删除设施服务")
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.DELETE)
    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);
        return success("success");
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/dict/SystemDictDao.java

@@ -15,11 +15,6 @@ public interface SystemDictDao extends JpaRepository<SystemDict, Long> {
    SystemDict findByName(String name);
    Page<SystemDict> findByNameOrPhoneticCodeOrderByNameAsc(String name, String phoneticCode, Pageable pageable);
    @Query("select max(dict.id) from SystemDict dict where 1=1")
    long getNextId();
    SystemDict findByPhoneticCode(String phoneticCode);
    SystemDict findById(String id);
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/dict/SystemDictEntryDao.java

@@ -21,11 +21,8 @@ import java.util.List;
 */
public interface SystemDictEntryDao extends JpaRepository<SystemDictEntry, DictEntryKey> {
    List<SystemDictEntry> findByDictId(String dictId);
    Page<SystemDictEntry> findByDictId(String dictId, Pageable pageable);
    Page<SystemDictEntry> findByDictIdAndValueLike(String dictId, String value, Pageable pageable);
    @Query("select entry from SystemDictEntry entry where entry.dictId = :dictId and entry.value =:value")
    List<SystemDictEntry> findByDictIdAndValueLike(@Param("dictId")String dictId, @Param("value") String value);
    @Modifying
    void deleteByDictId(String dictId);
@@ -39,19 +36,5 @@ public interface SystemDictEntryDao extends JpaRepository<SystemDictEntry, DictE
    @Query("select max(entry.sort) from SystemDictEntry entry where entry.dictId = :dictId")
    Integer getNextEntrySN(@Param("dictId") String dictId);
    /**
     * 批量获取字典项列表.
     *
     * @param dictId
     * @param codes
     * @return
     */
    @Query("select entry from SystemDictEntry entry where entry.dictId = :dictId and entry.code in (:codes) order by entry.sort asc")
    List<SystemDictEntry> findByDictIdAndCodes(@Param("dictId") String dictId, @Param("codes") String[] codes);
    @Query("select entry from SystemDictEntry entry where entry.dictId = :dictId and entry.value = :value")
    List<SystemDictEntry> findByDictIdAndValue(@Param("dictId") String dictId, @Param("value") String value);
    List<SystemDictEntry> findByDictIdAndCode(@Param("dictId") String dictId, @Param("code") String code);
}

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

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

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

@@ -0,0 +1,16 @@
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/model/dict/SystemDictEntry.java

@@ -2,7 +2,12 @@ package com.yihu.jw.healthyhouse.model.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.healthyhouse.util.PinyinUtil;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import javax.persistence.*;
import java.io.Serializable;
@@ -20,9 +25,8 @@ import java.util.Date;
@Access(value = AccessType.PROPERTY)
@Embeddable
@IdClass(DictEntryKey.class)
public class SystemDictEntry  implements Serializable {
public class SystemDictEntry implements Serializable {
    private static final long serialVersionUID = 1L;
    String dictId;
    String code;
    String value;
@@ -30,14 +34,18 @@ public class SystemDictEntry  implements Serializable {
    String phoneticCode;
    String catalog;
    String pcode;//上级id
    /** 创建日期 */
    private Date createDate;
    /** 创建者 */
    private String creator;
    /** 修改日期 */
    private Date modifyDate;
    /** 修改者 */
    private String modifier;
    //创建时间
    protected Date createTime;
    //创建者
    protected String createUser;
    //创建者
    protected String createUserName;
    //更新时间
    protected Date updateTime;
    //更新者
    protected String updateUser;
    //更新者
    protected String updateUserName;
    public SystemDictEntry(){
    }
@@ -94,50 +102,74 @@ public class SystemDictEntry  implements Serializable {
        this.catalog = catalog;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "create_date", nullable = false, updatable = false)
    public Date getCreateDate() {
        return createDate;
    @Column(name = "pcode")
    public String getPcode() {
        return pcode;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    public void setPcode(String pcode) {
        this.pcode = pcode;
    }
    @Column(name = "creator")
    public String getCreator() {
        return creator;
    @CreatedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time", length = 0,updatable = false)
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "modify_date", nullable = false)
    public Date getModifyDate() {
        return modifyDate;
    @CreatedBy
    @Column(name = "create_user",updatable = false)
    public String getCreateUser() {
        return createUser;
    }
    public void setModifyDate(Date modifyDate) {
        this.modifyDate = modifyDate;
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Column(name = "modifier")
    public String getModifier() {
        return modifier;
    @CreatedBy
    @Column(name = "create_user_name",updatable = false)
    public String getCreateUserName() {
        return createUserName;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @Column(name = "pcode")
    public String getPcode() {
        return pcode;
    @LastModifiedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time", length = 0)
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setPcode(String pcode) {
        this.pcode = pcode;
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @LastModifiedBy
    @Column(name = "update_user")
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @LastModifiedBy
    @Column(name = "update_user_name")
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
}

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

@@ -0,0 +1,250 @@
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/facilities/FacilitiesServer.java

@@ -0,0 +1,62 @@
package com.yihu.jw.healthyhouse.model.facilities;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.*;
/**
 * 设施服务
 * @author zdm
 * @version 1.0
 * @created 2018.09.19
 */
@Entity
@Table(name = "facilities_services")
@Access(value = AccessType.PROPERTY)
public class FacilitiesServer extends UuidIdentityEntityWithOperator {
    //设施服务编码
    @Column(name = "code", nullable = false)
    private String code;
    //设施服务名称
    @Column(name = "name")
    private String name;
    //所属设施类型：系统字典设施类型
    @Column(name = "type" )
    private String type ;
    //设施服务提供量：多少设施提供此服务
    @Column(name = "num")
    private String num;
    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;
    }
    public String getNum() {
        return num;
    }
    public void setNum(String num) {
        this.num = num;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/dict/SystemDictEntryService.java

@@ -39,37 +39,6 @@ public class SystemDictEntryService extends BaseJpaService<SystemDictEntry, Syst
        return null == nextSort ? 1 : nextSort + 1;
    }
    /**
     * 获取所有字典项。对于大字典，若不分页效率可能会很低。
     *
     * @param dictId 字典ID
     * @param page   分页，-1 表示查找全部
     * @param size   页大小, page 为 -1 时忽略此参数
     * @return
     */
    public Page<SystemDictEntry> getDictEntries(String dictId, int page, int size) {
        SystemDictEntryDao repo = (SystemDictEntryDao) getJpaRepository();
        return repo.findByDictId(dictId, page == -1 ? null : new PageRequest(page, size));
    }
    /**
     * 获取简易字典项列表.
     *
     * @param dictId
     * @param codes  字典项代码列表,为空返回所有字典项. 但对于大字典效率会很低.
     * @return
     */
    public List<SystemDictEntry> getDictEntries(String dictId, String[] codes) {
        SystemDictEntryDao repo = (SystemDictEntryDao) getJpaRepository();
        if (codes == null) {
            return repo.findByDictId(dictId);
        } else {
            return repo.findByDictIdAndCodes(dictId, codes);
        }
    }
    /**
     * 获取字典项。
     *
@@ -83,41 +52,16 @@ public class SystemDictEntryService extends BaseJpaService<SystemDictEntry, Syst
        return repo.findOne(new DictEntryKey(code, dictId));
    }
    public SystemDictEntry getDictEntryByValueAndDictId(String value, String dictId) {
        List<SystemDictEntry> systemDictEntryList = systemDictEntryDao.findByDictIdAndValue(dictId, value);
        if (null != systemDictEntryList && systemDictEntryList.size() > 0) {
            return systemDictEntryList.get(0);
        }
        return null;
    }
    /**
     * 按字典ID与字典项值查找字典项.
     *
     * @param dictId
     * @param value
     * @param page
     * @param size
     * @return
     */
    public Page<SystemDictEntry> findByDictIdAndValueLike(String dictId, String value, int page, int size) {
    public List<SystemDictEntry> findByDictIdAndValueLike(String dictId, String value) {
        SystemDictEntryDao repo = (SystemDictEntryDao) getJpaRepository();
        return repo.findByDictIdAndValueLike(dictId, value, new PageRequest(page, size));
    }
    /**
     * 按字典ID查找字典项.
     *
     * @param dictId
     * @param page
     * @param size
     * @return
     */
    public Page<SystemDictEntry> findByDictId(String dictId, int page, int size) {
        SystemDictEntryDao repo = (SystemDictEntryDao) getJpaRepository();
        return repo.findByDictId(dictId, new PageRequest(page, size));
        return repo.findByDictIdAndValueLike(dictId, value);
    }
    public boolean isDictContainEntry(String dictId, String code) {
@@ -134,18 +78,11 @@ public class SystemDictEntryService extends BaseJpaService<SystemDictEntry, Syst
        return repo.save(systemDictEntry);
    }
    public void createDictEntry(SystemDictEntry systemDictEntry) {
        SystemDictEntryDao repo = (SystemDictEntryDao) getJpaRepository();
        repo.save(systemDictEntry);
    }
    public void deleteDictEntry(String dictId, String code) {
        SystemDictEntryDao repo = (SystemDictEntryDao) getJpaRepository();
        repo.delete(new DictEntryKey(code, dictId));
    }
    /**
     * 根据字典id获取字典项编码和值
     */

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/dict/SystemDictService.java

@@ -30,11 +30,6 @@ public class SystemDictService extends BaseJpaService<SystemDict, SystemDictDao>
    @Autowired
    private SystemDictEntryDao entryRepo;
    public Page<SystemDict> getDictList(String sorts, int page, int size) {
        Pageable pageable = new PageRequest(page, size, parseSorts(sorts));
        return dictRepo.findAll(pageable);
    }
    public void updateDict(SystemDict dict) {
        dictRepo.save(dict);
    }
@@ -50,15 +45,6 @@ public class SystemDictService extends BaseJpaService<SystemDict, SystemDictDao>
        return systemDict != null;
    }
    public Page<SystemDict> searchDict(String name, String phoneticCode, int page, int size) {
        return dictRepo.findByNameOrPhoneticCodeOrderByNameAsc(name, phoneticCode, new PageRequest(page, size));
    }
    public long getNextId() {
        long id = dictRepo.getNextId()+1;
        return id;
    }
    public SystemDict findByPhoneticCode(String code) {
        return dictRepo.findByPhoneticCode(code);
    }

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

@@ -0,0 +1,28 @@
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

@@ -0,0 +1,28 @@
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);
    }
}