Merge remote-tracking branch 'origin/master'

src/main/java/com/care/bms/controller/SysUserController.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -99,6 +100,8 @@ public class SysUserController {
         try {
 
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            String md5Password = DigestUtils.md5Hex("123456");
+            vo.setPassword(md5Password);
             int flag = this.bmsSysUserService.createCareSysUser(vo,loginUser);
             if (flag == 1) {
                 return  Result.error("电话已存在！");

src/main/java/com/care/common/entity/CareEventOrder.java

@@ -69,6 +69,8 @@ public class    CareEventOrder implements Serializable {
     @ApiModelProperty("设备ID")
     @TableField("DEV_ID")
     private Long devId;
+    @TableField("DEV_CODE")
+    private String devCode;
 
 
     @ApiModelProperty("设备名称")

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -135,13 +135,14 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
         his.setCreateTime(order.getCreateTime());
 
         addOlderToOrderOlder(order);
-        addChamberlainToOrder(order);
+        List<CareEventOrderChamb> chambList =  addChamberlainToOrder(order);
         List<CareEventOrderContactStatus> contacts = addContactToOrderContact(order);
         Object switchSms = redisUtil.get(RedisKeyConstant.SWITCH_SMS);
         if (switchSms != null){
             //给联系人发送短信
+            CareHouse house = this.careHouseService.getById(order.getHouseId());
             if (CollUtil.isNotEmpty(contacts)){
-                CareHouse house = this.careHouseService.getById(order.getHouseId());
+
                 contacts.forEach(item ->{
                     boolean smsResult = smsSendService.sendSmsToLianxiren(order.getOrderType(),item.getContactPhone(),house.getName());
                     if (smsResult){
@@ -160,6 +161,26 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                     }
                 });
             }
+            //给管家发短信
+            if (CollUtil.isNotEmpty(chambList)){
+                chambList.forEach(item ->{
+                    boolean smsResult = smsSendService.sendSmsToLianxiren(order.getOrderType(),item.getPhone(),house.getName());
+                    if (smsResult){
+                        CareEventOrderHandleHis his2 = new CareEventOrderHandleHis();
+                        his2.setOrgId(item.getOrgId());
+                        his2.setStationId(item.getStationId());
+                        his2.setOrderId(item.getOrderId());
+                        his2.setLogType(LogTypeEnum.SMS.getValue());
+                        his2.setLogObjectId(item.getChambId());
+                        his2.setLogObjectName(item.getChambName());
+                        his2.setLogResult("短信通知");
+                        his2.setOpUserRole(UserRoleEnum.SEAT.getValue());
+                        his2.setCreateTime(DateUtil.date());
+                        his2.setRelationTypeDesc("管家");
+                        this.careEventOrderHandleHisService.save(his2);
+                    }
+                });
+            }
         }
         this.careEventOrderHandleHisService.save(his);
         return true;
@@ -202,7 +223,8 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
      * 将管家加入到工单当中
      * @param order
      */
-    private void addChamberlainToOrder(CareEventOrder order){
+    private List<CareEventOrderChamb> addChamberlainToOrder(CareEventOrder order){
+        List<CareEventOrderChamb> chambList = Lists.newArrayList();
         CareDevice dev = this.careDeviceService.getById(order.getDevId());
         if (dev != null){
             CareSysUser user = this.careSysUserService.getById(dev.getChambId());
@@ -219,8 +241,10 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                 chamb.setCreateTime(order.getCreateTime());
                 chamb.setModifyTime(order.getCreateTime());
                 this.careEventOrderChambService.save(chamb);
+                chambList.add(chamb);
             }
         }
+        return chambList;
     }
 
     /**

src/main/java/com/care/common/vo/order/EventOrderVO.java

@@ -101,4 +101,6 @@ public class EventOrderVO implements Serializable {
 
     @ApiModelProperty("告警数量")
     private Integer warnCount;
+
+    private String devCode;
 }

src/main/java/com/care/mqtt/service/MqttMsgService.java

@@ -249,6 +249,7 @@ public class MqttMsgService {
       order.setStationName(careStationService.getById(careDevice.getStationId()).getName());
       order.setHouseId(careHouse.getId());
       order.setDevId(careDevice.getId());
+      order.setDevCode(careDevice.getDevCode());
       order.setDevName(careDevice.getDevName());
       order.setHouseName(careHouse.getName());
       order.setMemberId(careDevice.getMemberId());

src/main/resources/application.properties

@@ -80,5 +80,5 @@ sms.notice.templateid.register.phone=1041847
 sms.notice.templateid.modify.password=1041838
 
 
-device.3d.url.host=https://www.ventropic.com/rt/dist/#/?topic=5JPD%2Fmonitor%2Ff1%2Fevent
+device.3d.url.host=https://www.ventropic.com
 device.3d.url.path=/rt/dist/#/?topic=