新增短信发送记录表基础数据

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/sms/domain/SmsSendRecord.java

@@ -0,0 +1,75 @@
+package com.xunmei.common.core.domain.sms.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 短信发送记录
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("sms_send_record")
+@ApiModel(value="SmsSendRecord对象", description="短信发送记录")
+public class SmsSendRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("id")
+    private Long id;
+
+    @ApiModelProperty(value = "发送时间")
+    @TableField("time")
+    private LocalDateTime time;
+
+    @ApiModelProperty(value = "交易类型")
+    @TableField("tran_type")
+    private Integer tranType;
+
+    @ApiModelProperty(value = "接收机构id")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "接收机构名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "短信接收人id")
+    @TableField("user_id")
+    private Long userId;
+
+    @ApiModelProperty(value = "接受人名称")
+    @TableField("user_name")
+    private String userName;
+
+    @ApiModelProperty(value = "接收人联系方式")
+    @TableField("user_phone")
+    private String userPhone;
+
+    @ApiModelProperty(value = "短信内容")
+    @TableField("content_data")
+    private String contentData;
+
+    @ApiModelProperty(value = "发送结果")
+    @TableField("result")
+    private String result;
+
+    @ApiModelProperty(value = "发送结果描述")
+    @TableField("result_description")
+    private String resultDescription;
+
+
+}

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -432,7 +432,7 @@ public class PdfUtil {
         //第三行
         createPDFCell(tableFont, table, "演练时间", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("drillTime").toString(), Element.ALIGN_LEFT, 5, 1);
-        createPDFCell(tableFont, table, "演练项目", Element.ALIGN_MIDDLE, 1, 1);
+        createPDFCell(tableFont, table, "演练类型", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("typeText").toString(), Element.ALIGN_LEFT, 5, 1);
         //预设案由
         createPDFCell(tableFont, table, "预设案由", Element.ALIGN_MIDDLE, 1, 1);

soc-modules/soc-modules-gen/src/main/java/com/xunmei/gen/util/CodeGenerators.java

@@ -29,8 +29,8 @@ public class CodeGenerators {
         throw new MybatisPlusException("请输入正确的" + tip + "！");
     }*/
 
-    public static final String moduleName="com.xunmei.core.compensate";
-    public static final String tableNames="core_compensate_log";
+    public static final String moduleName="com.xunmei.sms";
+    public static final String tableNames="sms_send_record";
 
     public static void main(String[] args) {
         // 代码生成器
@@ -53,7 +53,7 @@ public class CodeGenerators {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("jinJie@2021");*/
-        dsc.setUrl("jdbc:mysql://10.87.21.108:3306/soc?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&characterSetResults=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true");
+        dsc.setUrl("jdbc:mysql://10.87.23.57:3306/soc?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&characterSetResults=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("XM_zm2019");

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/controller/SmsSendRecordController.java

@@ -0,0 +1,21 @@
+package com.xunmei.sms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 短信发送记录 前端控制器
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-05
+ */
+@RestController
+@RequestMapping("/SendRecord")
+public class SmsSendRecordController {
+
+}
+

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/mapper/SmsSendRecordMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.sms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.sms.domain.SmsSendRecord;
+
+/**
+ * <p>
+ * 短信发送记录 Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-05
+ */
+public interface SmsSendRecordMapper extends BaseMapper<SmsSendRecord> {
+
+}

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/ISmsSendRecordService.java

@@ -0,0 +1,16 @@
+package com.xunmei.sms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.sms.domain.SmsSendRecord;
+
+/**
+ * <p>
+ * 短信发送记录 服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-05
+ */
+public interface ISmsSendRecordService extends IService<SmsSendRecord> {
+
+}

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/SmsService.java

@@ -154,7 +154,7 @@ public class SmsService implements ISmsService {
                 smsInfoVo.setOccurTime(sfm);
                 smsInfoVo.setBak3("任务【"+ content + "】未完成,将于"+date+"逾期。");
                 CompositeData smsCompositeData = SmsUtil.createSmsBody(smsInfoVo,systemCode,systemName,serviceCode,serviceScene);
-                CompositeData rspData = null;
+                CompositeData rspData = null;//result_description
                 try {
                     rspData = ESBClient.request(smsCompositeData);
                 } catch (Exception e) {

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/impl/SmsSendRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.xunmei.sms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.sms.domain.SmsSendRecord;
+import com.xunmei.sms.mapper.SmsSendRecordMapper;
+import org.springframework.stereotype.Service;
+import com.xunmei.sms.service.ISmsSendRecordService;
+
+/**
+ * <p>
+ * 短信发送记录 服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-05
+ */
+@Service
+public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, SmsSendRecord> implements ISmsSendRecordService {
+
+}

soc-modules/soc-modules-sms/src/main/resources/mapper/SmsSendRecordMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.sms.mapper.SmsSendRecordMapper">
+
+</mapper>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/Sm4Util.java

@@ -185,7 +185,7 @@ public class Sm4Util {
 
 
     public static void main(String[] args) {
-        String s = encryptEcb("51d95b1dc43a9faaad0570f81c755fcf", "update core_edu_training_task set status=2 where id=1787272874109542406;");
+        String s = encryptEcb("51d95b1dc43a9faaad0570f81c755fcf", "update core_drill_task set status=3 where id=1785571098942177286;");
 
         System.out.println(s);