缺个短信模板编码

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java

@@ -25,6 +25,7 @@ import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.PointRecordResultDTO;
 import com.epmet.dto.result.demand.*;
 import com.epmet.entity.IcUserDemandRecEntity;
+import com.epmet.entity.ServerInfoDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -262,4 +263,6 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
     void icEventComment(IcEventCommentToDemandFromDTO formDTO);
 
     Integer selectCountByServerId(String serverId);
+
+    ServerInfoDTO queryServiceName(String serverId, String serviceType);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java

@@ -14,6 +14,8 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.dao.IcServiceFeedbackV2Dao;
 import com.epmet.dao.IcServiceRecordV2Dao;
 import com.epmet.dao.IcServiceScopeDao;
@@ -22,19 +24,15 @@ import com.epmet.dto.IcServiceFeedbackV2DTO;
 import com.epmet.dto.IcServiceRecordV2DTO;
 import com.epmet.dto.IcServiceScopeV2DTO;
 import com.epmet.dto.form.IcServiceRecordV2AddEditFormDTO;
+import com.epmet.dto.form.SendSmsFormDTO;
 import com.epmet.dto.form.ServiceRecordV2DetailFormDTO;
 import com.epmet.dto.form.ServiceRecordV2ListFormDTO;
 import com.epmet.dto.result.ServiceRecordV2DetailResultDTO;
 import com.epmet.dto.result.ServiceRecordV2ListResultDTO;
-import com.epmet.entity.HeartAttachmentEntity;
+import com.epmet.entity.*;
-import com.epmet.entity.IcServiceFeedbackV2Entity;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
-import com.epmet.entity.IcServiceRecordV2Entity;
-import com.epmet.entity.IcServiceScopeV2Entity;
 import com.epmet.redis.IcPartyUnitRedis;
-import com.epmet.service.HeartAttachmentService;
+import com.epmet.service.*;
-import com.epmet.service.IcServiceFeedbackV2Service;
-import com.epmet.service.IcServiceRecordV2Service;
-import com.epmet.service.IcServiceScopeV2Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -44,10 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 服务记录表
@@ -75,6 +70,8 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
     private IcServiceFeedbackV2Dao serviceFeedbackV2Dao;
     @Autowired
     private IcServiceScopeV2Dao icServiceScopeV2Dao;
+    @Autowired
+    private EpmetMessageOpenFeignClient messageOpenFeignClient;
 
     @Override
     public PageData<IcServiceRecordV2DTO> page(Map<String, Object> params) {
@@ -156,7 +153,35 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
         }
 
         insert(entity);
-
+        // 未直接反馈的，给服务组织发送短信
+        // XXX社区发起一个【服务名称】服务，请服务完成后尽快反馈，谢谢合作。
+        if(null==formDTO.getFeedback()){
+            sendPhoneMsgToServiceOrg(formDTO.getCustomerId(),formDTO.getUserId(),formDTO.getServiceOrgId(),formDTO.getServiceOrgType(),formDTO.getServiceName());
+        }
+    }
+    /**
+     * 未直接反馈的，给服务组织(社区自组织、联建单位、志愿者)发送短信
+     */
+    private void sendPhoneMsgToServiceOrg(String customerId, String staffId, String serviceOrgId, String serviceOrgType, String serviceName) {
+        ServerInfoDTO serverInfoDTO = SpringContextUtils.getBean(IcUserDemandRecService.class).queryServiceName(serviceOrgId, serviceOrgType);
+        if (null == serverInfoDTO || StringUtils.isBlank(serverInfoDTO.getMobile()) || serverInfoDTO.getMobile().length() < 11 || serverInfoDTO.getMobile().contains("-")) {
+            return;
+        }
+        // XXX社区发起一个【服务名称】服务，请服务完成后尽快反馈，谢谢合作。
+        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+        if (null == staffInfoCacheResult || StringUtils.isBlank(staffInfoCacheResult.getAgencyName())) {
+            return;
+        }
+        List<SendSmsFormDTO> smsList = new ArrayList<>();
+        SendSmsFormDTO sms = new SendSmsFormDTO();
+        sms.setCustomerId(customerId);
+        sms.setMobile(serverInfoDTO.getMobile());
+        sms.setAliyunTemplateCode(SmsTemplateConstant.COMMON_SMS_TEM);
+        Map<String, String> paramMap = new HashMap<>();
+        paramMap.put("content", String.format("%s发起一个【%s】服务，请服务完成后尽快反馈，谢谢合作。", staffInfoCacheResult.getAgencyName(), serviceName));
+        sms.setParamMap(paramMap);
+        smsList.add(sms);
+        messageOpenFeignClient.sendMsg(smsList);
     }
 
     @Override

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -453,13 +453,12 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         SendSmsFormDTO sms = new SendSmsFormDTO();
         sms.setCustomerId(customerId);
         sms.setMobile(mobile);
-        sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
+        sms.setAliyunTemplateCode(SmsTemplateConstant.COMMON_SMS_TEM);
-        List<String> paramsContent=new ArrayList<>();
+        Map<String, String> paramMap = new HashMap<>();
-        paramsContent.add(String.format("%s给您指派了一个新的需求，请查看",staffInfoCacheResult.getAgencyName()));
+        paramMap.put("content", String.format("%s给您指派了一个新的需求，请查看", staffInfoCacheResult.getAgencyName()));
-        sms.setParamsContent(paramsContent);
+        sms.setParamMap(paramMap);
         smsList.add(sms);
         messageOpenFeignClient.sendMsg(smsList);
-
     }
 
     /**
@@ -468,7 +467,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      * @param serviceType
      * @return
      */
-    private ServerInfoDTO queryServiceName(String serverId, String serviceType) {
+    public ServerInfoDTO queryServiceName(String serverId, String serviceType) {
         String serviceName="";
         String mobile="";
         switch (serviceType)

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java

@@ -37,4 +37,12 @@ public interface SmsTemplateConstant {
      * 项目滞留提醒
      */
     String PROJECT_OVERDUE = "SMS_206885207";
+
+    /**
+     * 通用的短信模板，翻出来的内容
+     *【党群e事通】:XXXXX
+     * 参数key：content
+     */
+    // todo
+    String COMMON_SMS_TEM="";
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendSmsFormDTO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
+import java.util.Map;
 
 /**
  * @Description
@@ -35,8 +35,8 @@ public class SendSmsFormDTO implements Serializable {
     /**
      * 如果短信模板内有参数，按序传入
      */
-    private List<String> paramsContent;
+    // private List<String> paramsContent;
-
+    private Map<String,String> paramMap;
     private String customerId;
 }
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -333,16 +332,15 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
     public void sendMsg(List<SendSmsFormDTO> formDTOList) {
         try {
             for(SendSmsFormDTO formDTO:formDTOList){
+                if (StringUtils.isBlank(formDTO.getAliyunTemplateCode())) {
+                    continue;
+                }
                 SysSmsDTO sysSmsDTO = new SysSmsDTO();
                 sysSmsDTO.setMobile(formDTO.getMobile());
                 sysSmsDTO.setAliyunTemplateCode(formDTO.getAliyunTemplateCode());
                 sysSmsDTO.setCustomerId(formDTO.getCustomerId());
-                HashMap<String, String> map = new HashMap<>();
                 try{
-                    if(SmsTemplateConstant.PROJECT_TRANSFER.equals(formDTO.getAliyunTemplateCode())){
+                    String paramJson = new ObjectMapper().writeValueAsString(formDTO.getParamMap());
-                        map.put("params1", formDTO.getParamsContent().get(NumConstant.ZERO));
-                    }
-                    String paramJson = new ObjectMapper().writeValueAsString(map);
                     sysSmsDTO.setParams(paramJson);
                 } catch (JsonProcessingException e) {
                     log.warn("sendMsg JsonProcessingException", e);