Merge remote-tracking branch 'origin/jtdev' into jtdev

aix

2024-07-22 283c3e700fe5341d55cd06b0369dac7a1fca9f0c

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/feign/DataAbnormalWarnClient.java

@@ -242,6 +242,7 @@
    * 白蚁预警发短信
    */
   public void sendBaiYiWarn() {
      log.info("sendBaiYiWarn执行" );
      List<BaiYiTestEntity> list = skBaiYiService.selectList();
      Set<String> skNameSet = new HashSet<>();
      ArrayList<WarnMsg> msgEntityList = new ArrayList<>();
@@ -282,20 +283,21 @@
         }
      }
      // 获取到了数据开始发短信
      System.err.println("发送白蚁报警短信数量："+msgEntityList.size());
      if (msgEntityList!= null && msgEntityList.size()>0) {
         System.err.println("白蚁报警信息：");
         for (WarnMsg item : msgEntityList) {
            System.err.println(item.toString());
            String skName = item.getSkName();
            String personInCharge = item.getPersonInCharge();
            String phone = item.getPhone();
            String bayistate = item.getBayistate();


            SMSSendRequest request = new SMSSendRequest();
            request.setUserNumber(phone);
            request.setTemplateId("2431012268292");//短信模版编号
            request.setMessageContent("紧急通知："+skName+" 中 "+bayistate+" 以上白蚁监测点发生白蚁预警，请立安排人前去检查是否真实存在白蚁。");
            request.setTemplateId("2431012282799");//短信模版编号
            request.setMessageContent("紧急通知："+skName+" 中以下白蚁监测点发生白蚁预警，请立安排人前去检查是否真实存在白蚁："+ bayistate);
            SmsUtils.sendMsg(request);

         }
      }