Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-10-24 e43297404e0d77b9af0c297430c2eedab978dd5e

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.common.util.UtilNumber;
@@ -59,6 +60,7 @@
    @ApiOperation(value = "添加门店信息")
    @RequestMapping(value = "/add", method = RequestMethod.POST)
    @ResponseBody
    @LogSave(operationType = "门店管理",contain = "添加门店")
    public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
        StoreInfo storeInfo = StoreInfo.builder()
                .owner(umsStoreInfoParam.getOwner())

 ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java

@@ -1,8 +1,15 @@
package com.ycl.service.message.factory;

import com.ycl.common.util.PropertyValueUtil;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
import com.ycl.exception.ApiException;
import com.ycl.service.message.Sender;
import com.ycl.service.user.UmsAdminService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

/**
 * <p>
@@ -12,9 +19,49 @@
 * @author mg
 * @since 2022-10-09
 */
@Component
public class SmsSender implements Sender {

    private final Logger logger = LoggerFactory.getLogger(getClass());

    private static InnerSender innerSender;
    @Autowired
    public void setIMessageService(InnerSender innerSender) {
        SmsSender.innerSender = innerSender;
    }

    private static PropertyValueUtil propertyValueUtil;
    @Autowired
    public void setPropertyValueUtil(PropertyValueUtil propertyValueUtil) {
        SmsSender.propertyValueUtil = propertyValueUtil;
    }
    private static UmsAdminService adminService;
    @Autowired
    public void setUmsAdminService(UmsAdminService adminService) {
        SmsSender.adminService = adminService;
    }

    @Override
    public Message sendMessage(MessageParam messageParam) {
        return null;
        //入库保存
        Message message = innerSender.sendMessage(messageParam);
        //发送短信发送
        sendSms(message);
        return message;
    }

    public Message sendSms(Message message) {
        //组装短信发送

        try {
            logger.info("组装短信发送");

        }catch (Exception e){
            e.printStackTrace();
            logger.error("发送组装短信异常！", e);
            e.printStackTrace();
            throw new ApiException("发送组装短信异常");
        }
        return message;
    }
}

 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java

@@ -5,10 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.constant.ChannelCode;
import com.ycl.common.util.CommonUtils;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.exception.ApiException;
import com.ycl.mapper.message.MessageMapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.message.IMessageService;
import com.ycl.service.message.Provider;
import com.ycl.service.message.Sender;
@@ -16,6 +19,10 @@
import com.ycl.service.message.factory.MailFactory;
import com.ycl.service.message.factory.SmsFactory;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -27,6 +34,10 @@
 */
@Service
public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {


    @Resource
    private UmsAdminMapper umsAdminMapper;

    @Override
    public Message sendMessage(MessageParam messageParam) {
@@ -41,16 +52,10 @@
            //邮件发送
            case ChannelCode.SMS:
                provider = new MailFactory();
                //id换成邮箱号
                //String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
                //messageParam.setTargetTo(targetToMail);
                break;
              //短信发送
             //短信发送
            case ChannelCode.MAIL:
                provider = new SmsFactory();
                //id换成手机号
                //String targetToPhone = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
                //messageParam.setTargetTo(targetToPhone);
                break;
            default:
                throw new ApiException("未匹配到该类型");
@@ -64,14 +69,34 @@
    public IPage<Message> list(MessageParam messageParam) {
        Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
        LambdaQueryWrapper<Message> queryWrapper = new LambdaQueryWrapper<>();
        if (messageParam.getMessageType() != null) {
            queryWrapper.eq(Message::getMessageType, messageParam.getMessageType());
        queryWrapper.eq(Message::getParentId, 0);
        if (!CommonUtils.isEmpty(messageParam.getHead())) {
            queryWrapper.eq(Message::getHead, messageParam.getHead());
        }
        if (messageParam.getStatus() != null) {
        if (!CommonUtils.isEmpty(messageParam.getChannelCode())) {
            queryWrapper.eq(Message::getChannelCode, messageParam.getChannelCode());
        }
        if (!CommonUtils.isEmpty(messageParam.getStatus())) {
            queryWrapper.eq(Message::getStatus, messageParam.getStatus());
        }
        queryWrapper.orderByDesc(Message::getCreateTime);
        Page<Message> result = baseMapper.selectPage(page, queryWrapper);
        List<Message> messages = result.getRecords();
        if (!CommonUtils.isEmpty(messages)) {
            List<Long> ids = messages.stream().map(e -> Long.parseLong(e.getTargetFrom().trim())).collect(Collectors.toList());
            LambdaQueryWrapper<UmsAdmin> queryUSers = new LambdaQueryWrapper<>();
            queryUSers.in(UmsAdmin::getId, ids);
            List<UmsAdmin> users = umsAdminMapper.selectList(queryUSers);
            if (!CommonUtils.isEmpty(users)) {
                for (UmsAdmin user : users) {
                    for (Message message : messages) {
                        if (message.getTargetFrom().equals(user.getId()+"")) {
                            message.setTargetFrom(user.getUsername());
                        }
                    }
                }
            }
        }
        return result;
    }


 ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java

@@ -74,7 +74,7 @@

    @ApiModelProperty("门店类型")
    @TableField("type")
    private String type;
    private String typeName;

    @ApiModelProperty("描述")
    @TableField("description")

 ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml

@@ -17,7 +17,7 @@
    <select id="selectStorePage" resultType="com.ycl.vo.store.StoreInfoVO">
        SELECT
            t1.*,
            t2.`name`
            t2.`name` as typeName
        FROM
            ums_store_store_info t1
               left JOIN ums_data_dictionary t2 ON t1.type = t2.id