Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

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

@@ -234,6 +234,8 @@ public class FacilitiesController extends EnvelopRestEndpoint {
            return failed("设施不存在！");
        }
        facility.setDeleteFlag("1");
        //将设施状态改成关闭，在用户历史行程中做提示使用
        facility.setStatus("1");
        facilityService.save(facility);
        return success("success");
    }

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

@@ -129,9 +129,9 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
        FacilityUsedRecord facilityUsedRecord;
        if (nearbyFlag) {
            if (StringUtils.isNotEmpty(filters)) {
                filters =  "deleteFlag=0;status=0;"+"name?" + filters + " g1;cityName?" + filters + " g1;countyName?" + filters + " g1;street?" + filters + " g1;address?"  + filters + " g1;";
            }else{
                filters =  "deleteFlag=0;status=0;";
                filters = "deleteFlag=0;status=0;" + "name?" + filters + " g1;cityName?" + filters + " g1;countyName?" + filters + " g1;street?" + filters + " g1;address?" + filters + " g1;";
            } else {
                filters = "deleteFlag=0;status=0;";
            }
            //获取所有设施，并根据设施编码及用户id查找使用次数
            List<Facility> facilityList = facilityService.search(filters);
@@ -145,6 +145,7 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
                facilityUsedRecord.setCreateUser(userId);
                facilityUsedRecord.setUserId(userId);
                facilityUsedRecord.setFacilitieId(facility.getId());
                facilityUsedRecord.setFacilitieStatus(facility.getStatus());
                long count = facilityUsedRecordService.countByFacilitieCodeAndUserId(facility.getCode(), userId);
                facilityUsedRecord.setNum((int) count);
                facilityUsedRecordList.add(facilityUsedRecord);
@@ -155,6 +156,9 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
            for (FacilityUsedRecord facilityUsedRecord1 : facilityUsedRecordList) {
                long count = facilityUsedRecordService.countByFacilitieCodeAndUserId(facilityUsedRecord1.getFacilitieCode(), userId);
                facilityUsedRecord1.setNum((int) count);
                //获取设施状态
                Facility facility = facilityService.findByCode(facilityUsedRecord1.getFacilitieCode());
                facilityUsedRecord1.setFacilitieStatus(facility.getStatus());
            }
        }
        return success(facilityUsedRecordList);
@@ -183,14 +187,14 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
    public ObjEnvelop facilityUsedRecordDetail(
            @ApiParam(name = "id", value = "使用记录ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        if (id == null ){
        if (id == null) {
            throw new ManageException("使用记录ID为空！");
        }
        Map<String, Object> usedRecordDetail = facilityUsedRecordService.getUsedRecordDetail(id);
        return success(usedRecordDetail);
    }
    @ApiOperation(value = "获取用户使用导航记录列表--分页（app）", responseContainer = "List")
    @ApiOperation(value = "我的行程-获取用户使用导航记录列表--分页（app）", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilityUsedRecord.PAGE_FACILITY_USED_RECORD_BY_USERID)
    public PageEnvelop<FacilityUsedRecord> getFacilityUsedRecordsByUserId(
            @ApiParam(name = "userId", value = "必输参数：登录用户id", defaultValue = "")
@@ -217,6 +221,9 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
            } else {
                record.setNavigationServiceEvaluationFlag("已评价");
            }
            //根据设施编码获取 设施状态
            Facility facility = facilityService.findByCode(facilityCode);
            record.setFacilitieStatus(facility.getStatus());
        }
        int count = (int) facilityUsedRecordService.getCount(filters);
        return success(facilityUsedRecordList, count, page, size);

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

@@ -11,6 +11,7 @@ import java.util.List;
/**
 * 用户导航记录
 *
 * @author zdm
 * @version 1.0
 * @created 2018.09.21
@@ -65,6 +66,9 @@ public class FacilityUsedRecord extends UuidIdentityEntityWithOperator {
    //设施关联的服务名称
    private String facilityRelationServiceName;
    //设施状态
    private String facilitieStatus;
    //评价记录
    private String navigationServiceEvaluationFlag;
@@ -179,14 +183,16 @@ public class FacilityUsedRecord extends UuidIdentityEntityWithOperator {
    public void setFacilitieId(String facilitieId) {
        this.facilitieId = facilitieId;
    }
    @Transient
    public String getFacilityRelationServiceName() {
        return facilityRelationServiceName;
    }
    public void setFacilityRelationServiceName(String facilityRelationServiceName) {
        this.facilityRelationServiceName =facilityRelationServiceName;
        this.facilityRelationServiceName = facilityRelationServiceName;
    }
    @Transient
    public String getNavigationServiceEvaluationFlag() {
        return navigationServiceEvaluationFlag;
@@ -195,4 +201,13 @@ public class FacilityUsedRecord extends UuidIdentityEntityWithOperator {
    public void setNavigationServiceEvaluationFlag(String navigationServiceEvaluationFlag) {
        this.navigationServiceEvaluationFlag = navigationServiceEvaluationFlag;
    }
    @Transient
    public String getFacilitieStatus() {
        return facilitieStatus;
    }
    public void setFacilitieStatus(String facilitieStatus) {
        this.facilitieStatus = facilitieStatus;
    }
}

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

@@ -46,6 +46,8 @@ public class User extends UuidIdentityEntityWithOperator {
    private String activatedContent;       //账户冻结原因
    @Column(name = "province_code", nullable = false)
    private String provinceCode;    //省编码
    @Column(name = "province_name", nullable = false)
    private String provinceName;    //省名称
    @Column(name = "city_code", nullable = false)
    private String cityCode;        //市编码
    @Column(name = "city_name", nullable = false)
@@ -277,6 +279,9 @@ public class User extends UuidIdentityEntityWithOperator {
    @Transient
    public String getAddress() {
        String address = "";
        if (this.getProvinceName() != null) {
            address += this.getProvinceName();
        }
        if (this.getCityName() != null) {
            address += this.getCityName();
        }
@@ -301,4 +306,12 @@ public class User extends UuidIdentityEntityWithOperator {
        }
        return genderValue;
    }
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
}

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

@@ -273,5 +273,9 @@ public class FacilityService extends BaseJpaService<Facility, FacilityDao> {
        }
    }
    public Facility findByCode(String code) {
        return facilityDao.findByCode(code);
    }
}