From 89f99008bd4b5461f31727f3049c89fa1ef6f4ae Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 17 十月 2022 22:58:36 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/message/ISmsAuditService.java | 17 +
ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java | 35 +++
ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java | 2
ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsTemplateController.java | 77 ++++++++
ycl-platform/src/main/java/com/ycl/service/message/ISmsTemplateService.java | 17 +
ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java | 32 +++
ycl-platform/src/main/java/com/ycl/entity/message/SmsTemplate.java | 74 ++++++++
ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java | 3
ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsAuditController.java | 90 ++++++++++
ycl-platform/src/main/java/com/ycl/entity/message/MessageColumnSet.java | 3
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 7
ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java | 2
ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java | 79 ++++++++
ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java | 7
ycl-platform/src/main/java/com/ycl/common/constant/ChannelCode.java | 24 ++
ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java | 15 +
ycl-platform/src/main/java/com/ycl/mapper/message/SmsTemplateMapper.java | 15 +
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 4
18 files changed, 489 insertions(+), 14 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/common/constant/ChannelCode.java b/ycl-platform/src/main/java/com/ycl/common/constant/ChannelCode.java
new file mode 100644
index 0000000..0957763
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/common/constant/ChannelCode.java
@@ -0,0 +1,24 @@
+package com.ycl.common.constant;
+
+/**
+ * <p>
+ * 绫昏鏄�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+public class ChannelCode {
+ /**
+ * 鍐呯珯鍙戦��
+ */
+ public static final String INNER = "01";
+ /**
+ * 鐭俊鍙戦��
+ */
+ public static final String SMS = "02";
+ /**
+ * 閭欢鍙戦��
+ */
+ public static final String MAIL = "03";
+}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
index 1f29c0d..a4a46b8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
@@ -42,7 +42,7 @@
@ApiOperation("鑾峰彇鎸囧畾鏍忕洰")
@RequestMapping(value = "/getColumnSet/{id}", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<MessageColumnSet> getMessage(@PathVariable Long id) {
+ public CommonResult<MessageColumnSet> getColumnSet(@PathVariable Long id) {
MessageColumnSet columnSet = iMessageColumnSetService.getById(id);
return CommonResult.success(columnSet);
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
index 4bb2698..2fdab6a 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
@@ -15,6 +15,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
import java.util.List;
/**
@@ -66,7 +67,8 @@
message.setId(id);
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
//璁剧疆鍒涘缓浜�
- message.setCreateUser(user.getUserId());
+ message.setUpdateUser(user.getUserId());
+ message.setUpdateTime(new Date());
BeanUtils.copyProperties(messageParam, message);
boolean success = iMessageService.updateById(message);
if (success) {
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsAuditController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsAuditController.java
new file mode 100644
index 0000000..5fc16fb
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsAuditController.java
@@ -0,0 +1,90 @@
+package com.ycl.controller.message;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
+import com.ycl.entity.message.SmsAudit;
+import com.ycl.service.message.ISmsAuditService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 鐭俊瀹℃牳绠＄悊 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+@RestController
+@RequestMapping("/message_audit")
+@Api(tags = "鐭俊瀹℃牳绠＄悊")
+public class MessageSmsAuditController {
+ @Autowired
+ private ISmsAuditService iSmsAuditService;
+
+
+ @ApiOperation(value = "鏂板鐭俊瀹℃牳")
+ @RequestMapping(value = "/addSmsAudit", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult addSmsAudit(@Validated @RequestBody SmsAudit smsAudit) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ smsAudit.setCreateUser(user.getUserId());
+ smsAudit.setCreateTime(new Date());
+ smsAudit.setUpdateTime(new Date());
+ smsAudit.setUpdateUser(user.getUserId());
+ iSmsAuditService.save(smsAudit);
+ return CommonResult.success(smsAudit);
+ }
+
+ @ApiOperation(value = "鑾峰彇鐭俊瀹℃牳鍒嗛〉鏌ヨ")
+ @RequestMapping(value = "/list", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult<IPage<SmsAudit>> list(@Validated @RequestBody SmsAudit smsAudit) {
+ return CommonResult.success(iSmsAuditService.list(smsAudit));
+ }
+
+
+ @ApiOperation("鑾峰彇鎸囧畾鐭俊瀹℃牳")
+ @RequestMapping(value = "/getSmsAudit/{id}", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult<SmsAudit> getSmsAudit(@PathVariable Long id) {
+ SmsAudit smsAudit = iSmsAuditService.getById(id);
+ return CommonResult.success(smsAudit);
+ }
+
+ @ApiOperation("淇敼鎸囧畾鐭俊瀹℃牳")
+ @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult update(@PathVariable Long id, @RequestBody SmsAudit smsAudit) {
+ smsAudit.setId(id);
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ smsAudit.setUpdateUser(user.getUserId());
+ smsAudit.setUpdateTime(new Date());
+ boolean success = iSmsAuditService.updateById(smsAudit);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎鐭俊瀹℃牳")
+ @RequestMapping(value = "/delete", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult delete(@RequestParam("ids") List<Long> ids) {
+ boolean success = iSmsAuditService.removeBatchByIds(ids);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsTemplateController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsTemplateController.java
index 74427ed..6bc2829 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsTemplateController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageSmsTemplateController.java
@@ -1,8 +1,19 @@
package com.ycl.controller.message;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
+import com.ycl.entity.message.SmsTemplate;
+import com.ycl.service.message.ISmsTemplateService;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -14,6 +25,66 @@
*/
@RestController
@RequestMapping("/message_sms_template")
-@Api(tags = "鐢ㄦ埛娑堟伅鏍忕洰璁剧疆")
+@Api(tags = "鐭俊妯℃澘绠＄悊")
public class MessageSmsTemplateController {
+ @Autowired
+ private ISmsTemplateService iSmsTemplateService;
+
+
+ @ApiOperation(value = "鏂板鐭俊妯℃澘")
+ @RequestMapping(value = "/addSmsTemplate", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult addSmsTemplate(@Validated @RequestBody SmsTemplate smsTemplate) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ smsTemplate.setCreateUser(user.getUserId());
+ smsTemplate.setCreateTime(new Date());
+ smsTemplate.setUpdateTime(new Date());
+ smsTemplate.setUpdateUser(user.getUserId());
+ iSmsTemplateService.save(smsTemplate);
+ return CommonResult.success(smsTemplate);
+ }
+
+ @ApiOperation(value = "鑾峰彇鐭俊妯℃澘鍒嗛〉鏌ヨ")
+ @RequestMapping(value = "/list", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult<IPage<SmsTemplate>> list(@Validated @RequestBody SmsTemplate smsTemplate) {
+ return CommonResult.success(iSmsTemplateService.list(smsTemplate));
+ }
+
+
+ @ApiOperation("鑾峰彇鎸囧畾鐭俊妯℃澘")
+ @RequestMapping(value = "/getSmsTemplate/{id}", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult<SmsTemplate> getSmsTemplate(@PathVariable Long id) {
+ SmsTemplate smsTemplate = iSmsTemplateService.getById(id);
+ return CommonResult.success(smsTemplate);
+ }
+
+ @ApiOperation("淇敼鎸囧畾鐭俊妯℃澘")
+ @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult update(@PathVariable Long id, @RequestBody SmsTemplate smsTemplate) {
+ smsTemplate.setId(id);
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ smsTemplate.setUpdateUser(user.getUserId());
+ smsTemplate.setUpdateTime(new Date());
+ boolean success = iSmsTemplateService.updateById(smsTemplate);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎鐭俊妯℃澘")
+ @RequestMapping(value = "/delete", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult delete(@RequestParam("ids") List<Long> ids) {
+ boolean success = iSmsTemplateService.removeBatchByIds(ids);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
index b4d892f..183d8c7 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
@@ -23,7 +23,7 @@
* @since 2022-09-16
*/
@RestController
-@RequestMapping("/sccg-region")
+@RequestMapping("/sccg_region")
@Api(tags = "琛屾斂鍖哄煙")
public class SccgRegionController extends BaseController {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
index f08e4dc..25557c3 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("ums_message_column")
@ApiModel(value = "娑堟伅鏍忕洰琛�")
-public class MessageColumn {
+public class MessageColumn implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 涓婚敭
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumnSet.java b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumnSet.java
index bc9e291..a381cc6 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumnSet.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumnSet.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
+import java.io.Serializable;
/**
* <p>
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("ums_message_column_set")
@ApiModel(value = "娑堟伅鏍忕洰鐢ㄦ埛璁剧疆琛�")
-public class MessageColumnSet {
+public class MessageColumnSet implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 涓婚敭
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
new file mode 100644
index 0000000..e126d41
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
@@ -0,0 +1,79 @@
+package com.ycl.entity.message;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.api.BasePageVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 鐭俊瀹℃牳 瀹炰綋绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_sms_audit")
+@ApiModel(value = "鐭俊瀹℃牳琛�")
+public class SmsAudit extends BasePageVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+ /**
+ * 娑堟伅Id
+ */
+ @TableField("message_id")
+ @ApiModelProperty(value = "娑堟伅Id")
+ private Long messageId;
+ /**
+ * 瀹℃牳浜篒d
+ */
+ @TableField("audit_id")
+ @ApiModelProperty(value = "瀹℃牳浜篒d")
+ private Long auditId;
+ /**
+ * 瀹℃牳鐘舵��
+ */
+ @TableField("audit_status")
+ @ApiModelProperty(value = "瀹℃牳鐘舵��")
+ private Integer auditStatus;
+ /**
+ * 鍒涘缓浜�
+ */
+ @TableField("create_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long createUser;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @TableField("update_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long updateUser;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField("update_time")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/SmsTemplate.java b/ycl-platform/src/main/java/com/ycl/entity/message/SmsTemplate.java
index f3e1a95..389f139 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/SmsTemplate.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/SmsTemplate.java
@@ -1,12 +1,82 @@
package com.ycl.entity.message;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.api.BasePageVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
/**
* <p>
- * 绫昏鏄�
+ * 鐭俊妯℃澘 瀹炰綋绫�
* </p>
*
* @author mg
* @since 2022-10-14
*/
-public class SmsTemplate {
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_sms_template")
+@ApiModel(value = "鐭俊妯℃澘琛�")
+public class SmsTemplate extends BasePageVO implements Serializable {
+
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+ /**
+ * 妯℃澘绫诲瀷1-楠岃瘉鐮佹ā鏉�2-娲诲姩妯℃澘
+ */
+ @TableField("type")
+ @ApiModelProperty(value = "妯℃澘绫诲瀷1-楠岃瘉鐮佹ā鏉�2-娲诲姩妯℃澘")
+ private Integer type;
+ /**
+ * 鏍囬
+ */
+ @TableField("title")
+ @ApiModelProperty(value = "鏍囬")
+ private String title;
+ /**
+ * 娑堟伅浣�
+ */
+ @TableField("body")
+ @ApiModelProperty(value = "娑堟伅浣�")
+ private String body;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @TableField("create_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long createUser;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @TableField("update_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long updateUser;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField("update_time")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java
new file mode 100644
index 0000000..ecdac2d
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java
@@ -0,0 +1,15 @@
+package com.ycl.mapper.message;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.message.SmsAudit;
+
+/**
+ * <p>
+ * 鐭俊瀹℃牳 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+public interface SmsAuditMapper extends BaseMapper<SmsAudit> {
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/message/SmsTemplateMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/message/SmsTemplateMapper.java
new file mode 100644
index 0000000..ac83561
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/message/SmsTemplateMapper.java
@@ -0,0 +1,15 @@
+package com.ycl.mapper.message;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.message.SmsTemplate;
+
+/**
+ * <p>
+ * 鐭俊妯℃澘 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+public interface SmsTemplateMapper extends BaseMapper<SmsTemplate> {
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/ISmsAuditService.java b/ycl-platform/src/main/java/com/ycl/service/message/ISmsAuditService.java
new file mode 100644
index 0000000..1bf6a6f
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/message/ISmsAuditService.java
@@ -0,0 +1,17 @@
+package com.ycl.service.message;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.message.SmsAudit;
+
+/**
+ * <p>
+ * 绫昏鏄�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+public interface ISmsAuditService extends IService<SmsAudit> {
+ IPage<SmsAudit> list(SmsAudit smsAudit);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/ISmsTemplateService.java b/ycl-platform/src/main/java/com/ycl/service/message/ISmsTemplateService.java
new file mode 100644
index 0000000..08a34e2
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/message/ISmsTemplateService.java
@@ -0,0 +1,17 @@
+package com.ycl.service.message;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.message.SmsTemplate;
+
+/**
+ * <p>
+ * 绫昏鏄�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+public interface ISmsTemplateService extends IService<SmsTemplate> {
+ IPage<SmsTemplate> list(SmsTemplate smsTemplate);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
index 2da8edd..83a8744 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
@@ -1,5 +1,6 @@
package com.ycl.service.message.factory;
+import com.ycl.common.constant.ChannelCode;
import com.ycl.common.util.UtilNumber;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
@@ -49,6 +50,11 @@
if (messageAdd.getSendTime() == null) {
messageAdd.setSendTime(new Date());
}
+ if (ChannelCode.MAIL.equals(messageParam.getChannelCode())) {
+ messageAdd.setIsScan(1);
+ } else {
+ messageAdd.setIsScan(0);
+ }
//鐢熸垚榛樿鍙傛暟
messageAdd.setCreateTime(new Date());
messageAdd.setUpdateTime(new Date());
@@ -56,7 +62,6 @@
messageAdd.setUpdateUser(messageParam.getCreateUser());
messageAdd.setIsView(0);
messageAdd.setVersion(0);
- messageAdd.setIsScan(1);
messages.add(messageAdd);
}
BeanUtils.copyProperties(messageParam, message);
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index ec959cd..f8b0e1a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.dto.message.MessageParam;
import com.ycl.entity.message.Message;
import com.ycl.exception.ApiException;
@@ -39,11 +40,11 @@
switch (messageParam.getChannelCode())
{
//鍐呯珯鍙戦��
- case "01":
+ case ChannelCode.INNER:
provider = new InnerFactory();
break;
//閭欢鍙戦��
- case "02":
+ case ChannelCode.SMS:
provider = new MailFactory();
//id鎹㈡垚閭鍙�
String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
@@ -51,7 +52,7 @@
break;
//鐭俊鍙戦��
- case "03":
+ case ChannelCode.MAIL:
provider = new SmsFactory();
//id鎹㈡垚鎵嬫満鍙�
String targetToPhone = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
new file mode 100644
index 0000000..b0bb2c3
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
@@ -0,0 +1,32 @@
+package com.ycl.service.message.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.message.SmsAudit;
+import com.ycl.mapper.message.SmsAuditMapper;
+import com.ycl.service.message.ISmsAuditService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鐭俊瀹℃牳 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+@Service
+public class SmsAuditServiceImpl extends ServiceImpl<SmsAuditMapper, SmsAudit> implements ISmsAuditService {
+ @Override
+ public IPage<SmsAudit> list(SmsAudit smsAudit) {
+ Page<SmsAudit> page = new Page<>(smsAudit.getCurrent(), smsAudit.getPageSize());
+ LambdaQueryWrapper<SmsAudit> queryWrapper = new LambdaQueryWrapper<>();
+ if (smsAudit.getAuditStatus() != null) {
+ queryWrapper.eq(SmsAudit::getAuditStatus, smsAudit.getAuditStatus());
+ }
+ Page<SmsAudit> result = baseMapper.selectPage(page, queryWrapper);
+ return result;
+ }
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java
new file mode 100644
index 0000000..dcbde34
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java
@@ -0,0 +1,35 @@
+package com.ycl.service.message.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.message.SmsTemplate;
+import com.ycl.mapper.message.SmsTemplateMapper;
+import com.ycl.service.message.ISmsTemplateService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鐭俊妯℃澘 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-17
+ */
+@Service
+public class SmsTemplateServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTemplate> implements ISmsTemplateService {
+ @Override
+ public IPage<SmsTemplate> list(SmsTemplate smsTemplate) {
+ Page<SmsTemplate> page = new Page<>(smsTemplate.getCurrent(), smsTemplate.getPageSize());
+ LambdaQueryWrapper<SmsTemplate> queryWrapper = new LambdaQueryWrapper<>();
+ if (smsTemplate.getType() != null) {
+ queryWrapper.eq(SmsTemplate::getType, smsTemplate.getType());
+ }
+ if (smsTemplate.getTitle() != null) {
+ queryWrapper.eq(SmsTemplate::getTitle, smsTemplate.getTitle());
+ }
+ Page<SmsTemplate> result = baseMapper.selectPage(page, queryWrapper);
+ return result;
+ }
+}
--
Gitblit v1.8.0