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/LoginController.java

@@ -25,7 +25,7 @@ import java.util.HashMap;
 * @author HZY
 * @created 2018/9/18 19:55
 */
@Api(value = "LoginController", description = "登录管理", tags = {"2登录及验证"})
@Api(value = "LoginController", description = "登录管理", tags = {"1登录及验证"})
@RestController
public class LoginController extends EnvelopRestEndpoint {

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

@@ -1,6 +1,7 @@
package com.yihu.jw.healthyhouse.model.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
@@ -25,12 +26,14 @@ public class User extends UuidIdentityEntityWithOperator {
    private String password;
    @Column(name = "gender" )
    private String gender;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    @Column(name = "birthday" )
    private Date birthday;
    @Column(name = "id_card_no", nullable = false)
    private String idCardNo;
    @Column(name = "telephone", nullable = false)
    private String telephone;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "last_login_time", length = 0)
    private Date lastLoginTime;
    @Column(name = "img_remote_path")

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

@@ -86,10 +86,11 @@ public class FacilityUsedRecordService extends BaseJpaService<FacilityUsedRecord
        List<FacilityServerRelation> facilityServerRelations = facilityServerRelationDao.findByFacilitieCode(facilityCode);
        List<String> services = facilityServerRelations.stream().map(FacilityServerRelation::getServiceName).collect(Collectors.toList());
        if (comment ==null) {
            result.put("Commented",false); //未评价
            result.put("commented",false); //未评价
            result.put("star",0);//评分
        }else {
            result.put("Commented",true);//已评价
            result.put("Star",comment.getScore());//评分
            result.put("commented",true);//已评价
            result.put("star",comment.getScore());//评分
        }
        result.put("usedCount",historyNum);//前往设施次数
        result.put("serviceList",services);//设施包含服务