优化

java110-interface/src/main/java/com/java110/intf/job/IIotInnerServiceSMO.java

@@ -8,6 +8,7 @@ import com.java110.dto.fee.TempCarPayOrderDto;
 import com.java110.dto.machine.CarInoutDto;
 import com.java110.dto.machine.MachineDto;
 import com.java110.dto.system.Business;
+import com.java110.dto.user.UserDto;
 import com.java110.vo.ResultVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,4 +48,7 @@ public interface IIotInnerServiceSMO {
      */
     @RequestMapping(value = "/postIotData", method = RequestMethod.POST)
     ResultVo postIotData(@RequestBody IotDataDto iotDataDto);
+
+    @RequestMapping(value = "/sendUserInfo", method = RequestMethod.POST)
+    ResultVo  sendUserInfo(@RequestBody UserDto userDto);
 }

service-job/src/main/java/com/java110/job/smo/impl/IotInnerServiceSMOImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.log.LoggerFactory;
 import com.java110.dto.IotDataDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.job.IIotInnerServiceSMO;
 import com.java110.job.adapt.hcIotNew.http.ISendIot;
 import com.java110.utils.cache.MappingCache;
@@ -58,4 +59,26 @@ public class IotInnerServiceSMOImpl extends BaseServiceSMO implements IIotInnerS
         return resultVo;
     }
 
+
+    @Override
+    public ResultVo sendUserInfo(@RequestBody UserDto userDto) {
+
+        String iotSwitch = MappingCache.getValue("IOT", "IOT_SWITCH");
+
+        if (!"ON".equals(iotSwitch)) {
+            return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+        }
+
+        JSONObject paramIn = new JSONObject();
+        paramIn.put("userId", userDto.getUserId());
+        paramIn.put("tel", userDto.getTel());
+        paramIn.put("passwd", userDto.getPassword());
+        paramIn.put("userName", userDto.getName());
+        paramIn.put("address", userDto.getAddress());
+
+        ResultVo resultVo = sendIotImpl.post("/iot/api/owner.transforOwnerUser", paramIn);
+
+        return resultVo;
+    }
+
 }

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

@@ -23,6 +23,7 @@ import com.java110.intf.common.ISmsInnerServiceSMO;
 import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.job.IIotInnerServiceSMO;
 import com.java110.intf.job.IMallInnerServiceSMO;
 import com.java110.intf.user.*;
 import com.java110.po.owner.OwnerAppUserPo;
@@ -83,6 +84,9 @@ public class OwnerUserLoginCmd extends Cmd {
     @Autowired
     private IMallInnerServiceSMO mallInnerServiceSMOImpl;
 
+    @Autowired
+    private IIotInnerServiceSMO iotInnerServiceSMOImpl;
+
     @Autowired
     private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
 
@@ -134,6 +138,9 @@ public class OwnerUserLoginCmd extends Cmd {
         //todo 1.2 同步物业用户资料给商城
         mallInnerServiceSMOImpl.sendUserInfo(userDtos.get(0));
 
+        //todo 1.3 同步物业用户资料给物联网
+        iotInnerServiceSMOImpl.sendUserInfo(userDtos.get(0));
+
         // todo  2.0 校验 业主用户绑定表是否存在记录
         OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
         ownerAppUserDto.setUserId(userDtos.get(0).getUserId());

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

@@ -25,10 +25,7 @@ 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.utils.util.*;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -116,10 +113,10 @@ public class UserLoginCmd extends Cmd {
         List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
 
         //todo 验证码登录，判断是否是否业主，并且是否绑定关系 如果没有 自动绑定关系
-        if (userDtos == null || userDtos.size() < 1) {
+        if (ListUtil.isNull(userDtos)) {
             userDtos = ifOwnerLoginByPhone(reqJson, context);
         }
-        if (userDtos == null || userDtos.size() < 1) {
+        if (ListUtil.isNull(userDtos)) {
             throw new SMOException(errorInfo);
         }