优化代码

java110-bean/src/main/java/com/java110/dto/user/LoginOwnerResDto.java

@@ -0,0 +1,109 @@
+package com.java110.dto.user;
+
+import java.io.Serializable;
+
+/**
+ * 业主登录返回对象
+ */
+public class LoginOwnerResDto implements Serializable {
+
+    private String userId;
+
+    private String userName;
+
+    private String ownerId;
+
+    private String memberId;
+
+    private String ownerName;
+
+    private String ownerTel;
+
+    private String communityId;
+
+    private String communityName;
+
+    private String token;
+
+    private String key;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getOwnerTel() {
+        return ownerTel;
+    }
+
+    public void setOwnerTel(String ownerTel) {
+        this.ownerTel = ownerTel;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getCommunityName() {
+        return communityName;
+    }
+
+    public void setCommunityName(String communityName) {
+        this.communityName = communityName;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+}

java110-bean/src/main/java/com/java110/dto/user/UserDto.java

@@ -94,6 +94,9 @@ public class UserDto extends PageDto implements Serializable {
 
     private List<String> urls;
 
+
+
+
     public String getUserId() {
         return userId;
     }

service-api/src/main/java/com/java110/api/configuration/ServiceConfiguration.java

@@ -41,6 +41,7 @@ public class ServiceConfiguration {
         exclusions.append("/app/loginProperty,");// 物业APP登录跳过
         exclusions.append("/app/loginOwner,");// 业主APP登录跳过
         exclusions.append("/app/loginOwnerByKey,");// 根据key登录业主
+        exclusions.append("/app/user.ownerUserLogin,");// 业主登录（新）
         exclusions.append("/app/area.listAreas,");// 加载地区
         exclusions.append("/app/community.listCommunitys,");// 加载小区
         exclusions.append("/app/user.userSendSms,");// 发送短信验证码

service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java

@@ -0,0 +1,300 @@
+package com.java110.user.cmd.user;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.app.AppDto;
+import com.java110.dto.community.CommunityDto;
+import com.java110.dto.msg.SmsDto;
+import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.user.LoginOwnerResDto;
+import com.java110.dto.user.UserAttrDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.common.ISmsInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.user.*;
+import com.java110.po.owner.OwnerAppUserPo;
+import com.java110.po.user.UserAttrPo;
+import com.java110.po.user.UserPo;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.UserLevelConstant;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.ValidatorUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+
+/**
+ * 业主登录，专门提供业主 使用
+ */
+@Java110Cmd(serviceCode = "user.ownerUserLogin")
+public class OwnerUserLoginCmd extends Cmd {
+
+    private final static Logger logger = LoggerFactory.getLogger(UserLoginCmd.class);
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Autowired
+    private IUserAttrV1InnerServiceSMO userAttrV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ISmsInnerServiceSMO smsInnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.hasKeyAndValue(reqJson, "username", "请求报文中未包含用户名");
+        Assert.hasKeyAndValue(reqJson, "password", "请求报文中未包含密码");
+
+        //todo 验证码登录
+        if (reqJson.containsKey("loginByPhone") && reqJson.getBoolean("loginByPhone")) {
+            SmsDto smsDto = new SmsDto();
+            smsDto.setTel(reqJson.getString("userName"));
+            smsDto.setCode(reqJson.getString("password"));
+            smsDto = smsInnerServiceSMOImpl.validateCode(smsDto);
+            if (!smsDto.isSuccess()) {
+                throw new SMOException("验证码错误");
+            }
+
+        }
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        UserDto userDto = new UserDto();
+        userDto.setLevelCd(UserDto.LEVEL_CD_USER);
+        if (ValidatorUtil.isMobile(reqJson.getString("userName"))) {//用户临时秘钥登录
+            userDto.setTel(reqJson.getString("userName"));
+        } else {
+            userDto.setUserName(reqJson.getString("userName"));
+        }
+
+        // todo 不是验证码登录
+        if (!reqJson.containsKey("loginByPhone") || !reqJson.getBoolean("loginByPhone")) {
+            userDto.setPassword(AuthenticationFactory.passwdMd5(reqJson.getString("password")));
+        }
+
+        //todo 1.0 查询用户是否存在
+        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+
+        //todo 1.1 如果验证码登录，自动绑定关系
+        if (userDtos == null || userDtos.size() < 1) {
+            userDtos = ifOwnerLoginByPhone(reqJson, context);
+        }
+        if (userDtos == null || userDtos.size() < 1) {
+            throw new CmdException("业主不存在，请先注册");
+        }
+
+        // todo  2.0 校验 业主用户绑定表是否存在记录
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setUserId(userDtos.get(0).getUserId());
+        ownerAppUserDto.setLink(userDtos.get(0).getTel());
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+        if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+            throw new CmdException("用户未注册，请先注册");
+        }
+
+        // todo 3.0 查询业主是否存在
+        OwnerDto ownerDto = new OwnerDto();
+        ownerDto.setMemberId(ownerAppUserDtos.get(0).getMemberId());
+        ownerDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
+        List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+
+        Assert.listOnlyOne(ownerDtos, "业主不存在");
+
+        // todo 4.0 查询小区是否存在
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
+        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+        Assert.listOnlyOne(communityDtos, "小区不存在，" + ownerAppUserDtos.get(0).getCommunityId());
+
+
+        //todo 生成 app 永久登录key
+        UserDto tmpUserDto = userDtos.get(0);
+        String newKey = generatorLoginKey(tmpUserDto);
+
+        //todo 生成登录token
+        String token = generatorLoginToken(tmpUserDto);
+
+        LoginOwnerResDto loginOwnerResDto = new LoginOwnerResDto();
+        loginOwnerResDto.setOwnerId(ownerDtos.get(0).getOwnerId());
+        loginOwnerResDto.setMemberId(ownerDtos.get(0).getMemberId());
+        loginOwnerResDto.setOwnerName(ownerDtos.get(0).getName());
+        loginOwnerResDto.setUserId(tmpUserDto.getUserId());
+        loginOwnerResDto.setUserName(tmpUserDto.getName());
+        loginOwnerResDto.setOwnerTel(ownerDtos.get(0).getLink());
+        loginOwnerResDto.setCommunityId(ownerDtos.get(0).getCommunityId());
+        loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
+        loginOwnerResDto.setToken(token);
+        loginOwnerResDto.setKey(newKey);
+        context.setResponseEntity(ResultVo.createResponseEntity(loginOwnerResDto));
+
+    }
+
+    /**
+     * 生成登录key
+     *
+     * @param tmpUserDto
+     * @return
+     */
+    private static String generatorLoginToken(UserDto tmpUserDto) {
+        String token;
+        try {
+            Map userMap = new HashMap();
+            userMap.put(CommonConstant.LOGIN_USER_ID, tmpUserDto.getUserId());
+            userMap.put(CommonConstant.LOGIN_USER_NAME, tmpUserDto.getUserName());
+            token = AuthenticationFactory.createAndSaveToken(userMap);
+        } catch (Exception e) {
+            logger.error("登录异常：", e);
+            throw new CmdException("系统内部错误，请联系管理员");
+        }
+        return token;
+    }
+
+    private String generatorLoginKey(UserDto tmpUserDto) {
+        List<UserAttrDto> userAttrDtos = tmpUserDto.getUserAttrs();
+        UserAttrDto userAttrDto = getCurrentUserAttrDto(userAttrDtos, UserAttrDto.SPEC_KEY);
+        String newKey = UUID.randomUUID().toString();
+        if (userAttrDto != null) {
+            UserAttrPo userAttrPo = BeanConvertUtil.covertBean(userAttrDto, UserAttrPo.class);
+            userAttrPo.setValue(newKey);
+            userAttrPo.setStatusCd("0");
+            userAttrV1InnerServiceSMOImpl.updateUserAttr(userAttrPo);
+        } else {
+            UserAttrPo userAttrPo = new UserAttrPo();
+            userAttrPo.setAttrId(GenerateCodeFactory.getAttrId());
+            userAttrPo.setUserId(tmpUserDto.getUserId());
+            userAttrPo.setSpecCd(UserAttrDto.SPEC_KEY);
+            userAttrPo.setValue(newKey);
+            userAttrPo.setStatusCd("0");
+            userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
+        }
+        return newKey;
+    }
+
+    /**
+     * 验证码登录，判断是否是否业主，并且是否绑定关系 如果没有 自动绑定关系
+     *
+     * @param reqJson
+     * @param context
+     */
+    private List<UserDto> ifOwnerLoginByPhone(JSONObject reqJson, ICmdDataFlowContext context) {
+        if (!reqJson.containsKey("loginByPhone") || !reqJson.getBoolean("loginByPhone")) {
+            return null;
+        }
+        String appId = context.getReqHeaders().get("app-id");
+
+        //todo 业主手机端
+        if (!AppDto.WECHAT_OWNER_APP_ID.equals(appId)
+                && !AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)
+                && !AppDto.OWNER_APP_APP_ID.equals(appId)) {
+            return null;
+        }
+
+        if (StringUtil.isEmpty(reqJson.getString("userName"))) {
+            return null;
+        }
+
+        // todo 查询业主或成员
+        OwnerDto ownerDto = new OwnerDto();
+        ownerDto.setLink(reqJson.getString("userName"));
+        ownerDto.setPage(1);
+        ownerDto.setRow(1);
+        List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+
+        // 说明业主不存在 直接返回跑异常
+        if (ownerDtos == null || ownerDtos.size() < 1) {
+            return null;
+        }
+
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId(ownerDtos.get(0).getCommunityId());
+        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+        Assert.listNotNull(communityDtos, "未包含小区信息");
+        CommunityDto tmpCommunityDto = communityDtos.get(0);
+
+        UserPo userPo = new UserPo();
+        userPo.setUserId(GenerateCodeFactory.getUserId());
+        userPo.setName(ownerDtos.get(0).getName());
+        userPo.setTel(ownerDtos.get(0).getLink());
+        userPo.setPassword(AuthenticationFactory.passwdMd5(reqJson.getString("password")));
+        userPo.setLevelCd(UserLevelConstant.USER_LEVEL_ORDINARY);
+        userPo.setAge(ownerDtos.get(0).getAge());
+        userPo.setAddress(ownerDtos.get(0).getAddress());
+        userPo.setSex(ownerDtos.get(0).getSex());
+        int flag = userV1InnerServiceSMOImpl.saveUser(userPo);
+        if (flag < 1) {
+            throw new CmdException("注册失败");
+        }
+
+        OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
+        //状态类型，10000 审核中，12000 审核成功，13000 审核失败
+        ownerAppUserPo.setState("12000");
+        ownerAppUserPo.setAppTypeCd("10010");
+        ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
+        ownerAppUserPo.setMemberId(ownerDtos.get(0).getMemberId());
+        ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
+        ownerAppUserPo.setCommunityId(ownerDtos.get(0).getCommunityId());
+        ownerAppUserPo.setAppUserName(ownerDtos.get(0).getName());
+        ownerAppUserPo.setIdCard(ownerDtos.get(0).getIdCard());
+        ownerAppUserPo.setAppType("WECHAT");
+        ownerAppUserPo.setLink(ownerDtos.get(0).getLink());
+        ownerAppUserPo.setUserId(userPo.getUserId());
+        ownerAppUserPo.setOpenId("-1");
+
+        flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
+        if (flag < 1) {
+            throw new CmdException("添加用户业主关系失败");
+        }
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userPo.getUserId());
+        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+        return userDtos;
+    }
+
+    private UserAttrDto getCurrentUserAttrDto(List<UserAttrDto> userAttrDtos, String specCd) {
+        if (userAttrDtos == null) {
+            return null;
+        }
+        for (UserAttrDto userAttrDto : userAttrDtos) {
+            if (specCd.equals(userAttrDto.getSpecCd())) {
+                return userAttrDto;
+            }
+        }
+
+        return null;
+    }
+}

springboot/src/main/java/com/java110/boot/configuration/ServiceConfiguration.java

@@ -41,6 +41,7 @@ public class ServiceConfiguration {
         exclusions.append("/app/loginProperty,");// 物业APP登录跳过
         exclusions.append("/app/loginOwner,");// 业主APP登录跳过
         exclusions.append("/app/loginOwnerByKey,");// 根据key登录业主
+        exclusions.append("/app/user.ownerUserLogin,");// 业主登录（新）
         exclusions.append("/app/area.listAreas,");// 加载地区
         exclusions.append("/app/community.listCommunitys,");// 加载小区
         exclusions.append("/app/user.userSendSms,");// 发送短信验证码