add:阿里云短信模板获取签名和模板信息5

cloudroam

2024-12-29 f03fd9baf8163a4429133a41a183d28abc9e66fd

add:阿里云短信模板获取签名和模板信息5

 src/main/java/com/mzl/flower/dto/request/sms/SmsTaskDTO.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
public class SmsTaskDTO {
    @ApiModelProperty(value = "短信任务管理id")
@@ -25,4 +27,6 @@

    private Long num;

    private List<SmsUserDTO> smsUserDTOS;

}

 src/main/java/com/mzl/flower/dto/request/sms/SmsTaskDetailQueryDTO.java

@@ -8,4 +8,10 @@
    @ApiModelProperty(value = "任务ID")
    private Long smsTaskId;

    @ApiModelProperty("接收号码")
    private String phone;

    @ApiModelProperty("发送结果")
    private String result;

}

 src/main/java/com/mzl/flower/dto/request/sms/SmsUserDTO.java

对比新文件
@@ -0,0 +1,16 @@
package com.mzl.flower.dto.request.sms;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
public class SmsUserDTO {
    @ApiModelProperty(value = "userId")
    private String userId;

    @ApiModelProperty("userPhone")
    private String userPhone;

}

 src/main/java/com/mzl/flower/dto/request/system/SearchUserDTO.java

@@ -17,4 +17,14 @@
    @ApiModelProperty(hidden = true)
    private List<String> userTypes;

    @ApiModelProperty(value = "ID")
    private String id;

    @ApiModelProperty(value = "userType")
    private String userType;

    @ApiModelProperty(value = "手机号")
    private String tel;


}

 src/main/java/com/mzl/flower/dto/response/sms/SmsPhoneResultVO.java

@@ -1,10 +1,14 @@
package com.mzl.flower.dto.response.sms;

import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;

@Data
public class SmsPhoneResultVO {
public class SmsPhoneResultVO  extends AbstractTransDTO {

    @ApiModelProperty("ID")
    private Long id;
@@ -13,5 +17,17 @@
    private String phone;

    @ApiModelProperty("发送结果")
    @DictTrans(target = "resultStr", codeType = "SMS_SEND_RESULT")
    private String result;

    private String resultStr;

    @ApiModelProperty("失败原因")
    private String failReason;

    @ApiModelProperty("创建时间")
    private LocalDateTime createTime;



}

 src/main/java/com/mzl/flower/dto/response/sms/SmsSelectVO.java

对比新文件
@@ -0,0 +1,27 @@
package com.mzl.flower.dto.response.sms;

import com.mzl.flower.base.AbstractTransDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class SmsSelectVO extends AbstractTransDTO {
    @ApiModelProperty("用户ID")
    private String userId;

    @ApiModelProperty("用户类型")
    private String type;

    @ApiModelProperty(value = "用户所在类型的ID")
    private String id;

    @ApiModelProperty("名称")
    private String loginName;

    @ApiModelProperty("注册手机号")
    private String tel;




}

 src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java

@@ -33,4 +33,16 @@
    @ApiModelProperty("创建时间")
    private LocalDateTime createTime;

    @ApiModelProperty("任务类型")
    private String type;

    @DictTrans(target = "typeStr", codeType = "SMS_TASK_STATUS")
    private String typeStr;

    @ApiModelProperty("导入文件路径")
    private String fileUrl;

    @ApiModelProperty("手机号")
    private String phones;

}

 src/main/java/com/mzl/flower/dto/response/system/UserListInfoDTO.java

对比新文件
@@ -0,0 +1,24 @@
package com.mzl.flower.dto.response.system;

import com.mzl.flower.base.AbstractTransDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class UserListInfoDTO extends AbstractTransDTO {

    private String userId;

    private String id;

    @ApiModelProperty(value = "用户名")
    private String loginName;

    @ApiModelProperty(value = "手机号")
    private String tel;

    @ApiModelProperty(value = "类型")
    private String type;


}

 src/main/java/com/mzl/flower/entity/SmsTaskDO.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -53,6 +54,10 @@
     * 任务状态
     */
    private String status;
    /**
     * 用户ID列表
     */
    private String userIds;


}

 src/main/java/com/mzl/flower/entity/SmsTaskDetailDO.java

@@ -43,5 +43,10 @@
     */
    private String responseResult;

    /**
     * 失败原因
     */
    private String failReason;


}

 src/main/java/com/mzl/flower/mapper/SmsTaskDetailMapper.java

@@ -25,14 +25,5 @@
    List<SmsPhoneResultVO> queryPage(@Param("dto") SmsTaskDetailQueryDTO dto, Page page);


    @Select("SELECT\n" +
            "\tt.id,\n" +
            "\tt.NAME AS smsTaskName ,\n" +
            "\tt.num as totalNum,\n" +
            "\tst.`name` as smsTemplateName\n" +
            "FROM\n" +
            "\tt_sms_task t\n" +
            "\tLEFT JOIN t_sms_template st ON t.sms_template_id = st.id\n" +
            "\tleft join t_sms_task_detail std ON t.id = std.sms_task_id")
    SmsTaskDetailVO getCountBySmsTaskId(Long id);
    SmsTaskDetailVO getCountBySmsTaskId(@Param("id") Long id);
}

 src/main/java/com/mzl/flower/mapper/system/UserMapper.java

@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.dto.request.system.SearchUserDTO;
import com.mzl.flower.dto.response.sms.SmsSelectVO;
import com.mzl.flower.dto.response.system.UserListDTO;
import com.mzl.flower.dto.response.system.UserListInfoDTO;
import com.mzl.flower.entity.system.User;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -21,4 +24,9 @@
    String selectUserRoleDesc(@Param("userId") String userId);

    User getByOpenID(@Param("openId") String openId, List<String> userTypes);


    List<SmsSelectVO> getSelectList(@Param("idList") List<String> idList);

    List<UserListInfoDTO> searchUserInfo(Page page, @Param("condition") SearchUserDTO dto);
}

 src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java

@@ -14,6 +14,8 @@
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.sms.SmsTaskDTO;
import com.mzl.flower.dto.request.sms.SmsTaskQueryDTO;
import com.mzl.flower.dto.request.sms.SmsUserDTO;
import com.mzl.flower.dto.response.sms.SmsSelectVO;
import com.mzl.flower.dto.response.sms.SmsTaskVO;
import com.mzl.flower.entity.SmsTaskDO;
import com.mzl.flower.entity.SmsTaskDetailDO;
@@ -21,8 +23,10 @@
import com.mzl.flower.mapper.SmsTaskDetailMapper;
import com.mzl.flower.mapper.SmsTaskMapper;
import com.mzl.flower.mapper.SmsTemplateMapper;
import com.mzl.flower.mapper.system.UserMapper;
import com.mzl.flower.service.sms.SmsTaskDetailService;
import com.mzl.flower.service.sms.SmsTaskService;
import com.mzl.flower.service.system.UserService;
import com.mzl.flower.utils.SmsUtil;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.*;
@@ -30,6 +34,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.io.File;
@@ -56,6 +61,8 @@
public class SmsTaskServiceImpl extends ServiceImpl<SmsTaskMapper, SmsTaskDO> implements SmsTaskService {
    private final OssProperties ossProperties;
    private final SmsTaskMapper smsTaskMapper;

    private final UserMapper userMapper;

    private final SmsTemplateMapper smsTemplateMapper;

@@ -119,8 +126,28 @@
        if (Constants.SMS_RECEIVE_TYPE.IMPORT.name().equals(smsTaskDTO.getType())) {
            dealImportExcel(smsTaskDTO);
        }
        List<SmsUserDTO> smsUserDTOS = smsTaskDTO.getSmsUserDTOS();
        List<String> userIds = smsUserDTOS.stream()
                .map(SmsUserDTO::getUserId)
                .collect(Collectors.toList());

        List<String> userPhones = smsUserDTOS.stream()
                .map(SmsUserDTO::getUserPhone)
                .collect(Collectors.toList());

        if(CollectionUtils.isEmpty(userPhones)){
            String phones = userPhones.stream()
                    .map(Object::toString) // 确保每个元素都转换为字符串
                    .collect(Collectors.joining("\n")); // 使用换行符连接字符串
            smsTaskDTO.setPhones(phones); // 假设有一个setPhones方法用于设置phones字段
        }
        SmsTaskDO smsTaskDO = new SmsTaskDO();
        BeanUtils.copyProperties(smsTaskDTO, smsTaskDO);
        if (CollectionUtils.isEmpty(userIds)) {
            String userIdInfos = userIds.stream().map(Object::toString) // 确保每个元素都转换为字符串
                    .collect(Collectors.joining(";")); // 使用换行符连接字符串
            smsTaskDO.setUserIds(userIdInfos);
        }
        smsTaskDO.setStatus(Constants.SMS_TASK_STATUS.wait_publish.name());
        smsTaskDO.setPhones(smsTaskDTO.getPhones());
        smsTaskDO.create(SecurityUtils.getUserId());
@@ -291,6 +318,20 @@
        });
    }

    @Override
    public List<SmsSelectVO> getSelectList(Long id) {
        List<SmsSelectVO> smsSelectVOList = null;
        SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
        String ids = smsTaskDO.getUserIds();
        if (StringUtils.isEmpty(ids)) {
            return smsSelectVOList;
        } else {
            String[] idArray = ids.split(";");
            List<String> idList = Arrays.asList(idArray);
            return userMapper.getSelectList(idList);
        }
    }

    private List<SmsTaskDetailDO> createSmsTaskDetails(SmsTaskDO smsTaskDO, List<String> phoneNumbers) {
        return phoneNumbers.stream().map(phone -> {
            SmsTaskDetailDO detail = new SmsTaskDetailDO();
@@ -311,6 +352,7 @@
                if("OK".equals(sendSmsResponse.getCode())){
                    detail.setResult(Constants.SMS_SEND_RESULT.success.name());
                }else{
                    detail.setFailReason(sendSmsResponse.getMessage());
                    detail.setResult(Constants.SMS_SEND_RESULT.failure.name());
                }
                detail.setResponseResult(sendSmsResponse.toString());

 src/main/java/com/mzl/flower/service/sms/SmsTaskService.java

@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mzl.flower.dto.request.sms.SmsTaskDTO;
import com.mzl.flower.dto.request.sms.SmsTaskQueryDTO;
import com.mzl.flower.dto.response.sms.SmsSelectVO;
import com.mzl.flower.dto.response.sms.SmsTaskVO;
import com.mzl.flower.entity.SmsTaskDO;

import java.util.List;

/**
 * <p>
@@ -27,4 +30,5 @@

    void publishSmsTask(SmsTaskDTO smsTaskDTO);

    List<SmsSelectVO> getSelectList(Long id);
}

 src/main/java/com/mzl/flower/service/system/UserService.java

@@ -11,10 +11,7 @@
import com.mzl.flower.dto.request.customer.UpdateCustomerDTO;
import com.mzl.flower.dto.request.system.*;
import com.mzl.flower.dto.response.current.CurrentUserDTO;
import com.mzl.flower.dto.response.system.EmployeeDTO;
import com.mzl.flower.dto.response.system.MenuTreeDTO;
import com.mzl.flower.dto.response.system.UserDetailsDTO;
import com.mzl.flower.dto.response.system.UserListDTO;
import com.mzl.flower.dto.response.system.*;
import com.mzl.flower.entity.point.CustomerPoint;
import com.mzl.flower.entity.system.*;
import com.mzl.flower.enums.TrueOrFalseEnum;
@@ -560,4 +557,12 @@
        }
    }

    public Page<UserListInfoDTO> searchUserInfos(SearchUserDTO dto, Page page) {
        List<UserListInfoDTO> result = userMapper.searchUserInfo(page, dto);

        page.setRecords(result);
        return page;
    }


}

 src/main/java/com/mzl/flower/web/system/UserController.java

@@ -11,6 +11,7 @@
import com.mzl.flower.dto.request.system.UpdateUserDTO;
import com.mzl.flower.dto.response.system.UserDetailsDTO;
import com.mzl.flower.dto.response.system.UserListDTO;
import com.mzl.flower.dto.response.system.UserListInfoDTO;
import com.mzl.flower.service.system.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -102,4 +103,10 @@
        return returnData(R.SUCCESS.getCode(), null);
    }

    @GetMapping("/user/list")
    @ApiOperation(value = "查询用户列表")
    public ResponseEntity<ReturnDataDTO<Page<UserListInfoDTO>>> searchAllUser(@ModelAttribute SearchUserDTO dto, Page page) {
        return returnData(R.SUCCESS.getCode(), userService.searchUserInfos(dto, page));
    }

}

 src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java

@@ -1,10 +1,12 @@
package com.mzl.flower.web.v2.sms;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.dto.request.sms.SmsTaskDTO;
import com.mzl.flower.dto.request.sms.SmsTaskQueryDTO;
import com.mzl.flower.dto.response.sms.SmsSelectVO;
import com.mzl.flower.dto.response.sms.SmsTaskVO;
import com.mzl.flower.service.sms.SmsTaskService;
import io.swagger.annotations.Api;
@@ -12,6 +14,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import javax.validation.constraints.NotNull;


@@ -61,5 +64,12 @@
        return returnData(R.SUCCESS.getCode(), null);
    }

    @GetMapping("/select/{id}")
    @ApiOperation(value = "任务筛选详情列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<SmsSelectVO>> selectList(@PathVariable(name = "id") Long id) {
        return returnData(R.SUCCESS.getCode(), smsTaskService.getSelectList(id));
    }



}

 src/main/java/com/mzl/flower/web/v2/sms/SmsTaskDetailController.java

@@ -1,12 +1,10 @@
package com.mzl.flower.web.v2.sms;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.dto.request.sms.SmsTaskDetailQueryDTO;
import com.mzl.flower.dto.request.sms.SmsTaskQueryDTO;
import com.mzl.flower.dto.response.sms.SmsPhoneResultVO;
import com.mzl.flower.dto.response.sms.SmsTaskDetailVO;
import com.mzl.flower.service.sms.SmsTaskDetailService;
@@ -15,16 +13,16 @@
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.validation.constraints.NotNull;

/**
 * @author @TaoJie
 * @since 2024-12-25
 */
@Api(value = "任务详情管理", tags = "任务详情管理")
@Api(value = "短信任务详情管理", tags = "短信任务详情管理")
@RestController
@RequestMapping("/v2/sms-task-detail")
@RequiredArgsConstructor
@@ -33,13 +31,14 @@
    private final SmsTaskDetailService smsTaskDetailService;

    @GetMapping("/list")
    @ApiOperation(value = "任务详情列表", httpMethod = "GET")
    @ApiOperation(value = "短信任务详情列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<Page<SmsPhoneResultVO>>> getSmsTaskList(Page page, SmsTaskDetailQueryDTO dto) {
        return returnData(R.SUCCESS.getCode(), smsTaskDetailService.queryPage(dto, page));
    }
    @GetMapping("/taskStatistics")
    @ApiOperation(value = "任务详情列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<SmsTaskDetailVO> >taskStatistics(@NotNull(message = "id不能为空") Long id ) {

    @GetMapping("/taskStatistics/{id}")
    @ApiOperation(value = "短信任务详情列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<SmsTaskDetailVO>> taskStatistics(@PathVariable(name = "id") Long id) {
        return returnData(R.SUCCESS.getCode(), smsTaskDetailService.getCountBySmsTaskId(id));
    }


 src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java

@@ -64,7 +64,7 @@
        return returnData(R.SUCCESS.getCode(), smsTemplateService.queryPage(dto, page));
    }

    @GetMapping("/template/list")
    @GetMapping("/aliyun/list")
    @ApiOperation(value = "短信模板列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<Page<SmsTemplateDO>>> getALSmsTemplateList(Page page, SmsTemplateQueryDTO dto) throws Exception {
        Client client = createClient();
@@ -88,8 +88,8 @@
        return new Client(config);
    }

    @GetMapping("/aliyun/all")
    @ApiOperation(value = "阿里云短信模板下拉列表", httpMethod = "GET")
    @GetMapping("/templateName/all")
    @ApiOperation(value = "短信模板下拉列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO> getSmsTemplateNameList() {
        List<SmsTemplateListVO> allTemplateName = smsTemplateService.getAllTemplateName();
        return returnData(R.SUCCESS.getCode(), allTemplateName);

 src/main/resources/mapper/sms/SmsTaskDetailMapper.xml

@@ -2,12 +2,39 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mzl.flower.mapper.SmsTaskDetailMapper">

    <select id="queryPage" resultType="com.mzl.flower.dto.response.sms.SmsTaskDetailVO">
    <select id="queryPage" resultType="com.mzl.flower.dto.response.sms.SmsPhoneResultVO">
        select t.* from t_sms_task_detail t
        where t.deleted= 0
        <if test="dto.smsTaskId!=null ">
            and t.sms_task_id = #{dto.smsTaskId}
        </if>
        <if test="dto.phone!=null ">
            and t.phone like concat('%', #{dto.phone}, '%')
        </if>
        <if test="dto.result!=null ">
            and t.result = #{dto.result}
        </if>
    </select>
    <select id="getCountBySmsTaskId" resultType = "com.mzl.flower.dto.response.sms.SmsTaskDetailVO">
        SELECT
        t.id,
        t.name as smsTaskName,
        st.name as smsTemplateName,
        COUNT(CASE WHEN std.result = 'success' THEN 1 END) AS successNum,
        COUNT(CASE WHEN std.result = 'failure' THEN 1 END) AS failureNum,
        COUNT(CASE WHEN std.result is null THEN 1 END) AS sendingNum,
        COUNT(std.id) AS totalNum
        FROM
            t_sms_task t
                LEFT JOIN t_sms_template st ON t.sms_template_id = st.id
                LEFT JOIN t_sms_task_detail std ON t.id = std.sms_task_id
        WHERE
            t.deleted = '0'
        <if test="id!=null ">
            and t.id = #{id}
        </if>
        GROUP BY
        t.id, t.name; -- 根据你需要的字段进行分组
    </select>

</mapper>

 src/main/resources/mapper/system/UserMapper.xml

@@ -89,4 +89,81 @@
        </foreach>

    </select>

    <select id="searchUserInfo" resultType="com.mzl.flower.dto.response.system.UserListInfoDTO">
        SELECT
            user_id,
            id,
            name AS loginName,
            contact_tel tel,
            type
        FROM (
                 SELECT user_id, id, name, contact_tel, 'supplier' AS type
                 FROM t_supplier_info
                 WHERE user_id IN (SELECT id FROM t_user WHERE type = 'supplier')

                 UNION ALL

                 SELECT user_id, id, name, contact_tel, 'partner' AS type
                 FROM t_partner_info
                 WHERE user_id IN (SELECT id FROM t_user WHERE type = 'partner')

                 UNION ALL

                 SELECT c.user_id, c.id, c.name, u.tel AS contact_tel, 'customer' AS type
                 FROM t_customer_info c
                          JOIN t_user u ON c.user_id = u.id
                 WHERE c.user_id IN (SELECT id FROM t_user WHERE type = 'customer')
             ) AS combined_table
        <where>
        <if test="condition.userType != null and condition.userType != ''">
            AND type = #{condition.userType}
        </if>
        <if test="condition.id != null and condition.id != ''">
            AND id = #{condition.id}
        </if>
        <if test="condition.loginName != null and condition.loginName != ''">
            AND name = #{condition.loginName}
        </if>
        <if test="condition.tel != null and condition.tel != ''">
            AND contact_tel = #{condition.tel}
        </if>
        </where>
    </select>

    <select id="getSelectList" resultType="com.mzl.flower.dto.response.sms.SmsSelectVO">
        SELECT
        user_id,
        id,
        name AS loginName,
        contact_tel tel,
        type
        FROM (
        SELECT user_id, id, name, contact_tel, 'supplier' AS type
        FROM t_supplier_info
        WHERE user_id IN (SELECT id FROM t_user WHERE type = 'supplier')

        UNION ALL

        SELECT user_id, id, name, contact_tel, 'partner' AS type
        FROM t_partner_info
        WHERE user_id IN (SELECT id FROM t_user WHERE type = 'partner')

        UNION ALL

        SELECT c.user_id, c.id, c.name, u.tel AS contact_tel, 'customer' AS type
        FROM t_customer_info c
        JOIN t_user u ON c.user_id = u.id
        WHERE c.user_id IN (SELECT id FROM t_user WHERE type = 'customer')
        ) AS combined_table
        <where>
            1=1
            <if test="idList != null and idList.size() > 0">
                AND user_id IN
                <foreach collection="idList" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>
        </where>
    </select>
</mapper>