From 51d86428eb5343ad5e48b7fd36e4db49293b405b Mon Sep 17 00:00:00 2001 From: lujiang Date: Fri, 17 Jan 2025 20:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ics/admin/controller/MeetingPrintController.java | 9 --------- .../ics/admin/service/impl/RepairRemindServiceImpl.java | 1 - .../src/main/java/com/ics/admin/utils/SMSUtil.java | 9 +++++---- .../ics/service/impl/RepairRemindPushServiceImpl.java | 1 + 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingPrintController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingPrintController.java index d73ad46..13896f7 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingPrintController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingPrintController.java @@ -67,7 +67,6 @@ public class MeetingPrintController { if (!checkToken(accessToken)) return R.error().put("msg", "accessToken无效"); MeetingRecordVo mrv = new MeetingRecordVo(); mrv.setRole(5); - //mrv.setStatus(7); mrv.setExt1("all"); List list = meetingReservationService.selectMeetingReservationList(mrv); JSONArray datas = new JSONArray(); @@ -82,14 +81,6 @@ public class MeetingPrintController { data.put("dept", meetingRecordVo.getUserOrg()); data.put("status", meetingRecordVo.getStatus()); data.put("updateTime", meetingRecordVo.getUpdateTime() == null ? "" : DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, meetingRecordVo.getUpdateTime())); -// String operate = meetingRecordVo.getOperate(); -// JSONArray jsonArray = JSONArray.parseArray(operate); -// if (jsonArray != null && jsonArray.size() > 0) { -// JSONObject jsonObject = jsonArray.getJSONObject(jsonArray.size() - 1); -// data.put("updateTime", jsonObject.getString("time")); -// } else { -// data.put("updateTime", ""); -// } datas.add(data); } return R.ok().put("data", datas); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java index 6e08d85..0bea47f 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRemindServiceImpl.java @@ -1,6 +1,5 @@ package com.ics.admin.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.ics.admin.domain.RepairRemind; import com.ics.admin.mapper.RepairRemindMapper; diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/SMSUtil.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/SMSUtil.java index 867c265..0ed8efe 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/SMSUtil.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/SMSUtil.java @@ -27,11 +27,11 @@ public class SMSUtil { private RestTemplate restTemplate = new RestTemplate(); - private final static String SIGN_NAME = ""; + private final static String SIGN_NAME = "淮安市市级机关服务中心"; private final static String SEND_URL = "https://qxtapi.js118114.com:9003/SMSController/sendSms.do"; - private final static String SPID = ""; - private final static String AUTH_CODE = ""; - private final static String AUTH_KEY = ""; + private final static String SPID = "1000045377"; + private final static String AUTH_CODE = "db69a6f2653f034d699d2cab266e2e6082cb7070"; + private final static String AUTH_KEY = "fbb261ee327e46a09f204fcaeb4c356d"; public JSONObject sendSms(String message, String mobiles) { // 准备请求参数 @@ -100,4 +100,5 @@ public class SMSUtil { } return hexString.toString(); } + } diff --git a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java index 22f4196..a07a337 100644 --- a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java +++ b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairRemindPushServiceImpl.java @@ -105,6 +105,7 @@ public class RepairRemindPushServiceImpl implements RepairRemindPushService { JSONObject smsResult = smsSender.sendSms(content, customerStaff.getMobile()); System.out.println("==========短信发送结果==========" + smsResult.toString()); int code = smsResult.getInteger("code"); +// int code = 5;//瞎写，先替代 if (code == 1) { sms3.add(repairRemind.getId()); } else {