Merge remote-tracking branch 'origin/main'

portal-service-domain/src/main/java/com/hfln/portal/domain/customer/util/MsgClient.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.PostConstruct;
 import javax.validation.constraints.NotBlank;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -26,6 +27,8 @@ public class MsgClient {
     @Autowired
     private RestTemplate restTemplate;
 
+    private SmsClient smsClient;
+
     @NotBlank
     @Value("${lnxx.sms.tencent.secretId}")
     private String secretId;
@@ -58,6 +61,16 @@ public class MsgClient {
     @Value("${lnxx.sms.tencent.signName}")
     private String signName;
 
+    @PostConstruct
+    private void init() {
+        try {
+            this.smsClient = new SmsClient(new Credential(secretId, secretKey), region, new ClientProfile());
+        } catch (Exception e) {
+            log.error("初始化腾讯云短信客户端失败", e);
+            throw new BizException("初始化腾讯云短信客户端失败: " + e.getMessage());
+        }
+    }
+
     public String sendMsg(String mobile, String content, String signName) {
         if (isValidMobile(mobile)) {
             return "手机号格式不正确";
@@ -101,15 +114,13 @@ public class MsgClient {
             throw new BizException("手机号码格式有误");
         }
         try {
-            SmsClient client = new SmsClient(new Credential(secretId, secretKey), region, new ClientProfile());
             SendSmsRequest req = new SendSmsRequest();
             req.setPhoneNumberSet(new String[]{mobile});
-//			req.setSignName("雷能守护小程序");
             req.setSignName(signName);
             req.setTemplateId(templateId);
             req.setTemplateParamSet(templateParams);
             req.setSmsSdkAppId(sdkAppId);
-            SendSmsResponse resp = client.SendSms(req);
+            SendSmsResponse resp = smsClient.SendSms(req);
             return AbstractModel.toJsonString(resp);
         } catch (Exception e) {
             log.error("发送腾讯云短信失败", e);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebAdminDealGatewayImpl.java

@@ -47,6 +47,10 @@ public class WebAdminDealGatewayImpl implements WebAdminDealGateway {
     private EventsService eventsService;
     @Autowired
     private EventListService eventListService;
+    @Autowired
+    private PersonInOutService personInOutService;
+    @Autowired
+    private DevOnOffInfoService devOnOffInfoService;
 
 
     @Override
@@ -62,6 +66,8 @@ public class WebAdminDealGatewayImpl implements WebAdminDealGateway {
         // 6 设备下房间 逻辑删除
         // 7 设备下跌倒事件 逻辑删除
         // 8 设备下告警事件 逻辑删除
+        // 9 监测人员进出表 逻辑删除
+        // 10 监测设备掉线表 逻辑删除
         log.info("超管对设备devId:{}, 进行设备初始化", param.getDevId());
 
         DevInfo devInfo = devInfoService.getById(param.getDevId());
@@ -132,6 +138,24 @@ public class WebAdminDealGatewayImpl implements WebAdminDealGateway {
                         .eq(EventList::getIsDeleted, 0)
                         .set(EventList::getIsDeleted, 1)
         );
+        // 监测人员进出表 逻辑删除
+        List<PersonInOutInfo> personInOutInfos = personInOutService.list(new LambdaQueryWrapper<PersonInOutInfo>().eq(PersonInOutInfo::getDevId, devInfo.getDevId()));
+        log.info("监测人员进出表:{}", JSON.toJSONString(personInOutInfos));
+        personInOutService.update(
+                Wrappers.<PersonInOutInfo>lambdaUpdate()
+                        .eq(PersonInOutInfo::getDevId, devInfo.getDevId())
+                        .eq(PersonInOutInfo::getIsDeleted, 0)
+                        .set(PersonInOutInfo::getIsDeleted, 1)
+        );
+        // 监测设备掉线表 逻辑删除
+        List<DevOnOffInfo> devOnOffInfos = devOnOffInfoService.list(new LambdaQueryWrapper<DevOnOffInfo>().eq(DevOnOffInfo::getDevId, devInfo.getDevId()));
+        log.info("监测设备掉线表:{}", JSON.toJSONString(devOnOffInfos));
+        devOnOffInfoService.update(
+                Wrappers.<DevOnOffInfo>lambdaUpdate()
+                        .eq(DevOnOffInfo::getDevId, devInfo.getDevId())
+                        .eq(DevOnOffInfo::getIsDeleted, 0)
+                        .set(DevOnOffInfo::getIsDeleted, 1)
+        );
 
         // 对设备 绑定信息置空信息
         devInfoService.resetDevInfo(devInfo.getDevId());