查找设施服务，不分页。导航记录追加设施id

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

@@ -65,6 +65,7 @@ public class HealthyHouseMapping {
            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";
            public static final String LIST_FACILITIESERVERS = "/list/listFacilitieServers";
        }
        //意见反馈

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

@@ -132,5 +132,18 @@ public class FacilitiesServerController extends EnvelopRestEndpoint {
        return success("success");
    }
    @ApiOperation(value = "获取设施服务列表", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilitiesServer.LIST_FACILITIESERVERS )
    public ListEnvelop<FacilityServer> getFacilitiesServer(
            @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) throws Exception {
        List<FacilityServer> facilityServerList = facilityServerService.search(fields, filters, sorts);
        return success(facilityServerList);
    }
}

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

@@ -126,6 +126,7 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
                facilityUsedRecord.setFacilitieLatitudes(facility.getLatitude());
                facilityUsedRecord.setFacilitieAddr(facility.getAddress());
                facilityUsedRecord.setCreateUser(userId);
                facilityUsedRecord.setFacilitieId(facility.getId());
                long count = facilityUsedRecordService.countByFacilitieCodeAndUserId(facility.getCode(), userId);
                facilityUsedRecord.setNum((int)count);
                facilityUsedRecordList.add(facilityUsedRecord);

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

@@ -38,6 +38,9 @@ public class FacilityUsedRecord extends UuidIdentityEntityWithOperator {
    //设施地址
    @Column(name = "facilitie_addr", nullable = false)
    private String facilitieAddr;
    //设施id
    @Column(name = "facilitie_id")
    private String facilitieId;
    //服务编码
    @Column(name = "service_code")
    private String serviceCode;
@@ -161,4 +164,12 @@ public class FacilityUsedRecord extends UuidIdentityEntityWithOperator {
    public void setDistance(String distance) {
        this.distance = distance;
    }
    public String getFacilitieId() {
        return facilitieId;
    }
    public void setFacilitieId(String facilitieId) {
        this.facilitieId = facilitieId;
    }
}

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

@@ -28,32 +28,23 @@ public class FacilityUsedRecordService extends BaseJpaService<FacilityUsedRecord
        return facilityUsedRecordDao.findById(id);
    }
    //根据用户id获取用户历史记录，按设施编码分组
    public List<FacilityUsedRecord> countDistinctByFacilitieCodeAndUserId(String userId) throws Exception {
        String sql = "select fur.*  from facility_used_records  fur WHERE  fur.create_user=? GROUP BY fur.facilitie_code ";
    public Long countByUserId(String userId){
        return facilityUsedRecordDao.countByUserId(userId);
    }
    public Long countAll(){
        return facilityUsedRecordDao.countAllByUserIdIsNotNull();
    }
    public List<FacilityUsedRecord> countDistinctByFacilitieCodeAndUserId(String userId,Integer page,Integer size) throws Exception {
        Integer pageStart = (page - 1) * size;
        Integer pageEnd = page * size;
        String sql = "select fur.*  from facility_used_records  fur WHERE  fur.user_id=? GROUP BY fur.facilitie_code LIMIT "+pageStart+","+pageEnd;
        List<FacilityUsedRecord> facilityUsedRecords = jdbcTemplate.query(sql, new BeanPropertyRowMapper(FacilityUsedRecord.class), userId);
        return facilityUsedRecords;
    }
    public long countPageDistinctByFacilitieCodeAndUserId(String userId) throws Exception {
        String sql = "select count(DISTINCT facilitie_code )  from facility_used_records  fur WHERE  fur.create_user=? ";
        String count = jdbcTemplate.queryForObject(sql, String.class,userId);
        return Long.parseLong(count);
    public Long countByUserId(String userId) {
        return facilityUsedRecordDao.countByUserId(userId);
    }
    public Long countAll() {
        return facilityUsedRecordDao.countAllByUserIdIsNotNull();
    }
    public long countByFacilitieCodeAndUserId(String facilitieCode,String userId) {
        return facilityUsedRecordDao.countByFacilitieCodeAndCreateUser( facilitieCode, userId);
    //根据用户id及设施编码统计历史导航记录总数
    public long countByFacilitieCodeAndUserId(String facilitieCode, String userId) {
        return facilityUsedRecordDao.countByFacilitieCodeAndCreateUser(facilitieCode, userId);
    }
}