sccg_server.git

			@@ -156,8 +156,15 @@
			}
			//对用户名系统默认添加
			//umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
			baseMapper.updateById(umsAdmin);
			//添加部门
			UmsDepartManage departManage = new UmsDepartManage();
			departManage.setUserId(umsAdmin.getId());
			departManage.setDepartId(umsAdmin.getDepartmentId());
			departManage.setCreateTime(new Date());
			departManage.setUpdateTime(new Date());
			umsDepartManageMapper.insert(departManage);

			baseMapper.updateById(umsAdmin);
			return umsAdmin;
			}

			@@ -16,6 +16,12 @@
			@Data
			@ApiModel("消息参数体")
			public class MessageParam extends BasePageVO {

			/**
			* 主键id
			*/
			@ApiModelProperty(value = "主键id")
			private Long id;
			/**
			* 标题
			*/

			@@ -1,6 +1,7 @@
			package com.ycl.service.message.factory;

			import com.ycl.common.constant.ChannelCode;
			import com.ycl.common.util.CommonUtils;
			import com.ycl.common.util.UtilNumber;
			import com.ycl.dto.message.MessageParam;
			import com.ycl.entity.message.Message;
			@@ -42,8 +43,9 @@
			@Override
			public Message sendMessage(MessageParam messageParam) {
			Message message = new Message();
			String messageNumber = UtilNumber.getNumber("MC", 6);
			List<Message> messages = new ArrayList<>();
			if (CommonUtils.isEmpty(messageParam.getId())) {
			String messageNumber = UtilNumber.getNumber("MC", 6);
			BeanUtils.copyProperties(messageParam, message);
			//父Id为0
			message.setParentId(0L);
			@@ -62,6 +64,15 @@
			message.setCreateUser(messageParam.getCreateUser());
			message.setUpdateUser(messageParam.getCreateUser());
			messageMapper.insert(message);
			} else {
			message.setId(messageParam.getId());
			BeanUtils.copyProperties(messageParam, message);
			message.setUpdateTime(new Date());
			message.setUpdateUser(messageParam.getCreateUser());
			messageMapper.updateById(message);
			}
			//发布消息
			if (message.getStatus() == 1) {
			String[] ids = messageParam.getTargetTo().split(",");
			for (String id : ids) {
			Message messageAdd = new Message();
			@@ -71,7 +82,7 @@
			//设置接收者
			messageAdd.setTargetTo(id);
			//生成8位随机数消息编码
			messageAdd.setMessageNumber(messageNumber);
			messageAdd.setMessageNumber(message.getMessageNumber());
			//发送时间
			if (messageAdd.getSendTime() == null) {
			messageAdd.setSendTime(new Date());
			@@ -92,6 +103,7 @@
			}
			//批量新增
			iMessageService.saveBatch(messages);
			}
			return message;
			}
			}

			@@ -53,6 +53,7 @@
			public Message sendMessage(MessageParam messageParam) {
			//入库保存
			Message message = innerSender.sendMessage(messageParam);
			if (messageParam.getStatus() == 1) {
			//发起审核
			iSmsAuditService.startAuditSms(message);
			//id换成邮箱号
			@@ -60,6 +61,7 @@
			message.setTargetTo(targetToMail);
			//发送邮件
			sendMail(message);
			}
			return message;
			}

	ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史