| ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-admin/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/domain/PatArchiveSrmVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -2,6 +2,7 @@ import com.github.pagehelper.ISelect; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; @@ -10,6 +11,7 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.PreachFormEnum; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.DtoConversionUtils; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -19,9 +21,11 @@ import com.smartor.service.IServiceSubtaskRecordService; import com.smartor.service.IServiceSubtaskService; import com.smartor.service.IServiceTaskService; import com.sun.org.apache.bcel.internal.generic.NEW; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import net.bytebuddy.implementation.bytecode.Throw; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +33,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -386,4 +391,21 @@ return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq)); } /** * åéçä¿¡æ¨¡æ¿ */ @ApiOperation("åéç信模æ¿") @PostMapping("/sendMsgTemplate") public Map<String, Object> sendMsgTemplate(@RequestBody List<PatArchiveSrmVO> patArchiveSrmVOS) { if (CollectionUtils.isEmpty(patArchiveSrmVOS)) { throw new BaseException("æ£è ä¿¡æ¯ä¸è½ä¸ºç©º"); } List<PatArchiveSrmVO> pasList = serviceSubtaskService.sendMsgTemplate(patArchiveSrmVOS); Map<String, Object> map = new HashMap<>(); map.put("code", HttpStatus.SUCCESS); map.put("fail", CollectionUtils.isEmpty(pasList) ? null : pasList); return map; } } ruoyi-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@ # å½é åèµæºæä»¶è·¯å¾ basename: i18n/messages profiles: active: druid active: sltd # æä»¶ä¸ä¼ servlet: multipart: smartor/src/main/java/com/smartor/domain/PatArchiveSrmVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,44 @@ package com.smartor.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; import java.util.List; /** * æ£è æ¡£æ¡å¯¹è±¡ PatArchiveVO * * @author ls */ @ApiModel(value = "PatArchiveVO", description = "æ£è ç信模æ¿åé") @Data public class PatArchiveSrmVO extends BaseEntity { /** * å§å */ @ApiModelProperty("å§å") @Excel(name = " å§å ") private String name; @ApiModelProperty("ç信模æ¿") @Excel(name = "ç信模æ¿") private String srmTemplate; @ApiModelProperty("ææºå·") @Excel(name = "ææºå·") private String phone; @ApiModelProperty("æ¥è®¿æ¶é´") @Excel(name = "æ¥è®¿æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date visitTime; } smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -134,4 +134,6 @@ public List<ServiceSubtaskCount> getSfStatisticsJoydetails(ServiceSubtaskCountReq serviceSubtaskCountReq); public List<ServiceStatisticsResponse> getServiceStatistics(ServiceStatisticsRequest request); public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS); } smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1,10 +1,12 @@ package com.smartor.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.dx.MessageSend; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.*; import com.smartor.common.FtpService; @@ -25,10 +27,7 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.time.Duration; import java.time.LocalDate; import java.time.LocalTime; import java.time.ZoneId; import java.time.*; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.TimeUnit; @@ -2080,6 +2079,37 @@ return result; } @Override public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS) { //ç¨æ¥è®°å½åé失败ç List<PatArchiveSrmVO> sendError = new ArrayList<>(); for (PatArchiveSrmVO patArchiveSrmVO : patArchiveSrmVOS) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYYå¹´MMæddæ¥HH:mm"); String timestamp = simpleDateFormat.format(patArchiveSrmVO.getVisitTime()); StringBuilder stringBuilder = new StringBuilder(); if (patArchiveSrmVO.getSrmTemplate().equals("å ¥é¢åå¤ä¸å¿-æ æ£æ¥")) { stringBuilder.append(patArchiveSrmVO.getName() + ",æ¨å¥½ï¼ä¸»ç®¡å»ç已为æ¨å®æä½é¢ï¼è¯·äºå½å¤©"); } else if (patArchiveSrmVO.getSrmTemplate().equals("å ¥é¢åå¤ä¸å¿-ç©ºè ¹æ£æ¥")) { stringBuilder.append(patArchiveSrmVO.getName() + ",æ¨å¥½ï¼ä¸»ç®¡å»ç已为æ¨å®æä½é¢ï¼è¯·å½å¤©ç©ºè ¹å¹¶äº"); } else if (patArchiveSrmVO.getSrmTemplate().equals("æ¥é´ç æ¿âæ©æç äººæ£æ¥")) { stringBuilder.append(patArchiveSrmVO.getName() + ",æ¨å¥½ï¼ä¸»ç®¡å»ç已为æ¨å®æä½é¢åæ£æ¥ï¼è¯·å½å¤©ç©ºè ¹å¹¶äº"); } stringBuilder.append(timestamp + ",ä¹åæºå¸¦å»ä¿å¡æçµåå»ä¿å¡èº«ä»½è¯åæ¤æ¡çä¿¡å°1å·æ¥¼3楼åå ¥é¢åå¤ä¸å¿å ¥é¢ç»è®°çªå£ï¼åçæ£å¼ä½é¢æç»ï¼å®æåé¡¹æ£æ¥ååå°ç¸åºç åºæ¤å£«ç«æ¥å°ã"); stringBuilder.append("å ¥é¢åå¤ä¸å¿çµè¯ï¼89975977ãå ¥é¢åçé¡»ç¥:https://mp.weixin.qq.com/s/OCkotuRyQ8Ld2owFF0YErw"); JSONObject data = MessageSend.sendMsg(stringBuilder.toString(), "2", patArchiveSrmVO.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); String code = data.get("code").toString(); if (StringUtils.isNotEmpty(code) && !code.equals("00000")) { sendError.add(patArchiveSrmVO); } } return sendError; } /** * è·åé访ç»è®¡æ¯ä¾ *