时间格式 设施导入模板修改

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/constant/LoginInfo.java

@@ -18,8 +18,8 @@ public class LoginInfo {
    public static final String SAVE_TYPE_PHONE = "phoneLogin";//手机登录注册
    //用户类型
    public static final String USER_TYPE_PATIENT = "Patient";//居民
    public static final String USER_TYPE_AdminManager = "AdminManager";//超管
    public static final String USER_TYPE_Server = "Server";//运营维护
    public static final String USER_TYPE_PATIENT = "patient";//居民
    public static final String USER_TYPE_SUPER_AdminManager = "superAdmin";//超管
    public static final String USER_TYPE_Server = "admin";//运营维护
}

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

@@ -1,7 +1,6 @@
package com.yihu.jw.healthyhouse.service.user;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.base.sms.SmsGatewayDO;
import com.yihu.jw.exception.business.ManageException;
import com.yihu.jw.healthyhouse.cache.WlyyRedisVerifyCodeService;
import com.yihu.jw.healthyhouse.constant.LoginInfo;
@@ -25,7 +24,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -64,6 +62,7 @@ public class LoginService  extends BaseJpaService {
            // 更新身份证验证字段
            user.setPhoneAuthentication(UserConstant.AUTHORIZED);
            user.setPassword(LoginInfo.DEFAULT_PASSWORD);
            user.setUserType(LoginInfo.USER_TYPE_PATIENT);
        }
        //已注册用户更改用户状态
        user.setActivated(HouseUserContant.activated_active);
@@ -101,6 +100,8 @@ public class LoginService  extends BaseJpaService {
                user.setGender((String) data.get("gender"));
                user.setIdCardNo((String) data.get("idcard"));
                user.setTelephone((String) data.get("mobile"));
                user.setUserType(LoginInfo.USER_TYPE_PATIENT);
                user.setIjkAuthentication(UserConstant.AUTHORIZED);
            } else {
                String message = "账号不存在";
@@ -264,7 +265,7 @@ public class LoginService  extends BaseJpaService {
    @Transactional(noRollbackForClassName = "ManageException")
    public User managerPhoneLogin(HttpServletRequest request, String loginCode) throws ManageException {
        //判断管理员用户信息是否存在
        User user = userService.findByLoginCodeAndUserType(loginCode, LoginInfo.USER_TYPE_AdminManager);
        User user = userService.findByLoginCodeAndUserType(loginCode, LoginInfo.USER_TYPE_SUPER_AdminManager);
        if (user == null) {
            throw new ManageException("该管理员账号不存在!");
        } else {
@@ -294,7 +295,7 @@ public class LoginService  extends BaseJpaService {
    @Transactional(noRollbackForClassName = "ManageException")
    public User managerLogin(HttpServletRequest request, String clientId, String loginCode, String password) throws ManageException {
        //判断登陆信息是否正确
        User user = userService.findByCode(loginCode);
        User user = userService.findByLoginCodeAndUserType(loginCode, LoginInfo.USER_TYPE_SUPER_AdminManager);
        if (user == null) {
            String message = "该管理员账号不存在！";
            throw new ManageException(message);