smartor.git - Gitblit

			@@ -10,12 +10,15 @@
			import com.ruoyi.common.core.redis.RedisCache;
			import com.ruoyi.common.enums.MsgLSEnum;
			import com.ruoyi.common.enums.ServiceFromEnum;
			import com.ruoyi.common.enums.VisitSendStateEnum;
			import com.ruoyi.common.enums.WxGZHEnum;
			import com.ruoyi.common.exception.base.BaseException;
			import com.ruoyi.common.utils.HttpUtil;
			import com.ruoyi.common.utils.OkHttpExample;
			import com.ruoyi.common.utils.RSAPublicKeyExample;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.http.HttpUtils;
			import com.smartor.common.LSHospTokenUtil;
			import com.smartor.domain.*;
			import com.smartor.mapper.ServiceSubtaskMapper;
			import com.smartor.mapper.ServiceTaskMapper;
			@@ -305,23 +308,15 @@
			* @return
			*/
			public boolean isDateToday(Date date) {
			//如果给的日期小于当前日期，也直接发送
			LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
			if (localDateTime.isBefore(LocalDateTime.now())) {
			return true;
			if (date == null) {
			return false;
			}
			// 获取当前日期
			Calendar calendarNow = Calendar.getInstance();
			int todayYear = calendarNow.get(Calendar.YEAR);
			int todayMonth = calendarNow.get(Calendar.MONTH);
			int todayDay = calendarNow.get(Calendar.DAY_OF_MONTH);

			// 创建一个 Calendar 实例用于检查的日期
			Calendar calendarToCheck = Calendar.getInstance();
			calendarToCheck.setTime(date);

			// 比较年、月和日
			return (calendarToCheck.get(Calendar.YEAR) == todayYear && calendarToCheck.get(Calendar.MONTH) == todayMonth && calendarToCheck.get(Calendar.DAY_OF_MONTH) == todayDay);
			// 将 Date 转为 LocalDate
			LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
			// 获取今天的 LocalDate
			LocalDate today = LocalDate.now();
			// 如果日期早于或等于今天，返回 true
			return !localDate.isAfter(today);
			}

			public void sfHandlle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
			@@ -340,6 +335,15 @@
			ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
			ivrTaskcall.setSendstate(2L);
			List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
			//丽水有的医院还没法做长期任务随访
			List<ServiceSubtask> subtaskList2 = new ArrayList<>();
			if (visitHosp == 2) {
			for (ServiceSubtask serviceSubtask : subtaskList) {
			Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
			if (b) subtaskList2.add(serviceSubtask);
			}
			subtaskList = subtaskList2;
			}

			// 按照 endtime 离当前时间最近的排序
			List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
			@@ -482,8 +486,9 @@
			isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
			} else if (visitHosp == 2) {
			//丽水的短信发送方式
			String address = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
			if (StringUtils.isEmpty(address)) {
			Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
			String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid());
			if (ObjectUtils.isNotEmpty(map) && StringUtils.isEmpty(map.get("address"))) {
			ServiceSubtask ss = new ServiceSubtask();
			ss.setResult("error");
			ss.setRemark("短信发送失败,该机构没有配置短信地址");
			@@ -493,11 +498,12 @@
			serviceSubtaskMapper.updateServiceSubtask(ss);
			continue;
			}
			String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()));
			log.error("---------丽水短信发送入参address：{}, sendMagParam:{}, orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
			String dxCode = getDXCode(map.get("address"), sendMagParam.getPhone(), sendMagParam.getContent(), map.get("sendPersonId"), map.get("sendPersonName"), MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()), token);
			log.error("---------丽水短信发送结果：{}-------", dxCode);
			ObjectMapper objectMapper = new ObjectMapper();
			Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
			String code = textParam.get("code").toString();
			String code = textParam.get("Code").toString();
			if (code.equals("0")) {
			isSuccess = "true";
			}
			@@ -606,6 +612,7 @@
			if ((Boolean) map.get("succ") == true) {
			serviceSubtask.setResult("success");
			} else {
			log.error("serviceSubtask1231313的值为：{}", serviceSubtask);
			serviceSubtask.setResult("error");
			serviceSubtask.setSendstate(5L);
			serviceSubtask.setRemark(map.get("msg").toString());
			@@ -842,7 +849,7 @@
			return key;
			}

			private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap) {
			private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap, String token) {
			Map<String, Object> map = new LinkedHashMap<>();

			Map<String, Object> YeWuXX = new LinkedHashMap<>();
			@@ -854,11 +861,17 @@
			YeWuXX.put("DuanXinXX", DuanXinXX);

			map.put("XiaoXiTou", headerMap);
			map.put("DuanXinXX", DuanXinXX);
			map.put("YeWuXX", YeWuXX);

			String body = new Gson().toJson(map);

			String result = HttpUtils.sendPost(address, body);
			// String result = HttpUtils.sendPost(address, body);
			String result = null;
			try {
			result = OkHttpExample.sendPostRequest(address, body, token);
			} catch (IOException e) {
			e.printStackTrace();
			}
			log.error("--------result的值为：{}-----", result);

			JSONObject jsonObject = JSONObject.parseObject(result);