Просмотр исходного кода

1、优化系统通知
2、增加错误提示

rayson 7 месяцев назад
Родитель
Сommit
585c6ee3b2

+ 38 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/error/AppErrorRecordController.java

@@ -0,0 +1,38 @@
+package com.citu.module.menduner.system.controller.app.common.error;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.common.util.LoginUserContext;
+import com.citu.module.menduner.system.dal.dataobject.error.ErrorRecordDO;
+import com.citu.module.menduner.system.dal.mysql.error.ErrorRecordMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "公共 - 错误记录")
+@RestController
+@RequestMapping("/menduner/system/error-record")
+@Validated
+public class AppErrorRecordController {
+
+    @Resource
+    private ErrorRecordMapper errorRecordMapper;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建错误记录")
+    public CommonResult<Integer> createErrorRecord(@Valid @RequestBody ErrorRecordSaveReqVO createReqVO) {
+        ErrorRecordDO insert = BeanUtils.toBean(createReqVO, ErrorRecordDO.class);
+        insert.setUserId(LoginUserContext.getUserId2());
+        insert.setEnterpriseId(LoginUserContext.getEnterpriseId3());
+        return success(errorRecordMapper.insert(insert));
+    }
+}

+ 13 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/error/ErrorRecordSaveReqVO.java

@@ -0,0 +1,13 @@
+package com.citu.module.menduner.system.controller.app.common.error;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "用户端 - 错误记录新增/修改 Request VO")
+@Data
+public class ErrorRecordSaveReqVO {
+
+    @Schema(description = "内容")
+    private String content;
+
+}

+ 43 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/error/ErrorRecordDO.java

@@ -0,0 +1,43 @@
+package com.citu.module.menduner.system.dal.dataobject.error;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+
+/**
+ * 错误记录 DO
+ *
+ * @author Rayson
+ */
+@TableName("mde_error_record")
+@KeySequence("mde_error_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ErrorRecordDO extends TenantBaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 企业id
+     */
+    private Long enterpriseId;
+    /**
+     * 内容
+     */
+    private String content;
+
+}

+ 15 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/error/ErrorRecordMapper.java

@@ -0,0 +1,15 @@
+package com.citu.module.menduner.system.dal.mysql.error;
+
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.dal.dataobject.error.ErrorRecordDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 错误记录 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface ErrorRecordMapper extends BaseMapperX<ErrorRecordDO> {
+
+}

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/MessageUtils.java

@@ -96,7 +96,7 @@ public class MessageUtils {
                     emailReqDTO.setMail(data.getEmail());
                     emailReqDTO.setTemplateCode(CommonConstants.EMAIL_SYS_NOTIFY_TEMPLATE);
                     emailReqDTO.setTemplateParams(MapUtil.<String, Object>builder()
-                            .put("content", reqDTO.getTemplateParams())
+                            .put("content", notifySysStrMap.get(reqDTO.getTemplateCode()))
                             .build());
                     mailSendApi.sendSingleMailToAdmin(emailReqDTO);
                 }