冲突解决

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

@@ -48,6 +48,8 @@ public class HealthyHouseMapping {
            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";
            public static final String UPDATE_FACILITIE_STATE = "/update/facilitieState";
            public static final String COUNT_FACILITIES_BY_TIME = "/count/facilitiesByTime";
        }
        //设施服务
@@ -84,6 +86,37 @@ public class HealthyHouseMapping {
            public static final String GET_FACILITY_USED_RECORD_BY_FIELD = "/getFacilityUsedRecordByField";
            public static final String UPDATE_FACILITY_USED_RECORD_BY_ID = "/updateFacilityUsedRecordById";
        }
        //服务评价
        public static class NavigationServiceEvaluation {
            public static final String CREATE = "/create/navigationServiceEvaluation";
            public static final String DELETE = "/delete/navigationServiceEvaluation";
            public static final String UPDATE = "/update/navigationServiceEvaluation";
            public static final String PAGE = "/page/navigationServiceEvaluation";
            public static final String LIST = "/list/navigationServiceEvaluation";
            public static final String GET_NAVIGATION_SERVICE_EVALUATION_BY_ID = "/getNavigationServiceEvaluationById";
            public static final String GET_NAVIGATION_SERVICE_EVALUATION_BY_FIELD = "/getNavigationServiceEvaluationByField";
            public static final String UPDATE_NAVIGATION_SERVICE_EVALUATION_BY_ID = "/updateNavigationServiceEvaluationById";
        }
        /**
         * 城市
         */
        public static class Town {
            public static final String LIST = "/list/city";
        }
        public static class FastDFS{
            public static final String UPLOAD="/dfs/upload";
            public static final String UPLOADJSON="/dfs/jsonUpload";
            public static final String DOWN="/dfs/down";
            public static final String DELETE_BY_ID="/dfs/deleteById";
            public static final String DELETE_BY_PATH="/dfs/deleteByPath";
            public static final String GET_FILE_INFO ="/dfs/getFileInfo";
            public static final String DOWNLOAD_BY_ID="/dfs/downloadById";
            public static final String DOWNLOAD_BY_PATH="/dfs/downloadByPath";
        }
    }

svr/svr-healthy-house/pom.xml

@@ -180,7 +180,14 @@
			<groupId>net.sf.json-lib</groupId>
			<artifactId>json-lib</artifactId>
		</dependency>
	</dependencies>
        <!-- 文件服务器 -->
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>fastdfs-starter</artifactId>
            <version>2.0.0</version>
        </dependency>
    </dependencies>
	<build>
		<finalName>svr-healthy-house</finalName>

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

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

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

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

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

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

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

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

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/dfs/FastDFSController.java

@@ -0,0 +1,218 @@
package com.yihu.jw.healthyhouse.controller.dfs;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.fastdfs.config.FastDFSConfig;
import com.yihu.jw.healthyhouse.model.dfs.FileResource;
import com.yihu.jw.healthyhouse.service.dfs.FileResourceService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
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.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.*;
/**
 *文件服务
 */
@RestController
@RequestMapping(HealthyHouseMapping.api_healthyHouse_common)
@Api(value = "FastDFSController", description = "FastDFS服务", tags = {"FastDFS服务"})
public class FastDFSController extends EnvelopRestEndpoint {
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @Autowired
    private FastDFSUtil fastDFSUtil;
    @Autowired
    private FileResourceService fileResourceService;
    /**
     * 文件上传 - 返回相关索引信息
     * @param file
     * @param creator
     * @param objectId
     * @return
     */
    @PostMapping(value =HealthyHouseMapping.HealthyHouse.FastDFS.UPLOAD )
    @ApiOperation(value = "文件上传", notes = "返回相关索引信息,以及HttpUrl下载连接")
    public ObjEnvelop<FileResource> upload (
            @ApiParam(name = "file", value = "文件", required = true)
            @RequestPart(value = "file") MultipartFile file,
            @ApiParam(name = "creator", value = "创建者", required = true)
            @RequestParam(value = "creator") String creator,
            @ApiParam(name = "objectId", value = "被创建文件所属对象标识", required = true)
            @RequestParam(value = "objectId") String objectId) throws Exception {
        String fileName = file.getOriginalFilename();
        String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
        if (fileExtension.equals(fileName)) {
            fileExtension = "file";
        }
        //上传
        ObjectNode objectNode = fastDFSUtil.upload(file.getInputStream(), fileExtension, "svr-dfs");
        String groupName = objectNode.get(FastDFSUtil.GROUP_NAME).toString();
        String remoteFileName = objectNode.get(FastDFSUtil.REMOTE_FILE_NAME).toString();
        int fileSize = objectNode.get(FastDFSUtil.FILE_SIZE).asInt();
        String path = groupName.substring(1, groupName.length() - 1) + ":" + remoteFileName.substring(1, remoteFileName.length() - 1);
        //路径存储到mysql数据库
        FileResource fileResource =new FileResource();
        fileResource.setObjectId(objectId);
        fileResource.setStoragePath(path);
        fileResource.setFileSize(String.valueOf(fileSize));
        fileResource.setFileName(fileName);
        fileResource=  fileResourceService.save(fileResource);
        path = groupName.substring(1, groupName.length() - 1) + "/" + remoteFileName.substring(1, remoteFileName.length() - 1);
        fileResource.setStoragePath( fastdfs_file_url + path);
        return success(fileResource);
    }
    /**
     * 文件上传 - 返回相关索引信息，兼容旧接口
     * @param jsonData
     * @return
     * @throws Exception
     */
    @PostMapping(value = HealthyHouseMapping.HealthyHouse.FastDFS.UPLOADJSON)
    @ApiOperation(value = "文件上传", notes = "返回相关索引信息,以及HttpUrl下载连接(兼容旧接口)")
    public ObjEnvelop<FileResource> upload(
            @ApiParam(name = "jsonData", value = "文件资源", required = true)
            @RequestBody String jsonData) throws Exception {
        Map<String, String> paramMap = toEntity(jsonData, Map.class);
        String fileStr = paramMap.get("fileStr");
        byte[] bytes = Base64.getDecoder().decode(fileStr);
        InputStream inputStream = new ByteArrayInputStream(bytes);
        String fileName = paramMap.get("fileName");
        String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
        if (fileExtension.equals(fileName)) {
            fileExtension = "file";
        }
        ObjectNode objectNode = fastDFSUtil.upload(inputStream, fileExtension, "svr-dfs");
        int fileSize = objectNode.get(FastDFSUtil.FILE_SIZE).asInt();
        String groupName = objectNode.get(FastDFSUtil.GROUP_NAME).toString();
        String remoteFileName = objectNode.get(FastDFSUtil.REMOTE_FILE_NAME).toString();
        String path = groupName.substring(1, groupName.length() - 1) + ":" + remoteFileName.substring(1, remoteFileName.length() - 1);
        //路径存储到mysql数据库
        FileResource fileResource =new FileResource();
        //TODO
        fileResource.setObjectId("111");
        fileResource.setStoragePath(path);
        fileResource.setFileSize(String.valueOf(fileSize));
        fileResource.setFileName(fileName);
        fileResource=  fileResourceService.save(fileResource);
         path = groupName.substring(1, groupName.length() - 1) + "/" + remoteFileName.substring(1, remoteFileName.length() - 1);
        fileResource.setStoragePath( fastdfs_file_url + path);
        return success(fileResource);
    }
    /**
     * 删除资源表对应关系，并且删除fastDfs相对应当文件
     * @param id
     * @return
     * @throws Exception
     */
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.FastDFS.DELETE_BY_ID)
    @ApiOperation(value = "删除资源表对应关系，并且删除fastDfs相对应文件")
    public Envelop deleteById(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) throws Exception {
      FileResource fileResource=  fileResourceService.findById(id);
      if(null==fileResource){
          return failed("无相关文件资源");
      }
        String storagePath = fileResource.getStoragePath();
        String groupName = storagePath.split(":")[0];
        String remoteFileName = storagePath.split(":")[1];
        // 删除文件
        fastDFSUtil.delete(groupName, remoteFileName);
        fileResourceService.delete(fileResource);
        return success("success");
    }
    /**
     * 删除资源表对应关系，并且删除fastDfs相对应当文件
     * @param path
     * @return
     * @throws Exception
     */
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.FastDFS.DELETE_BY_PATH)
    @ApiOperation(value = "删除资源表对应关系，并且删除fastDfs相对应文件")
    public Envelop deleteByPath(
            @ApiParam(name = "path", value = "文件路径", required = true)
            @RequestParam(value = "path") String path) throws Exception {
        if (path.split(":").length < 2) {
            return failed("参数有误");
        }
        // 删除文件
        fastDFSUtil.delete(path.split(":")[0], path.split(":")[1]);
        List<FileResource> fileResourceList=  fileResourceService.findByField("storagePath",path);
        StringBuilder ids = new StringBuilder();
        for (FileResource fileResource : fileResourceList) {
            String id= fileResource.getId();
            ids.append(id + ",");
        }
        // 删除mysql数据
        fileResourceService.delete(ids);
        return success("success");
    }
    /**
     * 下载文件
     * @param id
     * @return
     * @throws Exception
     */
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FastDFS.DOWNLOAD_BY_ID)
    @ApiOperation(value = "下载文件(byId)")
    public Envelop downloadById (
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) throws Exception {
        FileResource fileResource=  fileResourceService.findById(id);
        String storagePath = fileResource.getStoragePath();
        String groupName = storagePath.split(":")[0];
        String remoteFileName = storagePath.split(":")[1];
        byte[] bytes = fastDFSUtil.download(groupName, remoteFileName);
        String fileStream = new String(Base64.getEncoder().encode(bytes));
        if (!StringUtils.isEmpty(fileStream)) {
            return success(fileStream);
        }
        return failed("FileStream Is Empty");
    }
    /**
     * 下载文件
     * @param path
     * @return
     * @throws Exception
     */
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FastDFS.DOWNLOAD_BY_PATH)
    @ApiOperation(value = "下载文件(byPath)")
    public Envelop downloadByPath(
            @ApiParam(name = "path", value = "文件路径", required = true)
            @RequestParam(value = "path") String path) throws Exception {
        if (path.split(":").length < 2) {
            return failed("参数有误");
        }
        String groupName = path.split(":")[0];
        String remoteFileName = path.split(":")[1];
        byte[] bytes = fastDFSUtil.download(groupName, remoteFileName);
        String fileStream = new String(Base64.getEncoder().encode(bytes));
        if (!StringUtils.isEmpty(fileStream)) {
            return success(fileStream);
        }
        return failed("FileStream Is Empty");
    }
}

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

@@ -220,6 +220,26 @@ public class FacilitiesController extends EnvelopRestEndpoint {
        return success("success", count);
    }
    @ApiOperation(value = "变更设施状态")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.UPDATE_FACILITIE_STATE)
    public ObjEnvelop<Facility> updateFacilitieState(
            @ApiParam(name = "facilitiesId", value = "设施id", required = true)
            @RequestParam(value = "facilitiesId") String facilitiesId,
            @ApiParam(name = "state", value = "状态：0开放，1关闭，2损坏，3维修")
            @RequestParam(value = "state") String state) throws Exception {
        Facility facility = facilityService.findById(facilitiesId);
        facility.setStatus(state);
        facility = facilityService.save(facility);
        return success(facility);
    }
    @ApiOperation(value = "今日使用设施数统计")
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.Facilities.COUNT_FACILITIES_BY_TIME)
    public ObjEnvelop<Long> countFacilitiesByTime() throws Exception {
        long count = facilityServerRelationService.countDistinctByFacilitieCodeAndCreateTimeBetween();
        return success("success", count);
    }
    @GetMapping("/exportToExcel")

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/NavigationServiceEvaluationController.java

@@ -0,0 +1,94 @@
package com.yihu.jw.healthyhouse.controller.user;
import com.yihu.jw.healthyhouse.model.user.NavigationServiceEvaluation;
import com.yihu.jw.healthyhouse.service.user.NavigationServiceEvaluationService;
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.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
/**
 * 服务评价
 * Created by zdm on 2018/9/21.
 */
@RestController
@RequestMapping(HealthyHouseMapping.api_healthyHouse_common)
@Api(value = "NavigationServiceEvaluation", description = "服务评价管理", tags = {"服务评价管理"})
public class NavigationServiceEvaluationController extends EnvelopRestEndpoint {
    @Autowired
    private NavigationServiceEvaluationService navigationServiceEvaluationService;
    @ApiOperation(value = "获取服务评价列表", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.NavigationServiceEvaluation.PAGE)
    public PageEnvelop<NavigationServiceEvaluation> getNavigationServiceEvaluations(
            @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<NavigationServiceEvaluation> navigationServiceEvaluationList = navigationServiceEvaluationService.search(fields, filters, sorts, page, size);
        return success(navigationServiceEvaluationList, (null == navigationServiceEvaluationList) ? 0 : navigationServiceEvaluationList.size(), page, size);
    }
    @ApiOperation(value = "创建/更新（id存在）服务评价")
    @PostMapping(value = HealthyHouseMapping.HealthyHouse.NavigationServiceEvaluation.CREATE)
    public ObjEnvelop<NavigationServiceEvaluation> createNavigationServiceEvaluation(
            @ApiParam(name = "NavigationServiceEvaluation", value = "服务评价JSON结构")
            @RequestBody NavigationServiceEvaluation navigationServiceEvaluation) throws IOException {
        navigationServiceEvaluation = navigationServiceEvaluationService.save(navigationServiceEvaluation);
        return success(navigationServiceEvaluation);
    }
    @ApiOperation(value = "获取服务评价")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.NavigationServiceEvaluation.GET_NAVIGATION_SERVICE_EVALUATION_BY_ID)
    public ObjEnvelop<NavigationServiceEvaluation> getNavigationServiceEvaluation(
            @ApiParam(name = "id", value = "服务评价ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        NavigationServiceEvaluation navigationServiceEvaluation = navigationServiceEvaluationService.findById(id);
        if (navigationServiceEvaluation == null) {
            return failed("服务评价不存在！", ObjEnvelop.class);
        }
        return success(navigationServiceEvaluation);
    }
    @ApiOperation(value = "获取服务评价:根据日期，根据评价人等")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.NavigationServiceEvaluation.GET_NAVIGATION_SERVICE_EVALUATION_BY_FIELD)
    public ListEnvelop<NavigationServiceEvaluation> getNavigationServiceEvaluationByField(
            @ApiParam(name = "field", value = "查找字段名", required = true)
            @RequestParam(value = "field") String field,
            @ApiParam(name = "value", value = "检索值")
            @RequestParam(value = "value") String value) throws Exception {
        List<NavigationServiceEvaluation> navigationServiceEvaluationList = navigationServiceEvaluationService.findByField(field, value);
        return success(navigationServiceEvaluationList);
    }
    @ApiOperation(value = "删除服务评价")
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.NavigationServiceEvaluation.DELETE)
    public Envelop deleteNavigationServiceEvaluation(
            @ApiParam(name = "facilitiesServerId", value = "服务评价ID")
            @RequestParam(value = "facilitiesServerId") String facilitiesServerId) throws Exception {
        NavigationServiceEvaluation navigationServiceEvaluation = navigationServiceEvaluationService.findById(facilitiesServerId);
        navigationServiceEvaluationService.delete(navigationServiceEvaluation);
        return success("success");
    }
}

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

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

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

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

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

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

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

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

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

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

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/dfs/FileResourceDao.java

@@ -0,0 +1,17 @@
package com.yihu.jw.healthyhouse.dao.dfs;
import com.yihu.jw.healthyhouse.model.dfs.FileResource;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 文件服务
 * @author zdm
 * @version 1.0
 * @created 2018.09.25
 */
public interface FileResourceDao extends JpaRepository<FileResource, String> {
    FileResource findById(String id);
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/user/NavigationServiceEvaluationDao.java

@@ -0,0 +1,16 @@
package com.yihu.jw.healthyhouse.dao.user;
import com.yihu.jw.healthyhouse.model.user.NavigationServiceEvaluation;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 服务评价dao
 * @author zdm
 * @version 1.0
 * @created 2018.09.21
 */
public interface NavigationServiceEvaluationDao extends JpaRepository<NavigationServiceEvaluation, Long> {
    NavigationServiceEvaluation findById(String id);
}

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

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

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

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

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

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

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

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

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

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

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/dfs/FileResource.java

@@ -0,0 +1,75 @@
package com.yihu.jw.healthyhouse.model.dfs;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 文件记录
 * @author zdm
 * @version 1.0
 * @created 2018.09.25
 */
@Entity
@Table(name = "file_resource")
public class FileResource extends UuidIdentityEntityWithOperator {
    //文件地址
    @Column(name = "storage_path", nullable = false)
    private String storagePath;
    //模块
    @Column(name = "mime")
    private String mime;
    //模块-对象id
    @Column(name = "object_id", nullable = false)
    private String objectId ;
    //文件大小
    @Column(name = "file_size")
    private String fileSize;
    //文件名称
    @Column(name = "file_name")
    private String fileName;
    public String getStoragePath() {
        return storagePath;
    }
    public void setStoragePath(String storagePath) {
        this.storagePath = storagePath;
    }
    public String getMime() {
        return mime;
    }
    public void setMime(String mime) {
        this.mime = mime;
    }
    public String getObjectId() {
        return objectId;
    }
    public void setObjectId(String objectId) {
        this.objectId = objectId;
    }
    public String getFileSize() {
        return fileSize;
    }
    public void setFileSize(String fileSize) {
        this.fileSize = fileSize;
    }
    public String getFileName() {
        return fileName;
    }
    public void setFileName(String fileName) {
        this.fileName = fileName;
    }
}

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

@@ -2,6 +2,7 @@ package com.yihu.jw.healthyhouse.model.facility;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.hibernate.annotations.Formula;
import javax.persistence.*;
import java.util.List;
@@ -83,6 +84,7 @@ public class Facility extends UuidIdentityEntityWithOperator {
    private String imgPath;
    private String statusName;
    private String  categoryValue ;
    private List<FacilityServerRelation> facilityServerRelation;
    public String getCode() {
@@ -261,7 +263,8 @@ public class Facility extends UuidIdentityEntityWithOperator {
        this.userName = userName;
    }
    @Transient
    @Formula("( SELECT a.value FROM system_dict_entries a WHERE a.dict_id = 5 AND a.code = status )")
    public String getStatusName() {
        return statusName;
    }
@@ -278,6 +281,14 @@ public class Facility extends UuidIdentityEntityWithOperator {
        this.facilityServerRelation = facilityServerRelation;
    }
    @Formula("( SELECT a.value FROM system_dict_entries a WHERE a.dict_id = 3 AND a.code = category )")
    public String getCategoryValue() {
        return categoryValue;
    }
    public void setCategoryValue(String categoryValue) {
        this.categoryValue = categoryValue;
    }
    @Transient
    public String getAddress(){
        String address = "";

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

@@ -2,6 +2,7 @@ package com.yihu.jw.healthyhouse.model.facility;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.hibernate.annotations.Formula;
import javax.persistence.*;
@@ -26,6 +27,8 @@ public class FacilityServer extends UuidIdentityEntityWithOperator {
    //设施服务提供量：多少设施提供此服务
    @Column(name = "num")
    private String num;
    //设施类型字典值
    private String typeValue ;
    public String getCode() {
        return code;
@@ -58,4 +61,12 @@ public class FacilityServer extends UuidIdentityEntityWithOperator {
    public void setNum(String num) {
        this.num = num;
    }
    @Formula("( SELECT a.value FROM system_dict_entries a WHERE a.dict_id = 7 AND a.code = type )")
    public String getTypeValue() {
        return typeValue;
    }
    public void setTypeValue(String typeValue) {
        this.typeValue = typeValue;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/user/FeedBack.java

@@ -2,6 +2,7 @@ package com.yihu.jw.healthyhouse.model.user;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.hibernate.annotations.Formula;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -30,26 +31,26 @@ public class FeedBack extends UuidIdentityEntityWithOperator {
    @Column(name = "flag", nullable = false)
    private Integer  flag;
    //回复内容
    @Column(name = "replyContent", nullable = false)
    @Column(name = "reply_content", nullable = false)
    private String  replyContent;
    //是否有附件，0无，1有
    @Column(name = "enclosureFlag", nullable = false)
    @Column(name = "enclosure_flag", nullable = false)
    private String  enclosureFlag;
    //设施编号
    @Column(name = "facilitieCode", nullable = false)
    @Column(name = "facilitie_code", nullable = false)
    private String  facilitieCode;
    //设施经度
    @Column(name = "facilitieLongitude", nullable = false)
    @Column(name = "facilitie_longitude", nullable = false)
    private double  facilitieLongitude;
    //设施维度
    @Column(name = "facilitieLatitude", nullable = false)
    @Column(name = "facilitie_latitude", nullable = false)
    private double  facilitieLatitude;
    //上传附件地址(多张图片地址，用逗号隔开)
    @Column(name = "pig_path", nullable = false)
    private String  pigPath;
    //反馈类型，1建议、2投诉、3报修、4其他
    private String  feedTypeName;
    private String  feedTypeValue;
    //反馈的处理状态：0未阅，1待处理，2已处理
    private String  flagValue;
    //是否有附件，0无，1有
@@ -134,15 +135,15 @@ public class FeedBack extends UuidIdentityEntityWithOperator {
    public void setPigPath(String pigPath) {
        this.pigPath = pigPath;
    }
    @Transient
    public String getFeedTypeName() {
        return feedTypeName;
    @Formula("( SELECT a.value FROM system_dict_entries a WHERE a.dict_id = 4 AND a.code = feed_type )")
    public String getFeedTypeValue() {
        return feedTypeValue;
    }
    public void setFeedTypeName(String feedTypeName) {
        this.feedTypeName = feedTypeName;
    public void setFeedTypeValue(String feedTypeValue) {
        this.feedTypeValue = feedTypeValue;
    }
    @Transient
    @Formula("( SELECT a.value FROM system_dict_entries a WHERE a.dict_id = 6 AND a.code = flag )")
    public String getFlagValue() {
        return flagValue;
    }
@@ -150,7 +151,7 @@ public class FeedBack extends UuidIdentityEntityWithOperator {
    public void setFlagValue(String flagValue) {
        this.flagValue = flagValue;
    }
    @Transient
    @Formula("( SELECT a.value FROM system_dict_entries a WHERE a.dict_id = 8 AND a.code = enclosure_flag )")
    public String getEnclosureFlagValue() {
        return enclosureFlagValue;
    }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/user/NavigationServiceEvaluation.java

@@ -0,0 +1,97 @@
package com.yihu.jw.healthyhouse.model.user;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * 用户评价
 * @author zdm
 * @version 1.0
 * @created 2018.09.21
 */
@Entity
@Table(name = "navigation_service_evaluation")
public class NavigationServiceEvaluation extends UuidIdentityEntityWithOperator {
    //设施编码
    @Column(name = "facilitie_code", nullable = false)
    private String facilitieCode;
    //设施名称
    @Column(name = "facilitie_name")
    private String facilitieName;
    //服务编码
    @Column(name = "service_code")
    private String serviceCode;
    //服务名称
    @Column(name = "service_name")
    private String serviceName;
    //用户
    @Column(name = "user_id")
    private String userId;
    //分数:星星数量
    @Column(name = "score")
    private String score;
    //备注、意见或建议
    @Column(name = "remark")
    private String remark;
    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;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getScore() {
        return score;
    }
    public void setScore(String score) {
        this.score = score;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

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

@@ -1,15 +1,16 @@
package com.yihu.jw.healthyhouse.service.area;
import com.yihu.jw.healthyhouse.dao.area.BaseCityDao;
import com.yihu.jw.healthyhouse.model.area.BaseCityDO;
import com.yihu.jw.healthyhouse.model.area.BaseCity;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * 城市字典服务service
 *
 * @version <pre>
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年08月31日 Created
 *
@@ -17,13 +18,12 @@ import org.springframework.stereotype.Service;
 * @since 1.
 */
@Service
public class BaseCityService extends BaseJpaService<BaseCityDO, BaseCityDao> {
public class BaseCityService extends BaseJpaService<BaseCity, BaseCityDao> {
    @Autowired
    private BaseCityDao baseCityDao;
    public String getCodeByname(String name) {
        BaseCityDO cityDO = baseCityDao.findByName(name);
        BaseCity cityDO = baseCityDao.findByName(name);
        if (cityDO != null) {
            return cityDO.getCode();
        } else {
@@ -31,5 +31,4 @@ public class BaseCityService extends BaseJpaService<BaseCityDO, BaseCityDao> {
        }
    }
}

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

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

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

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

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

@@ -1,8 +1,7 @@
package com.yihu.jw.healthyhouse.service.area;
import com.yihu.jw.healthyhouse.dao.area.BaseStreetDao;
import com.yihu.jw.healthyhouse.model.area.BaseCityDO;
import com.yihu.jw.healthyhouse.model.area.BaseStreetDO;
import com.yihu.jw.healthyhouse.model.area.BaseStreet;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,18 +19,16 @@ import org.springframework.stereotype.Service;
 * @since 1.
 */
@Service
public class BaseStreetService extends BaseJpaService<BaseStreetDO, BaseStreetDao> {
public class BaseStreetService extends BaseJpaService<BaseStreet, BaseStreetDao> {
    @Autowired
    private BaseStreetDao baseStreetDao;
    public String getCodeByname(String name) {
        BaseStreetDO streetDO = baseStreetDao.findByName(name);
        BaseStreet streetDO = baseStreetDao.findByName(name);
        if (streetDO != null) {
            return streetDO.getCode();
        } else {
            return null;
        }
    }
}

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

@@ -1,8 +1,7 @@
package com.yihu.jw.healthyhouse.service.area;
import com.yihu.jw.healthyhouse.dao.area.BaseTownDao;
import com.yihu.jw.healthyhouse.model.area.BaseStreetDO;
import com.yihu.jw.healthyhouse.model.area.BaseTownDO;
import com.yihu.jw.healthyhouse.model.area.BaseTown;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,18 +19,16 @@ import org.springframework.stereotype.Service;
 * @since 1.
 */
@Service
public class BaseTownService extends BaseJpaService<BaseTownDO, BaseTownDao> {
public class BaseTownService extends BaseJpaService<BaseTown, BaseTownDao> {
    @Autowired
    public BaseTownDao baseTownDao;
    public String getCodeByname(String name) {
        BaseTownDO townDO = baseTownDao.findByName(name);
        BaseTown townDO = baseTownDao.findByName(name);
        if (townDO != null) {
            return townDO.getCode();
        } else {
            return null;
        }
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/dfs/FileResourceService.java

@@ -0,0 +1,28 @@
package com.yihu.jw.healthyhouse.service.dfs;
import com.yihu.jw.healthyhouse.dao.dfs.FileResourceDao;
import com.yihu.jw.healthyhouse.model.dfs.FileResource;
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.25
 */
@Service
@Transactional
public class FileResourceService extends BaseJpaService<FileResource, FileResourceDao> {
    @Autowired
    private FileResourceDao fileResourceDao;
    public FileResource findById(String id) {
        return  fileResourceDao.findById(id);
    }
}

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

@@ -2,6 +2,7 @@ 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.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,4 +30,12 @@ public class FacilityServerRelationService extends BaseJpaService<FacilityServer
        facilityServerRelationDao.deleteByFacilitieCode(facilitieCode);
    }
    public long countDistinctByFacilitieCodeAndCreateTimeBetween() throws Exception {
        String date=DateUtil.getStringDateShort();
        String sql = "select COUNT(DISTINCT facilitie_code ) from facility_used_records  WHERE LEFT(create_time,10)=?";
        String count = jdbcTemplate.queryForObject(sql, String.class, date);
        return Long.parseLong(count);
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/NavigationServiceEvaluationService.java

@@ -0,0 +1,28 @@
package com.yihu.jw.healthyhouse.service.user;
import com.yihu.jw.healthyhouse.dao.user.NavigationServiceEvaluationDao;
import com.yihu.jw.healthyhouse.model.user.NavigationServiceEvaluation;
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.21
 */
@Service
@Transactional
public class NavigationServiceEvaluationService extends BaseJpaService<NavigationServiceEvaluation, NavigationServiceEvaluationDao> {
    @Autowired
    private NavigationServiceEvaluationDao navigationServiceEvaluationDao;
    public NavigationServiceEvaluation findById(String id) {
        return  navigationServiceEvaluationDao.findById(id);
    }
}